Rename additional header files to avoid conflicts with KDE4

18 files changed, 30 insertions, 30 deletions

diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index a8ad5858d..5b3b47d84 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -23,10 +23,10 @@
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index e6695e53c..1adefd207 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -26,10 +26,10 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "korganizer/korganizer.h"
 #include "korganizer/calendarview.h"
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 55710bcc8..106fc8672 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -23,9 +23,9 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <exchangeaccount.h>
 
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index d998f37f3..e457de38a 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -21,10 +21,10 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index a6dd2e5a8..06f0b1b7d 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -18,10 +18,10 @@
 */
 #include "configdialog.h"
 #include "configdialog.moc"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
diff --git a/korganizer/plugins/hebrew/converter.cpp b/korganizer/plugins/hebrew/converter.cpp
index 1381292e6..39140715f 100644
--- a/korganizer/plugins/hebrew/converter.cpp
+++ b/korganizer/plugins/hebrew/converter.cpp
@@ -9,7 +9,7 @@
  *   (at your option) any later version.                                                       *
  ***************************************************************************/
 #include "converter.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 Converter::Converter()
 {
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index 065188537..a96859a6c 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
diff --git a/korganizer/plugins/hebrew/holiday.cpp b/korganizer/plugins/hebrew/holiday.cpp
index c6afbb613..c4f5aa6ee 100644
--- a/korganizer/plugins/hebrew/holiday.cpp
+++ b/korganizer/plugins/hebrew/holiday.cpp
@@ -9,7 +9,7 @@
  *   (at your option) any later version.                                                       *
  ***************************************************************************/
 #include "holiday.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 bool Holiday::CholP;
 bool Holiday::OmerP;
diff --git a/korganizer/plugins/hebrew/parsha.cpp b/korganizer/plugins/hebrew/parsha.cpp
index bba30f620..4f5522ab7 100644
--- a/korganizer/plugins/hebrew/parsha.cpp
+++ b/korganizer/plugins/hebrew/parsha.cpp
@@ -9,7 +9,7 @@
  *   (at your option) any later version.                                                       *
  ***************************************************************************/
 #include "parsha.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQStringList Parsha::parshiot_names;
 
diff --git a/korganizer/plugins/printing/journal/journalprint.h b/korganizer/plugins/printing/journal/journalprint.h
index c84153a47..1ab7e2597 100644
--- a/korganizer/plugins/printing/journal/journalprint.h
+++ b/korganizer/plugins/printing/journal/journalprint.h
@@ -24,7 +24,7 @@
 #ifndef JOURNALPRINT_H
 #define JOURNALPRINT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/list/listprint.h b/korganizer/plugins/printing/list/listprint.h
index db7997272..dd47ae374 100644
--- a/korganizer/plugins/printing/list/listprint.h
+++ b/korganizer/plugins/printing/list/listprint.h
@@ -24,7 +24,7 @@
 #ifndef LISTPRINT_H
 #define LISTPRINT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.h b/korganizer/plugins/printing/whatsnext/whatsnextprint.h
index 467e02571..d31a585cc 100644
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.h
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.h
@@ -24,7 +24,7 @@
 #ifndef WHATSNEXTPRINT_H
 #define WHATSNEXTPRINT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 41d54c243..c10218457 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
diff --git a/korganizer/plugins/printing/year/yearprint.h b/korganizer/plugins/printing/year/yearprint.h
index 99c1422e0..ae6435bf3 100644
--- a/korganizer/plugins/printing/year/yearprint.h
+++ b/korganizer/plugins/printing/year/yearprint.h
@@ -24,7 +24,7 @@
 #ifndef YEARPRINT_H
 #define YEARPRINT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 8f0c3b662..033b6ba64 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -30,10 +30,10 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 9c8b611e0..602576234 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -22,10 +22,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "koprojectview.h"
 
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index d3ab6a6cf..4b3df7ef7 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -22,10 +22,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kotimespanview.h"
 
diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp
index b1c156ee5..8b0ff4b39 100644
--- a/korganizer/plugins/timespanview/timespanwidget.cpp
+++ b/korganizer/plugins/timespanview/timespanwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqheader.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <libkcal/event.h>