update header files and move files around

app/CMakeLists.txt

@@ -5,26 +5,26 @@ set(lattedock-app_SRCS
     xwindowinterface.cpp
     waylandinterface.cpp
     windowinfowrap.cpp
-    visibilitymanager.cpp
-    dockcorona.cpp
-    dockview.cpp
-    dockconfigview.cpp
-    packageplugins/shell/dockpackage.cpp
-    panelshadows.cpp
-    alternativeshelper.cpp
     screenpool.cpp
+    packageplugins/shell/dockpackage.cpp
+    alternativeshelper.cpp
+    dockcorona.cpp
     globalshortcuts.cpp
     universalsettings.cpp
     layoutmanager.cpp
     layout.cpp
     latteconfigdialog.cpp
     importer.cpp
+    infoview.cpp
+    launcherssignals.cpp
     layoutsDelegates/checkboxdelegate.cpp
     layoutsDelegates/colorcmbboxdelegate.cpp
     layoutsDelegates/colorcmbboxitemdelegate.cpp
     layoutsDelegates/activitycmbboxdelegate.cpp
-    infoview.cpp
+    dock/dockview.cpp
-    launcherssignals.cpp
+    dock/dockconfigview.cpp
+    dock/panelshadows.cpp
+    dock/visibilitymanager.cpp
     main.cpp
 )
 

app/dock/dockconfigview.cpp

@@ -19,11 +19,13 @@
 */
 
 #include "dockconfigview.h"
+
 #include "dockview.h"
-#include "dockcorona.h"
 #include "panelshadows_p.h"
-#include "abstractwindowinterface.h"
+#include "../abstractwindowinterface.h"
-#include "../liblattedock/dock.h"
+#include "../dockcorona.h"
+#include "../layoutmanager.h"
+#include "../universalsettings.h"
 
 #include <QFontMetrics>
 #include <QQuickItem>

app/dock/dockconfigview.h

@@ -21,8 +21,8 @@
 #ifndef DOCKCONFIGVIEW_H
 #define DOCKCONFIGVIEW_H
 
-#include "plasmaquick/configview.h"
+#include "../plasmaquick/configview.h"
-#include "../liblattedock/dock.h"
+#include "../../liblattedock/dock.h"
 
 #include <plasma/package.h>
 #include <Plasma/FrameSvg>

app/dock/dockview.cpp

@@ -19,12 +19,17 @@
 */
 
 #include "dockview.h"
+
 #include "dockconfigview.h"
-#include "dockcorona.h"
+
 #include "panelshadows_p.h"
-#include "screenpool.h"
 #include "visibilitymanager.h"
-#include "../liblattedock/extras.h"
+#include "../dockcorona.h"
+#include "../layout.h"
+#include "../layoutmanager.h"
+#include "../screenpool.h"
+#include "../universalsettings.h"
+#include "../../liblattedock/extras.h"
 
 #include <QAction>
 #include <QQmlContext>

app/dock/dockview.h

@@ -21,12 +21,12 @@
 #ifndef DOCKVIEW_H
 #define DOCKVIEW_H
 
-#include "plasmaquick/containmentview.h"
-#include "plasmaquick/configview.h"
-#include "layout.h"
-#include "visibilitymanager.h"
-#include "../liblattedock/dock.h"
 #include "dockconfigview.h"
+#include "visibilitymanager.h"
+#include "../layout.h"
+#include "../plasmaquick/containmentview.h"
+#include "../plasmaquick/configview.h"
+#include "../../liblattedock/dock.h"
 
 #include <QQuickView>
 #include <QQmlListProperty>
