From 4b08c03726be9357bfda925b6dbde4ae0c62879e Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 4 Nov 2008 02:04:34 +0000
Subject: [PATCH] change KDE includes to use the .h style now that we're in
 libs

svn path=/trunk/KDE/kdelibs/; revision=879795
---
 abstractrunner.cpp    | 10 +++++-----
 abstractrunner.h      |  4 ++--
 animator.cpp          | 10 +++++-----
 applet.cpp            | 30 +++++++++++++++---------------
 applet.h              |  8 ++++----
 configloader.cpp      |  4 ++--
 configloader.h        |  6 +++---
 containment.cpp       | 24 ++++++++++++------------
 corona.cpp            |  8 ++++----
 datacontainer.cpp     |  2 +-
 dataengine.cpp        |  8 ++++----
 dataengine.h          |  4 ++--
 dataenginemanager.cpp |  4 ++--
 delegate.cpp          | 10 +++++-----
 dialog.cpp            |  4 ++--
 extenderitem.cpp      |  8 ++++----
 extenderitem.h        |  4 ++--
 framesvg.cpp          |  2 +-
 package.cpp           | 28 ++++++++++++++--------------
 packagemetadata.cpp   |  4 ++--
 packagestructure.cpp  | 14 +++++++-------
 packagestructure.h    |  6 +++---
 popupapplet.cpp       |  8 ++++----
 querymatch.cpp        |  2 +-
 runnercontext.cpp     | 12 ++++++------
 runnermanager.cpp     | 22 +++++++++++-----------
 service.cpp           | 12 ++++++------
 service.h             |  3 ++-
 servicejob.h          |  6 ++++--
 svg.cpp               | 14 +++++++-------
 theme.cpp             | 22 +++++++++++-----------
 theme.h               |  2 +-
 tooltipcontent.cpp    |  2 +-
 tooltipmanager.cpp    |  2 +-
 view.cpp              |  6 +++---
 view.h                |  2 +-
 wallpaper.cpp         |  4 ++--
 wallpaper.h           |  2 +-
 38 files changed, 163 insertions(+), 160 deletions(-)

diff --git a/abstractrunner.cpp b/abstractrunner.cpp
index 3f5d9e7f7..bb1ab7a5c 100644
--- a/abstractrunner.cpp
+++ b/abstractrunner.cpp
@@ -23,13 +23,13 @@
 #include <QHash>
 #include <QMutex>
 #include <QMutexLocker>
-
-#include <KDebug>
-#include <KPluginInfo>
-#include <KServiceTypeTrader>
-#include <KStandardDirs>
 #include <QTimer>
 
+#include <kdebug.h>
+#include <kplugininfo.h>
+#include <kservicetypetrader.h>
+#include <kstandarddirs.h>
+
 #include <plasma/querymatch.h>
 #include <plasma/package.h>
 
diff --git a/abstractrunner.h b/abstractrunner.h
index 8bfc32d36..0f1d3e494 100644
--- a/abstractrunner.h
+++ b/abstractrunner.h
@@ -24,8 +24,8 @@
 #include <QtCore/QMutex>
 #include <QtCore/QStringList>
 
-#include <KDE/KConfigGroup>
-#include <KDE/KService>
+#include <kconfiggroup.h>
+#include <kservice.h>
 
 #include <plasma/plasma_export.h>
 #include <plasma/runnercontext.h>
diff --git a/animator.cpp b/animator.cpp
index 4f386b371..e57b0758e 100644
--- a/animator.cpp
+++ b/animator.cpp
@@ -23,11 +23,11 @@
 #include <QGraphicsItem>
 #include <QTimeLine>
 
-#include <KConfig>
-#include <KConfigGroup>
-#include <KService>
-#include <KServiceTypeTrader>
-#include <KGlobalSettings>
+#include <kconfig.h>
+#include <kconfiggroup.h>
+#include <kservice.h>
+#include <kservicetypetrader.h>
+#include <kglobalsettings.h>
 
 #include "animationdriver.h"
 
diff --git a/applet.cpp b/applet.cpp
index 6723b2e61..3bc2a4703 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -41,22 +41,22 @@
 #include <QTextDocument>
 #include <QUiLoader>
 
