Rename additional header files to avoid conflicts with KDE4

22 files changed, 36 insertions, 36 deletions

diff --git a/kdvi/TeXFontDefinition.cpp b/kdvi/TeXFontDefinition.cpp
index 49ddcaa0..58d21f1b 100644
--- a/kdvi/TeXFontDefinition.cpp
+++ b/kdvi/TeXFontDefinition.cpp
@@ -2,7 +2,7 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 #include "dviRenderer.h"
diff --git a/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp
index d2c74e27..a8d55c48 100644
--- a/kdvi/TeXFont_PFB.cpp
+++ b/kdvi/TeXFont_PFB.cpp
@@ -13,7 +13,7 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqimage.h>
 
 #include "fontpool.h"
diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp
index 625e86d0..87d7de86 100644
--- a/kdvi/TeXFont_PK.cpp
+++ b/kdvi/TeXFont_PK.cpp
@@ -52,7 +52,7 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <math.h>
 #include <tqbitmap.h>
 #include <tqfile.h>
diff --git a/kdvi/TeXFont_TFM.cpp b/kdvi/TeXFont_TFM.cpp
index 456a27c3..987c0034 100644
--- a/kdvi/TeXFont_TFM.cpp
+++ b/kdvi/TeXFont_TFM.cpp
@@ -10,7 +10,7 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdatastream.h>
 #include <tqfile.h>
 
diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp
index 1b508367..d4c53dd2 100644
--- a/kdvi/dviFile.cpp
+++ b/kdvi/dviFile.cpp
@@ -52,8 +52,8 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <stdlib.h>
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index ffc5a372..46a56980 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -29,15 +29,15 @@
 #include <tqvbox.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimemagic.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <keditcl.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kprocess.h>
 #include <kprogress.h>
diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp
index 050396e9..74b5fd22 100644
--- a/kdvi/dviRenderer_draw.cpp
+++ b/kdvi/dviRenderer_draw.cpp
@@ -68,8 +68,8 @@
 
 #include <stdlib.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tqpainter.h>
 #include <tqbitmap.h> 
diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp
index e5204a89..d6e15873 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -28,15 +28,15 @@
 
 #include <stdlib.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 
diff --git a/kdvi/dviRenderer_prescan.cpp b/kdvi/dviRenderer_prescan.cpp
index ea923130..84493dcc 100644
--- a/kdvi/dviRenderer_prescan.cpp
+++ b/kdvi/dviRenderer_prescan.cpp
@@ -19,7 +19,7 @@
 #include "xdvi.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kprocio.h>
diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp
index ded6e6cb..8b8545b6 100644
--- a/kdvi/dviWidget.cpp
+++ b/kdvi/dviWidget.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dviWidget.h"
 
diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp
index a9d207eb..830d0f67 100644
--- a/kdvi/fontpool.cpp
+++ b/kdvi/fontpool.cpp
@@ -8,8 +8,8 @@
 
 #include <kdebug.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kprocio.h>
 #include <math.h>
diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp
index 07b61d91..7b7b8f3f 100644
--- a/kdvi/fontprogress.cpp
+++ b/kdvi/fontprogress.cpp
@@ -8,7 +8,7 @@
 #include "fontprogress.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <kprogress.h>
 #include <tqapplication.h>
diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp
index 0ec8f36a..4434109e 100644
--- a/kdvi/infodialog.cpp
+++ b/kdvi/infodialog.cpp
@@ -7,7 +7,7 @@
 
 #include <kdebug.h>
 #include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index 382a5ae2..6a578873 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -7,11 +7,11 @@
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktip.h>
 #include <tqtimer.h>
 
diff --git a/kdvi/kdvi_multipage_texthandling.cpp b/kdvi/kdvi_multipage_texthandling.cpp
index 495ed06f..f087f4b1 100644
--- a/kdvi/kdvi_multipage_texthandling.cpp
+++ b/kdvi/kdvi_multipage_texthandling.cpp
@@ -30,8 +30,8 @@
 #include <kdebug.h>
 #include <keditcl.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqapplication.h>
 #include <tqprogressdialog.h>
 
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index c9c9b2d8..d96db4a2 100644
--- a/kdvi/main.cpp
+++ b/kdvi/main.cpp
@@ -6,7 +6,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tqdir.h>
 
diff --git a/kdvi/optionDialogFontsWidget.cpp b/kdvi/optionDialogFontsWidget.cpp
index 14a72ee2..39f7749d 100644
--- a/kdvi/optionDialogFontsWidget.cpp
+++ b/kdvi/optionDialogFontsWidget.cpp
@@ -11,7 +11,7 @@
 
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp
index 8b51c739..800a5d19 100644
--- a/kdvi/optionDialogSpecialWidget.cpp
+++ b/kdvi/optionDialogSpecialWidget.cpp
@@ -14,7 +14,7 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
diff --git a/kdvi/psgs.cpp b/kdvi/psgs.cpp
index 7336d51f..7551a12f 100644
--- a/kdvi/psgs.cpp
+++ b/kdvi/psgs.cpp
@@ -9,10 +9,10 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <tqdir.h>
 #include <tqpainter.h>
diff --git a/kdvi/special.cpp b/kdvi/special.cpp
index 48c99ec8..760d849b 100644
--- a/kdvi/special.cpp
+++ b/kdvi/special.cpp
@@ -9,7 +9,7 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprocio.h>
 #include <tqdir.h>
diff --git a/kdvi/util.cpp b/kdvi/util.cpp
index 205b60c2..2942cf08 100644
--- a/kdvi/util.cpp
+++ b/kdvi/util.cpp
@@ -54,8 +54,8 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "dviRenderer.h"
 #include "xdvi.h"
diff --git a/kdvi/vf.cpp b/kdvi/vf.cpp
index 6e8f7a41..8532223f 100644
--- a/kdvi/vf.cpp
+++ b/kdvi/vf.cpp
@@ -26,7 +26,7 @@
 #include <config.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>