fix: 修复和调整项目；

Author: Wing-summer

.github/workflows/qt-build-release-linux.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWINGHEX_USE_FRAMELESS=ON -DBUILD_TEST_PLUGIN=OFF -DBUILD_SHARED_MEM_EXT=OFF -DANGEL_LSP=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/package 
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWINGHEX_USE_FRAMELESS=ON -DWINGHEX_BUILD_TEST_PLUGIN=OFF -DWINGHEX_BUILD_SHARED_MEM_EXT=OFF -DWINGHEX_ANGEL_LSP=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/package
 
     - name: Build
       # Build your program with the given configuration

.github/workflows/qt-build-release-win.yml

@@ -48,7 +48,7 @@ jobs:
     - name: Configure CMake
        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWINGHEX_USE_FRAMELESS=ON -DBUILD_TEST_PLUGIN=OFF -DBUILD_SHARED_MEM_EXT=OFF -DANGEL_LSP=ON
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWINGHEX_USE_FRAMELESS=ON -DWINGHEX_BUILD_TEST_PLUGIN=OFF -DWINGHEX_BUILD_SHARED_MEM_EXT=OFF -DWINGHEX_ANGEL_LSP=ON
 
     - name: Build
        # Build your program with the given configuration

.github/workflows/qt-build-test.yml

@@ -59,7 +59,7 @@ jobs:
       - name: Configure CMake
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
         # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWINGHEX_USE_FRAMELESS=ON -DBUILD_TEST_PLUGIN=OFF -DBUILD_SHARED_MEM_EXT=OFF -DANGEL_LSP=ON
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWINGHEX_USE_FRAMELESS=ON -DWINGHEX_BUILD_TEST_PLUGIN=OFF -DWINGHEX_BUILD_SHARED_MEM_EXT=OFF -DWINGHEX_ANGEL_LSP=ON
 
       - name: Build
         # Build your program with the given configuration

3rdparty/QConsoleWidget/QConsoleIODevice.cpp

