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

6 files changed, 15 insertions, 15 deletions

diff --git a/kipi-plugins/sync/Makefile.am b/kipi-plugins/sync/Makefile.am
index bfa8dd0..91f7e5f 100644
--- a/kipi-plugins/sync/Makefile.am
+++ b/kipi-plugins/sync/Makefile.am
@@ -16,7 +16,7 @@ kipiplugin_sync_la_SOURCES = plugin_sync.cpp \
 		sinks/gallery/gallerycollection.cpp sinks/gallery/galleryitem.cpp
 
 kipiplugin_sync_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_sync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/sync/galleryconfig.cpp b/kipi-plugins/sync/galleryconfig.cpp
index f0f19ff..f40db0c 100644
--- a/kipi-plugins/sync/galleryconfig.cpp
+++ b/kipi-plugins/sync/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/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp
index 7313d7b..c31db8d 100644
--- a/kipi-plugins/sync/gallerywidget.cpp
+++ b/kipi-plugins/sync/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/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index 166f6cd..aff311f 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/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>
diff --git a/kipi-plugins/sync/sink.h b/kipi-plugins/sync/sink.h
index bfdddc8..39df189 100644
--- a/kipi-plugins/sync/sink.h
+++ b/kipi-plugins/sync/sink.h
@@ -25,7 +25,7 @@
 #include <kconfig.h>
 #include <tdeversion.h>
 #if KDE_IS_VERSION(3,2,0)
-#include <kwallet.h>
+#include <tdewallet.h>
 #endif
 
 namespace KIPI2
diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp
index ea6d9ed..14fa279 100644
--- a/kipi-plugins/sync/sinks.cpp
+++ b/kipi-plugins/sync/sinks.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 "sinks.h"
@@ -65,18 +65,18 @@ Sinks::Sinks()
                                          KWallet::Wallet::Synchronous);
   if (!mpWallet)
   {
-    kdWarning() << "Failed to open kwallet" << endl;
+    kdWarning() << "Failed to open tdewallet" << endl;
   }
   else
   {
     if (!mpWallet->hasFolder("KIPISyncPlugin"))
     {
       if (!mpWallet->createFolder("KIPISyncPlugin"))
-        kdWarning() << "Failed to create kwallet folder" << endl;
+        kdWarning() << "Failed to create tdewallet folder" << endl;
     }
 
     if (!mpWallet->setFolder("KIPISyncPlugin"))
-      kdWarning() << "Failed to set kwallet folder" << endl;
+      kdWarning() << "Failed to set tdewallet folder" << endl;
     else
       p_wallet = mpWallet;
   }
@@ -155,13 +155,13 @@ void Sinks::Save()
     if (mpWallet->hasFolder("KIPISyncPlugin"))
     {
       if (!mpWallet->removeFolder("KIPISyncPlugin"))
-        kdWarning() << "Failed to clear kwallet folder" << endl;
+        kdWarning() << "Failed to clear tdewallet folder" << endl;
     }
     if (!mpWallet->createFolder("KIPISyncPlugin"))
-      kdWarning() << "Failed to create kwallet folder" << endl;
+      kdWarning() << "Failed to create tdewallet folder" << endl;
 
     if (!mpWallet->setFolder("KIPISyncPlugin"))
-      kdWarning() << "Failed to set kwallet folder" << endl;
+      kdWarning() << "Failed to set tdewallet folder" << endl;
     else
       p_wallet = mpWallet;
   }