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

1 files changed, 7 insertions, 7 deletions

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;
   }