From 0234bdcbb7d21286adb5cf17f24137635fe9c5b5 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Tue, 26 Aug 2014 19:22:12 +0200
Subject: [PATCH] include 'plasmaquick' directly in the includes

makes it a lot easier to track where the problem spots are with a
`grep plasmaquick`
---
 shell/CMakeLists.txt            | 2 --
 shell/containmentconfigview.cpp | 2 +-
 shell/containmentconfigview.h   | 2 +-
 shell/desktopview.h             | 2 +-
 shell/interactiveconsole.cpp    | 2 +-
 shell/main.cpp                  | 2 +-
 shell/osd.cpp                   | 2 +-
 shell/panelconfigview.h         | 2 +-
 shell/panelview.h               | 5 ++---
 shell/shellcorona.cpp           | 4 ++--
 10 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index fa7a389f6..4b1dd664c 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -9,8 +9,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
-include_directories(plasmaquick)
-
 find_package(Qt5Qml REQUIRED)
 find_package(Qt5Quick REQUIRED)
 find_package(Qt5DBus REQUIRED)
diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
index acfa6b24f..38d8bcf31 100644
--- a/shell/containmentconfigview.cpp
+++ b/shell/containmentconfigview.cpp
@@ -19,7 +19,7 @@
 
 #include "currentcontainmentactionsmodel.h"
 #include "containmentconfigview.h"
-#include "configmodel.h"
+#include "plasmaquick/configmodel.h"
 #include "shellcorona.h"
 #include "config-workspace.h"
 
diff --git a/shell/containmentconfigview.h b/shell/containmentconfigview.h
index 8c6c2a244..6364423bd 100644
--- a/shell/containmentconfigview.h
+++ b/shell/containmentconfigview.h
@@ -21,7 +21,7 @@
 #define CONTAINMENTCONFIGVIEW_H
 
 
-#include "configview.h"
+#include "plasmaquick/configview.h"
 
 
 namespace Plasma {
diff --git a/shell/desktopview.h b/shell/desktopview.h
index 620d6df5a..6aeeeb680 100644
--- a/shell/desktopview.h
+++ b/shell/desktopview.h
@@ -20,7 +20,7 @@
 #define DESKTOVIEW_H
 
 
-#include <view.h>
+#include "plasmaquick/view.h"
 #include "panelconfigview.h"
 #include <QtCore/qpointer.h>
 
diff --git a/shell/interactiveconsole.cpp b/shell/interactiveconsole.cpp
index e7a3e85e0..7096033a3 100644
--- a/shell/interactiveconsole.cpp
+++ b/shell/interactiveconsole.cpp
@@ -50,7 +50,7 @@
 #include <Plasma/Package>
 
 #include "scripting/desktopscriptengine.h"
-#include "shellpluginloader.h"
+#include "plasmaquick/shellpluginloader.h"
 #include "shellcorona.h"
 
 //TODO:
diff --git a/shell/main.cpp b/shell/main.cpp
index e34578d81..bb63bdc85 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -26,7 +26,7 @@
 #include <kdbusservice.h>
 #include <klocalizedstring.h>
 
-#include "shellpluginloader.h"
+#include "plasmaquick/shellpluginloader.h"
 #include "shellmanager.h"
 
 static const char description[] = "Plasma Shell";
diff --git a/shell/osd.cpp b/shell/osd.cpp
index a2bee29f4..961c9ca39 100644
--- a/shell/osd.cpp
+++ b/shell/osd.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "osd.h"
-#include "shellpluginloader.h"
+#include "plasmaquick/shellpluginloader.h"
 #include "shellcorona.h"
 
 #include <QDBusConnection>
diff --git a/shell/panelconfigview.h b/shell/panelconfigview.h
index 02e126457..cb96194bf 100644
--- a/shell/panelconfigview.h
+++ b/shell/panelconfigview.h
@@ -20,7 +20,7 @@
 #ifndef PANELCONFIGVIEW_H
 #define PANELCONFIGVIEW_H
 
-#include "configview.h"
+#include "plasmaquick/configview.h"
 #include "panelview.h"
 
 #include <QQuickItem>
diff --git a/shell/panelview.h b/shell/panelview.h
index bd1643813..6cfbc8bc0 100644
--- a/shell/panelview.h
+++ b/shell/panelview.h
@@ -19,13 +19,12 @@
 #ifndef PANELVIEW_H
 #define PANELVIEW_H
 
-#include <view.h>
 #include <QtCore/qpointer.h>
 #include <Plasma/Theme>
 #include <QTimer>
 
-
-#include <configview.h>
+#include "plasmaquick/view.h"
+#include "plasmaquick/configview.h"
 
 class ShellCorona;
 
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index dd26ce3e5..c5447c24a 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -55,8 +55,8 @@
 #include "panelview.h"
 #include "scripting/desktopscriptengine.h"
 #include "widgetexplorer/widgetexplorer.h"
-#include "configview.h"
-#include "shellpluginloader.h"
+#include "plasmaquick/configview.h"
+#include "plasmaquick/shellpluginloader.h"
 #include "shellmanager.h"
 #include "osd.h"
 #if HAVE_KTEXTEDITOR