forked from quickshell/quickshell
all: fix new lints
This commit is contained in:
parent
05b5eccf2e
commit
517143adf9
6 changed files with 8 additions and 5 deletions
|
@ -115,7 +115,7 @@ void TestScriptModel::unique_data() {
|
||||||
void TestScriptModel::unique() {
|
void TestScriptModel::unique() {
|
||||||
QFETCH(const QString, oldstr);
|
QFETCH(const QString, oldstr);
|
||||||
QFETCH(const QString, newstr);
|
QFETCH(const QString, newstr);
|
||||||
QFETCH(OpList, operations);
|
QFETCH(const OpList, operations);
|
||||||
|
|
||||||
auto strToVariantList = [](const QString& str) -> QVariantList {
|
auto strToVariantList = [](const QString& str) -> QVariantList {
|
||||||
QVariantList list;
|
QVariantList list;
|
||||||
|
|
|
@ -16,6 +16,9 @@
|
||||||
#include "node.hpp"
|
#include "node.hpp"
|
||||||
#include "registry.hpp"
|
#include "registry.hpp"
|
||||||
|
|
||||||
|
// This and spa_json_init are part of json-core.h, which is missing from older pw versions.
|
||||||
|
struct spa_json;
|
||||||
|
|
||||||
namespace qs::service::pipewire {
|
namespace qs::service::pipewire {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
@ -72,7 +75,7 @@ void PwDefaultTracker::onMetadataProperty(const char* key, const char* type, con
|
||||||
if (type != nullptr && value != nullptr && strcmp(type, "Spa:String:JSON") == 0) {
|
if (type != nullptr && value != nullptr && strcmp(type, "Spa:String:JSON") == 0) {
|
||||||
auto failed = true;
|
auto failed = true;
|
||||||
auto iter = std::array<spa_json, 2>();
|
auto iter = std::array<spa_json, 2>();
|
||||||
spa_json_init(&iter[0], value, strlen(value));
|
spa_json_init(&iter[0], value, strlen(value)); // NOLINT (misc-include-cleaner)
|
||||||
|
|
||||||
if (spa_json_enter_object(&iter[0], &iter[1]) > 0) {
|
if (spa_json_enter_object(&iter[0], &iter[1]) > 0) {
|
||||||
auto buf = std::array<char, 1024>();
|
auto buf = std::array<char, 1024>();
|
||||||
|
|
|
@ -18,7 +18,6 @@ HyprlandSurface::HyprlandSurface(
|
||||||
QtWaylandClient::QWaylandWindow* backer
|
QtWaylandClient::QWaylandWindow* backer
|
||||||
)
|
)
|
||||||
: QtWayland::hyprland_surface_v1(surface)
|
: QtWayland::hyprland_surface_v1(surface)
|
||||||
, backer(backer)
|
|
||||||
, backerSurface(backer->surface()) {}
|
, backerSurface(backer->surface()) {}
|
||||||
|
|
||||||
HyprlandSurface::~HyprlandSurface() { this->destroy(); }
|
HyprlandSurface::~HyprlandSurface() { this->destroy(); }
|
||||||
|
|
|
@ -24,7 +24,6 @@ public:
|
||||||
void setVisibleRegion(const QRegion& region);
|
void setVisibleRegion(const QRegion& region);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QtWaylandClient::QWaylandWindow* backer;
|
|
||||||
wl_surface* backerSurface = nullptr;
|
wl_surface* backerSurface = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -169,6 +169,7 @@ void QSWaylandSessionLockSurface::initVisible() {
|
||||||
auto& surfacePointer = reinterpret_cast<SurfaceAccessor*>(this->window())->surfacePointer();
|
auto& surfacePointer = reinterpret_cast<SurfaceAccessor*>(this->window())->surfacePointer();
|
||||||
|
|
||||||
// Swap out the surface for a dummy during initWindow.
|
// Swap out the surface for a dummy during initWindow.
|
||||||
|
QT_WARNING_PUSH
|
||||||
QT_WARNING_DISABLE_DEPRECATED // swap()
|
QT_WARNING_DISABLE_DEPRECATED // swap()
|
||||||
{
|
{
|
||||||
surfacePointer.swap(*tempSurface);
|
surfacePointer.swap(*tempSurface);
|
||||||
|
|
|
@ -156,7 +156,8 @@ QVector<Event> I3Ipc::parseResponse() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
QJsonParseError e;
|
// Importing this makes CI builds fail for some reason.
|
||||||
|
QJsonParseError e; // NOLINT (misc-include-cleaner)
|
||||||
|
|
||||||
auto data = QJsonDocument::fromJson(payload, &e);
|
auto data = QJsonDocument::fromJson(payload, &e);
|
||||||
if (e.error != QJsonParseError::NoError) {
|
if (e.error != QJsonParseError::NoError) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue