Rename a number of libraries and executables to avoid conflicts with KDE4

5 files changed, 14 insertions, 14 deletions

diff --git a/kipi-plugins/galleryexport/Makefile.am b/kipi-plugins/galleryexport/Makefile.am
index f3c385e..a69cfc2 100644
--- a/kipi-plugins/galleryexport/Makefile.am
+++ b/kipi-plugins/galleryexport/Makefile.am
@@ -14,7 +14,7 @@ kipiplugin_galleryexport_la_SOURCES = plugin_galleryexport.cpp \
 		galleryviewitem.cpp
 
 kipiplugin_galleryexport_la_LIBADD = $(LIBKEXIV2_LIBS) \
-	-lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+	-ltdewalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_galleryexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp
index 269b61c..eeb699b 100644
--- a/kipi-plugins/galleryexport/galleries.cpp
+++ b/kipi-plugins/galleryexport/galleries.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <tdeversion.h>
 #if KDE_IS_VERSION(3,2,0)
-#include <kwallet.h>
+#include <tdewallet.h>
 #endif
 
 #include "galleries.h"
@@ -123,18 +123,18 @@ void Galleries::Load()
                                          KWallet::Wallet::Synchronous);
   if (!mpWallet)
   {
-    kdWarning() << "Failed to open kwallet" << endl;
+    kdWarning() << "Failed to open tdewallet" << endl;
   }
   else
   {
     if (!mpWallet->hasFolder("KIPIGallerySyncPlugin"))
     {
       if (!mpWallet->createFolder("KIPIGallerySyncPlugin"))
-        kdWarning() << "Failed to create kwallet folder" << endl;
+        kdWarning() << "Failed to create tdewallet folder" << endl;
     }
 
     if (!mpWallet->setFolder("KIPIGallerySyncPlugin"))
-      kdWarning() << "Failed to set kwallet folder" << endl;
+      kdWarning() << "Failed to set tdewallet folder" << endl;
     else
       bln_use_wallet = true;
   }
@@ -198,13 +198,13 @@ void Galleries::Save()
     if (mpWallet->hasFolder("KIPIGallerySyncPlugin"))
     {
       if (!mpWallet->removeFolder("KIPIGallerySyncPlugin"))
-        kdWarning() << "Failed to clear kwallet folder" << endl;
+        kdWarning() << "Failed to clear tdewallet folder" << endl;
     }
     if (!mpWallet->createFolder("KIPIGallerySyncPlugin"))
-      kdWarning() << "Failed to create kwallet folder" << endl;
+      kdWarning() << "Failed to create tdewallet folder" << endl;
 
     if (!mpWallet->setFolder("KIPIGallerySyncPlugin"))
-      kdWarning() << "Failed to set kwallet folder" << endl;
+      kdWarning() << "Failed to set tdewallet folder" << endl;
     else
       bln_use_wallet = true;
   }
diff --git a/kipi-plugins/galleryexport/galleryconfig.cpp b/kipi-plugins/galleryexport/galleryconfig.cpp
index f0f19ff..f40db0c 100644
--- a/kipi-plugins/galleryexport/galleryconfig.cpp
+++ b/kipi-plugins/galleryexport/galleryconfig.cpp
@@ -36,8 +36,8 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <krun.h>
 #include <kdebug.h>
 #include <kconfig.h>
diff --git a/kipi-plugins/galleryexport/gallerywidget.cpp b/kipi-plugins/galleryexport/gallerywidget.cpp
index f465697..0770dae 100644
--- a/kipi-plugins/galleryexport/gallerywidget.cpp
+++ b/kipi-plugins/galleryexport/gallerywidget.cpp
@@ -20,8 +20,8 @@
  * ============================================================ */
 
 #include <klocale.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 
 #include <tqpushbutton.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index 917367f..83b5b23 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -40,8 +40,8 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <krun.h>
 #include <kdebug.h>
 #include <kconfig.h>