refacotr: Adaptation for Qt6

Adaptation for Qt6

Log: Adaptation for Qt6

CMakeLists.txt

@@ -31,16 +31,19 @@ endif ()
 
 set(CMAKE_CXX_FLAGS Release CACHE STRING "define CXXFLAGS")
 
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(BUILD_TESTING ON)
-    set(BUILD_EXAMPLES ON)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
-endif ()
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
+message("Using Qt version: ${QT_VERSION_MAJOR}")
+
+if(QT_VERSION_MAJOR EQUAL "5")
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set(BUILD_TESTING ON)
+        set(BUILD_EXAMPLES ON)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+    endif()
+endif()
 
-find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core DBus)
 find_package(DtkCore REQUIRED)
-
 add_compile_definitions(QT_NO_SIGNALS_SLOTS_KEYWORDS)
 
 # src

debian/control

@@ -19,7 +19,6 @@ Build-Depends:
  libsecret-1-dev,
  libpoppler-cpp-dev,
  libudisks2-qt5-dev,
- libdisomaster-dev,
  libkf5codecs-dev,
  libzip-dev,
  libkf5archive-dev,

examples/dtkburn/burn_client/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
 
-find_package(Qt5 COMPONENTS Core REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
 find_package(Dtk COMPONENTS Core REQUIRED)
 #find_package(dtkburn REQUIRED)
 

examples/dtkcompressor/dtkcompressor/CMakeLists.txt

@@ -12,7 +12,7 @@ set(CMAKE_AUTOUIC ON)
 PROJECT(testcompressor)
 
 
-find_package(Qt5Widgets)
+find_package(Qt${QT_VERSION_MAJOR}Widgets)
 find_package(PkgConfig REQUIRED)
 find_package(DtkCore REQUIRED)
 find_package(KF5Codecs REQUIRED)
@@ -33,7 +33,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     Qt${QT_VERSION_MAJOR}::DBus)
 
 set(TARGET_LIBS
-    Qt5::Widgets
+    Qt${QT_VERSION_MAJOR}::Widgets
     ${DtkCore_LIBRARIES}
     KF5::Codecs
     Qt${QT_VERSION_MAJOR}::DBus

examples/dtkio/io_client/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
 
-find_package(Qt5 COMPONENTS Core REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
 find_package(Dtk COMPONENTS Core REQUIRED)
 #find_package(dtkio REQUIRED)
 

examples/dtkmount/device_monitor/CMakeLists.txt

@@ -9,18 +9,26 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
 
-find_package(Qt5 COMPONENTS Widgets Core Gui DBus LinguistTools REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Core Gui DBus LinguistTools REQUIRED)
 find_package(Dtk COMPONENTS Widget Core Gui REQUIRED)
 #find_package(dtkmount REQUIRED)
 
 file(GLOB TS_FILES CONFIGURE_DEPENDS translations/*.ts)
 file(GLOB PROJECT_SOURCES CONFIGURE_DEPENDS src/*.cpp include/*.h ${TS_FILES})
 
-qt5_create_translation(
-    QM_FILES 
-    ${PROJECT_SOURCES} 
-    ${TS_FILES}
-)
+if(QT_VERSION_MAJOR EQUAL "6")
+    qt_create_translation(
+        QM_FILES
+        ${PROJECT_SOURCES}
+        ${TS_FILES}
+    )
+else()
+    qt5_create_translation(
+        QM_FILES
+        ${PROJECT_SOURCES}
+        ${TS_FILES}
+    )
+endif()
 
 add_executable(
     ${PROJECT_NAME}
@@ -35,7 +43,7 @@ target_link_libraries(
     ${DtkWidget_LIBRARIES}
     ${DtkCore_LIBRARIES}
     dtkmount
-    Qt5::Widgets
-    Qt5::Core
-    Qt5::DBus
+    Qt${QT_VERSION_MAJOR}::Widgets
+    Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::DBus
 )

examples/dtksearch/search_client/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
 
-find_package(Qt5 COMPONENTS Widgets Core Gui REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Core Gui REQUIRED)
 find_package(Dtk COMPONENTS Widget Core Gui REQUIRED)
 
 file(GLOB PROJECT_SOURCES CONFIGURE_DEPENDS ./*.cpp ./*.h)
@@ -25,7 +25,7 @@ target_link_libraries(
     ${DtkWidget_LIBRARIES}
     ${DtkCore_LIBRARIES}
     dtksearch
-    Qt5::Widgets
-    Qt5::Core
+    Qt${QT_VERSION_MAJOR}::Widgets
+    Qt${QT_VERSION_MAJOR}::Core
 )
 

src/dtkcompressor/3rdparty/cliunarchiverplugin/CMakeLists.txt

@@ -7,7 +7,7 @@ project(${LIB_NAME})
 
 #查找依赖关系的包信息
 find_package(PkgConfig REQUIRED)
-find_package(Qt5Widgets REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
 find_package(KF5Codecs REQUIRED)
 include(FindPkgConfig)
 
@@ -29,7 +29,7 @@ add_library(${LIB_NAME} SHARED  ${c_files} ${h_files} ${json_files})
 
 #链接动静态库
 target_link_libraries(${LIB_NAME}
-    Qt5::Widgets
+    Qt{QT_VERSION_MAJOR}::Widgets
     KF5::Codecs
     compressor-interface
 )

src/dtkcompressor/3rdparty/clizipplugin/CMakeLists.txt

@@ -10,16 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 find_package(PkgConfig REQUIRED)
-find_package(Qt5Core REQUIRED)
-find_package(Qt5DBus REQUIRED)
-find_package(Qt5Gui REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5 REQUIRED Widgets)
-find_package(Qt5Concurrent)
-find_package(Qt5Xml)
-find_package(Qt5Svg REQUIRED SvgWidgets)
-find_package(KF5Codecs REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets Network Concurrent Xml Svg)
 include(FindPkgConfig)
 
 pkg_search_module(DtkWidget REQUIRED dtkwidget)
@@ -47,6 +38,6 @@ file(GLOB_RECURSE json_files  *.json)
 include_directories(${PROJECT_SOURCE_DIR})
 
 add_library(${LIB_NAME} SHARED  ${c_files} ${h_files} ${json_files})
-target_link_libraries(${LIB_NAME} Qt5::Widgets)
+target_link_libraries(${LIB_NAME} Qt${QT_VERSION_MAJOR}::Widgets)
 target_link_libraries(${LIB_NAME} ${LIBS_INCLUDE_DIRS})
 target_link_libraries( ${LIB_NAME} compressor-interface)

src/dtkcompressor/3rdparty/interface/common.h

@@ -7,6 +7,7 @@
 
 #include <QString>
 #include <QLocale>
+#include <QTextCodec>
 
 class Common: public QObject
 {

src/dtkcompressor/3rdparty/interface/plugin/kpluginmetadata.h

@@ -26,7 +26,6 @@
 
 class KPluginLoader;
 class QPluginLoader;
-class QStringList;
 class KPluginMetaDataPrivate;
 class KAboutPerson;
 class QObject;

src/dtkcompressor/3rdparty/interface/process/kprocess.h

@@ -335,11 +335,13 @@ class KProcess : public QProcess
     KProcessPrivate *const d_ptr;
 
 private:
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     // hide those
     using QProcess::setReadChannelMode;
     using QProcess::readChannelMode;
     using QProcess::setProcessChannelMode;
     using QProcess::processChannelMode;
+#endif
 
     Q_PRIVATE_SLOT(d_func(), void _k_forwardStdout())
     Q_PRIVATE_SLOT(d_func(), void _k_forwardStderr())

src/dtkcompressor/3rdparty/libzipplugin/CMakeLists.txt

@@ -28,7 +28,6 @@ add_library(${LIB_NAME} SHARED ${c_files} ${json_files} ${h_files})
 
 #链接动静态库
 target_link_libraries(${LIB_NAME}
-#    Qt5::Core
     KF5::Codecs
     interfacecompressor
     zip

src/dtkcompressor/CMakeLists.txt

@@ -20,10 +20,12 @@ if(NOT DEFINED HFILES_OUTPUT_PATH)
     set(HFILES_OUTPUT_PATH ${CMAKE_BINARY_DIR}/include)
 endif()
 add_subdirectory(3rdparty)
-
 find_package(KF5Codecs REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(DtkCore REQUIRED)
+if(QT_VERSION_MAJOR EQUAL "6")
+    find_package(Qt6Core5Compat REQUIRED)
+endif()
 
 target_include_directories(${BIN_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}/)
 target_include_directories(${BIN_NAME} PUBLIC ${KF5Codecs_INCLUDE_DIRS})
@@ -34,18 +36,28 @@ set_target_properties(${BIN_NAME} PROPERTIES
 
 target_compile_definitions(${BIN_NAME} PRIVATE VERSION="${CMAKE_PROJECT_VERSION}")
 
+if(QT_VERSION_MAJOR EQUAL "6")
+    target_link_libraries(${BIN_NAME} PRIVATE
+        Qt${QT_VERSION_MAJOR}::Core
+        Qt6::Core5Compat
+        ${DtkCore_LIBRARIES}
+        interfacecompressor
+        KF5::Codecs
+    )
+else()
+    target_link_libraries(${BIN_NAME} PRIVATE
+        Qt${QT_VERSION_MAJOR}::Core
+        ${DtkCore_LIBRARIES}
+        interfacecompressor
+        KF5::Codecs
+    )
+endif()
+
+
 target_include_directories(${BIN_NAME} PUBLIC
-    Qt${QT_VERSION_MAJOR}::Core
     ${HFILES_OUTPUT_PATH}
 )
 
-target_link_libraries(${BIN_NAME} PRIVATE
-    Qt${QT_VERSION_MAJOR}::Core
-    ${DtkCore_LIBRARIES}
-    interfacecompressor
-    KF5::Codecs
-)
-
 install(FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${BIN_NAME})
 install(TARGETS ${BIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/dtkcompressor/archivemanager/processopenthread.cpp

@@ -4,6 +4,9 @@
 
 #include "processopenthread.h"
 #include "kprocess.h"
+
+#include <QProcess>
+
 DCOMPRESSOR_USE_NAMESPACE
 ProcessOpenThread::ProcessOpenThread(QObject *parent)
     : QThread(parent)

src/dtkcompressor/archivemanager/processopenthread.h

@@ -9,6 +9,8 @@
 #include "plugin.h"
 
 #include <QThread>
+#include <QTextCodec>
+
 #include "dcompressornamespace.h"
 DCOMPRESSOR_BEGIN_NAMESPACE
 

src/dtkcompressor/archivemanager/singlejob.h

@@ -10,6 +10,8 @@
 #include "commonstruct.h"
 #include "queries.h"
 #include "dcompressornamespace.h"
+
+#include <QTextCodec>
 #include <QThread>
 #include <QElapsedTimer>
 

src/dtkcompressor/archivemanager/uitools.cpp

@@ -140,7 +140,11 @@ bool UiTools::isArchiveFile(const QString &strFileName)
 bool UiTools::isExistMimeType(const QString &strMimeType, bool &bArchive)
 {
     QString conf = readConf();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QStringList confList = conf.split("\n", Qt::SkipEmptyParts);
+#else
     QStringList confList = conf.split("\n", QString::SkipEmptyParts);
+#endif
 
     bool exist = false;
     for (int i = 0; i < confList.count(); i++) {
@@ -291,10 +295,10 @@ ReadOnlyArchiveInterface *UiTools::createInterface(const QString &fileName, cons
 void UiTools::transSplitFileName(QString &fileName, UnCompressParameter::SplitType &eSplitType)
 {
     if (fileName.contains(".7z.")) {
-        QRegExp reg("^([\\s\\S]*\\.)7z\\.[0-9]{3}$");
-
-        if (reg.exactMatch(fileName)) {
-            fileName = reg.cap(1) + "7z.001";
+        QRegularExpression reg("^([\\s\\S]*\\.)7z\\.[0-9]{3}$");
+        QRegularExpressionMatch match = reg.match(fileName);
+        if (match.hasMatch()) {
+            fileName = match.captured(1) + "7z.001";
             eSplitType = UnCompressParameter::ST_Other;
         }
     } else if (fileName.contains(".part") && fileName.endsWith(".rar")) {
@@ -309,11 +313,12 @@ void UiTools::transSplitFileName(QString &fileName, UnCompressParameter::SplitTy
 
         eSplitType = UnCompressParameter::ST_Other;
     } else if (fileName.contains(".zip.")) {
-        QRegExp reg("^([\\s\\S]*\\.)zip\\.[0-9]{3}$");
-        if (reg.exactMatch(fileName)) {
-            QFileInfo fi(reg.cap(1) + "zip.001");
+        QRegularExpression reg("^([\\s\\S]*\\.)zip\\.[0-9]{3}$");
+        QRegularExpressionMatch match = reg.match(fileName);
+        if (match.hasMatch()) {
+            QFileInfo fi(match.captured(1) + "zip.001");
             if (fi.exists() == true) {
-                fileName = reg.cap(1) + "zip.001";
+                fileName = match.captured(1) + "zip.001";
                 eSplitType = UnCompressParameter::ST_Zip;
             }
         }
@@ -323,9 +328,10 @@ void UiTools::transSplitFileName(QString &fileName, UnCompressParameter::SplitTy
             eSplitType = UnCompressParameter::ST_Zip;
         }
     } else if (fileName.contains(".z")) {
-        QRegExp reg("^([\\s\\S]*\\.)z[0-9]+$");   //
-        if (reg.exactMatch(fileName)) {
-            fileName = reg.cap(1) + "zip";
+        QRegularExpression reg("^([\\s\\S]*\\.)z[0-9]+$");   //
+        QRegularExpressionMatch match = reg.match(fileName);
+        if (match.hasMatch()) {
+            fileName = match.captured(1) + "zip";
             QFileInfo fi(fileName);
             if (fi.exists()) {
                 eSplitType = UnCompressParameter::ST_Zip;

src/dtkio/dfilehelper.cpp

@@ -412,7 +412,13 @@ QSet<QString> hideListFromUrl(const QUrl &url)
     if (succ) {
         if (contents && len > 0) {
             QString dataStr(contents);
-            return QSet<QString>::fromList(dataStr.split('\n', QString::SkipEmptyParts));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            const QStringList strs { dataStr.split('\n', Qt::SkipEmptyParts) };
+            return QSet<QString> { strs.begin(), strs.end() };
+#else
+            const QStringList strs { dataStr.split('\n', QString::SkipEmptyParts) };
+            return QSet<QString>::fromList(strs);
+#endif
         }
     } else {
         qWarning() << "load .hidden fail, url: " << url << " error: " << error->code << " " << QString::fromLocal8Bit(error->message);

src/dtkmount/CMakeLists.txt

@@ -17,8 +17,13 @@ set_source_files_properties(
     ${UDISKS2_XML}
     PROPERTIES NO_NAMESPACE true INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/dbus/udisks2_dbus_common.h
     )
-qt5_add_dbus_interface(SRCS ${UDISKS2_OBJECT_XML} objectmanager_interface)
-qt5_add_dbus_interface(SRCS ${UDISKS2_XML} udisks2_interface)
+if(QT_VERSION_MAJOR EQUAL "6")
+    qt_add_dbus_interface(SRCS ${UDISKS2_OBJECT_XML} objectmanager_interface)
+    qt_add_dbus_interface(SRCS ${UDISKS2_XML} udisks2_interface)
+else()
+    qt5_add_dbus_interface(SRCS ${UDISKS2_OBJECT_XML} objectmanager_interface)
+    qt5_add_dbus_interface(SRCS ${UDISKS2_XML} udisks2_interface)
+endif()
 
 add_library(${BIN_NAME} SHARED
     ${INCLUDE_FILES}

src/dtkmount/dbus/udisks2_dbus_common.cpp

@@ -51,7 +51,11 @@ OrgFreedesktopDBusObjectManagerInterface *objectManager()
         qDBusRegisterMetaType<QPair<QString, QVariantMap>>();
         qDBusRegisterMetaType<QMap<QDBusObjectPath, QMap<QString, QVariantMap>>>();
 
-        QMetaType::registerDebugStreamOperator<QList<QPair<QString, QVariantMap>>>();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    // TODO
+#else
+    QMetaType::registerDebugStreamOperator<QList<QPair<QString, QVariantMap>>>();
+#endif
     }
 
     return omGlobal;