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

@@ -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)

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"
 

shell/containmentconfigview.h

@@ -21,7 +21,7 @@
 #define CONTAINMENTCONFIGVIEW_H
 
 
-#include "configview.h"
+#include "plasmaquick/configview.h"
 
 
 namespace Plasma {

shell/desktopview.h

@@ -20,7 +20,7 @@
 #define DESKTOVIEW_H
 
 
-#include <view.h>
+#include "plasmaquick/view.h"
 #include "panelconfigview.h"
 #include <QtCore/qpointer.h>
 

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:

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";

shell/osd.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "osd.h"
-#include "shellpluginloader.h"
+#include "plasmaquick/shellpluginloader.h"
 #include "shellcorona.h"
 
 #include <QDBusConnection>

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>

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;
 

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