chore: replace Qt keywords with macros (QT_NO_KEYWORDS)

CMakeLists.txt

@@ -12,6 +12,8 @@ project(DDEShell
     LANGUAGES CXX C
 )
 
+add_compile_definitions(QT_NO_KEYWORDS)
+
 if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX /usr)
 endif ()

applets/dde-am/amapplet.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -19,7 +19,7 @@
 
     virtual bool load() override;
 
-private slots:
+private Q_SLOTS:
     void onInterfacesRemoved(const QDBusObjectPath &objPath, const QStringList &interfaces);
 
 private:

applets/dde-appearance/appearanceapplet.h

@@ -20,7 +20,7 @@ class AppearanceApplet : public DApplet
 
     virtual bool load() override;
     qreal opacity() const;
-signals:
+Q_SIGNALS:
     void opacityChanged();
 private:
     void initDBusProxy();

applets/dde-apps/amappitemmodel.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -21,7 +21,7 @@ class AMAppItemModel : public AppItemModel
 
     bool ready() const;
 
-signals:
+Q_SIGNALS:
     void readyChanged(bool);
 
 private:

applets/dde-apps/appsapplet.h

@@ -31,7 +31,7 @@ class AppsApplet : public DApplet
     bool appModelReady() const;
     QVariantMap ddeCategories() const;
 
-signals:
+Q_SIGNALS:
     void appModelReadyChanged(bool ready);
 
 private:

applets/dde-apps/itemspage.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -34,7 +34,7 @@ QString ItemsPage::name() const
 void ItemsPage::setName(const QString &name)
 {
     m_displayName = name;
-    emit nameChanged();
+    Q_EMIT nameChanged();
 }
 
 int ItemsPage::maxItemCountPerPage() const
@@ -72,8 +72,8 @@ void ItemsPage::appendEmptyPage()
 {
     m_pages.append(QStringList());
 
-    emit pageCountChanged();
-    emit sigPageAdded(m_pages.count() - 1, m_pages.count() - 1);
+    Q_EMIT pageCountChanged();
+    Q_EMIT sigPageAdded(m_pages.count() - 1, m_pages.count() - 1);
 }
 
 // if length of items larger than max item count per page, there will be another page get appended
@@ -102,8 +102,8 @@ void ItemsPage::appendPage(const QStringList items)
         m_pages.append(newList);
     }
 
-    emit pageCountChanged();
-    emit sigPageAdded(first, m_pages.count() - 1);
+    Q_EMIT pageCountChanged();
+    Q_EMIT sigPageAdded(first, m_pages.count() - 1);
 }
 
 // find a page with empty place and append the item to that page.
@@ -186,8 +186,8 @@ bool ItemsPage::removeItem(const QString id, bool removePageIfPageIsEmpty)
 
         if (removePageIfPageIsEmpty && m_pages.at(page).isEmpty()) {
             m_pages.removeAt(page);
-            emit pageCountChanged();
-            emit sigPageRemoved(m_pages.count() - 1, m_pages.count() - 1);
+            Q_EMIT pageCountChanged();
+            Q_EMIT sigPageRemoved(m_pages.count() - 1, m_pages.count() - 1);
         }
 
         return true;
@@ -214,8 +214,8 @@ void ItemsPage::removeEmptyPages()
     int count = m_pages.size();
     m_pages.removeAll({});
     if (count != m_pages.size()) {
-        emit pageCountChanged();
-        emit sigPageRemoved(m_pages.count() - 1, m_pages.count() - 1);
+        Q_EMIT pageCountChanged();
+        Q_EMIT sigPageRemoved(m_pages.count() - 1, m_pages.count() - 1);
     }
 }
 

applets/dde-apps/itemspage.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -49,10 +49,10 @@
 private:
     void moveItem(int fromPage, int fromIndex, int toPage, int toIndex);
 
-signals:
+Q_SIGNALS:
     void nameChanged();
     void pageCountChanged();
     void sigPageAdded(int first, int last);
     void sigPageRemoved(int first, int last);
 
 private:

