From 2a66a2cdb1c9c8017e821e34ec93732761b14d47 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:14:36 -0600
Subject: [PATCH] Rename common header files for consistency with class
 renaming

---
 styles/dotnet/dotnet.h                       | 2 +-
 styles/phase/phasestyle.h                    | 2 +-
 tdescreensaver/kdesavers/banner.cpp          | 2 +-
 tdescreensaver/kdesavers/blob.cpp            | 2 +-
 tdescreensaver/kdesavers/fountain.cpp        | 2 +-
 tdescreensaver/kdesavers/gravity.cpp         | 2 +-
 tdescreensaver/kdesavers/kclock.cpp          | 2 +-
 tdescreensaver/kdesavers/kvm.cpp             | 2 +-
 tdescreensaver/kdesavers/lines.cpp           | 2 +-
 tdescreensaver/kdesavers/lorenz.cpp          | 2 +-
 tdescreensaver/kdesavers/science.cpp         | 2 +-
 tdescreensaver/kdesavers/slideshow.cpp       | 6 +++---
 tdescreensaver/kdesavers/wave.cpp            | 2 +-
 tdescreensaver/kxsconfig/kxsconfig.cpp       | 4 ++--
 tdescreensaver/kxsconfig/kxsrun.cpp          | 4 ++--
 tdescreensaver/tdepartsaver/tdepartsaver.cpp | 2 +-
 tdescreensaver/tdepartsaver/tdepartsaver.h   | 2 +-
 tdescreensaver/xsavers/demowin.h             | 2 +-
 tdescreensaver/xsavers/helpers.cpp           | 2 +-
 tdescreensaver/xsavers/main.cpp              | 4 ++--
 tdescreensaver/xsavers/saver.cpp             | 2 +-
 twin-styles/cde/config/config.cpp            | 2 +-
 twin-styles/icewm/config/config.cpp          | 2 +-
 twin-styles/openlook/OpenLook.cpp            | 2 +-
 twin-styles/system/systemclient.cpp          | 2 +-
 25 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h
index 72436526..21844616 100644
--- a/styles/dotnet/dotnet.h
+++ b/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
diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h
index faeb2507..8922960b 100644
--- a/styles/phase/phasestyle.h
+++ b/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;
diff --git a/tdescreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp
index 4f83c274..b8d01339 100644
--- a/tdescreensaver/kdesavers/banner.cpp
+++ b/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>
diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp
index 427a7237..2f09b19c 100644
--- a/tdescreensaver/kdesavers/blob.cpp
+++ b/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>
diff --git a/tdescreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp
index 35b5a2cf..310bd8f5 100644
--- a/tdescreensaver/kdesavers/fountain.cpp
+++ b/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>
diff --git a/tdescreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp
index 21933e18..f671049c 100644
--- a/tdescreensaver/kdesavers/gravity.cpp
+++ b/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>
diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp
index ce8ef182..c1838cff 100644
--- a/tdescreensaver/kdesavers/kclock.cpp
+++ b/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>
diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp
index c110d894..d2af8df1 100644
--- a/tdescreensaver/kdesavers/kvm.cpp
+++ b/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>
diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp
index 3349fe8e..720261e7 100644
--- a/tdescreensaver/kdesavers/lines.cpp
+++ b/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>
 
diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp
index 24a799a8..5981748e 100644
--- a/tdescreensaver/kdesavers/lorenz.cpp
+++ b/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>
diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp
index 06b780be..7ac72b2c 100644
--- a/tdescreensaver/kdesavers/science.cpp
+++ b/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>
diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp
index 19f82bed..e83aa5f5 100644
--- a/tdescreensaver/kdesavers/slideshow.cpp
+++ b/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 <kaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutapplication.h>
 #include <kdebug.h>
 
 #include <stdlib.h>
diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp
index d8e0c8a9..685669aa 100644
--- a/tdescreensaver/kdesavers/wave.cpp
+++ b/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>
diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp
index d5f0ac53..a8eb9bca 100644
--- a/tdescreensaver/kxsconfig/kxsconfig.cpp
+++ b/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"
diff --git a/tdescreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp
index 82ead267..2151f306 100644
--- a/tdescreensaver/kxsconfig/kxsrun.cpp
+++ b/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"
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
index 3b78e7bd..10eb9a5a 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp
+++ b/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>
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.h b/tdescreensaver/tdepartsaver/tdepartsaver.h
index b91f415a..feba06ed 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.h
+++ b/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>
diff --git a/tdescreensaver/xsavers/demowin.h b/tdescreensaver/xsavers/demowin.h
index b6b86275..dea8b376 100644
--- a/tdescreensaver/xsavers/demowin.h
+++ b/tdescreensaver/xsavers/demowin.h
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //----------------------------------------------------------------------------
 
diff --git a/tdescreensaver/xsavers/helpers.cpp b/tdescreensaver/xsavers/helpers.cpp
index e55cf98c..56c28d17 100644
--- a/tdescreensaver/xsavers/helpers.cpp
+++ b/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());
diff --git a/tdescreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp
index 053e6584..3456c943 100644
--- a/tdescreensaver/xsavers/main.cpp
+++ b/tdescreensaver/xsavers/main.cpp
@@ -17,8 +17,8 @@
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kcrash.h>
 
 #include "demowin.h"
diff --git a/tdescreensaver/xsavers/saver.cpp b/tdescreensaver/xsavers/saver.cpp
index 1c11fd73..dc3c3977 100644
--- a/tdescreensaver/xsavers/saver.cpp
+++ b/tdescreensaver/xsavers/saver.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kprocess.h>
 #include <klocale.h>
diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp
index 13441218..3905a583 100644
--- a/twin-styles/cde/config/config.cpp
+++ b/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>
diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp
index dc99a05a..870ceb06 100644
--- a/twin-styles/icewm/config/config.cpp
+++ b/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"
diff --git a/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp
index 435ce4ae..590ea07e 100644
--- a/twin-styles/openlook/OpenLook.cpp
+++ b/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"
diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp
index d183a7e4..747f03b6 100644
--- a/twin-styles/system/systemclient.cpp
+++ b/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