From 945c6e50e2105fc979a813d4b80fe307fcc0fbc0 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 11 May 2019 16:12:03 +0300 Subject: [PATCH] remove deprecated m_views from AbstractWMInterface --- app/view/visibilitymanager.cpp | 3 --- app/wm/abstractwindowinterface.cpp | 14 -------------- app/wm/abstractwindowinterface.h | 4 ---- app/wm/xwindowinterface.cpp | 4 ---- 4 files changed, 25 deletions(-) diff --git a/app/view/visibilitymanager.cpp b/app/view/visibilitymanager.cpp index 321d0d0d1..fbf6049d1 100644 --- a/app/view/visibilitymanager.cpp +++ b/app/view/visibilitymanager.cpp @@ -92,8 +92,6 @@ VisibilityManager::VisibilityManager(PlasmaQuick::ContainmentView *view) } }); - m_wm->addView(m_latteView->winId()); - restoreConfig(); } @@ -101,7 +99,6 @@ VisibilityManager::~VisibilityManager() { qDebug() << "VisibilityManager deleting..."; m_wm->removeViewStruts(*m_latteView); - m_wm->removeView(m_latteView->winId()); if (m_edgeGhostWindow) { m_edgeGhostWindow->deleteLater(); diff --git a/app/wm/abstractwindowinterface.cpp b/app/wm/abstractwindowinterface.cpp index 6852de663..c1751580d 100644 --- a/app/wm/abstractwindowinterface.cpp +++ b/app/wm/abstractwindowinterface.cpp @@ -68,20 +68,6 @@ AbstractWindowInterface::~AbstractWindowInterface() m_schemes.clear(); } -void AbstractWindowInterface::addView(WindowId wid) -{ - m_views.push_back(wid); -} - -void AbstractWindowInterface::removeView(WindowId wid) -{ - auto it = std::find(m_views.begin(), m_views.end(), wid); - - if (it != m_views.end()) - m_views.erase(it); -} - - //! Scheme support for windows void AbstractWindowInterface::updateDefaultScheme() { diff --git a/app/wm/abstractwindowinterface.h b/app/wm/abstractwindowinterface.h index 32be6202f..bd64e2805 100644 --- a/app/wm/abstractwindowinterface.h +++ b/app/wm/abstractwindowinterface.h @@ -94,9 +94,6 @@ public: virtual bool windowCanBeDragged(WindowId wid) const = 0; virtual WindowId winIdFor(QString appId, QRect geometry) const = 0; - void addView(WindowId wid); - void removeView(WindowId wid); - SchemeColors *schemeForWindow(WindowId wId); void setColorSchemeForWindow(WindowId wId, QString scheme); @@ -110,7 +107,6 @@ signals: protected: std::list m_windows; - std::list m_views; QPointer m_activities; private slots: diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp index a305c8549..7c4047fb6 100644 --- a/app/wm/xwindowinterface.cpp +++ b/app/wm/xwindowinterface.cpp @@ -438,10 +438,6 @@ bool XWindowInterface::isValidWindow(const KWindowInfo &winfo) const void XWindowInterface::windowChangedProxy(WId wid, NET::Properties prop1, NET::Properties2 prop2) { - //! if the view changed is ignored - if (std::find(m_views.cbegin(), m_views.cend(), wid) != m_views.cend()) - return; - const auto winType = KWindowInfo(wid, NET::WMWindowType).windowType(NET::DesktopMask); const auto winClass = KWindowInfo(wid, 0, NET::WM2WindowClass).windowClassName();