diff --git a/CMakeLists.txt b/CMakeLists.txt index f43150880..2e80b635f 100644 --- a/CMakeLists.txt +++ b/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 () diff --git a/applets/dde-am/amapplet.h b/applets/dde-am/amapplet.h index a075ccf2d..8ae1df6b9 100644 --- a/applets/dde-am/amapplet.h +++ b/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 @@ class AMApplet : public DApplet virtual bool load() override; -private slots: +private Q_SLOTS: void onInterfacesRemoved(const QDBusObjectPath &objPath, const QStringList &interfaces); private: diff --git a/applets/dde-appearance/appearanceapplet.h b/applets/dde-appearance/appearanceapplet.h index cef72b299..227aa4e57 100644 --- a/applets/dde-appearance/appearanceapplet.h +++ b/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(); diff --git a/applets/dde-apps/amappitemmodel.h b/applets/dde-apps/amappitemmodel.h index 5ace8b3c5..213eb8e4d 100644 --- a/applets/dde-apps/amappitemmodel.h +++ b/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: diff --git a/applets/dde-apps/appsapplet.h b/applets/dde-apps/appsapplet.h index 65d08f4d4..68d3d6588 100644 --- a/applets/dde-apps/appsapplet.h +++ b/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: diff --git a/applets/dde-apps/itemspage.cpp b/applets/dde-apps/itemspage.cpp index 4c068cb16..7f076465a 100644 --- a/applets/dde-apps/itemspage.cpp +++ b/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); } } diff --git a/applets/dde-apps/itemspage.h b/applets/dde-apps/itemspage.h index 26f074271..9df8ae6d6 100644 --- a/applets/dde-apps/itemspage.h +++ b/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,7 +49,7 @@ class ItemsPage : public QObject private: void moveItem(int fromPage, int fromIndex, int toPage, int toIndex); -signals: +Q_SIGNALS: void nameChanged(); void pageCountChanged(); void sigPageAdded(int first, int last); diff --git a/example/applet-example-data/exampleapplet.cpp b/example/applet-example-data/exampleapplet.cpp index 2944450a4..a37ee1fd4 100644 --- a/example/applet-example-data/exampleapplet.cpp +++ b/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) diff --git a/example/bridge-example/exampleappletitem.h b/example/bridge-example/exampleappletitem.h index 805bf0c46..3ce5ce52e 100644 --- a/example/bridge-example/exampleappletitem.h +++ b/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: diff --git a/example/panel-example/examplepanel.h b/example/panel-example/examplepanel.h index d46a98416..66526f6bb 100644 --- a/example/panel-example/examplepanel.h +++ b/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 @@ class ExamplePanel : public DPanel virtual bool init() override; -private slots: +private Q_SLOTS: void onReceivedSignal(const QString &id); }; diff --git a/frame/layershell/x11dlayershellemulation.h b/frame/layershell/x11dlayershellemulation.h index 5814f7b8b..a469c1f2d 100644 --- a/frame/layershell/x11dlayershellemulation.h +++ b/frame/layershell/x11dlayershellemulation.h @@ -22,7 +22,7 @@ class LayerShellEmulation : public QObject public: explicit LayerShellEmulation(QWindow* window, QObject* parent = nullptr); -private slots: +private Q_SLOTS: void onLayerChanged(); // margins or anchor changed void onPositionChanged(); diff --git a/frame/models/listtotableproxymodel.h b/frame/models/listtotableproxymodel.h index fc74d8354..887429d46 100644 --- a/frame/models/listtotableproxymodel.h +++ b/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 roles); void sourceColumnChanged(int sourceColum); diff --git a/frame/popupwindow.h b/frame/popupwindow.h index 24481389d..b71111a36 100644 --- a/frame/popupwindow.h +++ b/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(); diff --git a/frame/private/dsqmlglobal_p.h b/frame/private/dsqmlglobal_p.h index 459096b13..204db19df 100644 --- a/frame/private/dsqmlglobal_p.h +++ b/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 allChildrenWindows(QWindow *target); -signals: +Q_SIGNALS: void rootAppletChanged(); }; diff --git a/frame/private/utility_x11_p.h b/frame/private/utility_x11_p.h index f221148e5..892cd820c 100644 --- a/frame/private/utility_x11_p.h +++ b/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); diff --git a/frame/quick/dsquickdrag.cpp b/frame/quick/dsquickdrag.cpp index 5dae9c99a..56e6c6879 100644 --- a/frame/quick/dsquickdrag.cpp +++ b/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 diff --git a/frame/quick/dsquickdrag_p.h b/frame/quick/dsquickdrag_p.h index ff37f3375..4daa0bcc4 100644 --- a/frame/quick/dsquickdrag_p.h +++ b/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(); diff --git a/frame/utility_x11.cpp b/frame/utility_x11.cpp index af7b76652..90a2e0af9 100644 --- a/frame/utility_x11.cpp +++ b/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; } } diff --git a/panels/dock/appruntimeitem/windowmanager.cpp b/panels/dock/appruntimeitem/windowmanager.cpp index 20236e580..d1aefca35 100644 --- a/panels/dock/appruntimeitem/windowmanager.cpp +++ b/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; } } diff --git a/panels/dock/dockpanel.cpp b/panels/dock/dockpanel.cpp index b790011c9..c3f9e5501 100644 --- a/panels/dock/dockpanel.cpp +++ b/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) diff --git a/panels/dock/dockpositioner.cpp b/panels/dock/dockpositioner.cpp index e1b8bc5d4..0229c2e4f 100644 --- a/panels/dock/dockpositioner.cpp +++ b/panels/dock/dockpositioner.cpp @@ -65,7 +65,7 @@ void DockPositioner::setBounding(const QRect &newBounding) if (m_bounding == newBounding) return; m_bounding = newBounding; - emit boundingChanged(); + Q_EMIT boundingChanged(); } int DockPositioner::x() const @@ -93,7 +93,7 @@ void DockPositioner::setX(int x) if (m_x == x) return; m_x = x; - emit xChanged(); + Q_EMIT xChanged(); } void DockPositioner::setY(int y) @@ -101,7 +101,7 @@ void DockPositioner::setY(int y) if (m_y == y) return; m_y = y; - emit yChanged(); + Q_EMIT yChanged(); } void DockPositioner::update() @@ -171,7 +171,7 @@ void DockPanelPositioner::setHorizontalOffset(int newHorizontalOffset) if (m_horizontalOffset == newHorizontalOffset) return; m_horizontalOffset = newHorizontalOffset; - emit horizontalOffsetChanged(); + Q_EMIT horizontalOffsetChanged(); } int DockPanelPositioner::vertialOffset() const @@ -184,7 +184,7 @@ void DockPanelPositioner::setVertialOffset(int newVertialOffset) if (m_vertialOffset == newVertialOffset) return; m_vertialOffset = newVertialOffset; - emit vertialOffsetChanged(); + Q_EMIT vertialOffsetChanged(); } void DockPanelPositioner::resetHorizontalOffset() diff --git a/panels/dock/dockpositioner.h b/panels/dock/dockpositioner.h index b60ed1521..e3b8f05b9 100644 --- a/panels/dock/dockpositioner.h +++ b/panels/dock/dockpositioner.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 @@ -41,11 +41,11 @@ class DockPositioner : public QObject void setX(int x); void setY(int y); -public slots: +public Q_SLOTS: void update(); virtual void updatePosition(); -signals: +Q_SIGNALS: void boundingChanged(); void xChanged(); void yChanged(); @@ -80,10 +80,10 @@ class DockPanelPositioner : public DockPositioner void setVertialOffset(int newVertialOffset); void resetVertialOffset(); -public slots: +public Q_SLOTS: virtual void updatePosition() override; -signals: +Q_SIGNALS: void horizontalOffsetChanged(); void vertialOffsetChanged(); diff --git a/panels/dock/pluginmanagerextension.cpp b/panels/dock/pluginmanagerextension.cpp index c6237c968..ad1777bd1 100644 --- a/panels/dock/pluginmanagerextension.cpp +++ b/panels/dock/pluginmanagerextension.cpp @@ -812,7 +812,7 @@ void PluginSurface::setMargins(int newMargins) m_margins = newMargins; send_margin(m_margins); - emit marginsChanged(); + Q_EMIT marginsChanged(); } QSize PluginManager::dockSize() const @@ -826,7 +826,7 @@ void PluginManager::setDockSize(const QSize &newDockSize) return; m_dockSize = newDockSize; sendEventMsg(dockSizeMsg()); - emit dockSizeChanged(); + Q_EMIT dockSizeChanged(); } bool PluginManager::fashionMode() const @@ -840,7 +840,7 @@ void PluginManager::setFashionMode(bool newFashionMode) return; m_fashionMode = newFashionMode; sendEventMsg(fashionModeMsg()); - emit fashionModeChanged(); + Q_EMIT fashionModeChanged(); } void PluginManager::removePluginSurface(PluginSurface *plugin) diff --git a/panels/dock/pluginmanagerextension_p.h b/panels/dock/pluginmanagerextension_p.h index 57629ebdf..9e0a6d724 100644 --- a/panels/dock/pluginmanagerextension_p.h +++ b/panels/dock/pluginmanagerextension_p.h @@ -239,7 +239,7 @@ class PluginSurface : public QWaylandShellSurface, public QtWaylandServer::plugi int margins() const; void setMargins(int newMargins); -signals: +Q_SIGNALS: void itemActiveChanged(); void cardOrderChanged(); void heightChanged(); @@ -322,7 +322,7 @@ class PluginPopup : public QWaylandShellSurface, public QtWaylandServer::plugin_ int height() const; int width() const; -signals: +Q_SIGNALS: void aboutToDestroy(); protected: diff --git a/panels/dock/showdesktop/showdesktop.h b/panels/dock/showdesktop/showdesktop.h index 30c0c0303..6b7410f3b 100644 --- a/panels/dock/showdesktop/showdesktop.h +++ b/panels/dock/showdesktop/showdesktop.h @@ -31,7 +31,7 @@ class ShowDesktop : public DS_NAMESPACE::DApplet Q_SIGNALS: void visibleChanged(); -private slots: +private Q_SLOTS: void onEnableShowDesktopChanged(); private: diff --git a/panels/dock/taskmanager/dockcombinemodel.h b/panels/dock/taskmanager/dockcombinemodel.h index 9be05e6c7..46166ac16 100644 --- a/panels/dock/taskmanager/dockcombinemodel.h +++ b/panels/dock/taskmanager/dockcombinemodel.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 @@ -18,7 +18,7 @@ class DockCombineModel : public RoleCombineModel, public AbstractTaskManagerInte QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QHash roleNames() const override; -private slots: +private Q_SLOTS: void onSourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QList &roles); private: diff --git a/panels/dock/taskmanager/dockglobalelementmodel.h b/panels/dock/taskmanager/dockglobalelementmodel.h index 51391fdc6..164131b84 100644 --- a/panels/dock/taskmanager/dockglobalelementmodel.h +++ b/panels/dock/taskmanager/dockglobalelementmodel.h @@ -38,7 +38,7 @@ class DockGlobalElementModel : public QAbstractListModel, public AbstractTaskMan void moveItem(int from, int to); -public slots: +public Q_SLOTS: void initDockedElements(bool unused); private: diff --git a/panels/dock/taskmanager/taskmanager.cpp b/panels/dock/taskmanager/taskmanager.cpp index 02ef7189e..5dcbdc134 100644 --- a/panels/dock/taskmanager/taskmanager.cpp +++ b/panels/dock/taskmanager/taskmanager.cpp @@ -231,7 +231,7 @@ bool TaskManager::init() connect(m_windowMonitor.data(), &AbstractWindowMonitor::windowFullscreenChanged, this, [this] (bool isFullscreen) { m_windowFullscreen = isFullscreen; - emit windowFullscreenChanged(isFullscreen); + Q_EMIT windowFullscreenChanged(isFullscreen); }); connect(m_windowMonitor.data(), &AbstractWindowMonitor::previewShouldClear, this, [this]() { diff --git a/panels/dock/taskmanager/textcalculator.cpp b/panels/dock/taskmanager/textcalculator.cpp index b3f5c6e4a..708a16c95 100644 --- a/panels/dock/taskmanager/textcalculator.cpp +++ b/panels/dock/taskmanager/textcalculator.cpp @@ -39,7 +39,7 @@ void TextCalculator::setFont(const QFont &font) qCDebug(textCalculatorLog) << "Font changed, clearing cache and recalculating"; m_font = font; m_baselineWidthCache.clear(); - emit fontChanged(); + Q_EMIT fontChanged(); scheduleCalculation(); } } @@ -48,7 +48,7 @@ void TextCalculator::setIconSize(qreal size) { if (m_iconSize != size) { m_iconSize = size; - emit iconSizeChanged(); + Q_EMIT iconSizeChanged(); scheduleCalculation(); } } @@ -57,7 +57,7 @@ void TextCalculator::setCellSize(qreal size) { if (m_cellSize != size) { m_cellSize = size; - emit cellSizeChanged(); + Q_EMIT cellSizeChanged(); scheduleCalculation(); } } @@ -66,7 +66,7 @@ void TextCalculator::setSpacing(int spacing) { if (m_spacing != spacing) { m_spacing = spacing; - emit spacingChanged(); + Q_EMIT spacingChanged(); scheduleCalculation(); } } @@ -75,7 +75,7 @@ void TextCalculator::setItemPadding(int padding) { if (m_itemPadding != padding) { m_itemPadding = padding; - emit itemPaddingChanged(); + Q_EMIT itemPaddingChanged(); scheduleCalculation(); } } @@ -87,7 +87,7 @@ void TextCalculator::setDataModel(QAbstractItemModel *model) disconnectDataModelSignals(); m_dataModel = model; connectDataModelSignals(); - emit dataModelChanged(); + Q_EMIT dataModelChanged(); scheduleCalculation(); } } @@ -96,7 +96,7 @@ void TextCalculator::setRemainingSpace(qreal space) { if (m_remainingSpace != space) { m_remainingSpace = space; - emit remainingSpaceChanged(); + Q_EMIT remainingSpaceChanged(); scheduleCalculation(); } } @@ -113,7 +113,7 @@ void TextCalculator::setEnabled(bool enabled) } else { resetCalculatedWidths(); } - emit enabledChanged(); + Q_EMIT enabledChanged(); } void TextCalculator::componentComplete() @@ -156,7 +156,7 @@ void TextCalculator::onDataModelChanged() void TextCalculator::onDataModelDestroyed() { m_dataModel = nullptr; - emit dataModelChanged(); + Q_EMIT dataModelChanged(); resetCalculatedWidths(); } @@ -181,10 +181,10 @@ void TextCalculator::resetCalculatedWidths() m_totalWidth = 0.0; if (optimalWidthWasSet) { - emit optimalSingleTextWidthChanged(); + Q_EMIT optimalSingleTextWidthChanged(); } if (totalWidthWasSet) { - emit totalWidthChanged(); + Q_EMIT totalWidthChanged(); } } @@ -271,8 +271,8 @@ void TextCalculator::calculateOptimalTextWidth() qCDebug(textCalculatorLog) << "Setting optimal width to 0 (no apps or no space)"; m_optimalSingleTextWidth = 0.0; m_totalWidth = 0; - emit optimalSingleTextWidthChanged(); - emit totalWidthChanged(); + Q_EMIT optimalSingleTextWidthChanged(); + Q_EMIT totalWidthChanged(); } return; } @@ -323,9 +323,9 @@ void TextCalculator::calculateOptimalTextWidth() << "Remaining space:" << m_remainingSpace << "Total required:" << newTotalWidth << "Char count:" << charCount << "spacing:" << m_spacing; m_optimalSingleTextWidth = newOptimalWidth; - emit optimalSingleTextWidthChanged(); + Q_EMIT optimalSingleTextWidthChanged(); m_totalWidth = newTotalWidth; - emit totalWidthChanged(); + Q_EMIT totalWidthChanged(); } } @@ -381,7 +381,7 @@ void TextCalculatorAttached::setText(const QString &text) } m_text = text; ensureInitialize(); - emit textChanged(); + Q_EMIT textChanged(); } QString TextCalculatorAttached::elidedText() const @@ -401,7 +401,7 @@ void TextCalculatorAttached::setCalculator(TextCalculator *calculator) } m_calculator = calculator; - emit calculatorChanged(); + Q_EMIT calculatorChanged(); if (m_calculator) { connect(m_calculator, &TextCalculator::optimalSingleTextWidthChanged, this, &TextCalculatorAttached::updateElidedText); @@ -435,8 +435,8 @@ void TextCalculatorAttached::updateElidedText() qCDebug(textCalculatorLog) << "No calculator available for elided text update"; m_elidedText.clear(); m_ellipsisWidth = 0.0; - emit elidedTextChanged(); - emit ellipsisWidthChanged(); + Q_EMIT elidedTextChanged(); + Q_EMIT ellipsisWidthChanged(); return; } @@ -456,15 +456,15 @@ void TextCalculatorAttached::updateElidedText() if (visibleText != m_text) { m_ellipsisWidth = fontMetrics.horizontalAdvance(QString::fromUtf8("…")); - emit ellipsisWidthChanged(); + Q_EMIT ellipsisWidthChanged(); } else { m_ellipsisWidth = 0.0; - emit ellipsisWidthChanged(); + Q_EMIT ellipsisWidthChanged(); } if (m_elidedText != visibleText) { m_elidedText = visibleText; - emit elidedTextChanged(); + Q_EMIT elidedTextChanged(); } } diff --git a/panels/dock/taskmanager/textcalculator.h b/panels/dock/taskmanager/textcalculator.h index 6152b3b1d..f290190d0 100644 --- a/panels/dock/taskmanager/textcalculator.h +++ b/panels/dock/taskmanager/textcalculator.h @@ -158,7 +158,7 @@ class TextCalculator : public QObject, public QQmlParserStatus void remainingSpaceChanged(); void enabledChanged(); -private slots: +private Q_SLOTS: void onDataModelChanged(); void onDataModelDestroyed(); void calculateOptimalTextWidth(); diff --git a/panels/dock/taskmanager/treelandwindowmonitor.cpp b/panels/dock/taskmanager/treelandwindowmonitor.cpp index d0ccaabc1..28f3ef376 100644 --- a/panels/dock/taskmanager/treelandwindowmonitor.cpp +++ b/panels/dock/taskmanager/treelandwindowmonitor.cpp @@ -43,7 +43,7 @@ TreeLandDockPreviewContext::TreeLandDockPreviewContext(struct ::treeland_dock_pr connect(m_hideTimer, &QTimer::timeout, this, [this](){ if (!m_isDockMouseAreaEnter && !m_isPreviewEntered) { - emit closed(); + Q_EMIT closed(); close(); } }, Qt::QueuedConnection); @@ -149,7 +149,7 @@ void TreeLandWindowMonitor::requestPreview(QAbstractItemModel *sourceModel, }); connect(m_dockPreview.get(), &TreeLandDockPreviewContext::closed, this, [this]() { // 当预览关闭时,发出信号清空过滤状态 - emit previewShouldClear(); + Q_EMIT previewShouldClear(); }); } @@ -237,7 +237,7 @@ void TreeLandWindowMonitor::updateFullscreenState() if (window && window->isFullscreen() && !window->isMinimized()) { if (!m_fullscreenState) { m_fullscreenState = true; - emit windowFullscreenChanged(true); + Q_EMIT windowFullscreenChanged(true); } return; } @@ -245,7 +245,7 @@ void TreeLandWindowMonitor::updateFullscreenState() if (m_fullscreenState) { m_fullscreenState = false; - emit windowFullscreenChanged(false); + Q_EMIT windowFullscreenChanged(false); } } } diff --git a/panels/dock/taskmanager/x11windowmonitor.cpp b/panels/dock/taskmanager/x11windowmonitor.cpp index b10badf8e..6d264b30a 100644 --- a/panels/dock/taskmanager/x11windowmonitor.cpp +++ b/panels/dock/taskmanager/x11windowmonitor.cpp @@ -171,7 +171,7 @@ void X11WindowMonitor::requestUpdateWindowIconGeometry(const QModelIndex &index, void X11WindowMonitor::clearPreviewState() { // 发出信号通知 TaskManager 清空预览过滤状态 - emit previewShouldClear(); + Q_EMIT previewShouldClear(); } void X11WindowMonitor::onWindowMapped(xcb_window_t xcb_window) diff --git a/panels/dock/tray/quickpanel/quickpanelproxymodel.cpp b/panels/dock/tray/quickpanel/quickpanelproxymodel.cpp index 4ad8ef62b..4ac06a321 100644 --- a/panels/dock/tray/quickpanel/quickpanelproxymodel.cpp +++ b/panels/dock/tray/quickpanel/quickpanelproxymodel.cpp @@ -277,9 +277,9 @@ QAbstractListModel *QuickPanelProxyModel::surfaceModel() const void QuickPanelProxyModel::updateTrayItemSurface() { - emit trayItemSurfaceChanged(); + Q_EMIT trayItemSurfaceChanged(); if (rowCount() > 0) - emit dataChanged(index(0, 0), index(rowCount() - 1, 0), {TraySurface, TraySurfaceItemKey}); + Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {TraySurface, TraySurfaceItemKey}); } void QuickPanelProxyModel::classBegin() @@ -309,7 +309,7 @@ void QuickPanelProxyModel::setTrayItemPluginId(const QString &newTrayItemPluginI if (m_trayItemPluginId == newTrayItemPluginId) return; m_trayItemPluginId = newTrayItemPluginId; - emit trayItemPluginIdChanged(); + Q_EMIT trayItemPluginIdChanged(); updateTrayItemSurface(); } @@ -324,7 +324,7 @@ void QuickPanelProxyModel::setTrayPluginModel(QAbstractItemModel *newTrayPluginM return; m_trayPluginModel = newTrayPluginModel; watchingCountChanged(); - emit trayPluginModelChanged(); + Q_EMIT trayPluginModelChanged(); } } diff --git a/panels/dock/tray/quickpanel/quickpanelproxymodel.h b/panels/dock/tray/quickpanel/quickpanelproxymodel.h index 55b44d208..5bb50b66c 100644 --- a/panels/dock/tray/quickpanel/quickpanelproxymodel.h +++ b/panels/dock/tray/quickpanel/quickpanelproxymodel.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 @@ -36,7 +36,7 @@ class QuickPanelProxyModel : public QSortFilterProxyModel, public QQmlParserStat QAbstractItemModel *trayPluginModel() const; void setTrayPluginModel(QAbstractItemModel *newTrayPluginModel); -signals: +Q_SIGNALS: void trayItemSurfaceChanged(); void trayItemPluginIdChanged(); @@ -67,7 +67,7 @@ class QuickPanelProxyModel : public QSortFilterProxyModel, public QQmlParserStat QString traySurfaceItemKey(const QString &pluginId) const; int roleByName(const QByteArray &roleName) const; QAbstractListModel *surfaceModel() const; -private slots: +private Q_SLOTS: void updateTrayItemSurface(); private: diff --git a/panels/dock/tray/trayitem.cpp b/panels/dock/tray/trayitem.cpp index 13a01aa59..6fae63b13 100644 --- a/panels/dock/tray/trayitem.cpp +++ b/panels/dock/tray/trayitem.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 @@ -32,7 +32,7 @@ void TrayItem::setTrayPluginModel(QAbstractItemModel *newTrayPluginModel) if (m_trayPluginModel == newTrayPluginModel) return; m_trayPluginModel = newTrayPluginModel; - emit trayPluginModelChanged(); + Q_EMIT trayPluginModelChanged(); } QAbstractItemModel *TrayItem::quickPluginModel() const @@ -45,7 +45,7 @@ void TrayItem::setQuickPluginModel(QAbstractItemModel *newQuickPluginModel) if (m_quickPluginModel == newQuickPluginModel) return; m_quickPluginModel = newQuickPluginModel; - emit quickPluginModelChanged(); + Q_EMIT quickPluginModelChanged(); } QAbstractItemModel *TrayItem::fixedPluginModel() const @@ -58,7 +58,7 @@ void TrayItem::setFixedPluginModel(QAbstractItemModel *newFixedPluginModel) if (m_fixedPluginModel == newFixedPluginModel) return; m_fixedPluginModel = newFixedPluginModel; - emit fixedPluginModelChanged(); + Q_EMIT fixedPluginModelChanged(); } bool TrayItem::loopDockItemInfosModel(QAbstractItemModel *model, const std::function &cb) diff --git a/panels/dock/tray/trayitempositionmanager.cpp b/panels/dock/tray/trayitempositionmanager.cpp index c68cb5d34..589c6af24 100644 --- a/panels/dock/tray/trayitempositionmanager.cpp +++ b/panels/dock/tray/trayitempositionmanager.cpp @@ -25,7 +25,7 @@ void TrayItemPositionManager::registerVisualItemSize(int index, const QSize &siz // The registered itemsize may change, and the layout needs to be updated when it does. if (oldSize != size) { - emit visualItemSizeChanged(); + Q_EMIT visualItemSizeChanged(); } } @@ -111,7 +111,7 @@ void TrayItemPositionManager::layoutHealthCheck(int delayMs) QSize result(visualSize(m_visualItemCount - 1, false)); if (m_visualSize != result) { qWarning() << "layout size not matched, will trigger a force re-layout..."; - emit orientationChanged(m_orientation); + Q_EMIT orientationChanged(m_orientation); } else { qDebug() << "no problem founded while performing layout health check!"; } @@ -127,7 +127,7 @@ void TrayItemPositionManager::clearRegisteredSizes() } m_registeredItemsSize.clear(); - emit visualItemSizeChanged(); + Q_EMIT visualItemSizeChanged(); } TrayItemPositionManager::TrayItemPositionManager(QObject *parent) diff --git a/panels/dock/tray/trayitempositionmanager.h b/panels/dock/tray/trayitempositionmanager.h index dfc436dcb..3ab7991a5 100644 --- a/panels/dock/tray/trayitempositionmanager.h +++ b/panels/dock/tray/trayitempositionmanager.h @@ -60,7 +60,7 @@ class TrayItemPositionManager : public QObject Q_INVOKABLE void layoutHealthCheck(int delayMs = 200); Q_INVOKABLE void clearRegisteredSizes(); -signals: +Q_SIGNALS: void orientationChanged(Qt::Orientation); void dockHeightChanged(int); void visualSizeChanged(QSize); diff --git a/panels/dock/tray/trayitempositionregister.cpp b/panels/dock/tray/trayitempositionregister.cpp index 0f1dd0ad2..6d235a079 100644 --- a/panels/dock/tray/trayitempositionregister.cpp +++ b/panels/dock/tray/trayitempositionregister.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 @@ -15,12 +15,12 @@ TrayItemPositionRegisterAttachedType::TrayItemPositionRegisterAttachedType(QObje connect(this, &TrayItemPositionRegisterAttachedType::visualIndexChanged, this, [this](){ registerVisualSize(); - emit visualPositionChanged(); + Q_EMIT visualPositionChanged(); }); connect(this, &TrayItemPositionRegisterAttachedType::visualSizeChanged, this, [this](){ registerVisualSize(); - emit visualPositionChanged(); + Q_EMIT visualPositionChanged(); }); // recalculate position connect(&TrayItemPositionManager::instance(), &TrayItemPositionManager::orientationChanged, diff --git a/panels/dock/tray/trayitempositionregister.h b/panels/dock/tray/trayitempositionregister.h index 1de6bf742..5e2f1b4de 100644 --- a/panels/dock/tray/trayitempositionregister.h +++ b/panels/dock/tray/trayitempositionregister.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 @@ -24,7 +24,7 @@ class TrayItemPositionRegisterAttachedType : public QObject QPoint visualPosition() const; -signals: +Q_SIGNALS: void surfaceIdChanged(QString); void sectionTypeChanged(QString); void visualIndexChanged(int); diff --git a/panels/dock/tray/traysortordermodel.cpp b/panels/dock/tray/traysortordermodel.cpp index 371e6853b..7e62e8763 100644 --- a/panels/dock/tray/traysortordermodel.cpp +++ b/panels/dock/tray/traysortordermodel.cpp @@ -373,7 +373,7 @@ QStandardItem *TraySortOrderModel::createTrayItem(const QString &name, void TraySortOrderModel::updateVisualIndexes() { m_isUpdating = true; - emit isUpdatingChanged(true); + Q_EMIT isUpdatingChanged(true); // Clear registered sizes before re-assigning visual indexes // This ensures that when items are repositioned, the empty placeholder @@ -509,7 +509,7 @@ void TraySortOrderModel::updateVisualIndexes() setProperty("visualItemCount", currentVisualIndex); m_isUpdating = false; - emit isUpdatingChanged(false); + Q_EMIT isUpdatingChanged(false); qDebug() << "update" << m_visualItemCount << currentVisualIndex; } @@ -667,7 +667,7 @@ void TraySortOrderModel::stageDropPosition(const QString &surfaceId, int visualI m_stagedSurfaceId = surfaceId; m_stagedVisualIndex = visualIndex; - emit stagedDropChanged(); + Q_EMIT stagedDropChanged(); // Update visual indexes to show preview position updateVisualIndexes(); @@ -685,7 +685,7 @@ void TraySortOrderModel::commitStagedDrop() m_stagedSurfaceId.clear(); m_stagedVisualIndex = -1; - emit stagedDropChanged(); + Q_EMIT stagedDropChanged(); updateVisualIndexes(); dropToDockTray(surfaceId, visualIndex, true); @@ -700,7 +700,7 @@ void TraySortOrderModel::clearStagedDrop() m_stagedSurfaceId.clear(); m_stagedVisualIndex = -1; - emit stagedDropChanged(); + Q_EMIT stagedDropChanged(); // Update visual indexes to remove preview updateVisualIndexes(); diff --git a/panels/dock/tray/traysortordermodel.h b/panels/dock/tray/traysortordermodel.h index 4f3165f79..7b96486ef 100644 --- a/panels/dock/tray/traysortordermodel.h +++ b/panels/dock/tray/traysortordermodel.h @@ -75,7 +75,7 @@ class TraySortOrderModel : public QStandardItemModel Q_INVOKABLE void commitStagedDrop(); Q_INVOKABLE void clearStagedDrop(); -signals: +Q_SIGNALS: void collapsedChanged(bool); void isCollapsingChanged(bool); void actionsAlwaysVisibleChanged(bool); @@ -130,7 +130,7 @@ class TraySortOrderModel : public QStandardItemModel void saveCollapsedToDConfig(); void handlePluginVisibleChanged(const QString &surfaceId, bool visible); -private slots: +private Q_SLOTS: void onAvailableSurfacesChanged(); }; diff --git a/panels/dock/waylanddockhelper.cpp b/panels/dock/waylanddockhelper.cpp index 6e72cb112..c0b421648 100644 --- a/panels/dock/waylanddockhelper.cpp +++ b/panels/dock/waylanddockhelper.cpp @@ -118,7 +118,7 @@ bool WaylandDockHelper::currentActiveWindowFullscreened() void WaylandDockHelper::setCurrentActiveWindowFullscreened(bool isFullscreen) { m_isCurrentActiveWindowFullscreened = isFullscreen; - emit currentActiveWindowFullscreenChanged(isFullscreen); + Q_EMIT currentActiveWindowFullscreenChanged(isFullscreen); } bool WaylandDockHelper::isWindowOverlap() diff --git a/panels/notification/bubble/bubbleitem.h b/panels/notification/bubble/bubbleitem.h index d64cf1157..fc909e056 100644 --- a/panels/notification/bubble/bubbleitem.h +++ b/panels/notification/bubble/bubbleitem.h @@ -49,7 +49,7 @@ class BubbleItem : public QObject bool isValid() const; -signals: +Q_SIGNALS: void timeTipChanged(); private: diff --git a/panels/notification/bubble/bubblepanel.cpp b/panels/notification/bubble/bubblepanel.cpp index 98f1f272a..2d7e73924 100644 --- a/panels/notification/bubble/bubblepanel.cpp +++ b/panels/notification/bubble/bubblepanel.cpp @@ -210,7 +210,7 @@ void BubblePanel::setEnabled(bool newEnabled) if (m_enabled == newEnabled) return; m_enabled = newEnabled; - emit enabledChanged(); + Q_EMIT enabledChanged(); bool isEmpty = m_bubbles->items().isEmpty(); setVisible(!isEmpty && enabled()); diff --git a/panels/notification/center/notificationcenterpanel.cpp b/panels/notification/center/notificationcenterpanel.cpp index aded7e0b9..e3584999c 100644 --- a/panels/notification/center/notificationcenterpanel.cpp +++ b/panels/notification/center/notificationcenterpanel.cpp @@ -89,7 +89,7 @@ void NotificationCenterPanel::setVisible(bool newVisible) } } setBubblePanelEnabled(!m_visible); - emit visibleChanged(); + Q_EMIT visibleChanged(); } void NotificationCenterPanel::close() diff --git a/panels/notification/center/notificationcenterpanel.h b/panels/notification/center/notificationcenterpanel.h index 2cd546f7c..520d0031b 100644 --- a/panels/notification/center/notificationcenterpanel.h +++ b/panels/notification/center/notificationcenterpanel.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 @@ -27,7 +27,7 @@ class NotificationCenterPanel : public DS_NAMESPACE::DPanel Q_SIGNALS: void visibleChanged(); -private slots: +private Q_SLOTS: void setBubblePanelEnabled(bool enabled); private: diff --git a/panels/notification/center/notificationcenterproxy.h b/panels/notification/center/notificationcenterproxy.h index 173cda86c..abcd2f0b1 100644 --- a/panels/notification/center/notificationcenterproxy.h +++ b/panels/notification/center/notificationcenterproxy.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 @@ -15,12 +15,12 @@ class NotificationCenterProxy : public QObject explicit NotificationCenterProxy(QObject *parent = nullptr); ~NotificationCenterProxy(); -public slots: +public Q_SLOTS: void Toggle(); void Show(); void Hide(); -signals: +Q_SIGNALS: void VisibleChanged(bool visible); private: diff --git a/panels/notification/center/notifyaccessor.cpp b/panels/notification/center/notifyaccessor.cpp index 9038ce0aa..3077b2f88 100644 --- a/panels/notification/center/notifyaccessor.cpp +++ b/panels/notification/center/notifyaccessor.cpp @@ -89,7 +89,7 @@ void NotifyAccessor::setDataUpdater(QObject *updater) return; m_dataUpdater = updater; - emit dataUpdaterChanged(); + Q_EMIT dataUpdaterChanged(); } bool NotifyAccessor::enabled() const @@ -103,7 +103,7 @@ void NotifyAccessor::setEnabled(bool enabled) return; m_enabled = enabled; - emit enabledChanged(); + Q_EMIT enabledChanged(); } NotifyEntity NotifyAccessor::fetchEntity(qint64 id) const @@ -245,16 +245,16 @@ void NotifyAccessor::onNotificationStateChanged(qint64 id, int processedType) return; if (processedType == NotifyEntity::Processed) { - emit entityReceived(id); - emit stagingEntityClosed(id); + Q_EMIT entityReceived(id); + Q_EMIT stagingEntityClosed(id); } else if (processedType == NotifyEntity::NotProcessed) { - emit stagingEntityReceived(id); + Q_EMIT stagingEntityReceived(id); } } void NotifyAccessor::onReceivedRecord(const QString &id) { - emit entityReceived(id.toLongLong()); + Q_EMIT entityReceived(id.toLongLong()); } bool NotifyAccessor::debugging() const diff --git a/panels/notification/center/notifyaccessor.h b/panels/notification/center/notifyaccessor.h index ba3253632..2af85c0fc 100644 --- a/panels/notification/center/notifyaccessor.h +++ b/panels/notification/center/notifyaccessor.h @@ -58,7 +58,7 @@ class NotifyAccessor : public QObject void closeNotify(const NotifyEntity &entity, NotifyEntity::ClosedReason reason); void invokeNotify(const NotifyEntity &entity, const QString &actionId); -signals: +Q_SIGNALS: void entityReceived(qint64 id); void stagingEntityReceived(qint64 id); void stagingEntityClosed(qint64 id); @@ -67,7 +67,7 @@ class NotifyAccessor : public QObject void enabledChanged(); void dataUpdaterChanged(); -private slots: +private Q_SLOTS: void onReceivedRecord(const QString &id); private: diff --git a/panels/notification/center/notifymodel.cpp b/panels/notification/center/notifymodel.cpp index ac3135dd8..1c868a93e 100644 --- a/panels/notification/center/notifymodel.cpp +++ b/panels/notification/center/notifymodel.cpp @@ -800,7 +800,7 @@ void NotifyModel::doEntityReceived(qint64 id) void NotifyModel::onCountChanged() { updateCollapseStatus(); - emit dataInfoChanged(); + Q_EMIT dataInfoChanged(); } int NotifyModel::notifyCount(const NotifyType &type) const @@ -856,6 +856,6 @@ void NotifyModel::setCollapse(bool newCollapse) if (m_collapse == newCollapse) return; m_collapse = newCollapse; - emit collapseChanged(); + Q_EMIT collapseChanged(); } } diff --git a/panels/notification/center/notifymodel.h b/panels/notification/center/notifymodel.h index 6e2960cce..537851521 100644 --- a/panels/notification/center/notifymodel.h +++ b/panels/notification/center/notifymodel.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 @@ -61,7 +61,7 @@ class NotifyModel : public QAbstractListModel bool collapse() const; void setCollapse(bool newCollapse); -signals: +Q_SIGNALS: void dataInfoChanged(); void collapseChanged(); void countChanged(); @@ -73,7 +73,7 @@ class NotifyModel : public QAbstractListModel virtual void timerEvent(QTimerEvent *event) override; virtual void sort(int column, Qt::SortOrder order) override; -private slots: +private Q_SLOTS: void doEntityReceived(qint64 id); void onCountChanged(); diff --git a/panels/notification/center/notifystagingmodel.h b/panels/notification/center/notifystagingmodel.h index d41d4cce7..1afd82102 100644 --- a/panels/notification/center/notifystagingmodel.h +++ b/panels/notification/center/notifystagingmodel.h @@ -54,7 +54,7 @@ class NotifyStagingModel : public QAbstractListModel void updateOverlapCount(int count); void updateContentRowCount(int rowCount); -private slots: +private Q_SLOTS: void push(const NotifyEntity &entity); void replace(const NotifyEntity &entity); void doEntityReceived(qint64 id); diff --git a/panels/notification/common/notifysetting.h b/panels/notification/common/notifysetting.h index 4a2f9679f..e28e11034 100644 --- a/panels/notification/common/notifysetting.h +++ b/panels/notification/common/notifysetting.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 NotifySetting : public QObject int bubbleCount() const; int contentRowCount() const; -signals: +Q_SIGNALS: void bubbleCountChanged(int count); void contentRowCountChanged(int rowCount); diff --git a/panels/notification/osd/audio/audioapplet.cpp b/panels/notification/osd/audio/audioapplet.cpp index 4105e2709..21f160e59 100644 --- a/panels/notification/osd/audio/audioapplet.cpp +++ b/panels/notification/osd/audio/audioapplet.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 @@ -50,7 +50,7 @@ void AudioApplet::setIncreaseVolume(bool newIncreaseVolume) if (m_increaseVolume == newIncreaseVolume) return; m_increaseVolume = newIncreaseVolume; - emit increaseVolumeChanged(); + Q_EMIT increaseVolumeChanged(); } void AudioApplet::sync() @@ -120,7 +120,7 @@ void AudioApplet::setIconName(const QString &newIconName) if (m_iconName == newIconName) return; m_iconName = newIconName; - emit iconNameChanged(); + Q_EMIT iconNameChanged(); } double AudioApplet::volumeValue() const @@ -133,7 +133,7 @@ void AudioApplet::setVolumeValue(double newVolumeValue) if (qFuzzyCompare(m_volumeValue, newVolumeValue)) return; m_volumeValue = newVolumeValue; - emit volumeValueChanged(); + Q_EMIT volumeValueChanged(); } D_APPLET_CLASS(AudioApplet) diff --git a/panels/notification/osd/brightness/brightnessapplet.cpp b/panels/notification/osd/brightness/brightnessapplet.cpp index 422583302..90fe34c83 100644 --- a/panels/notification/osd/brightness/brightnessapplet.cpp +++ b/panels/notification/osd/brightness/brightnessapplet.cpp @@ -77,7 +77,7 @@ void BrightnessApplet::setIconName(const QString &newIconName) if (m_iconName == newIconName) return; m_iconName = newIconName; - emit iconNameChanged(); + Q_EMIT iconNameChanged(); } QString BrightnessApplet::fetchIconName() const @@ -123,7 +123,7 @@ void BrightnessApplet::setBrightness(double newBrightness) if (qFuzzyCompare(m_brightness, newBrightness)) return; m_brightness = newBrightness; - emit brightnessChanged(); + Q_EMIT brightnessChanged(); } D_APPLET_CLASS(BrightnessApplet) diff --git a/panels/notification/osd/displaymode/displaymodeapplet.cpp b/panels/notification/osd/displaymode/displaymodeapplet.cpp index 847ec77e8..5575fb0b7 100644 --- a/panels/notification/osd/displaymode/displaymodeapplet.cpp +++ b/panels/notification/osd/displaymode/displaymodeapplet.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 @@ -87,7 +87,7 @@ void DisPlayModeApplet::setState(int newState) if (m_state == newState) return; m_state = newState; - emit stateChanged(); + Q_EMIT stateChanged(); } DPItem *DisPlayModeApplet::currentPlanItem() const @@ -149,7 +149,7 @@ void DisPlayModeApplet::setCurrentPlanItem(DPItem *newCurrentPlanItem) if (m_currentPlanItem == newCurrentPlanItem) return; m_currentPlanItem = newCurrentPlanItem; - emit currentPlanItemChanged(); + Q_EMIT currentPlanItemChanged(); } void DisPlayModeApplet::fetchPlanItems() diff --git a/panels/notification/osd/kblayout/kblayoutapplet.cpp b/panels/notification/osd/kblayout/kblayoutapplet.cpp index 9b9c2eb98..24acea375 100644 --- a/panels/notification/osd/kblayout/kblayoutapplet.cpp +++ b/panels/notification/osd/kblayout/kblayoutapplet.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 @@ -52,7 +52,7 @@ void KBLayoutApplet::setCurrentLayout(const QString &newCurrentLayout) if (m_currentLayout == newCurrentLayout) return; m_currentLayout = newCurrentLayout; - emit currentLayoutChanged(); + Q_EMIT currentLayoutChanged(); } void KBLayoutApplet::fetchLayouts() diff --git a/panels/notification/osd/osdpanel.cpp b/panels/notification/osd/osdpanel.cpp index 6d47be03d..b17aae0d7 100644 --- a/panels/notification/osd/osdpanel.cpp +++ b/panels/notification/osd/osdpanel.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 @@ -115,7 +115,7 @@ void OsdPanel::setVisible(const bool visible) void OsdPanel::setOsdType(const QString &osdType) { m_osdType = osdType; - emit osdTypeChanged(m_osdType); + Q_EMIT osdTypeChanged(m_osdType); } void OsdPanel::updateLastOsdType(const QString &osdType) diff --git a/panels/notification/server/notificationmanager.cpp b/panels/notification/server/notificationmanager.cpp index 02820b638..782fb8381 100644 --- a/panels/notification/server/notificationmanager.cpp +++ b/panels/notification/server/notificationmanager.cpp @@ -475,7 +475,7 @@ void NotificationManager::tryPlayNotificationSound(const NotifyEntity &entity, c void NotificationManager::emitRecordCountChanged() { const auto count = m_persistence->fetchEntityCount(DataAccessor::AllApp(), NotifyEntity::Processed); - emit RecordCountChanged(count); + Q_EMIT RecordCountChanged(count); } void NotificationManager::updateEntityProcessed(qint64 id, uint reason) diff --git a/panels/notification/server/notificationmanager.h b/panels/notification/server/notificationmanager.h index 576190b50..99d5b2cf9 100644 --- a/panels/notification/server/notificationmanager.h +++ b/panels/notification/server/notificationmanager.h @@ -86,7 +86,7 @@ public Q_SLOTS: void initScreenLockedState(); void queryScreenLockedState(); -private slots: +private Q_SLOTS: void onScreenLockedChanged(bool); private: diff --git a/panels/notification/server/notificationsetting.h b/panels/notification/server/notificationsetting.h index 6b6f685f6..d1c3cc655 100644 --- a/panels/notification/server/notificationsetting.h +++ b/panels/notification/server/notificationsetting.h @@ -76,13 +76,13 @@ class NotificationSetting : public QObject QVariantMap appInfo(const QString &id) const; -signals: +Q_SIGNALS: void appAdded(const QString &appId); void appRemoved(const QString &id); void appValueChanged(const QString &appId, uint configItem, const QVariant &value); void systemValueChanged(uint configItem, const QVariant &value); -private slots: +private Q_SLOTS: void onAppsChanged(); private: diff --git a/tests/frame/kextracolumnsproxymodeltests.cpp b/tests/frame/kextracolumnsproxymodeltests.cpp index 46df287e5..e602804b9 100644 --- a/tests/frame/kextracolumnsproxymodeltests.cpp +++ b/tests/frame/kextracolumnsproxymodeltests.cpp @@ -76,10 +76,10 @@ class TestLayoutSourceModel : public QStandardItemModel explicit TestLayoutSourceModel(QObject *parent = nullptr) : QStandardItemModel(parent) {} void emitLayoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint) - { emit layoutAboutToBeChanged(parents, hint); } + { Q_EMIT layoutAboutToBeChanged(parents, hint); } void emitLayoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint) - { emit layoutChanged(parents, hint); } + { Q_EMIT layoutChanged(parents, hint); } }; namespace { diff --git a/tests/panels/dock/docktests/dockiteminfotests.cpp b/tests/panels/dock/docktests/dockiteminfotests.cpp index 7a116b7d0..7c3af07b4 100644 --- a/tests/panels/dock/docktests/dockiteminfotests.cpp +++ b/tests/panels/dock/docktests/dockiteminfotests.cpp @@ -19,7 +19,7 @@ class DockItemEchoObject : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.test.DockItemInfoEcho") -public slots: +public Q_SLOTS: DockItemInfo echo(const DockItemInfo &info) { return info; } }; diff --git a/tests/panels/dock/docktests/trayitempositionmanagertests.cpp b/tests/panels/dock/docktests/trayitempositionmanagertests.cpp index 91244a35e..918ae4862 100644 --- a/tests/panels/dock/docktests/trayitempositionmanagertests.cpp +++ b/tests/panels/dock/docktests/trayitempositionmanagertests.cpp @@ -488,7 +488,7 @@ TEST(TrayItemPositionManager, UpdateVisualSizeDockHeightZeroNoOp) mgr.m_visualSize = QSize(99, 99); // Emitting visualItemSizeChanged triggers updateVisualSize, // but dockHeight==0 → early return → m_visualSize unchanged. - emit mgr.visualItemSizeChanged(); + Q_EMIT mgr.visualItemSizeChanged(); EXPECT_EQ(mgr.m_visualSize, QSize(99, 99)); } @@ -503,7 +503,7 @@ TEST(TrayItemPositionManager, UpdateVisualSizeSetsVisualSize) // Emitting visualItemSizeChanged triggers updateVisualSize. // visualSize(0, false) = QSize(26, 50) → setProperty sets m_visualSize. QSignalSpy spy(&mgr, &TrayItemPositionManager::visualSizeChanged); - emit mgr.visualItemSizeChanged(); + Q_EMIT mgr.visualItemSizeChanged(); EXPECT_EQ(mgr.m_visualSize, QSize(26, 50)); EXPECT_GE(spy.count(), 1); } diff --git a/tests/panels/dock/taskmanager/rolecombinemodeltests.cpp b/tests/panels/dock/taskmanager/rolecombinemodeltests.cpp index 627935d73..9d573d61c 100644 --- a/tests/panels/dock/taskmanager/rolecombinemodeltests.cpp +++ b/tests/panels/dock/taskmanager/rolecombinemodeltests.cpp @@ -402,10 +402,10 @@ TEST(RoleCombineModel, MinorDataChangedForwardToAllMappedMajorRows) // Verify DataB::setData emits dataChanged on modelB QSignalSpy spyB(&modelB, &QAbstractItemModel::dataChanged); modelB.setData(modelB.index(0), "newAppData", TestModelB::dataRole); - EXPECT_EQ(spyB.count(), 1) << "modelB should emit dataChanged when setData is called"; + EXPECT_EQ(spyB.count(), 1) << "modelB should Q_EMIT dataChanged when setData is called"; // Now check if RoleCombineModel forwarded the signal - EXPECT_EQ(spy.count(), 2) << "Should emit dataChanged for both major rows mapping to the same minor row"; + EXPECT_EQ(spy.count(), 2) << "Should Q_EMIT dataChanged for both major rows mapping to the same minor row"; // 验证数据已更新 EXPECT_EQ(model.index(0, 0).data(bDataRole).toString(), "newAppData");