From dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:17:21 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kio/kpasswdserver/CMakeLists.txt    | 2 +-
 kio/kpasswdserver/Makefile.am       | 4 ++--
 kio/kpasswdserver/kpasswdserver.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kio/kpasswdserver')

diff --git a/kio/kpasswdserver/CMakeLists.txt b/kio/kpasswdserver/CMakeLists.txt
index a02d3b50a..5209e53c9 100644
--- a/kio/kpasswdserver/CMakeLists.txt
+++ b/kio/kpasswdserver/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/kio
 )
 
diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am
index 694718de4..9ba393ef3 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/kio/kpasswdserver/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 # Makefile.am of tdebase/kioslave/http
 
-INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
 
 ####### Files
 
@@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
 kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
 kded_kpasswdserver_la_METASOURCES = AUTO
 kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
index 7b140c467..b6a9aa696 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/kio/kpasswdserver/kpasswdserver.cpp
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kio/passdlg.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
@@ -361,7 +361,7 @@ KPasswdServer::processRequest()
             if ( ( username.isEmpty() || password.isEmpty() )
                 && !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) )
             {
-                // no login+pass provided, check if kwallet has one
+                // no login+pass provided, check if tdewallet has one
                 if ( openWallet( request->windowId ) )
                     hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins );
             }
-- 
cgit v1.2.3