@@ -51,8 +51,10 @@ class PlasmaShellSurface;
 }
 
 namespace Latte {
-
 class Layout;
+}
+
+namespace Latte {
 
 class DockView : public PlasmaQuick::ContainmentView {
     Q_OBJECT

app/dock/visibilitymanager.cpp

@@ -20,10 +20,12 @@
 
 #include "visibilitymanager.h"
 #include "visibilitymanager_p.h"
-#include "windowinfowrap.h"
+
 #include "dockview.h"
-#include "dockcorona.h"
+#include "../dockcorona.h"
-#include "../liblattedock/extras.h"
+#include "../layoutmanager.h"
+#include "../windowinfowrap.h"
+#include "../../liblattedock/extras.h"
 
 #include <QDebug>
 

app/dock/visibilitymanager.h

@@ -21,8 +21,8 @@
 #ifndef VISIBILITYMANAGER_H
 #define VISIBILITYMANAGER_H
 
-#include "plasmaquick/containmentview.h"
+#include "../plasmaquick/containmentview.h"
-#include "../liblattedock/dock.h"
+#include "../../liblattedock/dock.h"
 
 #include <QObject>
 #include <QTimer>

app/dock/visibilitymanager_p.h

@@ -1,9 +1,9 @@
 #ifndef VISIBILITYMANAGERPRIVATE_H
 #define VISIBILITYMANAGERPRIVATE_H
 
-#include "../liblattedock/dock.h"
+#include "../windowinfowrap.h"
-#include "windowinfowrap.h"
+#include "../abstractwindowinterface.h"
-#include "abstractwindowinterface.h"
+#include "../../liblattedock/dock.h"
 
 #include <array>
 #include <memory>

app/dockcorona.cpp

@@ -19,11 +19,18 @@
 */
 
 #include "dockcorona.h"
-#include "dockview.h"
+
-#include "packageplugins/shell/dockpackage.h"
 #include "abstractwindowinterface.h"
 #include "alternativeshelper.h"
+#include "globalshortcuts.h"
+#include "importer.h"
+#include "launcherssignals.h"
+#include "layoutmanager.h"
 #include "screenpool.h"
+#include "universalsettings.h"
+#include "dock/dockview.h"
+#include "packageplugins/shell/dockpackage.h"
+
 //dbus adaptor
 #include "lattedockadaptor.h"
 

app/dockcorona.h

@@ -21,40 +21,41 @@
 #ifndef DOCKCORONA_H
 #define DOCKCORONA_H
 
-#include "dockview.h"
-#include "globalshortcuts.h"
-#include "layoutmanager.h"
-#include "universalsettings.h"
 #include "../liblattedock/dock.h"
-#include "launcherssignals.h"
 
 #include <QObject>
+#include <QTimer>
+
+#include <Plasma/Corona>
+#include <PlasmaQuick/ConfigView>
 
 #include <KAboutApplicationDialog>
 #include <KDeclarative/QmlObject>
 
-class ScreenPool;
-class GlobalShortcuts;
-class UniversalSettings;
-class LayoutManager;
-class LaunchersSignals;
-
-namespace KActivities {
-class Consumer;
-}
-
 namespace Plasma {
 class Corona;
 class Containment;
 class Types;
 }
 
+namespace KActivities {
+class Consumer;
+}
+
 namespace KWayland {
 namespace Client {
 class PlasmaShell;
 }
 }
 
+namespace Latte {
+class ScreenPool;
+class GlobalShortcuts;
+class UniversalSettings;
+class LayoutManager;
+class LaunchersSignals;
+}
+
 namespace Latte {
 
 class DockCorona : public Plasma::Corona {

app/globalshortcuts.cpp

@@ -18,7 +18,10 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "dockcorona.h"
 #include "globalshortcuts.h"
+#include "layoutmanager.h"
+#include "dock/dockview.h"
 
 #include <QAction>
 #include <QDebug>

app/globalshortcuts.h

@@ -21,16 +21,16 @@
 #ifndef GLOBALSHORTCUTS_H
 #define GLOBALSHORTCUTS_H
 
-#include "dockcorona.h"
-#include "dockview.h"
 #include "../liblattedock/dock.h"
 
 #include <QQuickItem>
 #include <QMetaMethod>
 #include <QTimer>
 
+namespace Latte {
 class DockCorona;
 class DockView;
+}
 
 namespace Latte {
 

app/importer.cpp

@@ -23,6 +23,7 @@
 #include "layoutmanager.h"
 #include "layout.h"
 #include "screenpool.h"
+#include "universalsettings.h"
 #include "../liblattedock/dock.h"
 
 #include <QFile>

app/importer.h

@@ -21,11 +21,11 @@
 #ifndef IMPORTER_H
 #define IMPORTER_H
 
-#include "layoutmanager.h"
-
 #include <QObject>
 
+namespace Latte {
 class LayoutManager;
+}
 
 namespace Latte {
 

app/infoview.cpp

@@ -19,8 +19,8 @@
 */
 
 #include "infoview.h"
-#include "panelshadows_p.h"
 #include "abstractwindowinterface.h"
+#include "dock/panelshadows_p.h"
 
 #include <QQuickItem>
 #include <QQmlContext>

app/latteconfigdialog.cpp

@@ -19,9 +19,14 @@
  *
  */
 
-#include "ui_latteconfigdialog.h"
 #include "latteconfigdialog.h"
+
+#include "dockcorona.h"
 #include "layout.h"
+#include "layoutmanager.h"
+#include "importer.h"
+#include "universalsettings.h"
+#include "ui_latteconfigdialog.h"
 #include "layoutsDelegates/checkboxdelegate.h"
 #include "layoutsDelegates/colorcmbboxdelegate.h"
 #include "layoutsDelegates/activitycmbboxdelegate.h"

app/latteconfigdialog.h

@@ -24,6 +24,7 @@
 
 #include "dockcorona.h"
 #include "layout.h"
+#include "../liblattedock/dock.h"
 
 #include <QObject>
 #include <QButtonGroup>

app/launcherssignals.cpp

@@ -20,6 +20,8 @@
 
 #include "launcherssignals.h"
 
+#include <QQuickItem>
+
 namespace Latte {
 
 LaunchersSignals::LaunchersSignals(QObject *parent)

app/layout.cpp

@@ -20,12 +20,20 @@
 
 #include "layout.h"
 
+#include "dockcorona.h"
+#include "importer.h"
+#include "layoutmanager.h"
 #include "screenpool.h"
+#include "dock/dockview.h"
 
 #include <QDir>
 #include <QFile>
-#include <KSharedConfig>
 
+#include <Plasma>
+#include <Plasma/Applet>
+#include <Plasma/Containment>
+
+#include <KSharedConfig>
 #include <KActivities/Consumer>
 
 namespace Latte {

app/layout.h

@@ -22,16 +22,25 @@
 #define LAYOUT_H
 
 #include <QObject>
+#include <QScreen>
+
+#include <Plasma>
 
 #include <KConfigGroup>
 #include <KSharedConfig>
 
-#include "dockcorona.h"
+namespace Plasma {
+class Applet;
+class Containment;
+class Types;
+}
 
 namespace Latte {
-
 class DockCorona;
 class DockView;
+}
+
+namespace Latte {
 
 //! This class is responsible to hold the settings for a specific layout.
 //! It also updates always the relevant layout configuration concerning

app/layoutmanager.cpp

@@ -19,8 +19,13 @@
 */
 
 #include "layoutmanager.h"
+
+#include "importer.h"
 #include "infoview.h"
+#include "launcherssignals.h"
+#include "layout.h"
 #include "screenpool.h"
+#include "universalsettings.h"
 
 #include <QDir>
 #include <QFile>

app/layoutmanager.h

@@ -21,24 +21,29 @@
 #ifndef LAYOUTMANAGER_H
 #define LAYOUTMANAGER_H
 
-#include "importer.h"
+#include "../liblattedock/dock.h"
-#include "layout.h"
 #include "latteconfigdialog.h"
-#include "launcherssignals.h"
 
 #include <QAction>
 #include <QObject>
 
 #include <KLocalizedString>
 
+namespace Plasma {
+class Containment;
+class Types;
+}
+
+namespace KActivities {
+class Controller;
+}
+
+namespace Latte {
 class DockCorona;
 class Importer;
 class Layout;
 class LatteConfigDialog;
 class LaunchersSignals;
-
-namespace KActivities {
-class Controller;
 }
 
 namespace Latte {

app/screenpool.cpp

@@ -32,6 +32,8 @@
     #include <xcb/xcb_event.h>
 #endif
 
+namespace Latte {
+
 ScreenPool::ScreenPool(KSharedConfig::Ptr config, QObject *parent)
     : QObject(parent),
       m_configGroup(KConfigGroup(config, QStringLiteral("ScreenConnectors")))
@@ -276,5 +278,6 @@ bool ScreenPool::nativeEventFilter(const QByteArray &eventType, void *message, l
     return false;
 }
 
+}
 
 #include "moc_screenpool.cpp"

app/screenpool.h

@@ -30,6 +30,8 @@
 #include <KConfigGroup>
 #include <KSharedConfig>
 
+namespace Latte {
+
 class ScreenPool : public QObject, public QAbstractNativeEventFilter {
     Q_OBJECT
 
@@ -75,4 +77,6 @@ private:
     QTimer m_configSaveTimer;
 };
 
+}
+
 #endif // SCREENPOOL_H