From d166db12b6171f1fa64c5f95198899556fb8cd57 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Fri, 12 Nov 2021 10:32:56 +0100 Subject: [PATCH] OutputDeviceInterface: remove signals They're unused and unnecessary --- src/wayland/outputdevice_v2_interface.cpp | 36 +++------------ src/wayland/outputdevice_v2_interface.h | 53 +++++++---------------- 2 files changed, 20 insertions(+), 69 deletions(-) diff --git a/src/wayland/outputdevice_v2_interface.cpp b/src/wayland/outputdevice_v2_interface.cpp index 750b682883..f40dc0d647 100644 --- a/src/wayland/outputdevice_v2_interface.cpp +++ b/src/wayland/outputdevice_v2_interface.cpp @@ -137,12 +137,6 @@ OutputDeviceV2Interface::OutputDeviceV2Interface(Display *display, QObject *pare : QObject(parent) , d(new OutputDeviceV2InterfacePrivate(this, display)) { - connect(this, &OutputDeviceV2Interface::subPixelChanged, this, [this] { d->updateGeometry(); }); - connect(this, &OutputDeviceV2Interface::transformChanged, this, [this] { d->updateGeometry(); }); - connect(this, &OutputDeviceV2Interface::globalPositionChanged, this, [this] { d->updateGeometry(); }); - connect(this, &OutputDeviceV2Interface::modelChanged, this, [this] { d->updateGeometry(); }); - connect(this, &OutputDeviceV2Interface::manufacturerChanged, this, [this] { d->updateGeometry(); }); - connect(this, &OutputDeviceV2Interface::scaleChanged, this, [this] { d->updateScale(); }); } OutputDeviceV2Interface::~OutputDeviceV2Interface() @@ -199,8 +193,7 @@ void OutputDeviceV2Interface::setCurrentMode(OutputDeviceModeV2Interface *mode) d->sendCurrentMode(resource, d->currentMode); d->sendDone(resource); } - - Q_EMIT currentModeChanged(); + d->updateGeometry(); } bool OutputDeviceV2Interface::setCurrentMode(const QSize &size, int refreshRate) @@ -383,7 +376,6 @@ void OutputDeviceV2Interface::setPhysicalSize(const QSize &arg) return; } d->physicalSize = arg; - Q_EMIT physicalSizeChanged(d->physicalSize); } void OutputDeviceV2Interface::setGlobalPosition(const QPoint &arg) @@ -392,7 +384,7 @@ void OutputDeviceV2Interface::setGlobalPosition(const QPoint &arg) return; } d->globalPosition = arg; - Q_EMIT globalPositionChanged(d->globalPosition); + d->updateGeometry(); } void OutputDeviceV2Interface::setManufacturer(const QString &arg) @@ -401,7 +393,6 @@ void OutputDeviceV2Interface::setManufacturer(const QString &arg) return; } d->manufacturer = arg; - Q_EMIT manufacturerChanged(d->manufacturer); } void OutputDeviceV2Interface::setModel(const QString &arg) @@ -410,7 +401,6 @@ void OutputDeviceV2Interface::setModel(const QString &arg) return; } d->model = arg; - Q_EMIT modelChanged(d->model); } void OutputDeviceV2Interface::setSerialNumber(const QString &arg) @@ -419,7 +409,6 @@ void OutputDeviceV2Interface::setSerialNumber(const QString &arg) return; } d->serialNumber = arg; - Q_EMIT serialNumberChanged(d->serialNumber); } void OutputDeviceV2Interface::setEisaId(const QString &arg) @@ -428,7 +417,6 @@ void OutputDeviceV2Interface::setEisaId(const QString &arg) return; } d->eisaId = arg; - Q_EMIT eisaIdChanged(d->eisaId); } void OutputDeviceV2Interface::setName(const QString &arg) @@ -437,7 +425,6 @@ void OutputDeviceV2Interface::setName(const QString &arg) return; } d->name = arg; - Q_EMIT nameChanged(d->name); } void OutputDeviceV2Interface::setSubPixel(SubPixel arg) @@ -446,7 +433,7 @@ void OutputDeviceV2Interface::setSubPixel(SubPixel arg) return; } d->subPixel = arg; - Q_EMIT subPixelChanged(d->subPixel); + d->updateGeometry(); } void OutputDeviceV2Interface::setTransform(Transform arg) @@ -455,7 +442,7 @@ void OutputDeviceV2Interface::setTransform(Transform arg) return; } d->transform = arg; - Q_EMIT transformChanged(d->transform); + d->updateGeometry(); } void OutputDeviceV2Interface::setScale(qreal scale) @@ -464,7 +451,7 @@ void OutputDeviceV2Interface::setScale(qreal scale) return; } d->scale = scale; - Q_EMIT scaleChanged(d->scale); + d->updateScale(); } QSize OutputDeviceV2Interface::physicalSize() const @@ -559,19 +546,12 @@ void OutputDeviceV2Interface::setModes(const QListsendDone(resource); } - - if (oldCurrentMode != d->currentMode) { - Q_EMIT currentModeChanged(); - } - - Q_EMIT modesChanged(); } void OutputDeviceV2Interface::setEdid(const QByteArray &edid) { d->edid = edid; d->updateEdid(); - Q_EMIT edidChanged(); } QByteArray OutputDeviceV2Interface::edid() const @@ -584,7 +564,6 @@ void OutputDeviceV2Interface::setEnabled(bool enabled) if (d->enabled != enabled) { d->enabled = enabled; d->updateEnabled(); - Q_EMIT enabledChanged(); } } @@ -598,7 +577,6 @@ void OutputDeviceV2Interface::setUuid(const QUuid &uuid) if (d->uuid != uuid) { d->uuid = uuid; d->updateUuid(); - Q_EMIT uuidChanged(); } } @@ -673,7 +651,6 @@ void OutputDeviceV2Interface::setCapabilities(Capabilities cap) if (d->capabilities != cap) { d->capabilities = cap; d->updateCapabilities(); - Q_EMIT capabilitiesChanged(); } } @@ -696,7 +673,6 @@ void OutputDeviceV2Interface::setOverscan(uint32_t overscan) if (d->overscan != overscan) { d->overscan = overscan; d->updateOverscan(); - Q_EMIT overscanChanged(); } } @@ -729,7 +705,6 @@ void OutputDeviceV2Interface::setVrrPolicy(VrrPolicy policy) if (d->vrrPolicy != policy) { d->vrrPolicy = policy; d->updateVrrPolicy(); - Q_EMIT vrrPolicyChanged(); } } @@ -752,7 +727,6 @@ void OutputDeviceV2Interface::setRgbRange(RgbRange rgbRange) if (d->rgbRange != rgbRange) { d->rgbRange = rgbRange; d->updateRgbRange(); - Q_EMIT rgbRangeChanged(); } } diff --git a/src/wayland/outputdevice_v2_interface.h b/src/wayland/outputdevice_v2_interface.h index f92ba3c61c..8bbf141da9 100644 --- a/src/wayland/outputdevice_v2_interface.h +++ b/src/wayland/outputdevice_v2_interface.h @@ -35,21 +35,21 @@ class OutputDeviceModeV2InterfacePrivate; class KWAYLANDSERVER_EXPORT OutputDeviceV2Interface : public QObject { Q_OBJECT - Q_PROPERTY(QSize physicalSize READ physicalSize WRITE setPhysicalSize NOTIFY physicalSizeChanged) - Q_PROPERTY(QPoint globalPosition READ globalPosition WRITE setGlobalPosition NOTIFY globalPositionChanged) - Q_PROPERTY(QString manufacturer READ manufacturer WRITE setManufacturer NOTIFY manufacturerChanged) - Q_PROPERTY(QString model READ model WRITE setModel NOTIFY modelChanged) - Q_PROPERTY(QString serialNumber READ serialNumber WRITE setSerialNumber NOTIFY serialNumberChanged) - Q_PROPERTY(QString eisaId READ eisaId WRITE setEisaId NOTIFY eisaIdChanged) - Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) - Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) - Q_PROPERTY(QByteArray edid READ edid WRITE setEdid NOTIFY edidChanged) - Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) - Q_PROPERTY(QUuid uuid READ uuid WRITE setUuid NOTIFY uuidChanged) - Q_PROPERTY(Capabilities capabilities READ capabilities WRITE setCapabilities NOTIFY capabilitiesChanged) - Q_PROPERTY(uint32_t overscan READ overscan WRITE setOverscan NOTIFY overscanChanged) - Q_PROPERTY(VrrPolicy vrrPolicy READ vrrPolicy WRITE setVrrPolicy NOTIFY vrrPolicyChanged) - Q_PROPERTY(RgbRange rgbRange READ rgbRange WRITE setRgbRange NOTIFY rgbRangeChanged) + Q_PROPERTY(QSize physicalSize READ physicalSize WRITE setPhysicalSize) + Q_PROPERTY(QPoint globalPosition READ globalPosition WRITE setGlobalPosition) + Q_PROPERTY(QString manufacturer READ manufacturer WRITE setManufacturer) + Q_PROPERTY(QString model READ model WRITE setModel) + Q_PROPERTY(QString serialNumber READ serialNumber WRITE setSerialNumber) + Q_PROPERTY(QString eisaId READ eisaId WRITE setEisaId) + Q_PROPERTY(QString name READ name WRITE setName) + Q_PROPERTY(qreal scale READ scale WRITE setScale) + Q_PROPERTY(QByteArray edid READ edid WRITE setEdid) + Q_PROPERTY(bool enabled READ enabled WRITE setEnabled) + Q_PROPERTY(QUuid uuid READ uuid WRITE setUuid) + Q_PROPERTY(Capabilities capabilities READ capabilities WRITE setCapabilities) + Q_PROPERTY(uint32_t overscan READ overscan WRITE setOverscan) + Q_PROPERTY(VrrPolicy vrrPolicy READ vrrPolicy WRITE setVrrPolicy) + Q_PROPERTY(RgbRange rgbRange READ rgbRange WRITE setRgbRange) public: enum class SubPixel { Unknown, @@ -152,29 +152,6 @@ public: wl_resource *resource() const; static OutputDeviceV2Interface *get(wl_resource *native); -Q_SIGNALS: - void physicalSizeChanged(const QSize&); - void globalPositionChanged(const QPoint&); - void manufacturerChanged(const QString&); - void modelChanged(const QString&); - void serialNumberChanged(const QString&); - void eisaIdChanged(const QString &); - void nameChanged(const QString &name); - void scaleChanged(qreal); - void subPixelChanged(SubPixel); - void transformChanged(Transform); - void modesChanged(); - void currentModeChanged(); - - void edidChanged(); - void enabledChanged(); - void uuidChanged(); - - void capabilitiesChanged(); - void overscanChanged(); - void vrrPolicyChanged(); - void rgbRangeChanged(); - private: QScopedPointer d; };