From 5416b1c0ef9650b8e8d783e8c87f2529e04582d5 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Tue, 22 Jan 2019 18:17:55 +0200
Subject: [PATCH] REFACTOR:move layout to its own folder

---
 app/CMakeLists.txt              |  2 +-
 app/importer.cpp                |  2 +-
 app/launcherssignals.cpp        |  2 +-
 app/{ => layout}/layout.cpp     | 14 +++++++-------
 app/{ => layout}/layout.h       |  0
 app/layoutmanager.cpp           |  2 +-
 app/settings/settingsdialog.cpp |  2 +-
 app/view/view.cpp               |  2 +-
 app/view/view.h                 |  2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)
 rename app/{ => layout}/layout.cpp (99%)
 rename app/{ => layout}/layout.h (100%)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index cf3e9aa9e..d2f1f3b07 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -7,10 +7,10 @@ set(lattedock-app_SRCS
     infoview.cpp
     lattecorona.cpp
     launcherssignals.cpp
-    layout.cpp
     layoutmanager.cpp
     schemecolors.cpp
     screenpool.cpp
+    layout/layout.cpp
     package/lattepackage.cpp
     plasma/extended/screenpool.cpp
     plasma/extended/theme.cpp
diff --git a/app/importer.cpp b/app/importer.cpp
index 8032fa250..0986c18d4 100644
--- a/app/importer.cpp
+++ b/app/importer.cpp
@@ -23,8 +23,8 @@
 // local
 #include "lattecorona.h"
 #include "layoutmanager.h"
-#include "layout.h"
 #include "screenpool.h"
+#include "layout/layout.h"
 #include "settings/universalsettings.h"
 #include "../liblatte2/types.h"
 
diff --git a/app/launcherssignals.cpp b/app/launcherssignals.cpp
index 46bf6105a..01e83fbb1 100644
--- a/app/launcherssignals.cpp
+++ b/app/launcherssignals.cpp
@@ -22,7 +22,7 @@
 
 // local
 #include "lattecorona.h"
-#include "layout.h"
+#include "layout/layout.h"
 
 // Qt
 #include <QQuickItem>
diff --git a/app/layout.cpp b/app/layout/layout.cpp
similarity index 99%
rename from app/layout.cpp
rename to app/layout/layout.cpp
index 7796a2767..d1e11ccf0 100644
--- a/app/layout.cpp
+++ b/app/layout/layout.cpp
@@ -21,13 +21,13 @@
 #include "layout.h"
 
 // local
-#include "importer.h"
-#include "lattecorona.h"
-#include "layoutmanager.h"
-#include "screenpool.h"
-#include "view/positioner.h"
-#include "view/view.h"
-#include "settings/universalsettings.h"
+#include "../importer.h"
+#include "../lattecorona.h"
+#include "../layoutmanager.h"
+#include "../screenpool.h"
+#include "../view/positioner.h"
+#include "../view/view.h"
+#include "../settings/universalsettings.h"
 
 // Qt
 #include <QDir>
diff --git a/app/layout.h b/app/layout/layout.h
similarity index 100%
rename from app/layout.h
rename to app/layout/layout.h
diff --git a/app/layoutmanager.cpp b/app/layoutmanager.cpp
index 1c34be679..0ecbbe75e 100644
--- a/app/layoutmanager.cpp
+++ b/app/layoutmanager.cpp
@@ -24,8 +24,8 @@
 #include "importer.h"
 #include "infoview.h"
 #include "launcherssignals.h"
-#include "layout.h"
 #include "screenpool.h"
+#include "layout/layout.h"
 #include "settings/settingsdialog.h"
 #include "settings/universalsettings.h"
 #include "view/view.h"
diff --git a/app/settings/settingsdialog.cpp b/app/settings/settingsdialog.cpp
index 2401db6c4..d000383f0 100644
--- a/app/settings/settingsdialog.cpp
+++ b/app/settings/settingsdialog.cpp
@@ -22,12 +22,12 @@
 #include "settingsdialog.h"
 
 // local
-#include "layout.h"
 #include "layoutmanager.h"
 #include "importer.h"
 #include "universalsettings.h"
 #include "ui_settingsdialog.h"
 #include "../lattecorona.h"
+#include "../layout/layout.h"
 #include "../liblatte2/types.h"
 #include "../plasma/extended/theme.h"
 #include "delegates/checkboxdelegate.h"
diff --git a/app/view/view.cpp b/app/view/view.cpp
index 7206dedb7..a853f8ac1 100644
--- a/app/view/view.cpp
+++ b/app/view/view.cpp
@@ -27,8 +27,8 @@
 #include "visibilitymanager.h"
 #include "settings/primaryconfigview.h"
 #include "../lattecorona.h"
-#include "../layout.h"
 #include "../layoutmanager.h"
+#include "../layout/layout.h"
 #include "../plasma/extended/theme.h"
 #include "../screenpool.h"
 #include "../settings/universalsettings.h"
diff --git a/app/view/view.h b/app/view/view.h
index 3f6a8a569..4b251f329 100644
--- a/app/view/view.h
+++ b/app/view/view.h
@@ -26,7 +26,7 @@
 #include "positioner.h"
 #include "visibilitymanager.h"
 #include "settings/primaryconfigview.h"
-#include "../layout.h"
+#include "../layout/layout.h"
 #include "../plasma/quick/containmentview.h"
 #include "../plasma/quick/configview.h"
 #include "../../liblatte2/types.h"