From b05c7d94ae52eed24637b932b7e59e9c5069f9d3 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 9 Dec 2018 00:29:35 +0200
Subject: [PATCH] refactor:add visibilitymanager to ViewPart::

---
 app/view/view.cpp              | 6 +++---
 app/view/view.h                | 6 +++---
 app/view/visibilitymanager.cpp | 6 ++++--
 app/view/visibilitymanager.h   | 2 ++
 app/view/visibilitymanager_p.h | 7 ++++---
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/view/view.cpp b/app/view/view.cpp
index 0765aafe1..b4b109cf5 100644
--- a/app/view/view.cpp
+++ b/app/view/view.cpp
@@ -108,9 +108,9 @@ View::View(Plasma::Corona *corona, QScreen *targetScreen, bool byPassWM)
         reconsiderScreen();
 
         if (!m_visibility) {
-            m_visibility = new VisibilityManager(this);
+            m_visibility = new ViewPart::VisibilityManager(this);
 
-            connect(m_visibility, &VisibilityManager::isHiddenChanged, this, [&]() {
+            connect(m_visibility, &ViewPart::VisibilityManager::isHiddenChanged, this, [&]() {
                 if (m_visibility->isHidden()) {
                     deactivateApplets();
                 }
@@ -894,7 +894,7 @@ ViewPart::Positioner *View::positioner() const
     return m_positioner;
 }
 
-VisibilityManager *View::visibility() const
+ViewPart::VisibilityManager *View::visibility() const
 {
     return m_visibility;
 }
diff --git a/app/view/view.h b/app/view/view.h
index d66d32999..2bb238742 100644
--- a/app/view/view.h
+++ b/app/view/view.h
@@ -92,7 +92,7 @@ class View : public PlasmaQuick::ContainmentView
     Q_PROPERTY(Latte::ViewPart::Effects *effects READ effects NOTIFY effectsChanged)
     Q_PROPERTY(Layout *managedLayout READ managedLayout WRITE setManagedLayout NOTIFY managedLayoutChanged)
     Q_PROPERTY(Latte::ViewPart::Positioner *positioner READ positioner NOTIFY positionerChanged)
-    Q_PROPERTY(VisibilityManager *visibility READ visibility NOTIFY visibilityChanged)
+    Q_PROPERTY(Latte::ViewPart::VisibilityManager *visibility READ visibility NOTIFY visibilityChanged)
 
     Q_PROPERTY(QRect absoluteGeometry READ absGeometry NOTIFY absGeometryChanged)
     Q_PROPERTY(QRect localGeometry READ localGeometry WRITE setLocalGeometry NOTIFY localGeometryChanged)
@@ -157,7 +157,7 @@ public:
 
     ViewPart::Effects *effects() const;
     ViewPart::Positioner *positioner() const;
-    VisibilityManager *visibility() const;
+    ViewPart::VisibilityManager *visibility() const;
 
     Layout *managedLayout() const;
     void setManagedLayout(Layout *layout);
@@ -273,7 +273,7 @@ private:
     QPointer<ViewPart::ContextMenu> m_contextMenu;
     QPointer<ViewPart::Effects> m_effects;
     QPointer<ViewPart::Positioner> m_positioner;
-    QPointer<VisibilityManager> m_visibility;
+    QPointer<ViewPart::VisibilityManager> m_visibility;
 
     //! Connections to release and bound for the managed layout
     std::array<QMetaObject::Connection, 5> connectionsManagedLayout;
diff --git a/app/view/visibilitymanager.cpp b/app/view/visibilitymanager.cpp
index 7d36e1211..ba4c6b3a8 100644
--- a/app/view/visibilitymanager.cpp
+++ b/app/view/visibilitymanager.cpp
@@ -39,6 +39,7 @@
 #include <KWayland/Client/surface.h>
 
 namespace Latte {
+namespace ViewPart {
 
 //! BEGIN: VisiblityManagerPrivate implementation
 VisibilityManagerPrivate::VisibilityManagerPrivate(PlasmaQuick::ContainmentView *view, VisibilityManager *q)
@@ -1008,11 +1009,11 @@ void VisibilityManagerPrivate::updateKWinEdgesSupport()
 void VisibilityManagerPrivate::createEdgeGhostWindow()
 {
     if (!edgeGhostWindow) {
-        edgeGhostWindow = new ViewPart::ScreenEdgeGhostWindow(m_latteView);
+        edgeGhostWindow = new ScreenEdgeGhostWindow(m_latteView);
 
         wm->setViewExtraFlags(*edgeGhostWindow);
 
-        connect(edgeGhostWindow, &ViewPart::ScreenEdgeGhostWindow::containsMouseChanged, this, [ = ](bool contains) {
+        connect(edgeGhostWindow, &ScreenEdgeGhostWindow::containsMouseChanged, this, [ = ](bool contains) {
             if (contains) {
                 emit this->q->mustBeShown(VisibilityManager::QPrivateSignal{});
             }
@@ -1252,3 +1253,4 @@ bool VisibilityManager::activeWindowCanBeDragged()
 //! END: VisibilityManager implementation
 
 }
+}
diff --git a/app/view/visibilitymanager.h b/app/view/visibilitymanager.h
index 8c18597c1..bb8a8ce23 100644
--- a/app/view/visibilitymanager.h
+++ b/app/view/visibilitymanager.h
@@ -35,6 +35,7 @@
 #include <Plasma/Containment>
 
 namespace Latte {
+namespace ViewPart {
 
 class VisibilityManagerPrivate;
 
@@ -141,5 +142,6 @@ private:
     friend class VisibilityManagerPrivate;
 };
 
+}
 }
 #endif // VISIBILITYMANAGER_H
diff --git a/app/view/visibilitymanager_p.h b/app/view/visibilitymanager_p.h
index 858e8bf9a..7b58615d9 100644
--- a/app/view/visibilitymanager_p.h
+++ b/app/view/visibilitymanager_p.h
@@ -22,16 +22,16 @@
 #include <plasmaquick/containmentview.h>
 
 namespace Latte {
-
 class Corona;
 class View;
-class VisibilityManager;
 namespace ViewPart {
 class ScreenEdgeGhostWindow;
+class VisibilityManager;
 }
 }
 
 namespace Latte {
+namespace ViewPart {
 /*!
  * \brief The Latte::VisibilityManagerPrivate is a class d-pointer
  */
@@ -135,12 +135,13 @@ public:
     //! KWin Edges
     bool enableKWinEdgesFromUser{true};
     std::array<QMetaObject::Connection, 1> connectionsKWinEdges;
-    ViewPart::ScreenEdgeGhostWindow *edgeGhostWindow{nullptr};
+    ScreenEdgeGhostWindow *edgeGhostWindow{nullptr};
 
     Latte::Corona *m_corona{nullptr};
     Latte::View *m_latteView{nullptr};
 };
 
+}
 }
 
 #endif // VISIBILITYMANAGERPRIVATE_H