diff --git a/app/dockcorona.cpp b/app/dockcorona.cpp index da6b46650..2228a8178 100644 --- a/app/dockcorona.cpp +++ b/app/dockcorona.cpp @@ -68,13 +68,13 @@ DockCorona::~DockCorona() //deleting a containment will remove it from the list due to QObject::destroyed connect in Corona delete containments().first(); } - + qDeleteAll(m_dockViews); m_dockViews.clear(); - + disconnect(m_activityConsumer, &KActivities::Consumer::serviceStatusChanged, this, &DockCorona::load); delete m_activityConsumer; - + qDebug() << "deleted" << this; } @@ -154,7 +154,7 @@ QList DockCorona::freeEdges(int screen) const using Plasma::Types; QList edges{Types::BottomEdge, Types::LeftEdge, Types::TopEdge, Types::RightEdge}; - + //when screen=-1 is passed then the primaryScreenid is used int fixedScreen = (screen == -1) ? primaryScreenId() : screen; @@ -204,11 +204,11 @@ void DockCorona::addDock(Plasma::Containment *containment) dockView->init(); dockView->setContainment(containment); connect(containment, &QObject::destroyed, this, &DockCorona::dockContainmentDestroyed); - + dockView->show(); - + m_dockViews[containment] = dockView; - + emit containmentsNoChanged(); } diff --git a/app/dockcorona.h b/app/dockcorona.h index 0ac26f691..b0ac5afb2 100644 --- a/app/dockcorona.h +++ b/app/dockcorona.h @@ -55,7 +55,7 @@ public: int numDocks(); void addDock(Plasma::Containment *containment); - + void closeApplication(); public slots: @@ -68,13 +68,13 @@ signals: private slots: void load(); - + private: void qmlRegisterTypes() const; int primaryScreenId() const; QHash m_dockViews; - + KActivities::Consumer *m_activityConsumer; }; diff --git a/app/visibilitymanager.cpp b/app/visibilitymanager.cpp index e1e1a50c0..ccd538086 100644 --- a/app/visibilitymanager.cpp +++ b/app/visibilitymanager.cpp @@ -231,7 +231,7 @@ void VisibilityManagerPrivate::updateHiddenState() { if (dragEnter) return; - + switch (mode) { case Dock::AutoHide: raiseDock(containsMouse); @@ -379,42 +379,42 @@ bool VisibilityManagerPrivate::event(QEvent *ev) case QEvent::Enter: if (containsMouse) break; - + containsMouse = true; emit q->containsMouseChanged(); - + if (mode != Dock::AlwaysVisible) raiseDock(true); - + break; - + case QEvent::Leave: if (!containsMouse) break; - + containsMouse = false; emit q->containsMouseChanged(); updateHiddenState(); - + break; - + case QEvent::DragEnter: dragEnter = true; emit q->mustBeShown(); - + break; - + case QEvent::DragLeave: case QEvent::Drop: dragEnter = false; updateHiddenState(); - + break; - + case QEvent::Show: wm->setDockDefaultFlags(); restoreConfig(); - + break; } diff --git a/app/xwindowinterface.cpp b/app/xwindowinterface.cpp index 7dba0c7ee..36b6e99aa 100644 --- a/app/xwindowinterface.cpp +++ b/app/xwindowinterface.cpp @@ -37,12 +37,12 @@ XWindowInterface::XWindowInterface(QQuickWindow *const view, QObject *parent) connections << connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged , this, &AbstractWindowInterface::activeWindowChanged); - + connections << connect(KWindowSystem::self() , static_cast (&KWindowSystem::windowChanged) , this, &XWindowInterface::windowChangedProxy); - + auto addWindow = [&](WId wid) { if (std::find(m_windows.cbegin(), m_windows.cend(), wid) == m_windows.cend()) { if (isValidWindow(KWindowInfo(wid, NET::WMWindowType))) { @@ -63,7 +63,7 @@ XWindowInterface::XWindowInterface(QQuickWindow *const view, QObject *parent) connections << connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged , this, &AbstractWindowInterface::currentDesktopChanged); - + // fill windows list foreach (const auto &wid, KWindowSystem::self()->windows()) { addWindow(wid); @@ -73,11 +73,11 @@ XWindowInterface::XWindowInterface(QQuickWindow *const view, QObject *parent) XWindowInterface::~XWindowInterface() { qDebug() << "x window interface deleting..."; - + foreach (auto var, connections) { QObject::disconnect(var); } - + qDebug() << "x window interface connections removed..."; } diff --git a/app/xwindowinterface.h b/app/xwindowinterface.h index e61c23778..6493bb256 100644 --- a/app/xwindowinterface.h +++ b/app/xwindowinterface.h @@ -54,7 +54,7 @@ private: void windowChangedProxy(WId wid, NET::Properties prop1, NET::Properties2 prop2); WId m_desktopId; - + QList connections; };