Rename additional header files to avoid conflicts with KDE4

17 files changed, 36 insertions, 36 deletions

diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp
index 2bf6d9e2..0dc1911a 100644
--- a/karm/csvexportdialog.cpp
+++ b/karm/csvexportdialog.cpp
@@ -20,9 +20,9 @@
  */
 #include <kdateedit.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>
 #include <tqbuttongroup.h>
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index bc223486..d0040f84 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -33,7 +33,7 @@
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>            // i18n
+#include <tdelocale.h>            // i18n
 #include <twinmodule.h>
 
 #include "edittaskdialog.h"
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 911d1b2f..74aad7da 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -4,8 +4,8 @@
 #include <tqmessagebox.h>
 #include <tqtimer.h>
 
-#include <kglobal.h>
-#include <klocale.h>    // i18n
+#include <tdeglobal.h>
+#include <tdelocale.h>    // i18n
 
 IdleTimeDetector::IdleTimeDetector(int maxIdle)
 // Trigger a warning after maxIdle minutes
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 8d968ed7..b46202bf 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -12,8 +12,8 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
@@ -369,7 +369,7 @@ void karmPart::fileSaveAs()
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TDEInstance*  karmPartFactory::s_instance = 0L;
 TDEAboutData* karmPartFactory::s_about = 0L;
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 2f90e8f3..b9e68e65 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -37,11 +37,11 @@
 #include "incidence.h"
 #include "tdeapplication.h"       // kapp
 #include <kdebug.h>
-#include <kemailsettings.h>
-#include <klocale.h>            // i18n
-#include <kmessagebox.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h>            // i18n
+#include <tdemessagebox.h>
 #include <kprogress.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <resourcecalendar.h>
 #include <resourcelocal.h>
 #include <resourceremote.h>
diff --git a/karm/karmutility.cpp b/karm/karmutility.cpp
index 39b1865a..994e3f8c 100644
--- a/karm/karmutility.cpp
+++ b/karm/karmutility.cpp
@@ -3,8 +3,8 @@
 
 #include <stdlib.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include "karmutility.h"
 
 TQString formatTime( long minutes, bool decimal )
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index 112812b2..fb18e8be 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -7,8 +7,8 @@
 #include <tqvalidator.h>
 #include <tqwidget.h>
 
-#include <klocale.h>            // i18n
-#include <kglobal.h>
+#include <tdelocale.h>            // i18n
+#include <tdeglobal.h>
 #include "ktimewidget.h"
 
 enum ValidatorType { HOUR, MINUTE };
diff --git a/karm/main.cpp b/karm/main.cpp
index 96f59944..ef4326dc 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -1,6 +1,6 @@
 #include <signal.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 231cfeda..9e530078 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -12,10 +12,10 @@
 #include <tdeapplication.h>       // kapp
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeydialog.h>
-#include <klocale.h>            // i18n
-#include <kmessagebox.h>
+#include <tdelocale.h>            // i18n
+#include <tdemessagebox.h>
 #include <kstatusbar.h>         // statusBar()
 #include <kstdaction.h>
 #include <tqkeycode.h>
diff --git a/karm/plannerparser.h b/karm/plannerparser.h
index cba67211..ee40a810 100644
--- a/karm/plannerparser.h
+++ b/karm/plannerparser.h
@@ -28,7 +28,7 @@ test cases:
 */
 
 #include <tqxml.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "taskview.h"
 #include "task.h"
 #include "karmstorage.h"
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index d331188a..1307bfef 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -8,10 +8,10 @@
 #include <tdeapplication.h>       // kapp
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <kiconloader.h>
 #include <klineedit.h>          // lineEdit()
-#include <klocale.h>            // i18n
+#include <tdelocale.h>            // i18n
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 
diff --git a/karm/print.cpp b/karm/print.cpp
index c540663b..08921d32 100644
--- a/karm/print.cpp
+++ b/karm/print.cpp
@@ -4,8 +4,8 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
 
-#include <kglobal.h>
-#include <klocale.h>            // i18n
+#include <tdeglobal.h>
+#include <tdelocale.h>            // i18n
 
 #include "karmutility.h"        // formatTime()
 #include "print.h"
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index e4dfe30e..9b4e3b78 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -33,7 +33,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>            // i18n
+#include <tdelocale.h>            // i18n
 #include <twinmodule.h>
 
 #include "printdialog.h"
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 54459351..796e46d2 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -14,8 +14,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>            // i18n
-#include <kmessagebox.h>
+#include <tdelocale.h>            // i18n
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 #include "csvexportdialog.h"
@@ -402,7 +402,7 @@ void TaskView::startTimerFor(Task* task, TQDateTime startTime )
       }
     }
   }
-  else KMessageBox::error(0,i18n("Saving is impossible, so timing is useless. \nSaving problems may result from a full harddisk, a directory name instead of a file name, or stale locks. Check that your harddisk has enough space, that your calendar file exists and is a file and remove stale locks, typically from ~/.trinity/share/apps/kabc/lock."));
+  else KMessageBox::error(0,i18n("Saving is impossible, so timing is useless. \nSaving problems may result from a full harddisk, a directory name instead of a file name, or stale locks. Check that your harddisk has enough space, that your calendar file exists and is a file and remove stale locks, typically from ~/.trinity/share/apps/tdeabc/lock."));
 }
 
 void TaskView::clearActiveTasks()
@@ -518,7 +518,7 @@ void TaskView::newTask(TQString caption, Task *parent)
     if ( uid.isNull() )
     {
       KMessageBox::error( 0, i18n(
-            "Error storing new task. Your changes were not saved. Make sure you can edit your iCalendar file. Also quit all applications using this file and remove any lock file related to its name from ~/.trinity/share/apps/kabc/lock/ " ) );
+            "Error storing new task. Your changes were not saved. Make sure you can edit your iCalendar file. Also quit all applications using this file and remove any lock file related to its name from ~/.trinity/share/apps/tdeabc/lock/ " ) );
     }
 
     delete dialog;
diff --git a/karm/taskviewwhatsthis.cpp b/karm/taskviewwhatsthis.cpp
index 1598a851..d81b4e0d 100644
--- a/karm/taskviewwhatsthis.cpp
+++ b/karm/taskviewwhatsthis.cpp
@@ -12,7 +12,7 @@
 #include "taskviewwhatsthis.h"
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TaskViewWhatsThis::TaskViewWhatsThis( TQWidget* qw )
  : TQWhatsThis( qw )
diff --git a/karm/timekard.cpp b/karm/timekard.cpp
index 1be72b96..d0932b92 100644
--- a/karm/timekard.cpp
+++ b/karm/timekard.cpp
@@ -27,9 +27,9 @@
 #include <tqpainter.h>
 #include <tqmap.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>            // i18n
+#include <tdelocale.h>            // i18n
 #include <event.h>
 
 #include "karmutility.h"        // formatTime()
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 06d08af2..5187c7e4 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -17,10 +17,10 @@
 #include <tqtooltip.h>
 
 #include <tdeaction.h>            // actionPreferences()
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>        // UserIcon
-#include <klocale.h>            // i18n
+#include <tdelocale.h>            // i18n
 #include <tdepopupmenu.h>         // plug()
 #include <ksystemtray.h>