Port to StandardPaths and drop Qt 5

wengxt · wengxt · commit 0ebea2928075 · 2025-05-24T14:00:57.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,6 @@ set(REQUIRED_FCITX_VERSION 5.1.13)
 find_package(ECM 1.0.0 REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) 
 option(ENABLE_QT "Enable Qt for GUI configuration" On)
-option(USE_QT6 "Build against Qt6" On)
 
 include(ECMUninstallTarget)
 include(FeatureSummary)
@@ -16,21 +15,20 @@ find_package(Gettext REQUIRED)
 pkg_check_modules(GObject2 IMPORTED_TARGET "gobject-2.0" REQUIRED)
 find_package(LibSKK REQUIRED)
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 
 set(SKK_DEFAULT_PATH "/usr/share/skk/SKK-JISYO.L" CACHE STRING "Default path of SKK")
 
 include(GNUInstallDirs)
 
 if (ENABLE_QT)
-if (USE_QT6)
-    set(QT_MAJOR_VERSION 6)
-    find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
-else()
-    set(QT_MAJOR_VERSION 5)
-    find_package(Qt5 5.7 REQUIRED COMPONENTS Core Gui Widgets)
-endif()
-find_package(Fcitx5Qt${QT_MAJOR_VERSION}WidgetsAddons REQUIRED)
+  set(QT_MAJOR_VERSION 6)
+  find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
+  find_package(Fcitx5Qt${QT_MAJOR_VERSION}WidgetsAddons REQUIRED)
 endif()
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
diff --git a/gui/adddictdialog.cpp b/gui/adddictdialog.cpp
@@ -6,11 +6,24 @@
  */
 
 #include "adddictdialog.h"
+#include <memory>
+#include <QComboBox>
 #include <QDebug>
+#include <QDialogButtonBox>
+#include <QDir>
 #include <QFileDialog>
-#include <fcitx-utils/standardpath.h>
+#include <QFileInfo>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QWidget>
+#include <fcitx-utils/fs.h>
+#include <fcitx-utils/i18n.h>
+#include <fcitx-utils/standardpaths.h>
 #include <fcitxqti18nhelper.h>
 #include "config.h"
+#include "ui_adddictdialog.h"
 
 #define FCITX_CONFIG_DIR "$FCITX_CONFIG_DIR"
 
@@ -104,9 +117,9 @@ void AddDictDialog::browseClicked() {
         path = QFileDialog::getOpenFileName(this, _("Select Dictionary File"),
                                             info.path());
     } else {
-        auto fcitxBasePath = stringutils::joinPath(
-            StandardPath::global().userDirectory(StandardPath::Type::PkgData),
-            "skk");
+        auto fcitxBasePath =
+            StandardPaths::global().userDirectory(StandardPathsType::PkgData) /
+            "skk";
         fs::makePath(fcitxBasePath);
         QString basePath =
             QDir::cleanPath(QString::fromStdString(fcitxBasePath));
diff --git a/gui/dictmodel.cpp b/gui/dictmodel.cpp
@@ -5,16 +5,18 @@
  *
  */
 
+#include "dictmodel.h"
+#include <QAbstractListModel>
+#include <QByteArray>
 #include <QDebug>
 #include <QFile>
+#include <QObject>
 #include <QSet>
 #include <QStringList>
 #include <QTemporaryFile>
+#include <Qt>
 #include <QtGlobal>
-#include <fcitx-utils/standardpath.h>
-
-#include <fcntl.h>
-#include "dictmodel.h"
+#include <fcitx-utils/standardpaths.h>
 
 namespace fcitx {
 
@@ -28,17 +30,16 @@ SkkDictModel::SkkDictModel(QObject *parent) : QAbstractListModel(parent) {
 }
 
 void SkkDictModel::defaults() {
-    auto path =
-        StandardPath::global().fcitxPath("pkgdatadir", "skk/dictionary_list");
-    QFile f(path.data());
+    auto path = StandardPaths::fcitxPath("pkgdatadir", "skk/dictionary_list");
+    QFile f(path);
     if (f.open(QIODevice::ReadOnly)) {
         load(f);
     }
 }
 
 void SkkDictModel::load() {
-    auto file = StandardPath::global().open(StandardPath::Type::PkgData,
-                                            "skk/dictionary_list", O_RDONLY);
+    auto file = StandardPaths::global().open(StandardPathsType::PkgData,
+                                             "skk/dictionary_list");
     if (file.fd() < 0) {
         return;
     }
@@ -66,7 +67,7 @@ void SkkDictModel::load(QFile &file) {
 
         bool failed = false;
         QMap<QString, QString> dict;
-        Q_FOREACH (const QString &item, items) {
+        for (const QString &item : items) {
             if (!item.contains('=')) {
                 failed = true;
                 break;
@@ -89,18 +90,18 @@ void SkkDictModel::load(QFile &file) {
 }
 
 bool SkkDictModel::save() {
-    return StandardPath::global().safeSave(
-        StandardPath::Type::PkgData, "skk/dictionary_list", [this](int fd) {
+    return StandardPaths::global().safeSave(
+        StandardPathsType::PkgData, "skk/dictionary_list", [this](int fd) {
             QFile tempFile;
             if (!tempFile.open(fd, QIODevice::WriteOnly)) {
                 return false;
             }
 
-            typedef QMap<QString, QString> DictType;
+            using DictType = QMap<QString, QString>;
 
-            Q_FOREACH (const DictType &dict, m_dicts) {
+            for (const DictType &dict : m_dicts) {
                 bool first = true;
-                Q_FOREACH (const QString &key, dict.keys()) {
+                for (const QString &key : dict.keys()) {
                     if (first) {
                         first = false;
                     } else {
@@ -141,11 +142,11 @@ bool SkkDictModel::removeRows(int row, int count, const QModelIndex &parent) {
 
 QVariant SkkDictModel::data(const QModelIndex &index, int role) const {
     if (!index.isValid()) {
-        return QVariant();
+        return {};
     }
 
     if (index.row() >= m_dicts.size() || index.column() != 0) {
-        return QVariant();
+        return {};
     }
 
     switch (role) {
@@ -156,18 +157,16 @@ QVariant SkkDictModel::data(const QModelIndex &index, int role) const {
             return QString("%1:%2").arg(m_dicts[index.row()]["host"],
                                         m_dicts[index.row()]["port"]);
         }
+    default:
+        break;
     }
-    return QVariant();
+    return {};
 }
 
 bool SkkDictModel::moveUp(const QModelIndex &currentIndex) {
     if (currentIndex.row() > 0 && currentIndex.row() < m_dicts.size()) {
         beginResetModel();
-#if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
-        m_dicts.swap(currentIndex.row() - 1, currentIndex.row());
-#else
         m_dicts.swapItemsAt(currentIndex.row() - 1, currentIndex.row());
-#endif
         endResetModel();
         return true;
     }
@@ -177,11 +176,7 @@ bool SkkDictModel::moveUp(const QModelIndex &currentIndex) {
 bool SkkDictModel::moveDown(const QModelIndex &currentIndex) {
     if (currentIndex.row() >= 0 && currentIndex.row() + 1 < m_dicts.size()) {
         beginResetModel();
-#if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
-        m_dicts.swap(currentIndex.row() + 1, currentIndex.row());
-#else
         m_dicts.swapItemsAt(currentIndex.row() + 1, currentIndex.row());
-#endif
         endResetModel();
         return true;
     }
diff --git a/gui/dictwidget.cpp b/gui/dictwidget.cpp
@@ -6,12 +6,21 @@
  */
 #include "dictwidget.h"
 #include <fcntl.h>
+#include <memory>
+#include <QDialog>
+#include <QItemSelectionModel>
+#include <QPushButton>
+#include <QString>
+#include <QWidget>
 #include <fcitx-utils/fs.h>
-#include <fcitx-utils/standardpath.h>
+#include <fcitx-utils/i18n.h>
+#include <fcitx-utils/standardpaths.h>
 #include <fcitx-utils/stringutils.h>
+#include <fcitxqtconfiguiwidget.h>
 #include <fcitxqti18nhelper.h>
 #include "adddictdialog.h"
 #include "dictmodel.h"
+#include "ui_dictwidget.h"
 
 namespace fcitx {
 
@@ -20,9 +29,9 @@ SkkDictWidget::SkkDictWidget(QWidget *parent)
       m_ui(std::make_unique<Ui::SkkDictWidget>()) {
     m_ui->setupUi(this);
     m_dictModel = new SkkDictModel(this);
-    auto fcitxBasePath = stringutils::joinPath(
-        StandardPath::global().userDirectory(StandardPath::Type::PkgData),
-        "skk");
+    auto fcitxBasePath =
+        StandardPaths::global().userDirectory(StandardPathsType::PkgData) /
+        "skk";
     fs::makePath(fcitxBasePath);
 
     m_ui->dictionaryView->setModel(m_dictModel);
@@ -47,32 +56,32 @@ QString SkkDictWidget::icon() { return "fcitx-skk"; }
 
 void SkkDictWidget::load() {
     m_dictModel->load();
-    emit changed(false);
+    Q_EMIT changed(false);
 }
 
 void SkkDictWidget::save() {
     m_dictModel->save();
-    emit changed(false);
+    Q_EMIT changed(false);
 }
 
 void SkkDictWidget::addDictClicked() {
     AddDictDialog dialog;
     int result = dialog.exec();
     if (result == QDialog::Accepted) {
         m_dictModel->add(dialog.dictionary());
-        emit changed(true);
+        Q_EMIT changed(true);
     }
 }
 
 void SkkDictWidget::defaultDictClicked() {
     m_dictModel->defaults();
-    emit changed(true);
+    Q_EMIT changed(true);
 }
 
 void SkkDictWidget::removeDictClicked() {
     if (m_ui->dictionaryView->currentIndex().isValid()) {
         m_dictModel->removeRow(m_ui->dictionaryView->currentIndex().row());
-        emit changed(true);
+        Q_EMIT changed(true);
     }
 }
 
@@ -81,7 +90,7 @@ void SkkDictWidget::moveUpDictClicked() {
     if (m_dictModel->moveUp(m_ui->dictionaryView->currentIndex())) {
         m_ui->dictionaryView->selectionModel()->setCurrentIndex(
             m_dictModel->index(row - 1), QItemSelectionModel::ClearAndSelect);
-        emit changed(true);
+        Q_EMIT changed(true);
     }
 }
 
@@ -90,7 +99,7 @@ void SkkDictWidget::moveDownClicked() {
     if (m_dictModel->moveDown(m_ui->dictionaryView->currentIndex())) {
         m_ui->dictionaryView->selectionModel()->setCurrentIndex(
             m_dictModel->index(row + 1), QItemSelectionModel::ClearAndSelect);
-        emit changed(true);
+        Q_EMIT changed(true);
     }
 }
 
diff --git a/src/skk.cpp b/src/skk.cpp
@@ -16,6 +16,7 @@
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 #include <fcitx-config/iniparser.h>
@@ -27,7 +28,7 @@
 #include <fcitx-utils/log.h>
 #include <fcitx-utils/macros.h>
 #include <fcitx-utils/misc.h>
-#include <fcitx-utils/standardpath.h>
+#include <fcitx-utils/standardpaths.h>
 #include <fcitx-utils/stringutils.h>
 #include <fcitx-utils/textformatflags.h>
 #include <fcitx-utils/utf8.h>
@@ -465,8 +466,8 @@ enum class FcitxSkkDictType { FSDT_Invalid, FSDT_File, FSTD_Server };
 
 void SkkEngine::loadDictionary() {
     dictionaries_.clear();
-    auto file = StandardPath::global().open(StandardPath::Type::PkgData,
-                                            "skk/dictionary_list", O_RDONLY);
+    auto file = StandardPaths::global().open(StandardPathsType::PkgData,
+                                             "skk/dictionary_list");
 
     if (!file.isValid()) {
         return;
@@ -537,8 +538,8 @@ void SkkEngine::loadDictionary() {
                 std::string_view partialpath = path;
                 if (stringutils::consumePrefix(partialpath,
                                                "$XDG_DATA_DIRS/")) {
-                    path = StandardPath::global().locate(
-                        StandardPath::Type::Data, std::string(partialpath));
+                    path = StandardPaths::global().locate(
+                        StandardPathsType::Data, partialpath);
                 }
                 if (stringutils::endsWith(path, ".cdb")) {
                     SkkCdbDict *dict =
@@ -559,10 +560,9 @@ void SkkEngine::loadDictionary() {
                 std::string_view partialpath = path;
                 if (stringutils::consumePrefix(partialpath,
                                                "$FCITX_CONFIG_DIR/")) {
-                    path = stringutils::joinPath(
-                        StandardPath::global().userDirectory(
-                            StandardPath::Type::PkgData),
-                        partialpath);
+                    path = StandardPaths::global().userDirectory(
+                               StandardPathsType::PkgData) /
+                           partialpath;
                 }
                 SkkUserDict *userdict =
                     skk_user_dict_new(path.data(), encoding.data(), nullptr);
