From 3033cba52d89b8bcb2202f87ea03c5e4d5d75328 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Tue, 18 Jun 2024 20:46:58 -0700 Subject: [PATCH] all: fix failing lints --- src/core/desktopentry.cpp | 12 +- src/core/main.cpp | 2 + src/core/transformwatcher.cpp | 1 + src/wayland/hyprland/ipc/connection.cpp | 157 +++++++++++------------- 4 files changed, 83 insertions(+), 89 deletions(-) diff --git a/src/core/desktopentry.cpp b/src/core/desktopentry.cpp index a5ecef8..9c887b6 100644 --- a/src/core/desktopentry.cpp +++ b/src/core/desktopentry.cpp @@ -4,10 +4,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -94,7 +92,7 @@ void DesktopEntry::parseEntry(const QString& text) { auto groupName = QString(); auto entries = QHash>(); - auto finishCategory = [&]() { + auto finishCategory = [this, &groupName, &entries]() { if (groupName == "Desktop Entry") { if (entries["Type"].second != "Application") return; if (entries.contains("Hidden") && entries["Hidden"].second == "true") return; @@ -334,13 +332,13 @@ void DesktopEntryManager::scanPath(const QDir& dir, const QString& prefix) { qCDebug(logDesktopEntry) << "Found desktop entry" << id << "at" << path; - if (desktopEntries.contains(id)) { + if (this->desktopEntries.contains(id)) { qCDebug(logDesktopEntry) << "Replacing old entry for" << id; - delete desktopEntries.value(id); - desktopEntries.remove(id); + delete this->desktopEntries.value(id); + this->desktopEntries.remove(id); } - desktopEntries.insert(id, dentry); + this->desktopEntries.insert(id, dentry); } } } diff --git a/src/core/main.cpp b/src/core/main.cpp index 3daf09a..b893ab9 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -10,7 +10,9 @@ #include #include #include +#include #include +#include #include #include #include diff --git a/src/core/transformwatcher.cpp b/src/core/transformwatcher.cpp index 2a33bad..6fc7c34 100644 --- a/src/core/transformwatcher.cpp +++ b/src/core/transformwatcher.cpp @@ -7,6 +7,7 @@ #include #include #include +#include void TransformWatcher::resolveChains(QQuickItem* a, QQuickItem* b, QQuickItem* commonParent) { if (a == nullptr || b == nullptr) return; diff --git a/src/wayland/hyprland/ipc/connection.cpp b/src/wayland/hyprland/ipc/connection.cpp index 060d6fd..cb2bf20 100644 --- a/src/wayland/hyprland/ipc/connection.cpp +++ b/src/wayland/hyprland/ipc/connection.cpp @@ -377,58 +377,55 @@ void HyprlandIpc::refreshWorkspaces(bool canCreate) { if (this->requestingWorkspaces) return; this->requestingWorkspaces = true; - this->makeRequest( - "j/workspaces", - [this, canCreate](bool success, const QByteArray& resp) { - this->requestingWorkspaces = false; - if (!success) return; + this->makeRequest("j/workspaces", [this, canCreate](bool success, const QByteArray& resp) { + this->requestingWorkspaces = false; + if (!success) return; - qCDebug(logHyprlandIpc) << "parsing workspaces response"; - auto json = QJsonDocument::fromJson(resp).array(); + qCDebug(logHyprlandIpc) << "parsing workspaces response"; + auto json = QJsonDocument::fromJson(resp).array(); - const auto& mList = this->mWorkspaces.valueList(); - auto names = QVector(); + const auto& mList = this->mWorkspaces.valueList(); + auto names = QVector(); - for (auto entry: json) { - auto object = entry.toObject().toVariantMap(); - auto name = object.value("name").toString(); + for (auto entry: json) { + auto object = entry.toObject().toVariantMap(); + auto name = object.value("name").toString(); - auto workspaceIter = - std::find_if(mList.begin(), mList.end(), [name](const HyprlandWorkspace* m) { - return m->name() == name; - }); + auto workspaceIter = + std::find_if(mList.begin(), mList.end(), [name](const HyprlandWorkspace* m) { + return m->name() == name; + }); - auto* workspace = workspaceIter == mList.end() ? nullptr : *workspaceIter; - auto existed = workspace != nullptr; + auto* workspace = workspaceIter == mList.end() ? nullptr : *workspaceIter; + auto existed = workspace != nullptr; - if (workspace == nullptr) { - if (!canCreate) continue; - workspace = new HyprlandWorkspace(this); - } + if (workspace == nullptr) { + if (!canCreate) continue; + workspace = new HyprlandWorkspace(this); + } - workspace->updateFromObject(object); + workspace->updateFromObject(object); - if (!existed) { - this->mWorkspaces.insertObject(workspace); - } + if (!existed) { + this->mWorkspaces.insertObject(workspace); + } - names.push_back(name); - } + names.push_back(name); + } - auto removedWorkspaces = QVector(); + auto removedWorkspaces = QVector(); - for (auto* workspace: mList) { - if (!names.contains(workspace->name())) { - removedWorkspaces.push_back(workspace); - } - } + for (auto* workspace: mList) { + if (!names.contains(workspace->name())) { + removedWorkspaces.push_back(workspace); + } + } - for (auto* workspace: removedWorkspaces) { - this->mWorkspaces.removeObject(workspace); - delete workspace; - } - } - ); + for (auto* workspace: removedWorkspaces) { + this->mWorkspaces.removeObject(workspace); + delete workspace; + } + }); } HyprlandMonitor* @@ -489,61 +486,57 @@ void HyprlandIpc::refreshMonitors(bool canCreate) { if (this->requestingMonitors) return; this->requestingMonitors = true; - this->makeRequest( - "j/monitors", - [this, canCreate](bool success, const QByteArray& resp) { - this->requestingMonitors = false; - if (!success) return; + this->makeRequest("j/monitors", [this, canCreate](bool success, const QByteArray& resp) { + this->requestingMonitors = false; + if (!success) return; - this->monitorsRequested = true; + this->monitorsRequested = true; - qCDebug(logHyprlandIpc) << "parsing monitors response"; - auto json = QJsonDocument::fromJson(resp).array(); + qCDebug(logHyprlandIpc) << "parsing monitors response"; + auto json = QJsonDocument::fromJson(resp).array(); - const auto& mList = this->mMonitors.valueList(); - auto names = QVector(); + const auto& mList = this->mMonitors.valueList(); + auto names = QVector(); - for (auto entry: json) { - auto object = entry.toObject().toVariantMap(); - auto name = object.value("name").toString(); + for (auto entry: json) { + auto object = entry.toObject().toVariantMap(); + auto name = object.value("name").toString(); - auto monitorIter = - std::find_if(mList.begin(), mList.end(), [name](const HyprlandMonitor* m) { - return m->name() == name; - }); + auto monitorIter = std::find_if(mList.begin(), mList.end(), [name](const HyprlandMonitor* m) { + return m->name() == name; + }); - auto* monitor = monitorIter == mList.end() ? nullptr : *monitorIter; - auto existed = monitor != nullptr; + auto* monitor = monitorIter == mList.end() ? nullptr : *monitorIter; + auto existed = monitor != nullptr; - if (monitor == nullptr) { - if (!canCreate) continue; - monitor = new HyprlandMonitor(this); - } + if (monitor == nullptr) { + if (!canCreate) continue; + monitor = new HyprlandMonitor(this); + } - monitor->updateFromObject(object); + monitor->updateFromObject(object); - if (!existed) { - this->mMonitors.insertObject(monitor); - } + if (!existed) { + this->mMonitors.insertObject(monitor); + } - names.push_back(name); - } + names.push_back(name); + } - auto removedMonitors = QVector(); + auto removedMonitors = QVector(); - for (auto* monitor: mList) { - if (!names.contains(monitor->name())) { - removedMonitors.push_back(monitor); - } - } + for (auto* monitor: mList) { + if (!names.contains(monitor->name())) { + removedMonitors.push_back(monitor); + } + } - for (auto* monitor: removedMonitors) { - this->mMonitors.removeObject(monitor); - // see comment in onEvent - monitor->deleteLater(); - } - } - ); + for (auto* monitor: removedMonitors) { + this->mMonitors.removeObject(monitor); + // see comment in onEvent + monitor->deleteLater(); + } + }); } } // namespace qs::hyprland::ipc