From ebaf81ddd827b1bc0ab17c712e6e67d5d74b021c Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 12 May 2019 02:35:28 +0300 Subject: [PATCH] remove deprecated code from AbstractWindowInterfa --- app/wm/abstractwindowinterface.h | 2 -- app/wm/waylandinterface.cpp | 8 ------- app/wm/waylandinterface.h | 1 - app/wm/xwindowinterface.cpp | 38 +++++--------------------------- app/wm/xwindowinterface.h | 1 - 5 files changed, 6 insertions(+), 44 deletions(-) diff --git a/app/wm/abstractwindowinterface.h b/app/wm/abstractwindowinterface.h index b88bb57d4..31b6af56e 100644 --- a/app/wm/abstractwindowinterface.h +++ b/app/wm/abstractwindowinterface.h @@ -87,7 +87,6 @@ public: virtual WindowInfoWrap requestInfoActive() const = 0; virtual bool isOnCurrentDesktop(WindowId wid) const = 0; virtual bool isOnCurrentActivity(WindowId wid) const = 0; - virtual const std::list &windows() const = 0; virtual void setKeepAbove(const QDialog &dialog, bool above = true) const = 0; virtual void skipTaskBar(const QDialog &dialog) const = 0; @@ -115,7 +114,6 @@ signals: void currentActivityChanged(); protected: - std::list m_windows; QPointer m_activities; private: diff --git a/app/wm/waylandinterface.cpp b/app/wm/waylandinterface.cpp index 7a7185b48..30b5b0da4 100644 --- a/app/wm/waylandinterface.cpp +++ b/app/wm/waylandinterface.cpp @@ -188,11 +188,6 @@ WindowId WaylandInterface::activeWindow() const return wid ? wid->internalId() : 0; } -const std::list &WaylandInterface::windows() const -{ - return m_windows; -} - void WaylandInterface::setKeepAbove(const QDialog &dialog, bool above) const { if (above) { @@ -462,7 +457,6 @@ void WaylandInterface::windowCreatedProxy(KWayland::Client::PlasmaWindow *w) connect(w, &PlasmaWindow::unmapped, this, [ &, win = w]() noexcept { mapper->removeMappings(win); - m_windows.remove(win->internalId()); emit windowRemoved(win->internalId()); }); @@ -486,8 +480,6 @@ void WaylandInterface::windowCreatedProxy(KWayland::Client::PlasmaWindow *w) } }); - m_windows.push_back(w->internalId()); - emit windowAdded(w->internalId()); } diff --git a/app/wm/waylandinterface.h b/app/wm/waylandinterface.h index 4047c7317..344d35fc0 100644 --- a/app/wm/waylandinterface.h +++ b/app/wm/waylandinterface.h @@ -71,7 +71,6 @@ public: WindowInfoWrap requestInfoActive() const override; bool isOnCurrentDesktop(WindowId wid) const override; bool isOnCurrentActivity(WindowId wid) const override; - const std::list &windows() const override; void setKeepAbove(const QDialog &dialog, bool above = true) const override; void skipTaskBar(const QDialog &dialog) const override; diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp index 7c4047fb6..adef8d277 100644 --- a/app/wm/xwindowinterface.cpp +++ b/app/wm/xwindowinterface.cpp @@ -45,38 +45,17 @@ XWindowInterface::XWindowInterface(QObject *parent) : AbstractWindowInterface(parent) { m_activities = new KActivities::Consumer(this); - connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged - , this, &AbstractWindowInterface::activeWindowChanged); + connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &AbstractWindowInterface::activeWindowChanged); + connect(KWindowSystem::self(), &KWindowSystem::windowAdded, this, &AbstractWindowInterface::windowAdded); + connect(KWindowSystem::self(), &KWindowSystem::windowRemoved, this, &AbstractWindowInterface::windowRemoved); + connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, &XWindowInterface::currentDesktopChanged); + connect(KWindowSystem::self() , static_cast (&KWindowSystem::windowChanged) , this, &XWindowInterface::windowChangedProxy); - auto addWindow = [&](WindowId wid) { - if (std::find(m_windows.cbegin(), m_windows.cend(), wid) == m_windows.cend()) { - if (isValidWindow(KWindowInfo(wid.value(), NET::WMWindowType))) { - m_windows.push_back(wid); - emit windowAdded(wid); - } - } - }; - - connect(KWindowSystem::self(), &KWindowSystem::windowAdded, this, addWindow); - connect(KWindowSystem::self(), &KWindowSystem::windowRemoved, [this](WindowId wid) noexcept { - if (std::find(m_windows.cbegin(), m_windows.cend(), wid) != m_windows.end()) { - m_windows.remove(wid); - emit windowRemoved(wid); - } - }); - connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged - , this, &XWindowInterface::currentDesktopChanged); - connect(m_activities.data(), &KActivities::Consumer::currentActivityChanged - , this, &XWindowInterface::currentActivityChanged); - - // fill windows list - for (const auto &wid : KWindowSystem::self()->windows()) { - addWindow(wid); - } + connect(m_activities.data(), &KActivities::Consumer::currentActivityChanged, this, &XWindowInterface::currentActivityChanged); } XWindowInterface::~XWindowInterface() @@ -172,11 +151,6 @@ WindowId XWindowInterface::activeWindow() const return KWindowSystem::self()->activeWindow(); } -const std::list &XWindowInterface::windows() const -{ - return m_windows; -} - void XWindowInterface::setKeepAbove(const QDialog &dialog, bool above) const { if (above) { diff --git a/app/wm/xwindowinterface.h b/app/wm/xwindowinterface.h index 8bba55e0c..3e209b950 100644 --- a/app/wm/xwindowinterface.h +++ b/app/wm/xwindowinterface.h @@ -55,7 +55,6 @@ public: WindowInfoWrap requestInfoActive() const override; bool isOnCurrentDesktop(WindowId wid) const override; bool isOnCurrentActivity(WindowId wid) const override; - const std::list &windows() const override; void setKeepAbove(const QDialog &dialog, bool above = true) const override; void skipTaskBar(const QDialog &dialog) const override;