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

6 files changed, 10 insertions, 10 deletions

diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt
index 53dc852b..2ebe9738 100644
--- a/krdc/CMakeLists.txt
+++ b/krdc/CMakeLists.txt
@@ -60,6 +60,6 @@ tde_add_executable( krdc AUTOMOC
     maindialogbase.ui keycapturewidget.ui kservicelocator.cpp
     keycapturedialog.cpp kremoteview.cpp smartptr.cpp hostpreferences.cpp
     preferencesdialog.cpp maindialogwidget.cpp maindialog.cpp
-  LINK vnc-static rdp-static tdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext ${LIB_SLP}
+  LINK vnc-static rdp-static tdeui-shared tdednssd-shared tdewalletclient-shared jpeg Xext ${LIB_SLP}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/krdc/Makefile.am b/krdc/Makefile.am
index 5ab1faff..896bd92e 100644
--- a/krdc/Makefile.am
+++ b/krdc/Makefile.am
@@ -23,7 +23,7 @@ appdata_DATA =  pointcursor.png pointcursormask.png pinup.png pindown.png \
 dnssddatadir = $(kde_datadir)/zeroconf
 dnssddata_DATA = _rfb._tcp
 
-krdc_LDADD   = vnc/libvnc.la rdp/librdp.la $(LIB_TDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_KDNSSD) $(X_LDFLAGS) $(LIB_X11) -lkwalletclient -lDCOP
+krdc_LDADD   = vnc/libvnc.la rdp/librdp.la $(LIB_TDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_KDNSSD) $(X_LDFLAGS) $(LIB_X11) -ltdewalletclient -lDCOP
 krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE)
 
 xdg_apps_DATA = krdc.desktop
diff --git a/krdc/main.cpp b/krdc/main.cpp
index c3928fc0..f0ee0ab4 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -23,7 +23,7 @@
 #include <kmessagebox.h>
 #include <kconfig.h>
 #include <kdebug.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 #include <tqwindowdefs.h>
 #include <tqtimer.h>
 #include <tqfile.h>
diff --git a/krdc/rdp/Makefile.am b/krdc/rdp/Makefile.am
index 3ee8a9b4..df98e88c 100644
--- a/krdc/rdp/Makefile.am
+++ b/krdc/rdp/Makefile.am
@@ -8,4 +8,4 @@ librdp_la_SOURCES = krdpview.cpp rdphostpref.cpp rdpprefs.ui
 
 noinst_HEADERS = krdpview.h rdphostpref.h
 librdp_la_LIBADD   = $(LIB_TDEUI) $(LIBJPEG)
-librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 00ebf1a6..782aa673 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 #include <kpassdlg.h>
 
 #include <tqvbox.h>
@@ -165,7 +165,7 @@ bool KRdpView::editPreferences( HostPrefPtr host )
 	int hv = hp->height();
 	int cd = hp->colorDepth();
 	TQString kl = hp->layout();
-	bool kwallet = hp->useKWallet();
+	bool tdewallet = hp->useKWallet();
 
 	// show preferences dialog
 	KDialogBase *dlg = new KDialogBase( 0L, "dlg", true,
@@ -183,7 +183,7 @@ bool KRdpView::editPreferences( HostPrefPtr host )
 	prefs->setColorDepth(cd);
 	prefs->setKbLayout( keymap2int( kl ) );
 	prefs->setShowPrefs( true );
-	prefs->setUseKWallet(kwallet);
+	prefs->setUseKWallet(tdewallet);
 
 	if ( dlg->exec() == TQDialog::Rejected )
 		return false;
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 6ad50e93..0394f2c6 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -26,7 +26,7 @@
 #include <kstandarddirs.h>
 #include <kpassdlg.h>
 #include <kdialogbase.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include <tqdatastream.h>
 #include <dcopclient.h>
@@ -232,7 +232,7 @@ bool KVncView::editPreferences( HostPrefPtr host )
 	SmartPtr<VncHostPref> hp( host );
 
 	int ci = hp->quality();
-	bool kwallet = hp->useKWallet();
+	bool tdewallet = hp->useKWallet();
 
 	// show preferences dialog
 	KDialogBase *dlg = new KDialogBase( 0L, "dlg", true,
@@ -246,7 +246,7 @@ bool KVncView::editPreferences( HostPrefPtr host )
 
 	prefs->setQuality( ci );
 	prefs->setShowPrefs(true);
-	prefs->setUseKWallet(kwallet);
+	prefs->setUseKWallet(tdewallet);
 
 	if ( dlg->exec() == TQDialog::Rejected )
 		return false;