Rename additional header files to avoid conflicts with KDE4

libkipi/libkipi/batchprogressdialog.cpp

@@ -42,7 +42,7 @@
 
 // Include files for KDE
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kinstance.h>
 #include <tdeconfig.h>

libkipi/libkipi/imagecollection.cpp

@@ -23,7 +23,7 @@
 // KDE includes.
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local includes.
   

libkipi/libkipi/imagecollectionselector.cpp

@@ -34,8 +34,8 @@
 #include <kbuttonbox.h>
 #include <kdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/previewjob.h>
 
 // KIPI includes.

libkipi/libkipi/imagecollectionshared.cpp

@@ -22,7 +22,7 @@
 
 // KDE Includes.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // Local Includes.

libkipi/libkipi/imagedialog.cpp

@@ -34,7 +34,7 @@
 
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/previewjob.h>
 #include <tdeapplication.h>

libkipi/libkipi/uploadwidget.cpp

@@ -30,9 +30,9 @@
 // KDE includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/jobclasses.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeversion.h>
 #if TDE_VERSION >= 0x30200