From cad72753f046d9b6d0c0b340703171b59c9686f6 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Wed, 8 Feb 2023 22:32:28 +0200
Subject: [PATCH] wayland: Rename SurfaceInterface::preferredScale to
 preferredBufferScale

This is to match the wording in the core spec.
---
 src/wayland/fractionalscale_v1_interface.cpp |  2 +-
 src/wayland/surface_interface.cpp            | 12 ++++++------
 src/wayland/surface_interface.h              |  4 ++--
 src/wayland/surface_interface_p.h            |  2 +-
 src/waylandwindow.cpp                        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/wayland/fractionalscale_v1_interface.cpp b/src/wayland/fractionalscale_v1_interface.cpp
index 77390fe07c..3696a87c2f 100644
--- a/src/wayland/fractionalscale_v1_interface.cpp
+++ b/src/wayland/fractionalscale_v1_interface.cpp
@@ -49,7 +49,7 @@ FractionalScaleV1Interface::FractionalScaleV1Interface(SurfaceInterface *surface
 {
     SurfaceInterfacePrivate *surfacePrivate = SurfaceInterfacePrivate::get(surface);
     surfacePrivate->fractionalScaleExtension = this;
-    setPreferredScale(surfacePrivate->preferredScale);
+    setPreferredScale(surfacePrivate->preferredBufferScale);
 }
 
 FractionalScaleV1Interface::~FractionalScaleV1Interface()
diff --git a/src/wayland/surface_interface.cpp b/src/wayland/surface_interface.cpp
index 5293af5455..60988f6933 100644
--- a/src/wayland/surface_interface.cpp
+++ b/src/wayland/surface_interface.cpp
@@ -73,7 +73,7 @@ void SurfaceInterfacePrivate::addChild(SubSurfaceInterface *child)
     cached.above.append(child);
     current.above.append(child);
     child->surface()->setOutputs(outputs);
-    child->surface()->setPreferredScale(preferredScale);
+    child->surface()->setPreferredBufferScale(preferredBufferScale);
 
     Q_EMIT q->childSubSurfaceAdded(child);
     Q_EMIT q->childSubSurfacesChanged();
@@ -1109,21 +1109,21 @@ PresentationHint SurfaceInterface::presentationHint() const
     return d->current.presentationHint;
 }
 
-void SurfaceInterface::setPreferredScale(qreal scale)
+void SurfaceInterface::setPreferredBufferScale(qreal scale)
 {
-    if (scale == d->preferredScale) {
+    if (scale == d->preferredBufferScale) {
         return;
     }
-    d->preferredScale = scale;
+    d->preferredBufferScale = scale;
 
     if (d->fractionalScaleExtension) {
         d->fractionalScaleExtension->setPreferredScale(scale);
     }
     for (auto child : qAsConst(d->current.below)) {
-        child->surface()->setPreferredScale(scale);
+        child->surface()->setPreferredBufferScale(scale);
     }
     for (auto child : qAsConst(d->current.above)) {
-        child->surface()->setPreferredScale(scale);
+        child->surface()->setPreferredBufferScale(scale);
     }
 }
 
diff --git a/src/wayland/surface_interface.h b/src/wayland/surface_interface.h
index 6364336b07..18ee3ce935 100644
--- a/src/wayland/surface_interface.h
+++ b/src/wayland/surface_interface.h
@@ -354,10 +354,10 @@ public:
     PresentationHint presentationHint() const;
 
     /**
-    * Sets a preferred scale that clients should provide buffers in
+     * Sets a preferred buffer scale that clients should provide buffers in
      * @param scale
      */
-    void setPreferredScale(qreal scale);
+    void setPreferredBufferScale(qreal scale);
 
 Q_SIGNALS:
     /**
diff --git a/src/wayland/surface_interface_p.h b/src/wayland/surface_interface_p.h
index 9672371a0f..d26f0927ce 100644
--- a/src/wayland/surface_interface_p.h
+++ b/src/wayland/surface_interface_p.h
@@ -132,7 +132,7 @@ public:
     qreal pendingScaleOverride = 1.;
 
     QVector<OutputInterface *> outputs;
-    qreal preferredScale = 1.0;
+    qreal preferredBufferScale = 1.0;
 
     LockedPointerV1Interface *lockedPointer = nullptr;
     ConfinedPointerV1Interface *confinedPointer = nullptr;
diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
index 337f81250c..ec0c83b530 100644
--- a/src/waylandwindow.cpp
+++ b/src/waylandwindow.cpp
@@ -160,7 +160,7 @@ void WaylandWindow::updateClientOutputs()
     }
     surface()->setOutputs(waylandServer()->display()->outputsIntersecting(frameGeometry().toAlignedRect()));
     if (output()) {
-        surface()->setPreferredScale(output()->scale());
+        surface()->setPreferredBufferScale(output()->scale());
     }
 }