From 0218a8f3ba720ad17d803b345affb974332a7d70 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 2 Feb 2023 22:47:54 +0200 Subject: [PATCH] scripting: Drop deprecated apis --- src/scripting/workspace_wrapper.cpp | 92 +---------------------------- src/scripting/workspace_wrapper.h | 84 -------------------------- 2 files changed, 2 insertions(+), 174 deletions(-) diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp index cea696a3a5..ec17c9c3e6 100644 --- a/src/scripting/workspace_wrapper.cpp +++ b/src/scripting/workspace_wrapper.cpp @@ -21,11 +21,6 @@ #include "activities.h" #endif -#include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#include -#endif - namespace KWin { @@ -35,7 +30,6 @@ WorkspaceWrapper::WorkspaceWrapper(QObject *parent) KWin::Workspace *ws = KWin::Workspace::self(); KWin::VirtualDesktopManager *vds = KWin::VirtualDesktopManager::self(); connect(ws, &Workspace::desktopPresenceChanged, this, &WorkspaceWrapper::desktopPresenceChanged); - connect(ws, &Workspace::currentDesktopChanged, this, &WorkspaceWrapper::currentDesktopChanged); connect(ws, &Workspace::windowAdded, this, &WorkspaceWrapper::clientAdded); connect(ws, &Workspace::windowAdded, this, &WorkspaceWrapper::setupClientConnections); connect(ws, &Workspace::windowRemoved, this, &WorkspaceWrapper::clientRemoved); @@ -61,9 +55,6 @@ WorkspaceWrapper::WorkspaceWrapper(QObject *parent) connect(ws, &Workspace::outputRemoved, this, [this]() { Q_EMIT numberScreensChanged(numScreens()); }); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - connect(QApplication::desktop(), &QDesktopWidget::resized, this, &WorkspaceWrapper::screenResized); -#endif connect(Cursors::self()->mouse(), &Cursor::posChanged, this, &WorkspaceWrapper::cursorPosChanged); const QList clients = ws->allClientList(); @@ -72,11 +63,6 @@ WorkspaceWrapper::WorkspaceWrapper(QObject *parent) } } -int WorkspaceWrapper::currentDesktop() const -{ - return VirtualDesktopManager::self()->current(); -} - VirtualDesktop *WorkspaceWrapper::currentVirtualDesktop() const { return VirtualDesktopManager::self()->currentDesktop(); @@ -87,11 +73,6 @@ int WorkspaceWrapper::numberOfDesktops() const return VirtualDesktopManager::self()->count(); } -void WorkspaceWrapper::setCurrentDesktop(int desktop) -{ - VirtualDesktopManager::self()->setCurrent(desktop); -} - void WorkspaceWrapper::setCurrentVirtualDesktop(VirtualDesktop *desktop) { VirtualDesktopManager::self()->setCurrent(desktop); @@ -262,37 +243,6 @@ QSize WorkspaceWrapper::workspaceSize() const return QSize(workspaceWidth(), workspaceHeight()); } -QSize WorkspaceWrapper::displaySize() const -{ - return workspace()->geometry().size(); -} - -int WorkspaceWrapper::displayWidth() const -{ - return displaySize().width(); -} - -int WorkspaceWrapper::displayHeight() const -{ - return displaySize().height(); -} - -static VirtualDesktop *resolveVirtualDesktop(int desktopId) -{ - if (desktopId == 0 || desktopId == -1) { - return VirtualDesktopManager::self()->currentDesktop(); - } else { - return VirtualDesktopManager::self()->desktopForX11Id(desktopId); - } -} - -QRectF WorkspaceWrapper::clientArea(ClientAreaOption option, const QPoint &p, int desktop) const -{ - const Output *output = Workspace::self()->outputAt(p); - const VirtualDesktop *virtualDesktop = resolveVirtualDesktop(desktop); - return Workspace::self()->clientArea(static_cast(option), output, virtualDesktop); -} - QRectF WorkspaceWrapper::clientArea(ClientAreaOption option, const QPoint &p, VirtualDesktop *desktop) const { return workspace()->clientArea(static_cast(option), workspace()->outputAt(p), desktop); @@ -314,49 +264,11 @@ QRectF WorkspaceWrapper::clientArea(ClientAreaOption option, KWin::Window *c) co return Workspace::self()->clientArea(static_cast(option), c); } -static VirtualDesktop *resolveDesktop(int desktopId) -{ - auto vdm = VirtualDesktopManager::self(); - if (desktopId == NETWinInfo::OnAllDesktops || desktopId == 0) { - return vdm->currentDesktop(); - } - return vdm->desktopForX11Id(desktopId); -} - -static Output *resolveOutput(int outputId) -{ - if (outputId == -1) { - return workspace()->activeOutput(); - } - return workspace()->outputs().value(outputId); -} - -QRectF WorkspaceWrapper::clientArea(ClientAreaOption option, int outputId, int desktopId) const -{ - VirtualDesktop *desktop = resolveDesktop(desktopId); - if (Q_UNLIKELY(!desktop)) { - return QRect(); - } - - Output *output = resolveOutput(outputId); - if (Q_UNLIKELY(!output)) { - return QRect(); - } - - return workspace()->clientArea(static_cast(option), output, desktop); -} - QRectF WorkspaceWrapper::clientArea(ClientAreaOption option, Output *output, VirtualDesktop *desktop) const { return workspace()->clientArea(static_cast(option), output, desktop); } -QString WorkspaceWrapper::desktopName(int desktop) const -{ - const VirtualDesktop *vd = VirtualDesktopManager::self()->desktopForX11Id(desktop); - return vd ? vd->name() : QString(); -} - void WorkspaceWrapper::createDesktop(int position, const QString &name) const { VirtualDesktopManager::self()->createVirtualDesktop(position, name); @@ -430,12 +342,12 @@ int WorkspaceWrapper::desktopGridHeight() const int WorkspaceWrapper::workspaceHeight() const { - return desktopGridHeight() * displayHeight(); + return desktopGridHeight() * workspace()->geometry().height(); } int WorkspaceWrapper::workspaceWidth() const { - return desktopGridWidth() * displayWidth(); + return desktopGridWidth() * workspace()->geometry().width(); } int WorkspaceWrapper::numScreens() const diff --git a/src/scripting/workspace_wrapper.h b/src/scripting/workspace_wrapper.h index d4742b5409..35dd3710c6 100644 --- a/src/scripting/workspace_wrapper.h +++ b/src/scripting/workspace_wrapper.h @@ -29,10 +29,6 @@ class X11Window; class WorkspaceWrapper : public QObject { Q_OBJECT - /** - * @deprecated use the currentVirtualDesktop property instead - */ - Q_PROPERTY(int currentDesktop READ currentDesktop WRITE setCurrentDesktop NOTIFY currentDesktopChanged) Q_PROPERTY(KWin::VirtualDesktop *currentVirtualDesktop READ currentVirtualDesktop WRITE setCurrentVirtualDesktop NOTIFY currentVirtualDesktopChanged) Q_PROPERTY(KWin::Window *activeClient READ activeClient WRITE setActiveClient NOTIFY clientActivated) // TODO: write and notify? @@ -46,21 +42,6 @@ class WorkspaceWrapper : public QObject * The number of desktops currently used. Minimum number of desktops is 1, maximum 20. */ Q_PROPERTY(int desktops READ numberOfDesktops WRITE setNumberOfDesktops NOTIFY numberDesktopsChanged) - /** - * The same of the display, that is all screens. - * @deprecated since 5.0 use virtualScreenSize - */ - Q_PROPERTY(QSize displaySize READ displaySize) - /** - * The width of the display, that is width of all combined screens. - * @deprecated since 5.0 use virtualScreenSize - */ - Q_PROPERTY(int displayWidth READ displayWidth) - /** - * The height of the display, that is height of all combined screens. - * @deprecated since 5.0 use virtualScreenSize - */ - Q_PROPERTY(int displayHeight READ displayHeight) Q_PROPERTY(int activeScreen READ activeScreen) Q_PROPERTY(int numScreens READ numScreens NOTIFY numberScreensChanged) Q_PROPERTY(QString currentActivity READ currentActivity WRITE setCurrentActivity NOTIFY currentActivityChanged) @@ -87,7 +68,6 @@ private: Q_SIGNALS: void desktopPresenceChanged(KWin::Window *client, int desktop); - void currentDesktopChanged(int desktop, KWin::Window *client); void clientAdded(KWin::Window *client); void clientRemoved(KWin::Window *client); void clientManaging(KWin::X11Window *client); @@ -122,15 +102,6 @@ Q_SIGNALS: * @param count The new number of screens */ void numberScreensChanged(int count); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - /** - * This signal is emitted when the size of @p screen changes. - * Don't forget to fetch an updated client area. - * - * @deprecated Use QScreen::geometryChanged signal instead. - */ - void screenResized(int screen); -#endif /** * Signal emitted whenever the current activity changed. * @param id id of the new activity @@ -221,7 +192,6 @@ public: rettype getter() const; \ void setter(rettype val); GETTERSETTERDEF(int, numberOfDesktops, setNumberOfDesktops) - GETTERSETTERDEF(int, currentDesktop, setCurrentDesktop) GETTERSETTERDEF(QString, currentActivity, setCurrentActivity) GETTERSETTERDEF(KWin::Window *, activeClient, setActiveClient) #undef GETTERSETTERDEF @@ -231,9 +201,6 @@ public: int workspaceWidth() const; int workspaceHeight() const; QSize workspaceSize() const; - int displayWidth() const; - int displayHeight() const; - QSize displaySize() const; int activeScreen() const; int numScreens() const; QStringList activityList() const; @@ -258,9 +225,7 @@ public: * @param screen The screen for which the area should be considered * @param desktop The desktop for which the area should be considered, in general there should not be a difference * @returns The specified screen geometry - * @deprecated use clientArea(ClientAreaOption option, KWin::Output *output, KWin::VirtualDesktop *desktop) */ - Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, int screen, int desktop) const; // TODO Plasma 6: Drop Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, KWin::Output *output, KWin::VirtualDesktop *desktop) const; /** * Overloaded method for convenience. @@ -268,9 +233,7 @@ public: * @param point The coordinates which have to be included in the area * @param desktop The desktop for which the area should be considered, in general there should not be a difference * @returns The specified screen geometry - * @deprecated use clientArea(ClientAreaOption option, const QPoint &point, KWin::VirtualDesktop *desktop) */ - Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, const QPoint &point, int desktop) const; // TODO Plasma 6: Drop Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, const QPoint &point, KWin::VirtualDesktop *desktop) const; /** * Overloaded method for convenience. @@ -279,10 +242,6 @@ public: */ Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, KWin::Window *client) const; Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, const KWin::Window *client) const; - /** - * Returns the name for the given @p desktop. - */ - Q_SCRIPTABLE QString desktopName(int desktop) const; /** * Create a new virtual desktop at the requested position. * @param position The position of the desktop. It should be in range [0, count]. @@ -339,49 +298,6 @@ public Q_SLOTS: void slotWindowRaiseOrLower(); void slotActivateAttentionWindow(); - /** - * @deprecated since 5.24 use slotWindowMoveLeft() - */ - void slotWindowPackLeft() - { - slotWindowMoveLeft(); - } - /** - * @deprecated since 5.24 use slotWindowMoveRight() - */ - void slotWindowPackRight() - { - slotWindowMoveRight(); - } - /** - * @deprecated since 5.24 use slotWindowMoveUp() - */ - void slotWindowPackUp() - { - slotWindowMoveUp(); - } - /** - * @deprecated since 5.24 use slotWindowMoveDown() - */ - void slotWindowPackDown() - { - slotWindowMoveDown(); - } - /** - * @deprecated since 5.24 use slotWindowExpandHorizontal() - */ - void slotWindowGrowHorizontal() - { - slotWindowExpandHorizontal(); - } - /** - * @deprecated since 5.24 use slotWindowExpandVertical() - */ - void slotWindowGrowVertical() - { - slotWindowExpandVertical(); - } - void slotWindowMoveLeft(); void slotWindowMoveRight(); void slotWindowMoveUp();