change KDE includes to use the .h style now that we're in libs

svn path=/trunk/KDE/kdelibs/; revision=879795

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>
 

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>

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"
 

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"

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>

configloader.cpp

@@ -26,8 +26,8 @@
 #include <QXmlInputSource>
 #include <QXmlSimpleReader>
 
-#include <KDebug>
-#include <KUrl>
+#include <kdebug.h>
+#include <kurl.h>
 
 namespace Plasma
 {

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>
 

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"

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"

datacontainer.cpp

@@ -22,7 +22,7 @@
 
 #include <QVariant>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include "plasma.h"
 

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"

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>

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"

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>

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"

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"

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"
 

framesvg.cpp

@@ -24,7 +24,7 @@
 #include <QSize>
 #include <QBitmap>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include <plasma/theme.h>
 

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"
 

packagemetadata.cpp

@@ -21,8 +21,8 @@
 
 #include <QDir>
 
-#include <KConfigGroup>
-#include <KDesktopFile>
+#include <kconfiggroup.h>
+#include <kdesktopfile.h>
 
 namespace Plasma
 {

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>
 

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"

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"

querymatch.cpp

@@ -26,7 +26,7 @@
 #include <QStringList>
 #include <QIcon>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include "abstractrunner.h"
 

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"

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"
 

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"
 

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;

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
 {

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"
 

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"
 

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>

tooltipcontent.cpp

@@ -19,7 +19,7 @@
 
 #include "tooltipcontent.h"
 
-#include <KIconLoader>
+#include <kiconloader>
 
 namespace Plasma
 {

tooltipmanager.cpp

@@ -28,7 +28,7 @@
 #include <QGraphicsView>
 
 //KDE
-#include <KWindowSystem>
+#include <kwindowsystem.h>
 
 //X11
 #ifdef Q_WS_X11

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"

view.h

@@ -23,7 +23,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QGraphicsView>
 
-#include <KDE/KConfigGroup>
+#include <kconfiggroup.h>
 
 #include <plasma/plasma_export.h>
 

wallpaper.cpp

@@ -20,8 +20,8 @@
 
 #include "wallpaper.h"
 
-#include <KServiceTypeTrader>
-#include <KDebug>
+#include <kservicetypetrader.h>
+#include <kdebug.h>
 
 #include <version.h>
 

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>