-#include <KAction>
-#include <KIcon>
-#include <KColorScheme>
-#include <KConfigDialog>
-#include <KDialog>
-#include <KIconLoader>
-#include <KPluginInfo>
-#include <KStandardDirs>
-#include <KService>
-#include <KServiceTypeTrader>
-#include <KShortcut>
-#include <KWindowSystem>
-#include <KActionCollection>
-#include <KAuthorized>
+#include <kaction.h>
+#include <kicon.h>
+#include <kcolorscheme.h>
+#include <kconfigdialog.h>
+#include <kdialog.h>
+#include <kiconloader.h>
+#include <kplugininfo.h>
+#include <kstandarddirs.h>
+#include <kservice.h>
+#include <kservicetypetrader.h>
+#include <kshortcut.h>
+#include <kwindowsystem.h>
+#include <kactioncollection.h>
+#include <kauthorized.h>
 
-#include <Solid/PowerManagement>
+#include <solid/powermanagement.h>
 
 #include "configloader.h"
 #include "containment.h"
diff --git a/applet.h b/applet.h
index 2c1a84071..c45ecf1a1 100644
--- a/applet.h
+++ b/applet.h
@@ -26,10 +26,10 @@
 #include <QtGui/QWidget>
 #include <QtGui/QGraphicsWidget>
 
-#include <KDE/KConfigGroup>
-#include <KDE/KGenericFactory>
-#include <KDE/KPluginInfo>
-#include <KDE/KShortcut>
+#include <kconfiggroup.h>
+#include <kgenericfactory.h>
+#include <kplugininfo.h>
+#include <kshortcut.h>
 
 #include <plasma/configloader.h>
 #include <plasma/packagestructure.h>
diff --git a/configloader.cpp b/configloader.cpp
index e02e38bf4..7b80053f4 100644
--- a/configloader.cpp
+++ b/configloader.cpp
@@ -26,8 +26,8 @@
 #include <QXmlInputSource>
 #include <QXmlSimpleReader>
 