example/applet-example-data/exampleapplet.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -53,7 +53,7 @@ void ExampleApplet::setUserData(bool newUserData)
     if (m_userData == newUserData)
         return;
     m_userData = newUserData;
-    emit userDataChanged();
+    Q_EMIT userDataChanged();
 }
 
 QString ExampleApplet::call(const QString &id)

example/bridge-example/exampleappletitem.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -17,7 +17,7 @@ class ExampleAppletItem : public DS_NAMESPACE::DApplet
     explicit ExampleAppletItem(QObject *parent = nullptr);
     virtual bool init() override;
 
-signals:
+Q_SIGNALS:
     void applicationsModelChanged();
 
 private:

example/panel-example/examplepanel.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -18,7 +18,7 @@
 
     virtual bool init() override;
 
-private slots:
+private Q_SLOTS:
     void onReceivedSignal(const QString &id);
 
 };

frame/layershell/x11dlayershellemulation.h

@@ -22,7 +22,7 @@
 public:
     explicit LayerShellEmulation(QWindow* window, QObject* parent = nullptr);
 
-private slots:
+private Q_SLOTS:
     void onLayerChanged();
     // margins or anchor changed
     void onPositionChanged();

frame/models/listtotableproxymodel.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
@@ -18,7 +18,7 @@ class ListToTableProxyModel : public KExtraColumnsProxyModel
 
     QVariant extraColumnData(const QModelIndex &parent, int row, int extraColumn, int role = Qt::DisplayRole) const override;
 
-signals:
+Q_SIGNALS:
     void rolesChanged(QList<int> roles);
     void sourceColumnChanged(int sourceColum);
 

frame/popupwindow.h

@@ -27,7 +27,7 @@ class PopupWindow : public QQuickApplicationWindow
     void mouseMoveEvent(QMouseEvent *event) override;
     bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
 
-signals:
+Q_SIGNALS:
     void x11GrabFocusTransitionChanged();
     void x11FocusOutByGrab();
     void x11FocusInByUngrab();

frame/private/dsqmlglobal_p.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -40,7 +40,7 @@ class DQmlGlobal : public QObject, public DTK_CORE_NAMESPACE::DObject
     static DQmlGlobal *instance();
     static QList<QWindow *> allChildrenWindows(QWindow *target);
 
-signals:
+Q_SIGNALS:
     void rootAppletChanged();
 };
 

frame/private/utility_x11_p.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -42,7 +42,7 @@ class MouseGrabEventFilter : public QObject
     static bool isMatchingWindow(QWindow *target);
     void closeAllWindow();
     bool eventFilter(QObject *watched, QEvent *event) override;
-signals:
+Q_SIGNALS:
     void outsideMousePressed();
 private:
     void mousePressEvent(QMouseEvent *e);

frame/quick/dsquickdrag.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -141,7 +141,7 @@ void DQuickDrag::setActive(bool newActive)
     }
 
     d->m_active = newActive;
-    emit activeChanged();
+    Q_EMIT activeChanged();
 }
 
 QPoint DQuickDrag::startDragPoint() const
@@ -162,7 +162,7 @@ void DQuickDrag::setOverlay(QQmlComponent *newOverlay)
     if (d->m_overlay == newOverlay)
         return;
     d->m_overlay = newOverlay;
-    emit overlayChanged();
+    Q_EMIT overlayChanged();
 }
 
 QSizeF DQuickDrag::hotSpotScale() const
@@ -177,14 +177,14 @@ void DQuickDrag::setHotSpotScale(const QSizeF &newHotSpotScale)
     if (d->m_hotSpotScale == newHotSpotScale)
         return;
     d->m_hotSpotScale = newHotSpotScale;
-    emit hotSpotScaleChanged();
+    Q_EMIT hotSpotScaleChanged();
 }
 
 void DQuickDrag::resetHotSpotScale()
 {
     D_D(DQuickDrag);
     d->m_hotSpotScale = {};
-    emit hotSpotScaleChanged();
+    Q_EMIT hotSpotScaleChanged();
 }
 
 QPoint DQuickDrag::currentDragPoint() const
