Rename additional header files to avoid conflicts with KDE4

13 years ago · 65a02c1aff
parent f1f2f05210
commit 65a02c1aff
4 changed files with 6 additions and 6 deletions
--- a/libkdcraw/libkdcraw/dcrawbinary.cpp
+++ b/libkdcraw/libkdcraw/dcrawbinary.cpp
@ -28,10 +28,10 @@
 // KDE includes

 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>

 // Local includes
--- a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp
+++ b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp
@ -35,7 +35,7 @@

 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>

 // Local includes.
--- a/libkdcraw/libkdcraw/rcombobox.cpp
+++ b/libkdcraw/libkdcraw/rcombobox.cpp
@ -30,7 +30,7 @@
 // KDE includes.

 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>

 // Local includes.
--- a/libkdcraw/libkdcraw/rnuminput.cpp
+++ b/libkdcraw/libkdcraw/rnuminput.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h>