Rename common header files for consistency with class renaming

25 files changed, 29 insertions, 29 deletions

diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index 65e532afc..cadbef85e 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -24,7 +24,7 @@
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kipc.h>
 #include <tdepopupmenu.h>
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 277628e4d..75721c689 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -60,7 +60,7 @@
 #include <twin.h>
 #include <kglobalsettings.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirlister.h>
 // Create the equivalent of TDEAccelBase::connectItem
 // and then remove this include and fix reconnects in initRoot() -- ellis
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index 0620dcd4d..6d8015f31 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <tqvaluevector.h>
 
-#include <kapplication.h>	// for logout parameters
+#include <tdeapplication.h>	// for logout parameters
 
 class KURL;
 class TQCloseEvent;
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index e9c805bfe..be6f0c5d9 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -22,7 +22,7 @@
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index d114e443f..2e825c0d9 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -22,7 +22,7 @@
 
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kcustommenu.h"
 
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 8fd04b230..68897eb94 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -24,7 +24,7 @@
 
 #include <tdeio/paste.h>
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolordrag.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 719987130..38435d0bb 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -35,7 +35,7 @@
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcmultidialog.h>
 #include <kbookmarkmenu.h>
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 5aae0c465..885f1ce5b 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -21,12 +21,12 @@
 
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kurifilter.h>
 #include <tdeio/job.h>
 
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index 0848f40a7..a6e45da30 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -25,8 +25,8 @@
 
 #include <krun.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kglobalsettings.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
diff --git a/kdesktop/kxdglauncher.h b/kdesktop/kxdglauncher.h
index 5c6238d6a..8f487e88e 100644
--- a/kdesktop/kxdglauncher.h
+++ b/kdesktop/kxdglauncher.h
@@ -20,6 +20,6 @@
 #ifndef _MAIN_H
 #define _MAIN_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #endif
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index ef683cbcc..41a1946ec 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -7,7 +7,7 @@
 #include "lockprocess.h"
 #include "autologout.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <tdeconfig.h>
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index 56ee83e38..c241a1acd 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 2684403a5..e8e0f901c 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -15,7 +15,7 @@
 #include <kcheckpass.h>
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 28e15873f..604b93a84 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -37,7 +37,7 @@
 #include <dcopref.h>
 
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index ae7500d1d..1d7475a90 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -23,7 +23,7 @@
 #include "main.h"
 #include "kdesktopsettings.h"
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h
index 12db9ebca..aabdbdc63 100644
--- a/kdesktop/lock/main.h
+++ b/kdesktop/lock/main.h
@@ -20,7 +20,7 @@
 #ifndef _MAIN_H
 #define _MAIN_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <time.h>
 
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index acac92127..f1f1d5171 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index 4904e71e1..7a77feb0c 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc
index 79147ae0a..57e76ed14 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cc
@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index 9caf6f29b..24d950ab5 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index ce4b8115d..93b8d42c7 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -21,8 +21,8 @@
 #include <kuniqueapplication.h>
 #include <klocale.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kopenwith.h>
 #include <kcrash.h>
 #include <kdebug.h>
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 8bf9c9752..971b855eb 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -53,7 +53,7 @@
 #include <kprocess.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
 #include <krun.h>
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc
index d8cde0562..7a480cdb6 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cc
@@ -17,7 +17,7 @@
 #include <assert.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <X11/X.h>
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 3111cd881..6dd89b126 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -24,7 +24,7 @@
 
 #include <kiconloader.h>
 #include <tqcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqimage.h>
 #include <tqbitmap.h>
 #include <tdeconfig.h>
diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cc
index a2e18a0cd..3c7e62670 100644
--- a/kdesktop/xautolock.cc
+++ b/kdesktop/xautolock.cc
@@ -15,7 +15,7 @@
 #include "xautolock.h"
 #include "xautolock.moc"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <X11/Xlib.h>