From ee5df8d9e4880eb0ebda6f4af09fd13504616334 Mon Sep 17 00:00:00 2001
From: Kevin Ottens <ervin@kde.org>
Date: Wed, 10 Nov 2010 15:25:56 +0000
Subject: [PATCH] More kgenericfactory.h cleanups.

svn path=/trunk/KDE/kdelibs/; revision=1195206
---
 animationdriver.h            | 2 +-
 applet.h                     | 2 +-
 containment.h                | 2 +-
 dataengine.h                 | 2 +-
 packagestructure.cpp         | 1 +
 packagestructure.h           | 2 +-
 private/remotedataengine_p.h | 2 ++
 scripting/appletscript.h     | 2 +-
 scripting/dataenginescript.h | 2 +-
 scripting/runnerscript.h     | 2 +-
 scripting/wallpaperscript.h  | 2 +-
 view.cpp                     | 1 +
 12 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/animationdriver.h b/animationdriver.h
index 1dfba3cb4..51681ca12 100644
--- a/animationdriver.h
+++ b/animationdriver.h
@@ -25,7 +25,7 @@
 #include <QtGui/QRegion>
 #include <QtGui/QPixmap>
 
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 
 #include <plasma/version.h>
 #include <plasma/animator.h>
diff --git a/applet.h b/applet.h
index ca53cd886..7d60cb505 100644
--- a/applet.h
+++ b/applet.h
@@ -27,7 +27,7 @@
 #include <QtGui/QIcon>
 
 #include <kconfiggroup.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <kplugininfo.h>
 #include <kshortcut.h>
 
diff --git a/containment.h b/containment.h
index ae140766e..647ec884c 100644
--- a/containment.h
+++ b/containment.h
@@ -28,7 +28,7 @@
 
 #include <kplugininfo.h>
 #include <ksharedconfig.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 
 #include <plasma/applet.h>
 #include <plasma/animator.h>
diff --git a/dataengine.h b/dataengine.h
index afb92f9db..6f87a6772 100644
--- a/dataengine.h
+++ b/dataengine.h
@@ -24,7 +24,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <kservice.h>
 
 #include <plasma/version.h>
diff --git a/packagestructure.cpp b/packagestructure.cpp
index fd2491204..7a8680f03 100644
--- a/packagestructure.cpp
+++ b/packagestructure.cpp
@@ -26,6 +26,7 @@
 #include <QFileInfo>
 
 #include <kconfiggroup.h>
+#include <kdebug.h>
 #ifndef PLASMA_NO_KIO
 #include <kio/job.h>
 #endif
diff --git a/packagestructure.h b/packagestructure.h
index b2f2e4387..f45294308 100644
--- a/packagestructure.h
+++ b/packagestructure.h
@@ -23,7 +23,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QSharedData>
 
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <klocale.h>
 #include <ksharedptr.h>
 
diff --git a/private/remotedataengine_p.h b/private/remotedataengine_p.h
index a411ef3ce..d11da22e1 100644
--- a/private/remotedataengine_p.h
+++ b/private/remotedataengine_p.h
@@ -22,6 +22,8 @@
 #include "../dataengine.h"
 #include "remoteservice_p.h"
 
+#include <QtCore/QSet>
+
 class JobView;
 
 namespace Plasma
diff --git a/scripting/appletscript.h b/scripting/appletscript.h
index 07301473f..50310107c 100644
--- a/scripting/appletscript.h
+++ b/scripting/appletscript.h
@@ -24,7 +24,7 @@
 #include <QtCore/QRect>
 #include <QtCore/QSizeF>
 
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <kplugininfo.h>
 
 #include <plasma/plasma_export.h>
diff --git a/scripting/dataenginescript.h b/scripting/dataenginescript.h
index b5ed3ec45..cb7e4bee8 100644
--- a/scripting/dataenginescript.h
+++ b/scripting/dataenginescript.h
@@ -20,7 +20,7 @@
 #ifndef PLASMA_DATAENGINESCRIPT_H
 #define PLASMA_DATAENGINESCRIPT_H
 
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <kplugininfo.h>
 
 #include <plasma/plasma_export.h>
diff --git a/scripting/runnerscript.h b/scripting/runnerscript.h
index 9056f0c0e..46f4d10b4 100644
--- a/scripting/runnerscript.h
+++ b/scripting/runnerscript.h
@@ -20,7 +20,7 @@
 #ifndef PLASMA_RUNNERSCRIPT_H
 #define PLASMA_RUNNERSCRIPT_H
 
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <kplugininfo.h>
 
 #include <plasma/plasma_export.h>
diff --git a/scripting/wallpaperscript.h b/scripting/wallpaperscript.h
index 202f9ea17..4d3e70dbe 100644
--- a/scripting/wallpaperscript.h
+++ b/scripting/wallpaperscript.h
@@ -21,7 +21,7 @@
 #ifndef PLASMA_WALLPAPERSCRIPT_H
 #define PLASMA_WALLPAPERSCRIPT_H
 
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <kplugininfo.h>
 
 #include <plasma/plasma_export.h>
diff --git a/view.cpp b/view.cpp
index 86e4cf2d1..ef9d951f9 100644
--- a/view.cpp
+++ b/view.cpp
@@ -21,6 +21,7 @@
 
 #include <QTimer>
 
+#include <kdebug.h>
 #include <kglobal.h>
 #include <kwindowsystem.h>
 #include <kactioncollection.h>