Rename additional header files to avoid conflicts with KDE4

kdiff3plugin/kdiff3plugin.cpp

@@ -23,11 +23,11 @@
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include <iostream>
 

src/diff.cpp

@@ -23,8 +23,8 @@
 #include "fileaccess.h"
 #include "optiondialog.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
 #include <tqtextcodec.h>

src/difftextwindow.cpp

@@ -34,7 +34,7 @@
 #include <math.h>
 #include <cstdlib>
 #include <tqdragobject.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 class DiffTextWindowData

src/directorymergewindow.cpp

@@ -34,10 +34,10 @@
 #include <tqsplitter.h>
 #include <tqtextedit.h>
 #include <tqprogressdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 #include <assert.h>
 //#include <konq_popupmenu.h>

src/fileaccess.cpp

@@ -12,7 +12,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <tdeio/global.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "optiondialog.h"
 #include <tqlayout.h>
 #include <tqlabel.h>
@@ -22,12 +22,12 @@
 #include <tqeventloop.h>
 
 #include "common.h"
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqdir.h>
 #include <tqregexp.h>
 #include <tqtextstream.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/kdiff3.cpp

@@ -36,11 +36,11 @@
 
 // include files for KDE
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <tdecmdlineargs.h>

src/kdiff3_part.cpp

@@ -29,8 +29,8 @@
 #include "kdiff3.h"
 #include "fileaccess.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <iostream>
 
 #include "version.h"
@@ -252,7 +252,7 @@ bool KDiff3Part::saveFile()
 // 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*  KDiff3PartFactory::s_instance = 0L;
 TDEAboutData* KDiff3PartFactory::s_about = 0L;

src/kdiff3_shell.cpp

@@ -31,9 +31,9 @@
 #include <kstdaction.h>
 
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <iostream>
 

src/main.cpp

@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdiff3_shell.h"
 #include <kstandarddirs.h>
 #include "version.h"

src/mergeresultwindow.cpp

@@ -34,8 +34,8 @@
 #include <tqtextcodec.h>
 #include <tqdragobject.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <iostream>
 
 int g_bAutoSolve = true;

src/optiondialog.cpp

@@ -37,9 +37,9 @@
 #include <kcolorbtn.h>
 #include <tdefontdialog.h> // For TDEFontChooser
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemainwindow.h> //For tdetoolbar.h
 
 //#include <kkeydialog.h>
@@ -52,7 +52,7 @@
 #include <iostream>
 
 #ifndef KREPLACEMENTS_H
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #endif
 
 static TQString s_historyEntryStartRegExpToolTip;

src/pdiff.cpp

@@ -25,8 +25,8 @@
 #include <ctype.h>
 #include <tqaccel.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefontdialog.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>

src/smalldialogs.cpp

@@ -35,7 +35,7 @@
 
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // OpenDialog **************************************************************