Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/dde-session/impl/sessionmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private Q_SLOTS:
void handleLoginSessionLocked();
void handleLoginSessionUnlocked();

signals:
Q_SIGNALS:
// signals on dbus
void LockedChanged(bool locked);
void Unlock();
Expand Down
2 changes: 2 additions & 0 deletions tools/dde-keyring-checker/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
12 changes: 6 additions & 6 deletions tools/dde-oom-score-adj/oomscoreadjuster.cpp
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -50,7 +50,7 @@ void OomScoreAdjuster::loadServiceList()
}
if (m_watchedServices.isEmpty()) {
qWarning() << "No services to monitor, exiting immediately";
emit handleExit();
Q_EMIT handleExit();
return;
}
}
Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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();
Expand All @@ -356,5 +356,5 @@ void OomScoreAdjuster::onExitTimeout()
qWarning() << "Pending services:" << pending;
}

emit handleExit();
Q_EMIT handleExit();
}
8 changes: 4 additions & 4 deletions tools/dde-oom-score-adj/oomscoreadjuster.h
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions tools/dde-quick-login/lockprocessmanager.h
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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);

Expand Down
Loading