From 1d4cb588e7c7d80f0e9467f2e6b4d9960fe91365 Mon Sep 17 00:00:00 2001 From: yeshanshan Date: Mon, 2 Nov 2026 15:04:28 +0800 Subject: [PATCH] chore: replace Qt keywords with macros (QT_NO_KEYWORDS) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace emit/signals:/slots: with Q_EMIT/Q_SIGNALS:/Q_SLOTS: to avoid naming conflicts with pure C++ or third-party libraries. Add QT_NO_KEYWORDS compile definition after project() in CMakeLists.txt. 将 emit/signals:/slots: 替换为 Q_EMIT/Q_SIGNALS:/Q_SLOTS:， 避免纯 C++ 或第三方库引入时的命名冲突。在 CMakeLists.txt 中 添加 QT_NO_KEYWORDS 编译定义。 Log: 替换Qt关键字为宏形式并添加QT_NO_KEYWORDS编译定义 Influence: 无行为变更，仅关键字到宏的替换，解决第三方库命名冲突。 --- CMakeLists.txt | 2 ++ src/dde-session/impl/sessionmanager.h | 2 +- tools/dde-keyring-checker/CMakeLists.txt | 2 ++ tools/dde-oom-score-adj/oomscoreadjuster.cpp | 12 ++++++------ tools/dde-oom-score-adj/oomscoreadjuster.h | 8 ++++---- tools/dde-quick-login/lockprocessmanager.h | 6 +++--- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28854d25..9ad5ac6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.13) project(dde-session LANGUAGES CXX C) +add_compile_definitions(QT_NO_KEYWORDS) + set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/src/dde-session/impl/sessionmanager.h b/src/dde-session/impl/sessionmanager.h index c58062bd..7b92aa26 100644 --- a/src/dde-session/impl/sessionmanager.h +++ b/src/dde-session/impl/sessionmanager.h @@ -120,7 +120,7 @@ private Q_SLOTS: void handleLoginSessionLocked(); void handleLoginSessionUnlocked(); -signals: +Q_SIGNALS: // signals on dbus void LockedChanged(bool locked); void Unlock(); diff --git a/tools/dde-keyring-checker/CMakeLists.txt b/tools/dde-keyring-checker/CMakeLists.txt index 10ff198b..c6544871 100644 --- a/tools/dde-keyring-checker/CMakeLists.txt +++ b/tools/dde-keyring-checker/CMakeLists.txt @@ -1,5 +1,7 @@ project(dde-keyring-checker LANGUAGES C) +add_compile_definitions(QT_NO_KEYWORDS) + set(BIN_NAME dde-keyring-checker) find_package(PkgConfig REQUIRED) diff --git a/tools/dde-oom-score-adj/oomscoreadjuster.cpp b/tools/dde-oom-score-adj/oomscoreadjuster.cpp index 39f346e1..9aa8b431 100644 --- a/tools/dde-oom-score-adj/oomscoreadjuster.cpp +++ b/tools/dde-oom-score-adj/oomscoreadjuster.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2025-2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -50,7 +50,7 @@ void OomScoreAdjuster::loadServiceList() } if (m_watchedServices.isEmpty()) { qWarning() << "No services to monitor, exiting immediately"; - emit handleExit(); + Q_EMIT handleExit(); return; } } @@ -60,7 +60,7 @@ void OomScoreAdjuster::start() // 检查 D-Bus 连接 if (!m_systemdBus.isConnected()) { qWarning() << "D-Bus connection failed, exiting immediately"; - emit handleExit(); + Q_EMIT handleExit(); return; } @@ -76,7 +76,7 @@ void OomScoreAdjuster::start() if (m_adjustedServices.size() == m_watchedServices.size()) { qInfo() << "All services have been adjusted successfully, exiting immediately"; qInfo() << "Adjusted services:" << m_adjustedServices; - emit handleExit(); + Q_EMIT handleExit(); return; } @@ -333,7 +333,7 @@ void OomScoreAdjuster::checkIfAllServicesAdjusted() m_exitTimer->stop(); // 立即退出 - emit handleExit(); + Q_EMIT handleExit(); } else { qInfo() << "Waiting for remaining services. Adjusted:" << m_adjustedServices.size() << "/ Total:" << m_watchedServices.size(); @@ -356,5 +356,5 @@ void OomScoreAdjuster::onExitTimeout() qWarning() << "Pending services:" << pending; } - emit handleExit(); + Q_EMIT handleExit(); } diff --git a/tools/dde-oom-score-adj/oomscoreadjuster.h b/tools/dde-oom-score-adj/oomscoreadjuster.h index 137730f2..2651958d 100644 --- a/tools/dde-oom-score-adj/oomscoreadjuster.h +++ b/tools/dde-oom-score-adj/oomscoreadjuster.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2025-2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -25,13 +25,13 @@ class OomScoreAdjuster : public QObject explicit OomScoreAdjuster(QObject *parent = nullptr); ~OomScoreAdjuster(); -signals: +Q_SIGNALS: void handleExit(); -public slots: +public Q_SLOTS: void start(); -private slots: +private Q_SLOTS: void onExitTimeout(); void onUnitNew(const QString &unitName, const QDBusObjectPath &unitPath); void onPropertiesChanged(const QString &interface, const QVariantMap &changedProperties, const QStringList &invalidatedProperties); diff --git a/tools/dde-quick-login/lockprocessmanager.h b/tools/dde-quick-login/lockprocessmanager.h index b7ee2e08..e1a222af 100644 --- a/tools/dde-quick-login/lockprocessmanager.h +++ b/tools/dde-quick-login/lockprocessmanager.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 - 2023 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2021 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -19,10 +19,10 @@ class LockProcessManager : public QObject void start(); -signals: +Q_SIGNALS: void sessionLocked(bool locked); -private slots: +private Q_SLOTS: void onTimeout(); void onLockStatusChanged(bool locked);