From a623e16283229276fcf046220dce86813e57fe50 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Fri, 15 Jul 2011 13:00:31 +0200
Subject: [PATCH] cleanups, and GenericComponent no longer applies: just use
 Package::laod("Plasma/Generic")

---
 plasma.cpp | 6 ++++--
 plasma.h   | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plasma.cpp b/plasma.cpp
index aeb3823c1..b2307d5dc 100644
--- a/plasma.cpp
+++ b/plasma.cpp
@@ -24,8 +24,9 @@
 #include <QGraphicsView>
 #include <QMenu>
 
-#include <plasma/containment.h>
-#include <plasma/view.h>
+#include "plasma/containment.h"
+#include "plasma/view.h"
+#include "plasma/private/packages_p.h"
 
 namespace Plasma
 {
@@ -124,4 +125,5 @@ QList<QAction*> actionsFromMenu(QMenu *menu, const QString &prefix, QObject *par
     return ret;
 }
 
+
 } // Plasma namespace
diff --git a/plasma.h b/plasma.h
index 020b118eb..5124239a6 100644
--- a/plasma.h
+++ b/plasma.h
@@ -213,8 +213,7 @@ enum ComponentType {
     RunnerComponent = 4,      /**< Plasma::AbstractRunner based plugsin **/
     AnimatorComponent = 8,    /**< Plasma::Animator based plugins **/
     ContainmentComponent = 16,/**< Plasma::Containment based plugins **/
-    WallpaperComponent = 32,   /**< Plasma::Wallpaper based plugins **/
-    GenericComponent = 64      /** Generic repositories of files, usually they keep QML files and their assets **/
+    WallpaperComponent = 32   /**< Plasma::Wallpaper based plugins **/
 };
 Q_DECLARE_FLAGS(ComponentTypes, ComponentType)