fix: linting issues in src/dbus dir

Author: saltnpepper97

src/dbus/org.freedesktop.ScreenSaver.xml

@@ -1,17 +1,17 @@
 <node>
 	<interface name="org.freedesktop.ScreenSaver">
 		<!-- Get the current lock state -->
-		<method name="GetActive">
+		<method name="getActive">
 			<arg name="active" direction="out" type="b"/>
 		</method>
 
 		<!-- Signal emitted when lock state changes -->
-		<signal name="ActiveChanged">
+		<signal name="activeChanged">
 			<arg name="active" type="b"/>
 		</signal>
 
 		<!-- Get whether the compositor has confirmed the lock (secure state) -->
-		<method name="GetSecure">
+		<method name="getSecure">
 			<arg name="secure" direction="out" type="b"/>
 		</method>
 	</interface>

src/dbus/screensaver_dbus.cpp

@@ -3,57 +3,63 @@
 #include <QDBusConnection>
 #include <QDBusError>
 #include <QLoggingCategory>
+#include <QtGlobal>  // QtWarningMsg
+#include <QObject>   // emit
 
 #include "../core/logcat.hpp"
 
+namespace {
 QS_LOGGING_CATEGORY(logDbusScreenSaver, "quickshell.dbus.screensaver", QtWarningMsg);
+}
 
 namespace qs::dbus {
 
-ScreenSaverAdaptor::ScreenSaverAdaptor(QObject* parent): QDBusAbstractAdaptor(parent) {
-	// Register on session bus
-	auto connection = QDBusConnection::sessionBus();
-
-	if (!connection.registerService("org.freedesktop.ScreenSaver")) {
-		qCWarning(logDbusScreenSaver) << "Failed to register DBus service org.freedesktop.ScreenSaver:"
-		                              << connection.lastError().message();
-	} else {
-		qCInfo(logDbusScreenSaver) << "Registered DBus service org.freedesktop.ScreenSaver";
-	}
-
-	if (!connection
-	         .registerObject("/org/freedesktop/ScreenSaver", parent, QDBusConnection::ExportAdaptors))
-	{
-		qCWarning(logDbusScreenSaver) << "Failed to register DBus object /org/freedesktop/ScreenSaver:"
-		                              << connection.lastError().message();
-	} else {
-		qCInfo(logDbusScreenSaver) << "Registered DBus object /org/freedesktop/ScreenSaver";
-	}
+ScreenSaverAdaptor::ScreenSaverAdaptor(QObject* parent)
+    : QDBusAbstractAdaptor(parent) 
+{
+    // Register on session bus
+    auto connection = QDBusConnection::sessionBus();
+
+    if (!connection.registerService("org.freedesktop.ScreenSaver")) {
+        qCWarning(logDbusScreenSaver) << "Failed to register DBus service org.freedesktop.ScreenSaver:"
+                                      << connection.lastError().message();
+    } else {
+        qCInfo(logDbusScreenSaver) << "Registered DBus service org.freedesktop.ScreenSaver";
+    }
+
+    if (!connection.registerObject("/org/freedesktop/ScreenSaver", parent, 
+                                   QDBusConnection::ExportAdaptors)) 
+    {
+        qCWarning(logDbusScreenSaver) << "Failed to register DBus object /org/freedesktop/ScreenSaver:"
+                                      << connection.lastError().message();
+    } else {
+        qCInfo(logDbusScreenSaver) << "Registered DBus object /org/freedesktop/ScreenSaver";
+    }
 }
 
 void ScreenSaverAdaptor::setActive(bool active) {
-	if (this->mActive != active) {
-		this->mActive = active;
-		qCDebug(logDbusScreenSaver) << "Lock state changed to:" << active;
-		emit this->ActiveChanged(active);
-	}
+    if (this->mActive != active) {
+        this->mActive = active;
+        qCDebug(logDbusScreenSaver) << "Lock state changed to:" << active;
+        emit activeChanged(active);  // method name fixed
+    }
 }
 
 void ScreenSaverAdaptor::setSecure(bool secure) {
-	if (this->mSecure != secure) {
-		this->mSecure = secure;
-		qCDebug(logDbusScreenSaver) << "Secure state changed to:" << secure;
-	}
+    if (this->mSecure != secure) {
+        this->mSecure = secure;
+        qCDebug(logDbusScreenSaver) << "Secure state changed to:" << secure;
+    }
 }
 
-bool ScreenSaverAdaptor::GetActive() const {
-	qCDebug(logDbusScreenSaver) << "GetActive called, returning:" << this->mActive;
-	return this->mActive;
+bool ScreenSaverAdaptor::getActive() const {  // method name fixed
+    qCDebug(logDbusScreenSaver) << "getActive called, returning:" << this->mActive;
+    return this->mActive;
 }
 
-bool ScreenSaverAdaptor::GetSecure() const {
-	qCDebug(logDbusScreenSaver) << "GetSecure called, returning:" << this->mSecure;
-	return this->mSecure;
+bool ScreenSaverAdaptor::getSecure() const {  // method name fixed
+    qCDebug(logDbusScreenSaver) << "getSecure called, returning:" << this->mSecure;
+    return this->mSecure;
 }
 
 } // namespace qs::dbus

src/dbus/screensaver_dbus.hpp

@@ -1,40 +1,33 @@
 #pragma once
 
-#include <qdbusabstractadaptor.h>
-#include <qobject.h>
-#include <qtmetamacros.h>
+#include <QDBusAbstractAdaptor>
+#include <QObject>
+#include <QtGlobal> // QtWarningMsg
 
 namespace qs::dbus {
 
-// DBus adaptor for exposing screen lock state to other applications
-// Implements org.freedesktop.ScreenSaver interface
 class ScreenSaverAdaptor: public QDBusAbstractAdaptor {
-	Q_OBJECT
-	Q_CLASSINFO("D-Bus Interface", "org.freedesktop.ScreenSaver")
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.freedesktop.ScreenSaver")
 
 public:
-	explicit ScreenSaverAdaptor(QObject* parent);
-	~ScreenSaverAdaptor() override = default;
-	Q_DISABLE_COPY_MOVE(ScreenSaverAdaptor);
+    explicit ScreenSaverAdaptor(QObject* parent);
+    ~ScreenSaverAdaptor() override = default;
+    Q_DISABLE_COPY_MOVE(ScreenSaverAdaptor);
 
-	// Update the active state and emit signal if changed
-	void setActive(bool active);
-	// Update the secure state (compositor has confirmed lock)
-	void setSecure(bool secure);
+    void setActive(bool active);
+    void setSecure(bool secure);
 
-public slots: // NOLINT
-	// DBus method: Get current lock state
-	[[nodiscard]] bool GetActive() const;
-	// DBus method: Get whether lock is secure (compositor confirmed)
-	[[nodiscard]] bool GetSecure() const;
+public slots:
+    [[nodiscard]] bool getActive() const;
+    [[nodiscard]] bool getSecure() const;
 
-signals: // NOLINT
-	// DBus signal: Emitted when lock state changes
-	void ActiveChanged(bool active);
+signals:
+    void activeChanged(bool active);
 
 private:
-	bool mActive = false;
-	bool mSecure = false;
+    bool mActive = false;
+    bool mSecure = false;
 };
 
 } // namespace qs::dbus