Rename common header files for consistency with class renaming

styles/dotnet/dotnet.h

@@ -22,7 +22,7 @@
 #ifndef __DOTNET_H
 #define __DOTNET_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqbitmap.h>
 
 #define u_arrow -4,1, 2,1, -3,0, 1,0, -2,-1, 0,-1, -1,-2

styles/phase/phasestyle.h

@@ -27,7 +27,7 @@
 #ifndef PHASESTYLE_H
 #define PHASESTYLE_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqcolor.h>
 
 class KPixmap;

tdescreensaver/kdesavers/banner.cpp

@@ -25,7 +25,7 @@
 #include <tqfontdatabase.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krandomsequence.h>
 #include <kglobal.h>
 #include <klocale.h>

tdescreensaver/kdesavers/blob.cpp

@@ -30,7 +30,7 @@
 #include <tqpixmap.h>
 #include <tqimage.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <knuminput.h>

tdescreensaver/kdesavers/fountain.cpp

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>

tdescreensaver/kdesavers/gravity.cpp

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>

tdescreensaver/kdesavers/kclock.cpp

@@ -21,7 +21,7 @@
 #include <tqpainter.h>
 #include <tqslider.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kglobal.h>

tdescreensaver/kdesavers/kvm.cpp

@@ -40,7 +40,7 @@
 #include <tqpainter.h>
 #include <tqbitmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>

tdescreensaver/kdesavers/lines.cpp

@@ -15,7 +15,7 @@
 #include <tqlabel.h>
 #include <tqslider.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kcolorbutton.h>
 

tdescreensaver/kdesavers/lorenz.cpp

@@ -17,7 +17,7 @@
 #include <tqcolor.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <tdeconfig.h>

tdescreensaver/kdesavers/science.cpp

@@ -20,7 +20,7 @@
 #include <tqslider.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <klocale.h>

tdescreensaver/kdesavers/slideshow.cpp

@@ -24,15 +24,15 @@
 
 #include <tdeconfig.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kimageio.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kdebug.h>
 
 #include <stdlib.h>

tdescreensaver/kdesavers/wave.cpp

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>

tdescreensaver/kxsconfig/kxsconfig.cpp

@@ -44,13 +44,13 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 
 #include "kxsconfig.h"

tdescreensaver/kxsconfig/kxsrun.cpp

@@ -30,11 +30,11 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "kxsitem.h"
 #include "kxsxml.h"

tdescreensaver/tdepartsaver/tdepartsaver.cpp

@@ -33,7 +33,7 @@
 #include <tqlabel.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klibloader.h>
 #include <tdeconfig.h>

tdescreensaver/tdepartsaver/tdepartsaver.h

@@ -32,7 +32,7 @@
 #include <tqlabel.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>

tdescreensaver/xsavers/demowin.h

@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //----------------------------------------------------------------------------
 

tdescreensaver/xsavers/helpers.cpp

@@ -1,6 +1,6 @@
 #include "helpers.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 void min_width(TQWidget *w) {
   w->setMinimumWidth(w->sizeHint().width());

tdescreensaver/xsavers/main.cpp

@@ -17,8 +17,8 @@
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kcrash.h>
 
 #include "demowin.h"

tdescreensaver/xsavers/saver.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kprocess.h>
 #include <klocale.h>

twin-styles/cde/config/config.cpp

@@ -1,6 +1,6 @@
 // $Id$
 #include "config.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>

twin-styles/icewm/config/config.cpp

@@ -34,7 +34,7 @@
 #include <kstandarddirs.h>
 #include <kdialog.h>
 #include <kdirwatch.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 extern "C"

twin-styles/openlook/OpenLook.cpp

@@ -34,7 +34,7 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "OpenLook.h"

twin-styles/system/systemclient.cpp

@@ -10,7 +10,7 @@
 #include <kpixmapeffect.h>
 #include <kdrawutil.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 // Default button layout