From ef19948c00ac637a1a35a290141ffcaf638ef14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9ven=20Car?= Date: Wed, 10 Mar 2021 09:50:32 +0100 Subject: [PATCH] Reflect changes in kwayland-server changes https://invent.kde.org/plasma/kwayland-server/-/merge_requests/180 --- src/abstract_output.cpp | 4 ++-- src/abstract_output.h | 2 +- src/abstract_wayland_output.cpp | 6 ++---- src/abstract_wayland_output.h | 4 ++-- src/platform.cpp | 2 +- src/platform.h | 2 +- src/plugins/platforms/drm/drm_backend.cpp | 12 ++++++------ src/plugins/platforms/drm/drm_backend.h | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/abstract_output.cpp b/src/abstract_output.cpp index 4c17f9b455..3756e27424 100644 --- a/src/abstract_output.cpp +++ b/src/abstract_output.cpp @@ -83,9 +83,9 @@ AbstractOutput::~AbstractOutput() { } -QByteArray AbstractOutput::uuid() const +QString AbstractOutput::uuid() const { - return QByteArray(); + return QString(); } bool AbstractOutput::isEnabled() const diff --git a/src/abstract_output.h b/src/abstract_output.h index e0c9b3ac58..cf751017b9 100644 --- a/src/abstract_output.h +++ b/src/abstract_output.h @@ -102,7 +102,7 @@ public: * * Default implementation returns an empty byte array. */ - virtual QByteArray uuid() const; + virtual QString uuid() const; /** * Returns @c true if the output is enabled; otherwise returns @c false. diff --git a/src/abstract_wayland_output.cpp b/src/abstract_wayland_output.cpp index 8358b164f0..1a953c4042 100644 --- a/src/abstract_wayland_output.cpp +++ b/src/abstract_wayland_output.cpp @@ -51,7 +51,7 @@ QString AbstractWaylandOutput::name() const return m_name; } -QByteArray AbstractWaylandOutput::uuid() const +QString AbstractWaylandOutput::uuid() const { return m_waylandOutputDevice->uuid(); } @@ -259,7 +259,7 @@ void AbstractWaylandOutput::setWaylandMode(const QSize &size, int refreshRate) } void AbstractWaylandOutput::initInterfaces(const QString &model, const QString &manufacturer, - const QByteArray &uuid, const QSize &physicalSize, + const QString &uuid, const QSize &physicalSize, const QVector &modes, const QByteArray &edid) { @@ -294,8 +294,6 @@ void AbstractWaylandOutput::initInterfaces(const QString &model, const QString & m_waylandOutput->addMode(mode.size, flags, mode.refreshRate); } - m_waylandOutputDevice->create(); - // start off enabled m_waylandOutput->create(); diff --git a/src/abstract_wayland_output.h b/src/abstract_wayland_output.h index e33f43527b..e39f42e68e 100644 --- a/src/abstract_wayland_output.h +++ b/src/abstract_wayland_output.h @@ -57,7 +57,7 @@ public: ~AbstractWaylandOutput() override; QString name() const override; - QByteArray uuid() const override; + QString uuid() const override; QSize modeSize() const; @@ -132,7 +132,7 @@ Q_SIGNALS: protected: void initInterfaces(const QString &model, const QString &manufacturer, - const QByteArray &uuid, const QSize &physicalSize, + const QString &uuid, const QSize &physicalSize, const QVector &modes, const QByteArray &edid); diff --git a/src/platform.cpp b/src/platform.cpp index 971e03eb5f..9c2de4ec1c 100644 --- a/src/platform.cpp +++ b/src/platform.cpp @@ -169,7 +169,7 @@ AbstractOutput *Platform::findOutput(int screenId) return enabledOutputs().value(screenId); } -AbstractOutput *Platform::findOutput(const QByteArray &uuid) +AbstractOutput *Platform::findOutput(const QString &uuid) { const auto outs = outputs(); auto it = std::find_if(outs.constBegin(), outs.constEnd(), diff --git a/src/platform.h b/src/platform.h index e4eea932fb..8f8ecd9a02 100644 --- a/src/platform.h +++ b/src/platform.h @@ -427,7 +427,7 @@ public: return Outputs(); } AbstractOutput *findOutput(int screenId); - AbstractOutput *findOutput(const QByteArray &uuid); + AbstractOutput *findOutput(const QString &uuid); /** * A string of information to include in kwin debug output diff --git a/src/plugins/platforms/drm/drm_backend.cpp b/src/plugins/platforms/drm/drm_backend.cpp index fd0064ac1a..1cd61f81c0 100644 --- a/src/plugins/platforms/drm/drm_backend.cpp +++ b/src/plugins/platforms/drm/drm_backend.cpp @@ -420,7 +420,7 @@ void DrmBackend::readOutputsConfiguration() if (m_outputs.isEmpty()) { return; } - const QByteArray uuid = generateOutputConfigurationUuid(); + const QString uuid = generateOutputConfigurationUuid(); const auto outputGroup = kwinApp()->config()->group("DrmOutputs"); const auto configGroup = outputGroup.group(uuid); // default position goes from left to right @@ -454,7 +454,7 @@ void DrmBackend::writeOutputsConfiguration() if (m_outputs.isEmpty()) { return; } - const QByteArray uuid = generateOutputConfigurationUuid(); + const QString uuid = generateOutputConfigurationUuid(); auto configGroup = KSharedConfig::openConfig()->group("DrmOutputs").group(uuid); // default position goes from left to right for (auto it = m_outputs.cbegin(); it != m_outputs.cend(); ++it) { @@ -472,7 +472,7 @@ void DrmBackend::writeOutputsConfiguration() } } -QByteArray DrmBackend::generateOutputConfigurationUuid() const +QString DrmBackend::generateOutputConfigurationUuid() const { auto it = m_outputs.constBegin(); if (m_outputs.size() == 1) { @@ -480,10 +480,10 @@ QByteArray DrmBackend::generateOutputConfigurationUuid() const return (*it)->uuid(); } QCryptographicHash hash(QCryptographicHash::Md5); - for (; it != m_outputs.constEnd(); ++it) { - hash.addData((*it)->uuid()); + for (const DrmOutput *output: qAsConst(m_outputs)) { + hash.addData(output->uuid().toLocal8Bit()); } - return hash.result().toHex().left(10); + return QString::fromLocal8Bit(hash.result().toHex().left(10)); } void DrmBackend::enableOutput(DrmOutput *output, bool enable) diff --git a/src/plugins/platforms/drm/drm_backend.h b/src/plugins/platforms/drm/drm_backend.h index 317f00e78d..d513c19687 100644 --- a/src/plugins/platforms/drm/drm_backend.h +++ b/src/plugins/platforms/drm/drm_backend.h @@ -104,7 +104,7 @@ private: void initCursor(); void readOutputsConfiguration(); void writeOutputsConfiguration(); - QByteArray generateOutputConfigurationUuid() const; + QString generateOutputConfigurationUuid() const; DrmOutput *findOutput(quint32 connector); void updateOutputsEnabled(); QScopedPointer m_udev;