Use QT_NO_KEYWORDS and clean up qt plugin includes

wengxt · wengxt · commit c11b64ca1572 · 2025-07-03T12:15:44.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,6 +24,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-unikey\")
+add_definitions(-DQT_NO_KEYWORDS)
 fcitx5_add_i18n_definition()
 
 if (ENABLE_QT)
diff --git a/keymap-editor/editor.h b/keymap-editor/editor.h
@@ -50,7 +50,7 @@ class KeymapEditor : public FcitxQtConfigUIWidget, public Ui::Editor {
     QString icon() override;
 
     static QString getData(CKeymapTable *table, int i, bool iskey);
-private slots:
+private Q_SLOTS:
     void addKeymap();
     void deleteKeymap();
     void deleteAllKeymap();
diff --git a/keymap-editor/model.cpp b/keymap-editor/model.cpp
@@ -165,7 +165,7 @@ void KeymapModel::deleteAllItem() {
 void KeymapModel::setNeedSave(bool needSave) {
     if (needSave_ != needSave) {
         needSave_ = needSave;
-        emit needSaveChanged(needSave_);
+        Q_EMIT needSaveChanged(needSave_);
     }
 }
 
diff --git a/keymap-editor/model.h b/keymap-editor/model.h
@@ -41,7 +41,7 @@ class KeymapModel : public QAbstractTableModel {
     void save(const QString &fileName);
     void load(int profile);
 
-signals:
+Q_SIGNALS:
     void needSaveChanged(bool);
 
 private:
diff --git a/macro-editor/dialog.cpp b/macro-editor/dialog.cpp
@@ -5,15 +5,15 @@
  *
  */
 #include "dialog.h"
-#include "ui_dialog.h"
+#include <QDialog>
+#include <QString>
+#include <QWidget>
 
-namespace fcitx {
-namespace unikey {
+namespace fcitx::unikey {
 MacroDialog::MacroDialog(QWidget *parent) : QDialog(parent) { setupUi(this); }
 
 QString MacroDialog::macro() const { return macroLineEdit->text(); }
 
 QString MacroDialog::word() const { return wordLineEdit->text(); }
 
-} // namespace unikey
-} // namespace fcitx
+} // namespace fcitx::unikey
diff --git a/macro-editor/dialog.h b/macro-editor/dialog.h
@@ -9,19 +9,18 @@
 
 #include "ui_dialog.h"
 #include <QDialog>
+#include <QString>
+#include <QWidget>
 
-class CMacroTable;
+namespace fcitx::unikey {
 
-namespace fcitx {
-namespace unikey {
 class MacroDialog : public QDialog, private Ui::Dialog {
     Q_OBJECT
 public:
     explicit MacroDialog(QWidget *parent = nullptr);
     QString macro() const;
     QString word() const;
 };
-} // namespace unikey
-} // namespace fcitx
+} // namespace fcitx::unikey
 
 #endif // _MACRO_EDITOR_DIALOG_H_
diff --git a/macro-editor/editor.cpp b/macro-editor/editor.cpp
@@ -76,7 +76,7 @@ void MacroEditor::deleteWord() {
 void MacroEditor::deleteAllWord() { model_->deleteAllItem(); }
 
 void MacroEditor::addWord() {
-    MacroDialog *dialog = new MacroDialog(this);
+    auto *dialog = new MacroDialog(this);
     dialog->setAttribute(Qt::WA_DeleteOnClose, true);
     dialog->open();
     connect(dialog, &QDialog::accepted, this, &MacroEditor::addWordAccepted);
@@ -118,8 +118,7 @@ QString MacroEditor::getData(CMacroTable *table, int i, bool iskey) {
 }
 
 void MacroEditor::addWordAccepted() {
-    const MacroDialog *dialog =
-        qobject_cast<const MacroDialog *>(QObject::sender());
+    const auto *dialog = qobject_cast<const MacroDialog *>(QObject::sender());
 
     model_->addItem(dialog->macro(), dialog->word());
 }
@@ -142,7 +141,7 @@ void MacroEditor::save() {
 }
 
 void MacroEditor::importMacro() {
-    QFileDialog *dialog = new QFileDialog(this);
+    auto *dialog = new QFileDialog(this);
     dialog->setAttribute(Qt::WA_DeleteOnClose, true);
     dialog->setFileMode(QFileDialog::ExistingFile);
     dialog->setAcceptMode(QFileDialog::AcceptOpen);
@@ -152,8 +151,7 @@ void MacroEditor::importMacro() {
 }
 
 void MacroEditor::importFileSelected() {
-    const QFileDialog *dialog =
-        qobject_cast<const QFileDialog *>(QObject::sender());
+    const auto *dialog = qobject_cast<const QFileDialog *>(QObject::sender());
     if (dialog->selectedFiles().length() <= 0) {
         return;
     }
@@ -162,7 +160,7 @@ void MacroEditor::importFileSelected() {
 }
 
 void MacroEditor::exportMacro() {
-    QFileDialog *dialog = new QFileDialog(this);
+    auto *dialog = new QFileDialog(this);
     dialog->setAttribute(Qt::WA_DeleteOnClose, true);
     dialog->setDirectory("macro");
     dialog->setAcceptMode(QFileDialog::AcceptSave);
@@ -172,8 +170,7 @@ void MacroEditor::exportMacro() {
 }
 
 void MacroEditor::exportFileSelected() {
-    const QFileDialog *dialog =
-        qobject_cast<const QFileDialog *>(QObject::sender());
+    const auto *dialog = qobject_cast<const QFileDialog *>(QObject::sender());
     if (dialog->selectedFiles().length() <= 0) {
         return;
     }
diff --git a/macro-editor/editor.h b/macro-editor/editor.h
@@ -8,13 +8,14 @@
 #define _MACRO_EDITOR_EDITOR_H_
 
 #include "ui_editor.h"
+#include <QString>
+#include <QWidget>
 #include <fcitxqtconfiguiwidget.h>
 #include <memory>
 
 class CMacroTable;
 
-namespace fcitx {
-namespace unikey {
+namespace fcitx::unikey {
 
 class MacroModel;
 class MacroEditor : public FcitxQtConfigUIWidget, public Ui::Editor {
@@ -28,7 +29,7 @@ class MacroEditor : public FcitxQtConfigUIWidget, public Ui::Editor {
     QString icon() override;
 
     static QString getData(CMacroTable *table, int i, bool iskey);
-private slots:
+private Q_SLOTS:
     void addWord();
     void deleteWord();
     void deleteAllWord();
@@ -43,7 +44,6 @@ private slots:
     std::unique_ptr<CMacroTable> table_;
     MacroModel *model_;
 };
-} // namespace unikey
-} // namespace fcitx
+} // namespace fcitx::unikey
 
 #endif // _MACRO_EDITOR_EDITOR_H_
diff --git a/macro-editor/main.cpp b/macro-editor/main.cpp
@@ -6,9 +6,13 @@
  */
 #include "main.h"
 #include "editor.h"
-#include "model.h"
 #include <QApplication>
-#include <qplugin.h>
+#include <QObject>
+#include <QtPlugin>
+#include <fcitx-utils/i18n.h>
+#include <fcitx-utils/macros.h>
+#include <fcitxqtconfiguiplugin.h>
+#include <fcitxqtconfiguiwidget.h>
 
 namespace fcitx {
 
@@ -18,7 +22,7 @@ MacroEditorPlugin::MacroEditorPlugin(QObject *parent)
 }
 
 FcitxQtConfigUIWidget *MacroEditorPlugin::create(const QString &key) {
-    Q_UNUSED(key);
+    FCITX_UNUSED(key);
     return new fcitx::unikey::MacroEditor;
 }
 
diff --git a/macro-editor/main.h b/macro-editor/main.h
@@ -7,6 +7,8 @@
 #ifndef _MACRO_EDITOR_MAIN_H_
 #define _MACRO_EDITOR_MAIN_H_
 
+#include <QObject>
+#include <QString>
 #include <fcitxqtconfiguiplugin.h>
 
 namespace fcitx {
diff --git a/macro-editor/model.cpp b/macro-editor/model.cpp
@@ -8,12 +8,18 @@
 
 #include "editor.h"
 #include "model.h"
+#include "vnconv.h"
+#include <QAbstractTableModel>
+#include <QObject>
+#include <QString>
+#include <QVariant>
+#include <Qt>
 #include <fcitx-utils/i18n.h>
+#include <utility>
 
-namespace fcitx {
-namespace unikey {
+namespace fcitx::unikey {
 
-typedef std::pair<QString, QString> ItemType;
+using ItemType = std::pair<QString, QString>;
 
 MacroModel::MacroModel(QObject *parent)
     : QAbstractTableModel(parent), needSave_(false) {}
@@ -23,24 +29,29 @@ MacroModel::~MacroModel() {}
 QVariant MacroModel::headerData(int section, Qt::Orientation orientation,
                                 int role) const {
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
-        if (section == 0)
+        if (section == 0) {
             return _("Macro");
-        else if (section == 1)
+        }
+        if (section == 1) {
             return _("Word");
+        }
     }
-    return QVariant();
+    return {};
 }
 
-int MacroModel::rowCount(const QModelIndex &) const { return list_.count(); }
+int MacroModel::rowCount(const QModelIndex & /*parent*/) const {
+    return list_.count();
+}
 
-int MacroModel::columnCount(const QModelIndex &) const { return 2; }
+int MacroModel::columnCount(const QModelIndex & /*parent*/) const { return 2; }
 
 QVariant MacroModel::data(const QModelIndex &index, int role) const {
     do {
         if (role == Qt::DisplayRole && index.row() < list_.count()) {
             if (index.column() == 0) {
                 return list_[index.row()].first;
-            } else if (index.column() == 1) {
+            }
+            if (index.column() == 1) {
                 return list_[index.row()].second;
             }
         }
@@ -49,8 +60,9 @@ QVariant MacroModel::data(const QModelIndex &index, int role) const {
 }
 
 void MacroModel::addItem(const QString &macro, const QString &word) {
-    if (keyset_.contains(macro))
+    if (keyset_.contains(macro)) {
         return;
+    }
     beginInsertRows(QModelIndex(), list_.size(), list_.size());
     list_.append(std::pair<QString, QString>(macro, word));
     keyset_.insert(macro);
@@ -59,8 +71,9 @@ void MacroModel::addItem(const QString &macro, const QString &word) {
 }
 
 void MacroModel::deleteItem(int row) {
-    if (row >= list_.count())
+    if (row >= list_.count()) {
         return;
+    }
     std::pair<QString, QString> item = list_.at(row);
     QString key = item.first;
     beginRemoveRows(QModelIndex(), row, row);
@@ -71,8 +84,9 @@ void MacroModel::deleteItem(int row) {
 }
 
 void MacroModel::deleteAllItem() {
-    if (list_.count())
+    if (list_.count()) {
         setNeedSave(true);
+    }
     beginResetModel();
     list_.clear();
     keyset_.clear();
@@ -82,11 +96,11 @@ void MacroModel::deleteAllItem() {
 void MacroModel::setNeedSave(bool needSave) {
     if (needSave_ != needSave) {
         needSave_ = needSave;
-        emit needSaveChanged(needSave_);
+        Q_EMIT needSaveChanged(needSave_);
     }
 }
 
-bool MacroModel::needSave() { return needSave_; }
+bool MacroModel::needSave() const { return needSave_; }
 
 void MacroModel::load(CMacroTable *table) {
     beginResetModel();
@@ -103,12 +117,11 @@ void MacroModel::load(CMacroTable *table) {
 
 void MacroModel::save(CMacroTable *table) {
     table->resetContent();
-    foreach(const ItemType &item, list_) {
+    for (const ItemType &item : list_) {
         table->addItem(item.first.toUtf8().data(), item.second.toUtf8().data(),
                        CONV_CHARSET_XUTF8);
     }
     setNeedSave(false);
 }
 
-} // namespace unikey
-} // namespace fcitx
+} // namespace fcitx::unikey
diff --git a/macro-editor/model.h b/macro-editor/model.h
@@ -9,30 +9,34 @@
 
 #include "mactab.h"
 #include <QAbstractItemModel>
+#include <QObject>
 #include <QSet>
+#include <QString>
+#include <QVariant>
+#include <Qt>
+#include <utility>
 
-namespace fcitx {
-namespace unikey {
+namespace fcitx::unikey {
 class MacroModel : public QAbstractTableModel {
     Q_OBJECT
 public:
     explicit MacroModel(QObject *parent = 0);
     virtual ~MacroModel();
 
-    virtual QVariant headerData(int section, Qt::Orientation orientation,
-                                int role = Qt::DisplayRole) const;
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual QVariant data(const QModelIndex &index,
-                          int role = Qt::DisplayRole) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index,
+                  int role = Qt::DisplayRole) const override;
     void load(CMacroTable *table);
     void addItem(const QString &macro, const QString &word);
     void deleteItem(int row);
     void deleteAllItem();
     void save(CMacroTable *table);
-    bool needSave();
+    bool needSave() const;
 
-signals:
+Q_SIGNALS:
     void needSaveChanged(bool);
 
 private:
@@ -41,7 +45,7 @@ class MacroModel : public QAbstractTableModel {
     QSet<QString> keyset_;
     QList<std::pair<QString, QString>> list_;
 };
-} // namespace unikey
-} // namespace fcitx
+
+} // namespace fcitx::unikey
 
 #endif // _MACRO_EDITOR_MODEL_H_

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ void KeymapModel::deleteAllItem() {`
`165`	`165`	`void KeymapModel::setNeedSave(bool needSave) {`
`166`	`166`	`if (needSave_ != needSave) {`
`167`	`167`	`needSave_ = needSave;`
`168`		`- emit needSaveChanged(needSave_);`
	`168`	`+ Q_EMIT needSaveChanged(needSave_);`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`