Skip to content

Commit e6c6402

Browse files
committed
fix: clang formatting
1 parent d25f9bb commit e6c6402

File tree

2 files changed

+48
-50
lines changed

2 files changed

+48
-50
lines changed

src/dbus/screensaver_dbus.cpp

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include <QDBusConnection>
44
#include <QDBusError>
55
#include <QLoggingCategory>
6-
#include <QtGlobal> // QtWarningMsg
7-
#include <QObject> // emit
6+
#include <QObject> // emit
7+
#include <QtGlobal> // QtWarningMsg
88

99
#include "../core/logcat.hpp"
1010

@@ -14,52 +14,50 @@ QS_LOGGING_CATEGORY(logDbusScreenSaver, "quickshell.dbus.screensaver", QtWarning
1414

1515
namespace qs::dbus {
1616

17-
ScreenSaverAdaptor::ScreenSaverAdaptor(QObject* parent)
18-
: QDBusAbstractAdaptor(parent)
19-
{
20-
// Register on session bus
21-
auto connection = QDBusConnection::sessionBus();
22-
23-
if (!connection.registerService("org.freedesktop.ScreenSaver")) {
24-
qCWarning(logDbusScreenSaver) << "Failed to register DBus service org.freedesktop.ScreenSaver:"
25-
<< connection.lastError().message();
26-
} else {
27-
qCInfo(logDbusScreenSaver) << "Registered DBus service org.freedesktop.ScreenSaver";
28-
}
29-
30-
if (!connection.registerObject("/org/freedesktop/ScreenSaver", parent,
31-
QDBusConnection::ExportAdaptors))
32-
{
33-
qCWarning(logDbusScreenSaver) << "Failed to register DBus object /org/freedesktop/ScreenSaver:"
34-
<< connection.lastError().message();
35-
} else {
36-
qCInfo(logDbusScreenSaver) << "Registered DBus object /org/freedesktop/ScreenSaver";
37-
}
17+
ScreenSaverAdaptor::ScreenSaverAdaptor(QObject* parent): QDBusAbstractAdaptor(parent) {
18+
// Register on session bus
19+
auto connection = QDBusConnection::sessionBus();
20+
21+
if (!connection.registerService("org.freedesktop.ScreenSaver")) {
22+
qCWarning(logDbusScreenSaver) << "Failed to register DBus service org.freedesktop.ScreenSaver:"
23+
<< connection.lastError().message();
24+
} else {
25+
qCInfo(logDbusScreenSaver) << "Registered DBus service org.freedesktop.ScreenSaver";
26+
}
27+
28+
if (!connection
29+
.registerObject("/org/freedesktop/ScreenSaver", parent, QDBusConnection::ExportAdaptors))
30+
{
31+
qCWarning(logDbusScreenSaver) << "Failed to register DBus object /org/freedesktop/ScreenSaver:"
32+
<< connection.lastError().message();
33+
} else {
34+
qCInfo(logDbusScreenSaver) << "Registered DBus object /org/freedesktop/ScreenSaver";
35+
}
3836
}
3937

4038
void ScreenSaverAdaptor::setActive(bool active) {
41-
if (this->mActive != active) {
42-
this->mActive = active;
43-
qCDebug(logDbusScreenSaver) << "Lock state changed to:" << active;
44-
emit activeChanged(active); // method name fixed
45-
}
39+
if (this->mActive != active) {
40+
this->mActive = active;
41+
qCDebug(logDbusScreenSaver) << "Lock state changed to:" << active;
42+
emit activeChanged(active); // method name fixed
43+
}
4644
}
4745

4846
void ScreenSaverAdaptor::setSecure(bool secure) {
49-
if (this->mSecure != secure) {
50-
this->mSecure = secure;
51-
qCDebug(logDbusScreenSaver) << "Secure state changed to:" << secure;
52-
}
47+
if (this->mSecure != secure) {
48+
this->mSecure = secure;
49+
qCDebug(logDbusScreenSaver) << "Secure state changed to:" << secure;
50+
}
5351
}
5452

55-
bool ScreenSaverAdaptor::getActive() const { // method name fixed
56-
qCDebug(logDbusScreenSaver) << "getActive called, returning:" << this->mActive;
57-
return this->mActive;
53+
bool ScreenSaverAdaptor::getActive() const { // method name fixed
54+
qCDebug(logDbusScreenSaver) << "getActive called, returning:" << this->mActive;
55+
return this->mActive;
5856
}
5957

60-
bool ScreenSaverAdaptor::getSecure() const { // method name fixed
61-
qCDebug(logDbusScreenSaver) << "getSecure called, returning:" << this->mSecure;
62-
return this->mSecure;
58+
bool ScreenSaverAdaptor::getSecure() const { // method name fixed
59+
qCDebug(logDbusScreenSaver) << "getSecure called, returning:" << this->mSecure;
60+
return this->mSecure;
6361
}
6462

6563
} // namespace qs::dbus

src/dbus/screensaver_dbus.hpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
namespace qs::dbus {
88

99
class ScreenSaverAdaptor: public QDBusAbstractAdaptor {
10-
Q_OBJECT
11-
Q_CLASSINFO("D-Bus Interface", "org.freedesktop.ScreenSaver")
10+
Q_OBJECT
11+
Q_CLASSINFO("D-Bus Interface", "org.freedesktop.ScreenSaver")
1212

1313
public:
14-
explicit ScreenSaverAdaptor(QObject* parent);
15-
~ScreenSaverAdaptor() override = default;
16-
Q_DISABLE_COPY_MOVE(ScreenSaverAdaptor);
14+
explicit ScreenSaverAdaptor(QObject* parent);
15+
~ScreenSaverAdaptor() override = default;
16+
Q_DISABLE_COPY_MOVE(ScreenSaverAdaptor);
1717

18-
void setActive(bool active);
19-
void setSecure(bool secure);
18+
void setActive(bool active);
19+
void setSecure(bool secure);
2020

2121
public slots:
22-
[[nodiscard]] bool getActive() const;
23-
[[nodiscard]] bool getSecure() const;
22+
[[nodiscard]] bool getActive() const;
23+
[[nodiscard]] bool getSecure() const;
2424

2525
signals:
26-
void activeChanged(bool active);
26+
void activeChanged(bool active);
2727

2828
private:
29-
bool mActive = false;
30-
bool mSecure = false;
29+
bool mActive = false;
30+
bool mSecure = false;
3131
};
3232

3333
} // namespace qs::dbus

0 commit comments

Comments
 (0)