Rename common header files for consistency with class renaming

41 files changed, 73 insertions, 73 deletions

diff --git a/Documentation/ConduitProgrammingTutorial/mal-factory.cc b/Documentation/ConduitProgrammingTutorial/mal-factory.cc
index 1fc5337..dcbfdd8 100644
--- a/Documentation/ConduitProgrammingTutorial/mal-factory.cc
+++ b/Documentation/ConduitProgrammingTutorial/mal-factory.cc
@@ -7,9 +7,9 @@
  
 #include "options.h" 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <time.h> // Needed by pilot-link include
 #include "mal-conduit.h"
diff --git a/conduits/abbrowserconduit/abbrowser-setup.cc b/conduits/abbrowserconduit/abbrowser-setup.cc
index 1f30edb..a33632e 100644
--- a/conduits/abbrowserconduit/abbrowser-setup.cc
+++ b/conduits/abbrowserconduit/abbrowser-setup.cc
@@ -34,7 +34,7 @@
 #include <tqbuttongroup.h>
 
 #include <kurlrequester.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kaddressbookConduit.h"
 #include "abbrowser-setup.h"
diff --git a/conduits/docconduit/doc-factory.cc b/conduits/docconduit/doc-factory.cc
index db3c105..ca3cd96 100644
--- a/conduits/docconduit/doc-factory.cc
+++ b/conduits/docconduit/doc-factory.cc
@@ -31,7 +31,7 @@
 #include "doc-factory.h"
 
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kpilotlink.h>
 
 #include "doc-conduit.h"
diff --git a/conduits/docconduit/kpalmdoc.cpp b/conduits/docconduit/kpalmdoc.cpp
index f43b9c4..81bfdfd 100644
--- a/conduits/docconduit/kpalmdoc.cpp
+++ b/conduits/docconduit/kpalmdoc.cpp
@@ -28,9 +28,9 @@
 
 #include "options.h"
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 
 #include "kpalmdoc_dlg.h"
 
diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc
index 61bef6c..c8b17d9 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/conduits/docconduit/kpalmdoc_dlg.cc
@@ -40,8 +40,8 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kaboutapplication.h>
-#include <kapplication.h>
+#include <tdeaboutapplication.h>
+#include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 #include <kcharsets.h>
diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc
index 00880c6..84fe5cc 100644
--- a/conduits/knotes/knotes-action.cc
+++ b/conduits/knotes/knotes-action.cc
@@ -32,7 +32,7 @@
 #include <tqmap.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kurl.h>
 #include <libkcal/calendarlocal.h>
diff --git a/conduits/knotes/knotes-factory.cc b/conduits/knotes/knotes-factory.cc
index dc7f8f3..2719f32 100644
--- a/conduits/knotes/knotes-factory.cc
+++ b/conduits/knotes/knotes-factory.cc
@@ -28,9 +28,9 @@
 
 #include "options.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <dcopclient.h>
 
diff --git a/conduits/knotes/knotes-setup.cc b/conduits/knotes/knotes-setup.cc
index 93c4f71..0bdf41a 100644
--- a/conduits/knotes/knotes-setup.cc
+++ b/conduits/knotes/knotes-setup.cc
@@ -33,7 +33,7 @@
 #include <tqmap.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "setup_base.h"
diff --git a/conduits/malconduit/mal-factory.cc b/conduits/malconduit/mal-factory.cc
index d343fe3..f411e94 100644
--- a/conduits/malconduit/mal-factory.cc
+++ b/conduits/malconduit/mal-factory.cc
@@ -32,9 +32,9 @@
 
 #include "options.h" 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <time.h> // Needed by pilot-link include
 #include "mal-conduit.h"
diff --git a/conduits/malconduit/mal-setup.cc b/conduits/malconduit/mal-setup.cc
index 57f07c4..e853367 100644
--- a/conduits/malconduit/mal-setup.cc
+++ b/conduits/malconduit/mal-setup.cc
@@ -42,7 +42,7 @@
 #include <knuminput.h>
 #include <kpassdlg.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 
diff --git a/conduits/memofileconduit/memofile-factory.cc b/conduits/memofileconduit/memofile-factory.cc
index 30789f8..12afebb 100644
--- a/conduits/memofileconduit/memofile-factory.cc
+++ b/conduits/memofileconduit/memofile-factory.cc
@@ -34,7 +34,7 @@
 
 #include <tdeconfig.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kurlrequester.h>
 
 #include "setup_base.h"
diff --git a/conduits/notepadconduit/notepad-factory.cc b/conduits/notepadconduit/notepad-factory.cc
index 36ae5f9..d2e6e9f 100644
--- a/conduits/notepadconduit/notepad-factory.cc
+++ b/conduits/notepadconduit/notepad-factory.cc
@@ -30,7 +30,7 @@
 
 #include <tdeconfig.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 #include <tqlineedit.h>
diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc
index 30f6f00..68e7c56 100644
--- a/conduits/null/null-factory.cc
+++ b/conduits/null/null-factory.cc
@@ -34,7 +34,7 @@
 
 #include <tdeconfig.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "pluginfactory.h"
 
diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc
index 057a07c..8e277df 100644
--- a/conduits/popmail/popmail-conduit.cc
+++ b/conduits/popmail/popmail-conduit.cc
@@ -64,7 +64,7 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API;
 #include <tqtextstream.h>
 #include <tqtextcodec.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <ksock.h>
 #include <tdeconfig.h>
diff --git a/conduits/popmail/setupDialog.cc b/conduits/popmail/setupDialog.cc
index eb7a89c..ea23c90 100644
--- a/conduits/popmail/setupDialog.cc
+++ b/conduits/popmail/setupDialog.cc
@@ -40,7 +40,7 @@
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <tqcheckbox.h>
 #include <tqdir.h>
diff --git a/conduits/recordconduit/factory.cc b/conduits/recordconduit/factory.cc
index 22b14c8..66bf0e0 100644
--- a/conduits/recordconduit/factory.cc
+++ b/conduits/recordconduit/factory.cc
@@ -34,7 +34,7 @@
 
 #include <tdeconfig.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "pluginfactory.h"
 #include "pilotDatabase.h"
diff --git a/conduits/sysinfoconduit/sysinfo-setup.cc b/conduits/sysinfoconduit/sysinfo-setup.cc
index 2eef06f..647d1f6 100644
--- a/conduits/sysinfoconduit/sysinfo-setup.cc
+++ b/conduits/sysinfoconduit/sysinfo-setup.cc
@@ -34,8 +34,8 @@
 #include <tqbuttongroup.h>
 #include <tqlistview.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kurlrequester.h>
 
 #include "sysinfo-setup_dialog.h"
diff --git a/conduits/timeconduit/time-setup.cc b/conduits/timeconduit/time-setup.cc
index 8da1b7b..46e0f7b 100644
--- a/conduits/timeconduit/time-setup.cc
+++ b/conduits/timeconduit/time-setup.cc
@@ -32,8 +32,8 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 
 #include "time-setup_dialog.h"
 
diff --git a/conduits/vcalconduit/todo-setup.cc b/conduits/vcalconduit/todo-setup.cc
index f6a00e2..129675b 100644
--- a/conduits/vcalconduit/todo-setup.cc
+++ b/conduits/vcalconduit/todo-setup.cc
@@ -30,7 +30,7 @@
 #include "options.h"
 
 #include <tqbuttongroup.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "korganizerConduit.h"
 #include "todo-conduit.h"
diff --git a/conduits/vcalconduit/vcal-factory.cc b/conduits/vcalconduit/vcal-factory.cc
index 2e15781..926c016 100644
--- a/conduits/vcalconduit/vcal-factory.cc
+++ b/conduits/vcalconduit/vcal-factory.cc
@@ -29,7 +29,7 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "pluginfactory.h"
 
diff --git a/conduits/vcalconduit/vcal-setup.cc b/conduits/vcalconduit/vcal-setup.cc
index f103b4c..53fc937 100644
--- a/conduits/vcalconduit/vcal-setup.cc
+++ b/conduits/vcalconduit/vcal-setup.cc
@@ -30,7 +30,7 @@
 #include "options.h"
 
 #include <tqbuttongroup.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "korganizerConduit.h"
 #include "vcal-conduit.h"
diff --git a/kpilot/addressWidget.cc b/kpilot/addressWidget.cc
index 878f743..987cd17 100644
--- a/kpilot/addressWidget.cc
+++ b/kpilot/addressWidget.cc
@@ -52,7 +52,7 @@
 #include <tqtextcodec.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc
index b93a421..d09d96d 100644
--- a/kpilot/hotSync.cc
+++ b/kpilot/hotSync.cc
@@ -52,7 +52,7 @@
 
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "pilotUser.h"
diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc
index 72084fe..d652131 100644
--- a/kpilot/kpilot.cc
+++ b/kpilot/kpilot.cc
@@ -46,8 +46,8 @@
 #include <kcombobox.h>
 #include <kmenubar.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeaction.h>
diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc
index c5ba033..e626a7b 100644
--- a/kpilot/kpilotConfig.cc
+++ b/kpilot/kpilotConfig.cc
@@ -38,7 +38,7 @@
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <kglobalsettings.h>
 
diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc
index 1bcb39b..5327cb8 100644
--- a/kpilot/kpilotProbeDialog.cc
+++ b/kpilot/kpilotProbeDialog.cc
@@ -41,7 +41,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfigskeleton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>
 
 #include "kpilotConfig.h"
diff --git a/kpilot/kroupware.cc b/kpilot/kroupware.cc
index 0330c2e..f099851 100644
--- a/kpilot/kroupware.cc
+++ b/kpilot/kroupware.cc
@@ -36,7 +36,7 @@
 #include <ktempfile.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kroupware.h"
 #include "kpilotConfig.h"
 
diff --git a/kpilot/main-test.cc b/kpilot/main-test.cc
index 48268eb..97efd97 100644
--- a/kpilot/main-test.cc
+++ b/kpilot/main-test.cc
@@ -40,10 +40,10 @@
 #include <tqhbox.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kservice.h>
 #include <kservicetype.h>
 #include <kuserprofile.h>
diff --git a/kpilot/memoWidget.cc b/kpilot/memoWidget.cc
index e8f475a..d24ee4f 100644
--- a/kpilot/memoWidget.cc
+++ b/kpilot/memoWidget.cc
@@ -48,7 +48,7 @@
 #include <tqdatetime.h>
 #include <tqptrlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeversion.h>
diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc
index 975311c..94fbfb1 100644
--- a/kpilot/pilotDaemon.cc
+++ b/kpilot/pilotDaemon.cc
@@ -38,8 +38,8 @@
 #include <tqpixmap.h>
 
 #include <kuniqueapplication.h>
-#include <kaboutapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutapplication.h>
+#include <tdecmdlineargs.h>
 #include <twin.h>
 #include <kurl.h>
 #include <tdepopupmenu.h>
@@ -49,7 +49,7 @@
 #include <dcopclient.h>
 #include <kurldrag.h>
 #include <kservice.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 
 #include "pilotRecord.h"
diff --git a/lib/options.cc b/lib/options.cc
index ad755c9..f7ee6de 100644
--- a/lib/options.cc
+++ b/lib/options.cc
@@ -37,7 +37,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #ifdef DEBUG
 int debug_level = 1;
diff --git a/lib/plugin.cc b/lib/plugin.cc
index 7c0f2f1..7bb8e12 100644
--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@@ -48,9 +48,9 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc
index 89517b7..2f6533b 100644
--- a/tests/exportdatebook.cc
+++ b/tests/exportdatebook.cc
@@ -28,11 +28,11 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfigskeleton.h>
 
 #include <libkcal/calendar.h>
diff --git a/tests/importaddresses.cc b/tests/importaddresses.cc
index 3d4c0ff..4d37fa4 100644
--- a/tests/importaddresses.cc
+++ b/tests/importaddresses.cc
@@ -28,11 +28,11 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/resourcefile.h>
diff --git a/tests/importdatebook.cc b/tests/importdatebook.cc
index c05ffa7..d3e83b6 100644
--- a/tests/importdatebook.cc
+++ b/tests/importdatebook.cc
@@ -28,11 +28,11 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/calendarlocal.h>
diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc
index b451ba7..926b8a5 100644
--- a/tests/mergecalendars.cc
+++ b/tests/mergecalendars.cc
@@ -25,11 +25,11 @@
 ** Bug reports and questions can be sent to [email protected]
 */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfigskeleton.h>
 
 #include <libkcal/calendar.h>
diff --git a/tests/testaddress.cc b/tests/testaddress.cc
index bcedd9c..1f5b466 100644
--- a/tests/testaddress.cc
+++ b/tests/testaddress.cc
@@ -28,11 +28,11 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "pilot.h"
 #include "pilotAddress.h"
diff --git a/tests/testcategories.cc b/tests/testcategories.cc
index 299b738..e2d4b25 100644
--- a/tests/testcategories.cc
+++ b/tests/testcategories.cc
@@ -28,11 +28,11 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "pilotLocalDatabase.h"
 #include "pilotRecord.h"
diff --git a/tests/testdatabase.cc b/tests/testdatabase.cc
index 768d06f..fd397be 100644
--- a/tests/testdatabase.cc
+++ b/tests/testdatabase.cc
@@ -28,11 +28,11 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "pilotLocalDatabase.h"
 #include "pilotRecord.h"
diff --git a/tests/testdatebook.cc b/tests/testdatebook.cc
index 1facced..5852585 100644
--- a/tests/testdatebook.cc
+++ b/tests/testdatebook.cc
@@ -28,11 +28,11 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "pilot.h"
 #include "pilotDateEntry.h"
diff --git a/tests/testidmapper.cc b/tests/testidmapper.cc
index d5e460e..8c9cccf 100644
--- a/tests/testidmapper.cc
+++ b/tests/testidmapper.cc
@@ -29,9 +29,9 @@
 #include "idmapper.h"
 #include "options.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include <tqdir.h>
 #include <tqfile.h>