Rename many classes and header files to avoid conflicts with KDE4

11 years ago · c1ef0b3a19
parent 114bf522e0
commit c1ef0b3a19
5 changed files with 7 additions and 7 deletions
--- a/libkipi/libkipi/batchprogressdialog.cpp
+++ b/libkipi/libkipi/batchprogressdialog.cpp
@ -50,13 +50,13 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>

 // Include files for libKipi.

--- a/libkipi/libkipi/imagecollectionselector.cpp
+++ b/libkipi/libkipi/imagecollectionselector.cpp
@ -33,7 +33,7 @@

 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <tdeio/previewjob.h>
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@ -33,7 +33,7 @@
 // KDE includes.

 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/previewjob.h>
@ -41,7 +41,7 @@
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>

 // Include files for libKipi.

--- a/libkipi/libkipi/plugin.cpp
+++ b/libkipi/libkipi/plugin.cpp
@ -26,7 +26,7 @@

 // KDE includes.

-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kdebug.h>

--- a/libkipi/libkipi/plugin.h
+++ b/libkipi/libkipi/plugin.h
@ -29,7 +29,7 @@

 // KDE includes.

-#include <kaction.h>
+#include <tdeaction.h>

 // Lib KIPI includes.