@@ -299,14 +299,14 @@ void DQuickDragPrivate::updateStartDragPoint()
     m_startDragPoint = pos - hotSpot();
 
     D_Q(DQuickDrag);
-    emit q->startDragPointChanged();
+    Q_EMIT q->startDragPointChanged();
 }
 
 void DQuickDragPrivate::updateCurrentDragPoint()
 {
     m_currentDragPoint = m_window->position();
     D_Q(DQuickDrag);
-    emit q->currentDragPointChanged();
+    Q_EMIT q->currentDragPointChanged();
 }
 
 QPoint DQuickDragPrivate::hotSpot() const

frame/quick/dsquickdrag_p.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -45,7 +45,7 @@ class DQuickDrag : public QObject, public DTK_CORE_NAMESPACE::DObject
     bool isDragging() const;
 
     static DQuickDrag *qmlAttachedProperties(QObject *object);
-signals:
+Q_SIGNALS:
     void activeChanged();
     void startDragPointChanged();
     void overlayChanged();

frame/utility_x11.cpp

@@ -130,7 +130,7 @@ bool MouseGrabEventFilter::eventFilter(QObject *watched, QEvent *event)
             const auto pos = pt.globalPosition();
             if (!bounding.contains(pos.toPoint())) {
                 qCDebug(dsLog) << "touch outside menu window:" << m_target->winId();
-                emit outsideMousePressed();
+                Q_EMIT outsideMousePressed();
                 return true;
             }
         }
@@ -146,7 +146,7 @@ void MouseGrabEventFilter::mousePressEvent(QMouseEvent *e)
     if ((e->position().toPoint().isNull() && !pos.isNull()) ||
         !bounding.contains(pos.toPoint())) {
         instance()->deliverMouseEvent(e->button());
-        emit outsideMousePressed();
+        Q_EMIT outsideMousePressed();
         return;
     }
 }

panels/dock/appruntimeitem/windowmanager.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -101,7 +101,7 @@ void WindowManager::setWindowInfoActive(uint id, const QString &name)
         if (m_WindowList[i].id == id) {
             m_ActiveId = id;
             m_WindowList[i].name = "ForegroundApp："+name;
-            emit dataChanged(index(i), index(i), {NameRole, IdRole, StartTimeRole});
+            Q_EMIT dataChanged(index(i), index(i), {NameRole, IdRole, StartTimeRole});
             return;
         }
     }
@@ -113,7 +113,7 @@ void WindowManager::setWindowInfoInActive(uint id, const QString &name)
         if (m_ActiveId!=0&&m_WindowList[i].id == m_ActiveId) {
             m_WindowList[i].name = "BackgroundApp："+m_WindowList[i].name.split("：")[1];
             m_ActiveId=0;
-            emit dataChanged(index(i), index(i), {NameRole, IdRole, StartTimeRole});
+            Q_EMIT dataChanged(index(i), index(i), {NameRole, IdRole, StartTimeRole});
             return;
         }
     }

panels/dock/dockpanel.cpp

@@ -571,7 +571,7 @@ void DockPanel::setContextDragging(bool newContextDragging)
     m_contextDragging = newContextDragging;
     if (!m_contextDragging)
         m_helper->checkNeedHideOrNot();
-    emit contextDraggingChanged();
+    Q_EMIT contextDraggingChanged();
 }
 
 bool DockPanel::isResizing() const
@@ -585,7 +585,7 @@ void DockPanel::setIsResizing(bool resizing)
     if (m_isResizing == resizing)
         return;
     m_isResizing = resizing;
-    emit isResizingChanged(m_isResizing);
+    Q_EMIT isResizingChanged(m_isResizing);
 }
 
 bool DockPanel::moveXEmbedWindow(uint32_t wid, double dx, double dy, QQuickWindow *anchorWindow)