Merge branch 'main' into hyprsunset-manager-rewrite

Plugins/ZShell/Internal/circularbuffer.cpp

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 CircularBuffer::CircularBuffer(QObject* parent)
 	: QObject(parent) {
@@ -92,4 +92,4 @@ qreal CircularBuffer::at(int index) const {
 	return m_data[actualIndex];
 }
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal

Plugins/ZShell/Internal/circularbuffer.hpp

@@ -4,7 +4,7 @@
 #include <qqmlintegration.h>
 #include <qvector.h>
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 class CircularBuffer : public QObject {
 Q_OBJECT
@@ -41,4 +41,4 @@ int m_count = 0;
 int m_capacity = 0;
 };
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal

Plugins/ZShell/Internal/lidwatcher.cpp

@@ -6,7 +6,7 @@
 #include <QtDBus/qdbusreply.h>
 #include <qloggingcategory.h>
 
-Q_LOGGING_CATEGORY(lcLidWatcher, "caelestia.internal.logindmanager", QtInfoMsg)
+Q_LOGGING_CATEGORY(lcLidWatcher, "ZShell.internal.logindmanager", QtInfoMsg)
 
 namespace ZShell::internal {
 
@@ -14,27 +14,27 @@ LidWatcher::LidWatcher(QObject* parent) : QObject(parent) {
 	auto bus = QDBusConnection::systemBus();
 	if (!bus.isConnected()) {
 		qCWarning(lcLidWatcher)
-			<< "Failed to connect to system bus:" << bus.lastError().message();
+		        << "Failed to connect to system bus:" << bus.lastError().message();
 		return;
 	}
 
 	bool ok = bus.connect("org.freedesktop.login1",
-						  "/org/freedesktop/login1",
-						  "org.freedesktop.login1.Manager",
-						  "PrepareForSleep",
-						  this,
-						  SLOT(handlePrepareForSleep(bool)));
+	                      "/org/freedesktop/login1",
+	                      "org.freedesktop.login1.Manager",
+	                      "PrepareForSleep",
+	                      this,
+	                      SLOT(handlePrepareForSleep(bool)));
 
 	if (!ok) {
 		qCWarning(lcLidWatcher)
-			<< "Failed to connect to PrepareForSleep signal:"
-			<< bus.lastError().message();
+		        << "Failed to connect to PrepareForSleep signal:"
+		        << bus.lastError().message();
 	}
 
 	QDBusInterface login1("org.freedesktop.login1",
-						  "/org/freedesktop/login1",
-						  "org.freedesktop.login1.Manager",
-						  bus);
+	                      "/org/freedesktop/login1",
+	                      "org.freedesktop.login1.Manager",
+	                      bus);
 	const QDBusReply<QDBusObjectPath> reply = login1.call("GetSession", "auto");
 	if (!reply.isValid()) {
 		qCWarning(lcLidWatcher) << "Failed to get session path";
@@ -43,27 +43,27 @@ LidWatcher::LidWatcher(QObject* parent) : QObject(parent) {
 	const auto sessionPath = reply.value().path();
 
 	ok = bus.connect("org.freedesktop.login1",
-					 sessionPath,
-					 "org.freedesktop.login1.Session",
-					 "Lock",
-					 this,
-					 SLOT(handleLockRequested()));
+	                 sessionPath,
+	                 "org.freedesktop.login1.Session",
+	                 "Lock",
+	                 this,
+	                 SLOT(handleLockRequested()));
 
 	if (!ok) {
 		qCWarning(lcLidWatcher)
-			<< "Failed to connect to Lock signal:" << bus.lastError().message();
+		        << "Failed to connect to Lock signal:" << bus.lastError().message();
 	}
 
 	ok = bus.connect("org.freedesktop.login1",
-					 sessionPath,
-					 "org.freedesktop.login1.Session",
-					 "Unlock",
-					 this,
-					 SLOT(handleUnlockRequested()));
+	                 sessionPath,
+	                 "org.freedesktop.login1.Session",
+	                 "Unlock",
+	                 this,
+	                 SLOT(handleUnlockRequested()));
 
 	if (!ok) {
 		qCWarning(lcLidWatcher) << "Failed to connect to Unlock signal:"
-								<< bus.lastError().message();
+		                        << bus.lastError().message();
 	}
 }
 

Plugins/ZShell/Internal/lidwatcher.hpp

@@ -6,22 +6,22 @@
 namespace ZShell::internal {
 
 class LidWatcher : public QObject {
-	Q_OBJECT
-	QML_ELEMENT
+Q_OBJECT
+QML_ELEMENT
 
-	public:
-	explicit LidWatcher(QObject* parent = nullptr);
+public:
+explicit LidWatcher(QObject* parent = nullptr);
 
-	signals:
-	void aboutToSleep();
-	void resumed();
-	void lockRequested();
-	void unlockRequested();
+signals:
+void aboutToSleep();
+void resumed();
+void lockRequested();
+void unlockRequested();
 
-	private slots:
-	void handlePrepareForSleep(bool sleep);
-	void handleLockRequested();
-	void handleUnlockRequested();
+private slots:
+void handlePrepareForSleep(bool sleep);
+void handleLockRequested();
+void handleUnlockRequested();
 };
 
 } // namespace ZShell::internal

Plugins/ZShell/Internal/sparklineitem.cpp

@@ -4,7 +4,7 @@
 #include <qpainterpath.h>
 #include <qpen.h>
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 SparklineItem::SparklineItem(QQuickItem* parent)
 	: QQuickPaintedItem(parent) {
@@ -212,4 +212,4 @@ void SparklineItem::setLineWidth(qreal width) {
 	update();
 }
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal

Plugins/ZShell/Internal/sparklineitem.hpp

@@ -7,7 +7,7 @@
 
 #include "circularbuffer.hpp"
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 class SparklineItem : public QQuickPaintedItem {
 Q_OBJECT
@@ -87,4 +87,4 @@ int m_historyLength = 30;
 qreal m_lineWidth = 2.0;
 };
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal