From 65f4313e0435b6dfda41a89383b805d4197ac395 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Fri, 3 Feb 2023 22:11:29 +0200
Subject: [PATCH] effects: Drop EffectWindow::geometry

---
 src/effects.cpp                  | 1 -
 src/effects.h                    | 1 -
 src/libkwineffects/kwineffects.h | 6 +-----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/effects.cpp b/src/effects.cpp
index 6e9a83b87e..9240cf4287 100644
--- a/src/effects.cpp
+++ b/src/effects.cpp
@@ -2065,7 +2065,6 @@ WINDOW_HELPER(qreal, width, width)
 WINDOW_HELPER(qreal, height, height)
 WINDOW_HELPER(QPointF, pos, pos)
 WINDOW_HELPER(QSizeF, size, size)
-WINDOW_HELPER(QRectF, geometry, frameGeometry)
 WINDOW_HELPER(QRectF, frameGeometry, frameGeometry)
 WINDOW_HELPER(QRectF, bufferGeometry, bufferGeometry)
 WINDOW_HELPER(QRectF, clientGeometry, clientGeometry)
diff --git a/src/effects.h b/src/effects.h
index 168c6ea7db..29e748d74d 100644
--- a/src/effects.h
+++ b/src/effects.h
@@ -401,7 +401,6 @@ public:
     qreal height() const override;
 
     QSizeF basicUnit() const override;
-    QRectF geometry() const override;
     QRectF frameGeometry() const override;
     QRectF bufferGeometry() const override;
     QRectF clientGeometry() const override;
diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/kwineffects.h
index 0d0197041e..7366271799 100644
--- a/src/libkwineffects/kwineffects.h
+++ b/src/libkwineffects/kwineffects.h
@@ -2058,7 +2058,7 @@ class EffectWindowVisibleRef;
 class KWINEFFECTS_EXPORT EffectWindow : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QRectF geometry READ geometry)
+    Q_PROPERTY(QRectF geometry READ frameGeometry)
     Q_PROPERTY(QRectF expandedGeometry READ expandedGeometry)
     Q_PROPERTY(qreal height READ height)
     Q_PROPERTY(qreal opacity READ opacity)
@@ -2394,10 +2394,6 @@ public:
      * MAY BE DISOBEYED BY THE WM! It's only for information, do NOT rely on it at all.
      */
     virtual QSizeF basicUnit() const = 0;
-    /**
-     * @deprecated Use frameGeometry() instead.
-     */
-    virtual QRectF KWIN_DEPRECATED geometry() const = 0;
     /**
      * Returns the geometry of the window excluding server-side and client-side
      * drop-shadows.