i3/sway: fix linting errors

Author: nydragon

src/x11/CMakeLists.txt

@@ -11,6 +11,10 @@ qt_add_qml_module(quickshell-x11
 	DEPENDENCIES QtQuick
 )
 
+if(I3)
+	add_subdirectory(i3)
+endif()
+
 install_qml_module(quickshell-x11)
 
 add_library(quickshell-x11-init OBJECT init.cpp)

src/x11/i3/ipc/connection.cpp

@@ -1,13 +1,25 @@
 #include <algorithm>
+#include <cstring>
+#include <tuple>
 
+#include <qbytearray.h>
 #include <qbytearrayview.h>
+#include <qcontainerfwd.h>
+#include <qdatastream.h>
 #include <qjsonarray.h>
 #include <qjsondocument.h>
 #include <qjsonobject.h>
 #include <qjsonvalue.h>
+#include <qlocalsocket.h>
+#include <qlogging.h>
 #include <qloggingcategory.h>
+#include <qobject.h>
 #include <qsysinfo.h>
+#include <qtenvironmentvariables.h>
+#include <qtmetamacros.h>
+#include <qtypes.h>
 
+#include "../../../core/model.hpp"
 #include "connection.hpp"
 #include "monitor.hpp"
 #include "workspace.hpp"
@@ -43,7 +55,7 @@ void I3Ipc::dispatch(const QString& payload) {
 
 	for (auto message: data.array()) {
 		auto jsonMessage = message.toObject();
-		bool success = jsonMessage["success"].toBool();
+		const bool success = jsonMessage["success"].toBool();
 
 		if (!success) {
 			qWarning() << "Error while executing dispatch of" << payload << ":\n\t"
@@ -126,16 +138,16 @@ void I3Ipc::eventSocketReady() {
 
 QVector<Event> I3Ipc::parseResponse(QByteArray rawEvent) {
 	QVector<std::tuple<EventCode, QJsonDocument>> events;
-	int magicLen = 6;
-	int header = 8 + magicLen;
+	const int magicLen = 6;
+	const int header = 8 + magicLen;
 
 	while (rawEvent.startsWith(MAGIC)) {
 		QDataStream ds(QByteArray(rawEvent.data() + magicLen, 8)); // NOLINT
 
 		ds.setByteOrder(static_cast<QDataStream::ByteOrder>(QSysInfo::ByteOrder));
 
-		uint32_t size = 0;
-		uint32_t type = 0;
+		quint32 size = 0;
+		quint32 type = 0;
 
 		ds >> size;
 		ds >> type;
@@ -238,7 +250,7 @@ I3Ipc* I3Ipc::instance() {
 
 void I3Ipc::refreshWorkspaces() {
 	auto msg = I3Ipc::buildRequestMessage(EventCode::GET_WORKSPACES);
-	auto res = I3Ipc::makeRequest(msg);
+	auto res = this->makeRequest(msg);
 
 	if (res.isEmpty()) {
 		qWarning(logi3Ipc) << "Failed updating workspaces";
@@ -299,7 +311,7 @@ void I3Ipc::refreshWorkspaces() {
 
 void I3Ipc::refreshMonitors() {
 	auto msg = I3Ipc::buildRequestMessage(EventCode::GET_OUTPUTS);
-	auto res = I3Ipc::makeRequest(msg);
+	auto res = this->makeRequest(msg);
 
 	if (res.isEmpty()) {
 		qWarning(logi3Ipc) << "Failed to update monitors";
@@ -399,8 +411,8 @@ void I3Ipc::handleWorkspaceEvent(I3IpcEvent* event) {
 
 		qCInfo(logi3IpcEvents) << "Focus changed: " << oldName << "->" << newName;
 
-		auto* oldWorkspace = I3Ipc::findWorkspaceByName(oldName);
-		auto* newWorkspace = I3Ipc::findWorkspaceByName(newName);
+		auto* oldWorkspace = this->findWorkspaceByName(oldName);
+		auto* newWorkspace = this->findWorkspaceByName(newName);
 
 		if (oldWorkspace != nullptr) {
 			oldWorkspace->setFocus(false);
@@ -414,7 +426,7 @@ void I3Ipc::handleWorkspaceEvent(I3IpcEvent* event) {
 	} else if (change == "empty") {
 		auto name = event->mData["current"]["name"].toString();
 
-		auto* oldWorkspace = I3Ipc::findWorkspaceByName(name);
+		auto* oldWorkspace = this->findWorkspaceByName(name);
 
 		if (oldWorkspace != nullptr) {
 			qCInfo(logi3Ipc) << "Deleting" << oldWorkspace->id() << name;

src/x11/i3/ipc/monitor.cpp

@@ -1,5 +1,12 @@
 #include "monitor.hpp"
 
+#include <qcontainerfwd.h>
+#include <qstring.h>
+#include <qtmetamacros.h>
+#include <qtypes.h>
+
+#include "workspace.hpp"
+
 namespace qs::i3::ipc {
 
 qint32 I3Monitor::id() const { return this->mId; };

src/x11/i3/ipc/qml.cpp

@@ -1,6 +1,9 @@
-
 #include "qml.hpp"
 
+#include <qobject.h>
+#include <qstring.h>
+
+#include "../../../core/model.hpp"
 #include "connection.hpp"
 #include "workspace.hpp"
 

src/x11/i3/ipc/workspace.cpp

@@ -1,5 +1,12 @@
 #include "workspace.hpp"
 
+#include <qcontainerfwd.h>
+#include <qstring.h>
+#include <qtmetamacros.h>
+#include <qtypes.h>
+
+#include "monitor.hpp"
+
 namespace qs::i3::ipc {
 
 qint32 I3Workspace ::id() const { return this->mId; }
@@ -61,6 +68,6 @@ void I3Workspace::updateFromObject(const QVariantMap& obj) {
 	}
 }
 
-void I3Workspace::setFocus(bool data) { this->mFocused = data; }
+void I3Workspace::setFocus(bool focus) { this->mFocused = focus; }
 
 } // namespace qs::i3::ipc

src/x11/i3/ipc/workspace.hpp

@@ -30,7 +30,7 @@ class I3Workspace: public QObject {
 	[[nodiscard]] QVariantMap lastIpcObject() const;
 
 	void updateFromObject(const QVariantMap& obj);
-	void setFocus(bool);
+	void setFocus(bool focus);
 
 signals:
 	void idChanged();