From d1a3a8be39153e02cd555cb7e3bafcab2cb4530c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:54:15 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kcron/ctcron.cpp      | 4 ++--
 kcron/cti18n.h        | 2 +-
 kcron/ktapp.cpp       | 6 +++---
 kcron/kticon.cpp      | 2 +-
 kcron/ktlistcron.cpp  | 2 +-
 kcron/ktlisttask.cpp  | 2 +-
 kcron/ktlisttasks.cpp | 4 ++--
 kcron/ktlistvar.cpp   | 2 +-
 kcron/ktlistvars.cpp  | 4 ++--
 kcron/ktprint.cpp     | 2 +-
 kcron/ktprintopt.cpp  | 2 +-
 kcron/kttask.cpp      | 4 ++--
 kcron/ktvariable.cpp  | 4 ++--
 kcron/ktview.cpp      | 4 ++--
 kcron/main.cpp        | 2 +-
 15 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'kcron')

diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp
index 538ec34..6dbbad5 100644
--- a/kcron/ctcron.cpp
+++ b/kcron/ctcron.cpp
@@ -25,8 +25,8 @@
 #include <tqfile.h>
 
 #include <kprocess.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 #include <iostream>
 
diff --git a/kcron/cti18n.h b/kcron/cti18n.h
index 2c79e1a..7cea13a 100644
--- a/kcron/cti18n.h
+++ b/kcron/cti18n.h
@@ -21,7 +21,7 @@
 // Regardless, please don't introduce any other TQt or KDE dependencies here.
 // -GM 11/99
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #endif // CTI18N_H
diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp
index 9b70f87..6db4cb3 100644
--- a/kcron/ktapp.cpp
+++ b/kcron/ktapp.cpp
@@ -10,12 +10,12 @@
  ***************************************************************************/
 
 #include "ktapp.h"
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdestdaccel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>       // i18n()
+#include <tdelocale.h>       // i18n()
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
diff --git a/kcron/kticon.cpp b/kcron/kticon.cpp
index ef6b861..479d697 100644
--- a/kcron/kticon.cpp
+++ b/kcron/kticon.cpp
@@ -13,7 +13,7 @@
  
 #include <tqimage.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 TQPixmap KTIcon::getMiniIcon(const TQString& name)
diff --git a/kcron/ktlistcron.cpp b/kcron/ktlistcron.cpp
index 9379c3d..1a78c96 100644
--- a/kcron/ktlistcron.cpp
+++ b/kcron/ktlistcron.cpp
@@ -12,7 +12,7 @@
 #include "ktlistcron.h"
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ctcron.h"
 
diff --git a/kcron/ktlisttask.cpp b/kcron/ktlisttask.cpp
index 17a1378..e86b497 100644
--- a/kcron/ktlisttask.cpp
+++ b/kcron/ktlisttask.cpp
@@ -9,7 +9,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>  // i18n()
+#include <tdelocale.h>  // i18n()
 
 #include "cttask.h"
 
diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp
index 9be9231..65e909b 100644
--- a/kcron/ktlisttasks.cpp
+++ b/kcron/ktlisttasks.cpp
@@ -13,8 +13,8 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>  // i18n()
-#include <kglobalsettings.h>
+#include <tdelocale.h>  // i18n()
+#include <tdeglobalsettings.h>
 
 #include "ctcron.h"
 #include "cttask.h"
diff --git a/kcron/ktlistvar.cpp b/kcron/ktlistvar.cpp
index e6c4f6a..3805658 100644
--- a/kcron/ktlistvar.cpp
+++ b/kcron/ktlistvar.cpp
@@ -12,7 +12,7 @@
 #include "ktlistvar.h"
 #include "ktprint.h"
 
-#include <klocale.h>  // i18n()
+#include <tdelocale.h>  // i18n()
 
 #include "ctvariable.h"
 
diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp
index f5ccf95..1369507 100644
--- a/kcron/ktlistvars.cpp
+++ b/kcron/ktlistvars.cpp
@@ -14,8 +14,8 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>  // i18n()
-#include <kglobalsettings.h>
+#include <tdelocale.h>  // i18n()
+#include <tdeglobalsettings.h>
 
 #include "ctcron.h"
 #include "ctvariable.h"
diff --git a/kcron/ktprint.cpp b/kcron/ktprint.cpp
index b1de5c6..56d7070 100644
--- a/kcron/ktprint.cpp
+++ b/kcron/ktprint.cpp
@@ -16,7 +16,7 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <ktprintopt.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ktprint.h"
 
 const int KTPrint::alignTextLeft             (1000);
diff --git a/kcron/ktprintopt.cpp b/kcron/ktprintopt.cpp
index d7c1d87..a6a12c6 100644
--- a/kcron/ktprintopt.cpp
+++ b/kcron/ktprintopt.cpp
@@ -16,7 +16,7 @@
 
 #include <kdialog.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include "ktprintopt.h"
 
diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index 0ede639..b0e3cce 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -23,9 +23,9 @@
 
 #include <tdeapplication.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp
index 9c9f9c4..34b35ee 100644
--- a/kcron/ktvariable.cpp
+++ b/kcron/ktvariable.cpp
@@ -14,8 +14,8 @@
 #include <tqlayout.h>
 
 #include <tdeapplication.h>     // kapp
-#include <klocale.h>  // i18n()
-#include <kmessagebox.h>
+#include <tdelocale.h>  // i18n()
+#include <tdemessagebox.h>
 #include <ktextedit.h>
 
 #include "ctvariable.h"
diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp
index 0000bc7..2cab70b 100644
--- a/kcron/ktview.cpp
+++ b/kcron/ktview.cpp
@@ -32,8 +32,8 @@
 #include <tqdatetime.h>
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include "cthost.h"
 #include "ctcron.h"
diff --git a/kcron/main.cpp b/kcron/main.cpp
index b829473..a9358e6 100644
--- a/kcron/main.cpp
+++ b/kcron/main.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ktapp.h"
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-- 
cgit v1.2.1