@@ -62,16 +62,15 @@ QConsoleWidget *QConsoleIODevice::widget() const { return widget_; }
 qint64 QConsoleIODevice::readData(char *data, qint64 len) {
     int b = bytesAvailable();
     if (b) {
-        b = qMin((int)len, b);
+        b = qMin(len, b);
         memcpy(data, readbuff_.constData() + readpos_, b);
         readpos_ += b;
     }
     return (qint64)b;
 }
 
 qint64 QConsoleIODevice::writeData(const char *data, qint64 len) {
-    QByteArray ba(data, (int)len);
-    widget_->write(ba);
+    widget_->write(QString::fromLatin1(data, len));
     writtenSinceLastEmit_ += len;
     if (!signalsBlocked()) {
         Q_EMIT bytesWritten(writtenSinceLastEmit_);

3rdparty/qtsingleapplication/src/qtlocalpeer.cpp

@@ -33,7 +33,7 @@ QtLocalPeer::QtLocalPeer(QObject *parent, const QString &appId)
 #endif
         prefix = id.section(QLatin1Char('/'), -1);
     }
-    static QRegularExpression regex("[^a-zA-Z]");
+    static QRegularExpression regex(QStringLiteral("[^a-zA-Z]"));
     prefix.remove(regex);
     prefix.truncate(6);
 

CMakeLists.txt

@@ -24,15 +24,15 @@ message("Build ${PROJECT_NAME} with ${CMAKE_BUILD_TYPE}.")
 install(CODE "set(CMAKE_INSTALL_LOCAL_ONLY TRUE)" ALL_COMPONENTS)
 
 option(WINGHEX_USE_FRAMELESS ON)
-option(BUILD_TEST_PLUGIN OFF)
-option(BUILD_SHARED_MEM_EXT OFF)
-option(ANGEL_LSP ON)
-option(BUILD_TEST OFF)
+option(WINGHEX_BUILD_TEST_PLUGIN OFF)
+option(WINGHEX_BUILD_SHARED_MEM_EXT OFF)
+option(WINGHEX_ANGEL_LSP ON)
+option(WINGHEX_BUILD_TEST OFF)
 
 add_definitions(-DAS_NO_THREADS)
 add_definitions(-DWING_SYSTEM_NAME="${CMAKE_SYSTEM_NAME}")
 
-if(BUILD_TEST)
+if(WINGHEX_BUILD_TEST)
     add_subdirectory(test/TestStructGen)
 endif()
 
@@ -51,14 +51,14 @@ else()
     message(FATAL_ERROR "CMAKE_CXX_BYTE_ORDER not set or empty")
 endif()
 
-if(BUILD_TEST_PLUGIN)
+if(WINGHEX_BUILD_TEST_PLUGIN)
     add_subdirectory(TestPlugin)
     add_subdirectory(TestBadPlugin)
     add_subdirectory(TestHexExt)
     add_subdirectory(TestManager)
 endif()
 
-if(BUILD_SHARED_MEM_EXT)
+if(WINGHEX_BUILD_SHARED_MEM_EXT)
     add_subdirectory(ShareMemoryDrv)
 endif()
 
@@ -587,6 +587,14 @@ else()
     qt_add_executable(WingHexExplorer2 MANUAL_FINALIZATION ${PROJECT_SOURCES})
 endif()
 
+if(Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0)
+    target_compile_definitions(
+        WingHexExplorer2
+        PRIVATE QT_NO_CONTEXTLESS_CONNECT
+                QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+                QT_RESTRICTED_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII)
+endif()
+
 target_link_libraries(
     ${CMAKE_PROJECT_NAME}
     PRIVATE Qt6::Widgets
@@ -686,7 +694,7 @@ target_link_options(
     $<$<AND:$<CONFIG:Release>,$<CXX_COMPILER_ID:GNU>>:-Wl,--gc-sections>
     $<$<AND:$<CONFIG:Release>,$<CXX_COMPILER_ID:Clang>>:-Wl,--gc-sections>)
 
-if(ANGEL_LSP)
+if(WINGHEX_ANGEL_LSP)
     set(NODE_SUBDIR "${CMAKE_SOURCE_DIR}/3rdparty/angel-lsp/server")
     set(BUILD_BIN_DIR "${CMAKE_BINARY_DIR}/lsp")
     set(BUILD_BIN_BUILD_DIR "${CMAKE_BINARY_DIR}/lsp-build")
@@ -766,6 +774,6 @@ if(ANGEL_LSP)
         COMMAND ${PKG_CMD}
         COMMENT "Packaging with pkg"
         VERBATIM)
-    add_custom_target(build_angel_lsp ALL DEPENDS ${OUT_BIN})
-    add_dependencies(WingHexExplorer2 build_angel_lsp)
+    add_custom_target(build_WINGHEX_ANGEL_LSP ALL DEPENDS ${OUT_BIN})
+    add_dependencies(WingHexExplorer2 build_WINGHEX_ANGEL_LSP)
 endif()

ShareMemoryDrv/CMakeLists.txt

@@ -16,7 +16,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 # 测试模式，启用请配置主程序目录，方便调试
 
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-option(TEST_MODE TRUE)
+option(WINGHEX_TEST_MODE TRUE)
 
 # For Qt
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools)
@@ -59,7 +59,7 @@ add_library(
 
 set_target_properties(ShareMemoryDrv PROPERTIES SUFFIX ".wingdrv")
 
-if(TEST_MODE)
+if(WINGHEX_TEST_MODE)
     # If you want to be able to debug easily every time you compile, please set
     # this variable. Because this test plugin is a subproject of the main
     # project, use CMAKE_BINARY_DIR

TestBadPlugin/CMakeLists.txt

@@ -16,7 +16,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 # 测试模式，启用请配置主程序目录，方便调试
 
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-option(TEST_MODE TRUE)
+option(WINGHEX_TEST_MODE TRUE)
 
 # For Qt
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
@@ -30,7 +30,7 @@ add_library(TestBadPlugin SHARED TestBadPlugin.json
 
 set_target_properties(TestBadPlugin PROPERTIES SUFFIX ".wingplg")
 
-if(TEST_MODE)
+if(WINGHEX_TEST_MODE)
     # If you want to be able to debug easily every time you compile, please set
     # this variable. Because this test plugin is a subproject of the main
     # project, use CMAKE_BINARY_DIR

TestHexExt/CMakeLists.txt

@@ -16,7 +16,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 # 测试模式，启用请配置主程序目录，方便调试
 
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-option(TEST_MODE TRUE)
+option(WINGHEX_TEST_MODE TRUE)
 
 # For Qt
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
@@ -31,7 +31,7 @@ add_library(TestHexExt SHARED TestHexExt.json testhexext.h testhexext.cpp)
 
 set_target_properties(TestHexExt PROPERTIES SUFFIX ".winghexe")
 
-if(TEST_MODE)
+if(WINGHEX_TEST_MODE)
     # If you want to be able to debug easily every time you compile, please set
     # this variable. Because this test plugin is a subproject of the main
     # project, use CMAKE_BINARY_DIR

TestManager/CMakeLists.txt

@@ -16,7 +16,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 # 测试模式，启用请配置主程序目录，方便调试
 
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-option(TEST_MODE TRUE)
+option(WINGHEX_TEST_MODE TRUE)
 
 # For Qt
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
@@ -29,7 +29,7 @@ add_library(TestManager SHARED testmanager.h testmanager.cpp TestManager.json)
 
 set_target_properties(TestManager PROPERTIES SUFFIX ".wingman")
 
-if(TEST_MODE)
+if(WINGHEX_TEST_MODE)
     # If you want to be able to debug easily every time you compile, please set
     # this variable. Because this test plugin is a subproject of the main
     # project, use CMAKE_BINARY_DIR