Skip to content

Commit 517143a

Browse files
committed
all: fix new lints
1 parent 05b5ecc commit 517143a

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

src/core/test/scriptmodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void TestScriptModel::unique_data() {
115115
void TestScriptModel::unique() {
116116
QFETCH(const QString, oldstr);
117117
QFETCH(const QString, newstr);
118-
QFETCH(OpList, operations);
118+
QFETCH(const OpList, operations);
119119

120120
auto strToVariantList = [](const QString& str) -> QVariantList {
121121
QVariantList list;

src/services/pipewire/defaults.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
#include "node.hpp"
1717
#include "registry.hpp"
1818

19+
// This and spa_json_init are part of json-core.h, which is missing from older pw versions.
20+
struct spa_json;
21+
1922
namespace qs::service::pipewire {
2023

2124
namespace {
@@ -72,7 +75,7 @@ void PwDefaultTracker::onMetadataProperty(const char* key, const char* type, con
7275
if (type != nullptr && value != nullptr && strcmp(type, "Spa:String:JSON") == 0) {
7376
auto failed = true;
7477
auto iter = std::array<spa_json, 2>();
75-
spa_json_init(&iter[0], value, strlen(value));
78+
spa_json_init(&iter[0], value, strlen(value)); // NOLINT (misc-include-cleaner)
7679

7780
if (spa_json_enter_object(&iter[0], &iter[1]) > 0) {
7881
auto buf = std::array<char, 1024>();

src/wayland/hyprland/surface/surface.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ HyprlandSurface::HyprlandSurface(
1818
QtWaylandClient::QWaylandWindow* backer
1919
)
2020
: QtWayland::hyprland_surface_v1(surface)
21-
, backer(backer)
2221
, backerSurface(backer->surface()) {}
2322

2423
HyprlandSurface::~HyprlandSurface() { this->destroy(); }

src/wayland/hyprland/surface/surface.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class HyprlandSurface: public QtWayland::hyprland_surface_v1 {
2424
void setVisibleRegion(const QRegion& region);
2525

2626
private:
27-
QtWaylandClient::QWaylandWindow* backer;
2827
wl_surface* backerSurface = nullptr;
2928
};
3029

src/wayland/session_lock/surface.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ void QSWaylandSessionLockSurface::initVisible() {
169169
auto& surfacePointer = reinterpret_cast<SurfaceAccessor*>(this->window())->surfacePointer();
170170

171171
// Swap out the surface for a dummy during initWindow.
172+
QT_WARNING_PUSH
172173
QT_WARNING_DISABLE_DEPRECATED // swap()
173174
{
174175
surfacePointer.swap(*tempSurface);

src/x11/i3/ipc/connection.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ QVector<Event> I3Ipc::parseResponse() {
156156
break;
157157
}
158158

159-
QJsonParseError e;
159+
// Importing this makes CI builds fail for some reason.
160+
QJsonParseError e; // NOLINT (misc-include-cleaner)
160161

161162
auto data = QJsonDocument::fromJson(payload, &e);
162163
if (e.error != QJsonParseError::NoError) {

0 commit comments

Comments
 (0)