linuxdeepin · pengfeixx · Jan 15, 2025 · Jan 14, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,9 +36,14 @@ SET(CMAKE_AUTOMOC ON)
 SET(CMAKE_AUTORCC ON)
 SET(CMAKE_VERBOSE_MAKEFILE ON)
 
-FIND_PACKAGE(Qt5 COMPONENTS Core Gui Svg Sql Xml DBus Network REQUIRED)
-FIND_PACKAGE(DtkWidget REQUIRED)
-FIND_PACKAGE(DtkGui REQUIRED)
+set(QT_VERSION_MAJOR 6)
+if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+    set(DTK_VERSION 6)
+endif()
+
+FIND_PACKAGE(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Svg Sql Xml DBus Network REQUIRED)
+FIND_PACKAGE(Dtk${DTK_VERSION}Widget REQUIRED)
+FIND_PACKAGE(Dtk${DTK_VERSION}Gui REQUIRED)
 FIND_PACKAGE(Freetype REQUIRED)
 FIND_PACKAGE(PkgConfig REQUIRED)
 

diff --git a/deepin-font-manager/CMakeLists.txt b/deepin-font-manager/CMakeLists.txt
@@ -38,9 +38,21 @@ TARGET_INCLUDE_DIRECTORIES(${APP_BIN} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 TARGET_INCLUDE_DIRECTORIES(${APP_BIN} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/views)
 TARGET_INCLUDE_DIRECTORIES(${APP_BIN} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/interfaces)
 
-TARGET_LINK_LIBRARIES(${APP_BIN} PUBLIC Qt5::Core Qt5::Widgets Qt5::Gui Qt5::Sql Qt5::Xml Qt5::Svg Qt5::DBus Qt5::Network
-                                        ${DtkCore_LIBRARIES} ${DtkWidget_LIBRARIES} ${FREETYPE_LIBRARIES}
-                                        ${FREETYPE_LIBRARIES} PkgConfig::FontConfig)
+TARGET_LINK_LIBRARIES(${APP_BIN} PUBLIC
+    Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Widgets
+    Qt${QT_VERSION_MAJOR}::Gui
+    Qt${QT_VERSION_MAJOR}::Sql
+    Qt${QT_VERSION_MAJOR}::Xml
+    Qt${QT_VERSION_MAJOR}::Svg
+    Qt${QT_VERSION_MAJOR}::DBus
+    Qt${QT_VERSION_MAJOR}::Network
+    Dtk${DTK_VERSION}::Core
+    Dtk${DTK_VERSION}::Gui
+    Dtk${DTK_VERSION}::Widget
+    ${FREETYPE_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
+    PkgConfig::FontConfig)
 
 INSTALL(TARGETS ${APP_BIN} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 

diff --git a/deepin-font-manager/interfaces/dfmxmlwrapper.cpp b/deepin-font-manager/interfaces/dfmxmlwrapper.cpp
@@ -500,11 +500,11 @@ bool DFMXmlWrapper::deleteNodeWithTextList(const QString &fileName, const QStrin
             if (parentNode.isElement()) {
                 parentNode.removeChild(removeNode);
             } else {
-                qDebug() << "delete node failed!" << endl;
+                qDebug() << "delete node failed!" << Qt::endl;
                 return false;
             }
         } else {
-            qDebug() << "delete node failed!" << endl;
+            qDebug() << "delete node failed!" << Qt::endl;
         }
     }
 

diff --git a/deepin-font-manager/interfaces/dfontmenumanager.cpp b/deepin-font-manager/interfaces/dfontmenumanager.cpp
@@ -3,10 +3,14 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "interfaces/dfontmenumanager.h"
 
+#include <QActionGroup>
+
+#if QT_VERSION_MAJOR <= 5
 #include <DApplicationHelper>
+#endif
 #include <DApplication>
 
 DWIDGET_USE_NAMESPACE
 DCORE_USE_NAMESPACE

diff --git a/deepin-font-manager/interfaces/dfontpreviewer.cpp b/deepin-font-manager/interfaces/dfontpreviewer.cpp
@@ -4,14 +4,18 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "dfontpreviewer.h"
 #include "utils.h"
 
+#if QT_VERSION_MAJOR <= 5
 #include <DApplicationHelper>
+#endif
+#include <DPalette>
 
 #include <QPainter>
 #include <QPaintEvent>
 #include <QPainterPath>
 
+DGUI_USE_NAMESPACE
 DFontPreviewer::DFontPreviewer(QWidget *parent)
     : QWidget(parent)
 {
@@ -107,7 +111,11 @@
     QPen oldPen = painter.pen();
 
     painter.setRenderHint(QPainter::Antialiasing);
+#if QT_VERSION_MAJOR > 5
+    DPalette pa = this->palette();
+#else
     DPalette pa = DApplicationHelper::instance()->palette(this);
+#endif
     painter.setBrush(QBrush(pa.color(DPalette::Base)));
     painter.setPen(Qt::transparent);
 

diff --git a/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp b/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp
@@ -29,7 +29,9 @@
 #include "utils.h"
 
 #include <DApplication>
+#if QT_VERSION_MAJOR <= 5
 #include <DApplicationHelper>
+#endif
 #include <DStyleHelper>
 
 #include <QPainter>
@@ -115,8 +117,13 @@ void DFontPreviewItemDelegate::paintForegroundFontName(QPainter *painter, const
     nameFont.setPixelSize(DFontSizeManager::instance()->fontPixelSize(DFontSizeManager::T6));
     painter->setFont(nameFont);
 
+#if QT_VERSION_MAJOR > 5
+    DGuiApplicationHelper *dAppHelper = DGuiApplicationHelper::instance();
+    DPalette palette = dAppHelper->applicationPalette();
+#else
     DApplicationHelper *dAppHelper = DApplicationHelper::instance();
     DPalette palette = dAppHelper->applicationPalette();
+#endif
     QColor fillColor = palette.color(DPalette::TextTips);
     // SP3--禁用置灰(539)
     if (!itemData.isEnabled()) {
@@ -359,7 +366,11 @@ void DFontPreviewItemDelegate::paintBackground(QPainter *painter, const QStyleOp
             painter->fillPath(path, fillColor);
         }
     } else {
+#if QT_VERSION_MAJOR > 5
+        DPalette pa = DGuiApplicationHelper::instance()->applicationPalette();
+#else
         DPalette pa = DApplicationHelper::instance()->palette(m_parentView);
+#endif
         DStyleHelper styleHelper;
         QColor fillColor = styleHelper.getColor(static_cast<const QStyleOption *>(&option), pa, DPalette::ItemBackground);
         painter->setBrush(QBrush(fillColor));

diff --git a/deepin-font-manager/interfaces/dfontpreviewlistdatathread.cpp b/deepin-font-manager/interfaces/dfontpreviewlistdatathread.cpp
@@ -260,7 +260,7 @@ void DFontPreviewListDataThread::onFileAdded(const QStringList &files)
 
     if (m_mutex != nullptr)
         QMutexLocker locker(m_mutex);
-    qDebug() << __func__ << "S" << QThread::currentThreadId() << endl;
+    qDebug() << __func__ << "S" << QThread::currentThreadId() << Qt::endl;
     refreshFontListData(false, files);
 }
 
@@ -418,7 +418,7 @@ void DFontPreviewListDataThread::withoutDbRefreshDb()
     if(!m_dbManager->isDBDeleted()){
         return;
     }
-    qDebug() << "strAllFontList.size()" << m_allFontPathList.size() << endl;
+    qDebug() << "strAllFontList.size()" << m_allFontPathList.size() << Qt::endl;
 
     int index = 0;
     DFontInfoManager *fontInfoMgr = DFontInfoManager::instance();
@@ -614,17 +614,25 @@ void DFontPreviewListDataThread:: refreshFontListData(bool isStartup, const QStr
     m_diffFontModelList.clear();
 
     //根据文件路径比较出不同的字体文件
+#if QT_VERSION_MAJOR > 5
+    QSet<QString> allFontListSet(m_allFontPathList.begin(), m_allFontPathList.end());
+#else
     QSet<QString> allFontListSet = m_allFontPathList.toSet();
+#endif
     QSet<QString> diffSet = allFontListSet.subtract(dbFilePathSet);
 
     qInfo() << "diffSet count:" << diffSet.count();
     if (diffSet.count() > 0) {
         int maxFontId = m_dbManager->getCurrMaxFontId();
+#if QT_VERSION_MAJOR > 5
+    QSet<QString> diffFilePathList(diffSet.begin(), diffSet.end());
+#else
         QList<QString> diffFilePathList = diffSet.toList();
+#endif
         int index = maxFontId + 1;
         DFontInfoManager *fontInfoMgr = DFontInfoManager::instance();
         DFontInfo info;
-        for (QString &filePath : diffFilePathList) {
+        for (const QString &filePath : diffFilePathList) {
             if (m_dbManager->isSystemFont(filePath) || installFont.contains(filePath)) {
                 bool isEnabled = (isStartup && installFont.contains(filePath)) ? false : true;
                 info = fontInfoMgr->getFontInfo(filePath, true);

diff --git a/deepin-font-manager/interfaces/dfontpreviewlistview.cpp b/deepin-font-manager/interfaces/dfontpreviewlistview.cpp
@@ -12,6 +12,10 @@
 #include "performancemonitor.h"
 #include "dcomworker.h"
 
+#if QT_VERSION_MAJOR > 5
+#include <algorithm>
+#include <functional>
+#endif
 
 #include <DMessageManager>
 
@@ -337,7 +341,7 @@ void DFontPreviewListView::loadLeftFonts()
     if (isListDataLoadFinished()) {
         m_fontLoadTimer->stop();
 //        m_parentWidget->showSpinner(DFontSpinnerWidget::Load);
-        qDebug() << DFMDBManager::recordList.count() << endl;
+        qDebug() << DFMDBManager::recordList.count() << Qt::endl;
         qDebug() << QThread::currentThreadId() << __func__ << "------------";
 
         m_dataLoadThread = new LoadFontDataThread(DFMDBManager::recordList, this);
@@ -408,7 +412,11 @@ void DFontPreviewListView::markPositionBeforeRemoved()
 {
     QModelIndexList deleteFontList = selectedIndexes();
     if (deleteFontList.count() > 0) {
+#if QT_VERSION_MAJOR > 5
+        std::sort(deleteFontList.begin(), deleteFontList.end(), std::greater<QModelIndex>());
+#else
         qSort(deleteFontList.begin(), deleteFontList.end(), qGreater<QModelIndex>());
+#endif
         QVariant varModel = m_fontPreviewProxyModel->data(deleteFontList.last(), Qt::DisplayRole);
         //获取首个选中字体，判断是否为系统字体
         FontData fdata = varModel.value<FontData>();
@@ -528,7 +536,7 @@ void DFontPreviewListView::updateModel(int deleteCount, bool showSpinner)
     selectItemAfterRemoved(m_bListviewAtButtom, m_bListviewAtTop, false, false);
 
     //删除之后设置焦点
-    qDebug() << m_FontViewHasFocus << endl;
+    qDebug() << m_FontViewHasFocus << Qt::endl;
     if (m_FontViewHasFocus) {
         refreshFocuses();
         setFontViewHasFocus(false);
@@ -994,7 +1002,11 @@ void DFontPreviewListView::mousePressEvent(QMouseEvent *event)
             onMouseLeftBtnPressed(modelIndex, clickPoint, isShiftMd, isCtrlMd);
         } else if (event->button() == Qt::RightButton) {
             onMouseRightBtnPressed(modelIndex, isShiftMd);
-        } else if (event->button() == Qt::MidButton) {
+#if QT_VERSION_MAJOR > 5
+            } else if (event->button() == Qt::MiddleButton) {
+#else
+            } else if (event->button() == Qt::MidButton) {
+#endif
             if (!isShiftMd && !isCtrlMd) {
                 clearSelection();
                 setCurrentIndex(modelIndex);
@@ -1093,7 +1105,7 @@ void DFontPreviewListView::onMouseRightBtnPressed(const QModelIndex &modelIndex,
     }
     //记录焦点状态
     syncRecoveryTabStatus();
-    qDebug() << hasFocus() << endl;
+    qDebug() << hasFocus() << Qt::endl;
     setFontViewHasFocus(hasFocus());
     //弹出右键菜单
     onListViewShowContextMenu();
@@ -1113,7 +1125,11 @@ void DFontPreviewListView::onMouseRightBtnPressed(const QModelIndex &modelIndex,
 *************************************************************************/
 void DFontPreviewListView::mouseReleaseEvent(QMouseEvent *event)
 {
+#if QT_VERSION_MAJOR > 5
+    if (Qt::MiddleButton == event->button()) {
+#else
     if (Qt::MidButton == event->button()) {
+#endif
         return;
     }
     QListView::mouseReleaseEvent(event);
@@ -1339,7 +1355,11 @@ void DFontPreviewListView::keyPressEvent(QKeyEvent *event)
     } else {
         if (event->key() == Qt::Key_Up || event->key() == Qt::Key_Down) {
             QModelIndexList list = selectedIndexes();
+#if QT_VERSION_MAJOR > 5
+            std::sort(list.begin(), list.end(), std::greater<QModelIndex>());
+#else
             qSort(list.begin(), list.end(), qGreater<QModelIndex>());
+#endif
             //判断当前shift+上下键选中
             if (QApplication::keyboardModifiers() == Qt::ShiftModifier && list.count() > 0) {
                 if (event->key() == Qt::Key_Up) {
@@ -1635,7 +1655,11 @@ void DFontPreviewListView::onRightMenuShortCutActivated()
     DFontMgrMainWindow *mw = qobject_cast<DFontMgrMainWindow *>(m_parentWidget);
     QModelIndexList indexes = selectedIndexes();
     //排序选中项
+#if QT_VERSION_MAJOR > 5
+    std::sort(indexes.begin(), indexes.end());
+#else
     qSort(indexes.begin(), indexes.end());
+#endif
     //菜单弹出位置
     QPoint showMenuPosition;
     //记录鼠标位置下的QModelIndex
@@ -1733,8 +1757,13 @@ void DFontPreviewListView::onEnableBtnClicked(QModelIndexList &itemIndexes, int
     QMutexLocker locker(&m_mutex);
     QString fontName;
 
+#if QT_VERSION_MAJOR > 5
+    if (isFromActiveFont)
+        std::sort(itemIndexes.begin(), itemIndexes.end(), std::greater<QModelIndex>());
+#else
     if (isFromActiveFont)
         qSort(itemIndexes.begin(), itemIndexes.end(), qGreater<QModelIndex>());
+#endif
 
     //记录禁用前选中位置
     getAtListViewPosition();
@@ -1863,8 +1892,13 @@ void DFontPreviewListView::onCollectBtnClicked(QModelIndexList &indexList, bool
     qDebug() << __FUNCTION__ << " before " << currModelIndex().row() << currentIndex().row();
 
     QMutexLocker locker(&m_mutex);
+#if QT_VERSION_MAJOR > 5
+    if (isFromCollectFont)
+        std::sort(indexList.begin(), indexList.end(), std::greater<QModelIndex>());
+#else
     if (isFromCollectFont)
         qSort(indexList.begin(), indexList.end(), qGreater<QModelIndex>());
+#endif
     m_selectAfterDel = indexList.last().row();
 
     getAtListViewPosition();
@@ -2369,7 +2403,11 @@ void DFontPreviewListView::scrollWithTheSelected()
         return;
     }
     QModelIndexList indexes = selectionModel()->selectedIndexes();
+#if QT_VERSION_MAJOR > 5
+    std::sort(indexes.begin(), indexes.end(), std::greater<QModelIndex>());
+#else
     qSort(indexes.begin(), indexes.end(), qGreater<QModelIndex>());
+#endif
     bool needScroll = true;
     for (auto &idx : indexes) {
         QRect rect = visualRect(idx);

diff --git a/deepin-font-manager/main.cpp b/deepin-font-manager/main.cpp
@@ -13,7 +13,9 @@
 #include <DApplication>
 #include <DLog>
 #include <DWidgetUtil>
+#if QT_VERSION_MAJOR <= 5
 #include <DApplicationSettings>
+#endif
 
 #include <QDebug>
 #include <QDBusConnection>
@@ -57,7 +59,9 @@ int main(int argc, char *argv[])
     app.setApplicationDescription(DApplication::translate("Main", "Font Manager helps users install and manage fonts."));
     app.setApplicationDisplayName(DApplication::translate("Main", "Font Manager"));
 
+#if QT_VERSION_MAJOR <= 5
     DApplicationSettings savetheme;
+#endif
 
     DLogManager::registerConsoleAppender();
     DLogManager::registerFileAppender();

diff --git a/deepin-font-manager/singlefontapplication.cpp b/deepin-font-manager/singlefontapplication.cpp
@@ -225,7 +225,11 @@ void SingleFontApplication::activateWindow()
 void SingleFontApplication::slotBatchInstallFonts()
 {
     qDebug() << "batch install fonts";
+#if QT_VERSION_MAJOR > 5
+    m_selectedFiles << QList<QString>(waitForInstallSet.begin(), waitForInstallSet.end());
+#else
     m_selectedFiles << waitForInstallSet.toList();
+#endif
     activateWindow();
     m_selectedFiles.clear();
     waitForInstallSet.clear();