remove libuv uvw curl 3rdparty

Author: DHR60

.gitmodules

@@ -10,12 +10,6 @@
 [submodule "src/plugin-interface"]
 	path = src/plugin-interface
 	url = https://github.com/Qv2ray/QvPlugin-Interface
-[submodule "3rdparty/libuv"]
-    path = 3rdparty/libuv
-    url = https://github.com/libuv/libuv.git
-[submodule "3rdparty/uvw"]
-	path = 3rdparty/uvw
-	url = https://github.com/skypjack/uvw.git
 [submodule "cmake/android"]
 	path = cmake/android
 	url = https://github.com/LaurentGomila/qt-android-cmake

3rdparty/libuv

@@ -221,8 +221,6 @@ message("Qv2ray Version: ${_QV2RAY_BUILD_INFO_STR_} - ${_QV2RAY_BUILD_EXTRA_INFO
 # ==================================================================================
 # 3rdparty Sources
 # ==================================================================================
-include(cmake/libuv.cmake)
-include(cmake/libcurl.cmake)
 include(cmake/libsemver.cmake)
 include(cmake/backend.cmake)
 include(3rdparty/QJsonStruct/QJsonStruct.cmake)
@@ -294,18 +292,14 @@ add_library(qv2ray_baselib STATIC
 target_link_libraries(qv2ray_baselib
     ${QV2RAY_QT_LIBS}
     ${QV2RAY_BACKEND_LIBRARY}
-    ${LibUV_LIBRARIES}
-    ${CURL_LIBRARIES}
     ${SINGLEAPPLICATION_LIBRARY}
     Threads::Threads
     )
 
 target_include_directories(qv2ray_baselib PUBLIC
     ${CMAKE_BINARY_DIR}
     ${QV2RAY_BASEDIR_COMPONENTS}
-    ${LibUV_INCLUDE_DIR}
     ${SINGLEAPPLICATION_DIR}
-    ${CURL_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${Protobuf_INCLUDE_DIRS}

3rdparty/uvw

@@ -41,11 +41,6 @@ set(QV2RAY_BASE_SOURCES
     ${QV2RAY_BASEDIR_COMPONENTS}/latency/TCPing.h
     ${QV2RAY_BASEDIR_COMPONENTS}/latency/RealPing.cpp
     ${QV2RAY_BASEDIR_COMPONENTS}/latency/RealPing.h
-    ${QV2RAY_BASEDIR_COMPONENTS}/latency/DNSBase.h
-    ${QV2RAY_BASEDIR_COMPONENTS}/latency/win/ICMPPing.cpp
-    ${QV2RAY_BASEDIR_COMPONENTS}/latency/win/ICMPPing.h
-    ${QV2RAY_BASEDIR_COMPONENTS}/latency/unix/ICMPPing.cpp
-    ${QV2RAY_BASEDIR_COMPONENTS}/latency/unix/ICMPPing.h
     #
     ${QV2RAY_BASEDIR_COMPONENTS}/ntp/QvNTPClient.cpp
     ${QV2RAY_BASEDIR_COMPONENTS}/ntp/QvNTPClient.h

CMakeLists.txt

@@ -37,13 +37,13 @@ struct Qv2rayConfig_Graph
     safetype::QvEnumMap<StatisticsType, safetype::QvPair<QvGraphPenConfig>> colorConfig;
     JSONSTRUCT_COMPARE(Qv2rayConfig_Graph, useOutboundStats, hasDirectStats, colorConfig)
     JSONSTRUCT_REGISTER(Qv2rayConfig_Graph, F(useOutboundStats, hasDirectStats, colorConfig))
-    const static inline QvPair<QvGraphPenConfig> DefaultPen{
-        { 134, 196, 63,  1.5f, Qt::SolidLine },
-        { 50,  153, 255, 1.5f, Qt::SolidLine }
+    const static inline QvPair<QvGraphPenConfig> DefaultPen {
+        {134, 196, 63,  1.5f, Qt::SolidLine},
+        {50,  153, 255, 1.5f, Qt::SolidLine}
     };
-    const static inline QvPair<QvGraphPenConfig> DirectPen{
-        { 0,   210, 240, 1.5f, Qt::DotLine },
-        { 235, 220, 42,  1.5f, Qt::DotLine }
+    const static inline QvPair<QvGraphPenConfig> DirectPen {
+        {0,   210, 240, 1.5f, Qt::DotLine},
+        {235, 220, 42,  1.5f, Qt::DotLine}
     };
 };
 
@@ -68,10 +68,8 @@ struct Qv2rayConfig_UI
     bool useOldShareLinkFormat = false;
     bool startMinimized = true;
     bool exitByCloseEvent = false;
-    JSONSTRUCT_COMPARE(Qv2rayConfig_UI, theme, language, quietMode, graphConfig, useDarkTheme, useDarkTrayIcon, useGlyphTrayIcon, maximumLogLines,
-                       maxJumpListCount, recentConnections, useOldShareLinkFormat, startMinimized, exitByCloseEvent)
-    JSONSTRUCT_REGISTER(Qv2rayConfig_UI, F(theme, language, quietMode, graphConfig, useDarkTheme, useDarkTrayIcon, useGlyphTrayIcon,
-                                           maximumLogLines, maxJumpListCount, recentConnections, useOldShareLinkFormat, startMinimized, exitByCloseEvent))
+    JSONSTRUCT_COMPARE(Qv2rayConfig_UI, theme, language, quietMode, graphConfig, useDarkTheme, useDarkTrayIcon, useGlyphTrayIcon, maximumLogLines, maxJumpListCount, recentConnections, useOldShareLinkFormat, startMinimized, exitByCloseEvent)
+    JSONSTRUCT_REGISTER(Qv2rayConfig_UI, F(theme, language, quietMode, graphConfig, useDarkTheme, useDarkTrayIcon, useGlyphTrayIcon, maximumLogLines, maxJumpListCount, recentConnections, useOldShareLinkFormat, startMinimized, exitByCloseEvent))
 };
 
 struct Qv2rayConfig_Plugin
@@ -119,9 +117,12 @@ struct Qv2rayConfig_Kernel
 #undef _VARNAME_VASSETSPATH_
 
     JSONSTRUCT_COMPARE(Qv2rayConfig_Kernel, enableAPI, statsPort, //
-                       v2CorePath_linux, v2AssetsPath_linux,      //
-                       v2CorePath_macx, v2AssetsPath_macx,        //
-                       v2CorePath_win, v2AssetsPath_win)
+                       v2CorePath_linux,
+                       v2AssetsPath_linux, //
+                       v2CorePath_macx,
+                       v2AssetsPath_macx, //
+                       v2CorePath_win,
+                       v2AssetsPath_win)
     JSONSTRUCT_REGISTER(Qv2rayConfig_Kernel,                     //
                         F(enableAPI, statsPort),                 //
                         F(v2CorePath_linux, v2AssetsPath_linux), //
@@ -154,8 +155,7 @@ struct Qv2rayConfig_Advanced
 enum Qv2rayLatencyTestingMethod
 {
     TCPING = 0,
-    ICMPING = 1,
-    REALPING = 2
+    REALPING = 1
 };
 
 struct Qv2rayConfig_Network
@@ -213,8 +213,7 @@ struct Qv2rayConfigObject
 #else
     Q_DISABLE_COPY_MOVE(Qv2rayConfigObject);
 #endif
-    JSONSTRUCT_COMPARE(Qv2rayConfigObject, config_version, logLevel, autoStartId, lastConnectedId, autoStartBehavior, uiConfig, pluginConfig,
-                       kernelConfig, updateConfig, networkConfig, inboundConfig, outboundConfig, advancedConfig, defaultRouteConfig)
+    JSONSTRUCT_COMPARE(Qv2rayConfigObject, config_version, logLevel, autoStartId, lastConnectedId, autoStartBehavior, uiConfig, pluginConfig, kernelConfig, updateConfig, networkConfig, inboundConfig, outboundConfig, advancedConfig, defaultRouteConfig)
     JSONSTRUCT_REGISTER_NOCOPYMOVE(Qv2rayConfigObject,                                                                   //
                                    A(config_version, autoStartId, lastConnectedId, autoStartBehavior, logLevel),         //
                                    A(uiConfig, advancedConfig, pluginConfig, updateConfig, kernelConfig, networkConfig), //