-#include <KDebug>
-#include <KUrl>
+#include <kdebug.h>
+#include <kurl.h>
 
 namespace Plasma
 {
diff --git a/configloader.h b/configloader.h
index 160460d93..44c64f731 100644
--- a/configloader.h
+++ b/configloader.h
@@ -20,9 +20,9 @@
 #ifndef PLASMA_CONFIGLOADER_H
 #define PLASMA_CONFIGLOADER_H
 
-#include <KDE/KConfigGroup>
-#include <KDE/KConfigSkeleton>
-#include <KDE/KSharedConfig>
+#include <kconfiggroup.h>
+#include <kconfigskeleton.h>
+#include <ksharedconfig.h>
 
 #include <plasma/plasma_export.h>
 
diff --git a/containment.cpp b/containment.cpp
index fea415f61..de7d4fbdf 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -31,18 +31,18 @@
 #include <QGraphicsLayout>
 #include <QGraphicsLinearLayout>
 
-#include <KAction>
-#include <KApplication>
-#include <KAuthorized>
-#include <KIcon>
-#include <KMenu>
-#include <KMessageBox>
-#include <KMimeType>
-#include <KRun>
-#include <KServiceTypeTrader>
-#include <KStandardDirs>
-#include <KTemporaryFile>
-#include <KWindowSystem>
+#include <kaction.h>
+#include <kapplication.h>
+#include <kauthorized.h>
+#include <kicon.h>
+#include <kmenu.h>
+#include <kmessagebox.h>
+#include <kmimetype.h>
+#include <krun.h>
+#include <kservicetypetrader.h>
+#include <kstandarddirs.h>
+#include <ktemporaryfile.h>
+#include <kwindowsystem.h>
 
 #include "animator.h"
 #include "context.h"
diff --git a/corona.cpp b/corona.cpp
index 4cfbe6eef..6d7d8f0ad 100644
--- a/corona.cpp
+++ b/corona.cpp
@@ -29,10 +29,10 @@
 #include <QPainter>
 #include <QTimer>
 
-#include <KDebug>
-#include <KGlobal>
-#include <KLocale>
-#include <KMimeType>
+#include <kdebug.h>
+#include <kglobal.h>
+#include <klocale.h>
+#include <kmimetype.h>
 
 #include "containment.h"
 #include "view.h"
diff --git a/datacontainer.cpp b/datacontainer.cpp
index 9057be633..983cebfb3 100644
--- a/datacontainer.cpp
+++ b/datacontainer.cpp
@@ -22,7 +22,7 @@
 
 #include <QVariant>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include "plasma.h"
 
diff --git a/dataengine.cpp b/dataengine.cpp
index 588842ace..97071455a 100644
--- a/dataengine.cpp
+++ b/dataengine.cpp
@@ -26,10 +26,10 @@
 #include <QTimerEvent>
 #include <QVariant>
 
-#include <KDebug>
-#include <KPluginInfo>
-#include <KService>
-#include <KStandardDirs>
+#include <kdebug.h>
+#include <kplugininfo.h>
+#include <kservice.h>
+#include <kstandarddirs.h>
 
 #include "datacontainer.h"
 #include "package.h"
diff --git a/dataengine.h b/dataengine.h
index 97555416b..93b09302e 100644
--- a/dataengine.h
+++ b/dataengine.h
@@ -24,8 +24,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 
-#include <KDE/KGenericFactory>
-#include <KDE/KService>
+#include <kgenericfactory.h>
+#include <kservice.h>
 
 #include <plasma/version.h>
 #include <plasma/plasma.h>
diff --git a/dataenginemanager.cpp b/dataenginemanager.cpp
index 8547be9b1..6e94e1a3f 100644
--- a/dataenginemanager.cpp
+++ b/dataenginemanager.cpp
@@ -19,8 +19,8 @@
 
 #include "dataenginemanager.h"
 
-#include <KDebug>
-#include <KServiceTypeTrader>
+#include <kdebug.h>
+#include <kservicetypetrader.h>
 
 #include "private/dataengine_p.h"
 #include "scripting/scriptengine.h"
diff --git a/delegate.cpp b/delegate.cpp
index ebb61a00a..5c669611a 100644
--- a/delegate.cpp
+++ b/delegate.cpp
@@ -34,11 +34,11 @@
 #include <QStyleOptionViewItem>
 
 // KDE
-#include <KColorUtils>
-#include <KDebug>
-#include <KGlobal>
-#include <KGlobalSettings>
-#include <KColorScheme>
+#include <kcolorutils.h>
+#include <kdebug.h>
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <kcolorscheme.h>
 
 // plasma
 #include <plasma/paintutils.h>
diff --git a/dialog.cpp b/dialog.cpp
index e560f9ca8..5542b5675 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -35,8 +35,8 @@
 #include <QtGui/QGraphicsView>
 #include <QtGui/QGraphicsWidget>
 
-#include <KDebug>
-#include <NETRootInfo>
+#include <kdebug.h>
+#include <netrootinfo.h>
 
 #include "plasma/applet.h"
 #include "plasma/extender.h"
diff --git a/extenderitem.cpp b/extenderitem.cpp
index c3b1b7076..97483909b 100644
--- a/extenderitem.cpp
+++ b/extenderitem.cpp
@@ -29,10 +29,10 @@
 #include <QPainter>
 #include <QTimer>
 
-#include <KDebug>
-#include <KIcon>
-#include <KWindowSystem>
-#include <KGlobalSettings>
+#include <kdebug.h>
+#include <kicon.h>
+#include <kwindowsystem.h>
+#include <kglobalsettings.h>
 
 #include "applet.h"
 #include "containment.h"
diff --git a/extenderitem.h b/extenderitem.h
index 6b40124a3..3f9bbe52e 100644
--- a/extenderitem.h
+++ b/extenderitem.h
@@ -22,8 +22,8 @@
 
 #include <QtGui/QGraphicsWidget>
 
-#include <KDE/KConfigGroup>
-#include <KDE/KIcon>
+#include <kconfiggroup.h>
+#include <kicon.h>
 
 #include "plasma/plasma_export.h"
 
diff --git a/framesvg.cpp b/framesvg.cpp
index 656f0ea07..32b9755c1 100644
--- a/framesvg.cpp
+++ b/framesvg.cpp
@@ -24,7 +24,7 @@
 #include <QSize>
 #include <QBitmap>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include <plasma/theme.h>
 
diff --git a/package.cpp b/package.cpp
index 2c261702c..3eab0fb39 100644
--- a/package.cpp
+++ b/package.cpp
@@ -24,20 +24,20 @@
 #include <QFile>
 #include <QRegExp>
 
-#include <KArchiveDirectory>
-#include <KArchiveEntry>
-#include <KComponentData>
-#include <KDesktopFile>
-#include <KIO/CopyJob>
-#include <KIO/DeleteJob>
-#include <KIO/FileCopyJob>
-#include <KIO/Job>
-#include <KPluginInfo>
-#include <KStandardDirs>
-#include <KTempDir>
-#include <KTemporaryFile>
-#include <KZip>
-#include <KDebug>
+#include <karchivedirectory.h>
+#include <karchiveentry.h>
+#include <kcomponentdata.h>
+#include <kdesktopfile.h>
+#include <kio/copyjob.h>
+#include <kio/deletejob.h>
+#include <kio/filecopyjob.h>
+#include <kio/job.h>
+#include <kplugininfo.h>
+#include <kstandarddirs.h>
+#include <ktempdir.h>
+#include <ktemporaryfile.h>
+#include <kzip.h>
+#include <kdebug.h>
 
 #include "packagemetadata.h"
 
diff --git a/packagemetadata.cpp b/packagemetadata.cpp
index d6138ad9a..a30a120ff 100644
--- a/packagemetadata.cpp
+++ b/packagemetadata.cpp
@@ -21,8 +21,8 @@
 
 #include <QDir>
 
-#include <KConfigGroup>
-#include <KDesktopFile>
+#include <kconfiggroup.h>
+#include <kdesktopfile.h>
 
 namespace Plasma
 {
diff --git a/packagestructure.cpp b/packagestructure.cpp
index 9320447fb..f8d91dcbd 100644
--- a/packagestructure.cpp
+++ b/packagestructure.cpp
@@ -22,13 +22,13 @@
 #include <QMap>
 #include <QFileInfo>
 
-#include <KConfigGroup>
-#include <KStandardDirs>
-#include <KServiceTypeTrader>
-#include <KUrl>
-#include <KTemporaryFile>
-#include <KTempDir>
-#include <KZip>
+#include <kconfiggroup.h>
+#include <kstandarddirs.h>
+#include <kservicetypetrader.h>
+#include <kurl.h>
+#include <ktemporaryfile.h>
+#include <ktempdir.h>
+#include <kzip.h>
 #include <kio/netaccess.h>
 #include <kio/job.h>
 
diff --git a/packagestructure.h b/packagestructure.h
index bf41c360f..cd4b5ef85 100644
--- a/packagestructure.h
+++ b/packagestructure.h
@@ -23,9 +23,9 @@
 #include <QtCore/QStringList>
 #include <QtCore/QSharedData>
 
-#include <KDE/KGenericFactory>
-#include <KDE/KLocale>
-#include <KDE/KSharedPtr>
+#include <kgenericfactory.h>
+#include <klocale.h>
+#include <ksharedptr.h>
 
 #include <plasma/version.h>
 #include "packagemetadata.h"
diff --git a/popupapplet.cpp b/popupapplet.cpp
index d923e8b85..a4e16ae45 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -27,10 +27,10 @@
 #include <QTimer>
 #include <QApplication>
 
-#include <KIcon>
-#include <KIconLoader>
-#include <KWindowSystem>
-#include <KGlobalSettings>
+#include <kicon.h>
+#include <kiconloader.h>
+#include <kwindowsystem.h>
+#include <kglobalsettings.h>
 
 #include "plasma/private/applet_p.h"
 #include "plasma/dialog.h"
diff --git a/querymatch.cpp b/querymatch.cpp
index 47edff688..c4a7b192d 100644
--- a/querymatch.cpp
+++ b/querymatch.cpp
@@ -26,7 +26,7 @@
 #include <QStringList>
 #include <QIcon>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include "abstractrunner.h"
 
diff --git a/runnercontext.cpp b/runnercontext.cpp
index af682e3d3..f56b3e230 100644
--- a/runnercontext.cpp
+++ b/runnercontext.cpp
@@ -26,12 +26,12 @@
 #include <QFileInfo>
 #include <QSharedData>
 
-#include <KCompletion>
-#include <KDebug>
-#include <KMimeType>
-#include <KShell>
-#include <KStandardDirs>
-#include <KUrl>
+#include <kcompletion.h>
+#include <kdebug.h>
+#include <kmimetype.h>
+#include <kshell.h>
+#include <kstandarddirs.h>
+#include <kurl.h>
 
 #include "abstractrunner.h"
 #include "querymatch.h"
diff --git a/runnermanager.cpp b/runnermanager.cpp
index f18df0f6c..e995809d2 100644
--- a/runnermanager.cpp
+++ b/runnermanager.cpp
@@ -25,19 +25,19 @@
 #include <QTimer>
 #include <QCoreApplication>
 
-#include <KDebug>
-#include <KPluginInfo>
-#include <KServiceTypeTrader>
-#include <KStandardDirs>
+#include <kdebug.h>
+#include <kplugininfo.h>
+#include <kservicetypetrader.h>
+#include <kstandarddirs.h>
 
-#include <Solid/Device>
-#include <Solid/DeviceInterface>
+#include <solid/device.h>
+#include <solid/deviceinterface.h>
 
-#include <threadweaver/DebuggingAids.h>
-#include <ThreadWeaver/Thread>
-#include <ThreadWeaver/Job>
-#include <ThreadWeaver/QueuePolicy>
-#include <ThreadWeaver/Weaver>
+#include <threadweaver/debuggingaids.h.h>
+#include <threadweaver/thread.h>
+#include <threadweaver/job.h>
+#include <threadweaver/queuepolicy.h>
+#include <threadweaver/weaver.h>
 
 #include "querymatch.h"
 
diff --git a/service.cpp b/service.cpp
index 90c85801c..0f6d569a1 100644
--- a/service.cpp
+++ b/service.cpp
@@ -23,12 +23,12 @@
 #include <QFile>
 #include <QTimer>
 
-#include <KDebug>
-#include <KService>
-#include <KServiceTypeTrader>
-#include <KSharedConfig>
-#include <KStandardDirs>
-#include <KTemporaryFile>
+#include <kdebug.h.h>
+#include <kservice.h>
+#include <kservicetypetrader.h>
+#include <ksharedconfig.h>
+#include <kstandarddirs.h>
+#include <ktemporaryfile.h>
 
 #include "configloader.h"
 
diff --git a/service.h b/service.h
index 309f7e6c1..a074521fb 100644
--- a/service.h
+++ b/service.h
@@ -24,7 +24,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
 
-#include <KDE/KConfigGroup>
+#include <kconfiggroup.h>
+
 #include <plasma/plasma_export.h>
 
 class QGraphicsWidget;
diff --git a/servicejob.h b/servicejob.h
index 07ad2389c..e17c83bb8 100644
--- a/servicejob.h
+++ b/servicejob.h
@@ -21,9 +21,11 @@
 #define PLASMA_SERVICEJOB_H
 
 #include <QtCore/QVariant>
+
+#include <kjob.h>
+#include <kservice.h>
+
 #include <plasma/plasma_export.h>
-#include <KDE/KJob>
-#include <KDE/KService>
 
 namespace Plasma
 {
diff --git a/svg.cpp b/svg.cpp
index 7c88c6ed7..eba31b508 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -24,13 +24,13 @@
 #include <QPainter>
 #include <QSharedData>
 
-#include <KColorScheme>
-#include <KConfigGroup>
-#include <KDebug>
-#include <KIconEffect>
-#include <KGlobalSettings>
-#include <KSharedPtr>
-#include <KSvgRenderer>
+#include <kcolorscheme.h>
+#include <kconfiggroup.h>
+#include <kdebug.h>
+#include <kiconeffect.h>
+#include <kglobalsettings.h>
+#include <ksharedptr.h>
+#include <ksvgrenderer.h>
 
 #include "theme.h"
 
diff --git a/theme.cpp b/theme.cpp
index 303b3be3b..8d68f7a5f 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -25,17 +25,17 @@
 #include <QX11Info>
 #endif
 
-#include <KColorScheme>
-#include <KComponentData>
-#include <KConfigGroup>
-#include <KDebug>
-#include <KGlobal>
-#include <KGlobalSettings>
-#include <KPixmapCache>
-#include <KSelectionWatcher>
-#include <KSharedConfig>
-#include <KStandardDirs>
-#include <KWindowSystem>
+#include <kcolorscheme.h>
+#include <kcomponentdata.h>
+#include <kconfiggroup.h>
+#include <kdebug.h>
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <kpixmapcache.h>
+#include <kselectionwatcher.h>
+#include <ksharedconfig.h>
+#include <kstandarddirs.h>
+#include <kwindowsystem.h>
 
 #include "private/packages_p.h"
 
diff --git a/theme.h b/theme.h
index f32ef9fa9..7541358d8 100644
--- a/theme.h
+++ b/theme.h
@@ -24,7 +24,7 @@
 #include <QtGui/QFont>
 #include <QtGui/QFontMetrics>
 
-#include <KDE/KSharedConfig>
+#include <ksharedconfig.h>
 
 #include <plasma/plasma_export.h>
 #include <plasma/packagestructure.h>
diff --git a/tooltipcontent.cpp b/tooltipcontent.cpp
index 161f32ec3..4987faacb 100644
--- a/tooltipcontent.cpp
+++ b/tooltipcontent.cpp
@@ -19,7 +19,7 @@
 
 #include "tooltipcontent.h"
 
-#include <KIconLoader>
+#include <kiconloader>
 
 namespace Plasma
 {
diff --git a/tooltipmanager.cpp b/tooltipmanager.cpp
index 957d1c1ca..4ac1b4db6 100644
--- a/tooltipmanager.cpp
+++ b/tooltipmanager.cpp
@@ -28,7 +28,7 @@
 #include <QGraphicsView>
 
 //KDE
-#include <KWindowSystem>
+#include <kwindowsystem.h>
 
 //X11
 #ifdef Q_WS_X11
diff --git a/view.cpp b/view.cpp
index 653d49c71..5fc821ebd 100644
--- a/view.cpp
+++ b/view.cpp
@@ -19,9 +19,9 @@
 
 #include "view.h"
 
-#include <KGlobal>
-#include <KWindowSystem>
-#include <KActionCollection>
+#include <kglobal>
+#include <kwindowsystem.h>
+#include <kactioncollection.h>
 
 #include "corona.h"
 #include "containment.h"
diff --git a/view.h b/view.h
index 9f8dd6519..6db27bd16 100644
--- a/view.h
+++ b/view.h
@@ -23,7 +23,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QGraphicsView>
 
-#include <KDE/KConfigGroup>
+#include <kconfiggroup.h>
 
 #include <plasma/plasma_export.h>
 
diff --git a/wallpaper.cpp b/wallpaper.cpp
index 240aec1b3..ae75db848 100644
--- a/wallpaper.cpp
+++ b/wallpaper.cpp
@@ -20,8 +20,8 @@
 
 #include "wallpaper.h"
 
-#include <KServiceTypeTrader>
-#include <KDebug>
+#include <kservicetypetrader.h>
+#include <kdebug.h>
 
 #include <version.h>
 
diff --git a/wallpaper.h b/wallpaper.h
index 4d957fdbf..416e1b215 100644
--- a/wallpaper.h
+++ b/wallpaper.h
@@ -21,7 +21,7 @@
 #ifndef PLASMA_WALLPAPER_H
 #define PLASMA_WALLPAPER_H
 
-#include <KDE/KPluginInfo>
+#include <kplugininfo.h>
 
 #include <plasma/plasma.h>
 #include <plasma/version.h>