Rename KWallet to TDEWallet

5 files changed, 35 insertions, 35 deletions

diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index c3edc19b..111c13fd 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -54,9 +54,9 @@ Display* dpy;
 
 static KVncView *kvncview;
 
-//Passwords and KWallet data
-extern KWallet::Wallet *wallet;
-bool useKWallet = false;
+//Passwords and TDEWallet data
+extern TDEWallet::Wallet *wallet;
+bool useTDEWallet = false;
 static TQCString password;
 static TQMutex passwordLock;
 static TQWaitCondition passwordWaiter;
@@ -232,7 +232,7 @@ bool KVncView::editPreferences( HostPrefPtr host )
 	SmartPtr<VncHostPref> hp( host );
 
 	int ci = hp->quality();
-	bool tdewallet = hp->useKWallet();
+	bool tdewallet = hp->useTDEWallet();
 
 	// 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(tdewallet);
+	prefs->setUseTDEWallet(tdewallet);
 
 	if ( dlg->exec() == TQDialog::Rejected )
 		return false;
@@ -254,7 +254,7 @@ bool KVncView::editPreferences( HostPrefPtr host )
 	ci = prefs->quality();
 	hp->setAskOnConnect(prefs->showPrefs());
 	hp->setQuality(ci);
-	hp->setUseKWallet(prefs->useKWallet());
+	hp->setUseTDEWallet(prefs->useTDEWallet());
 
 	delete dlg;
 	return true;
@@ -292,7 +292,7 @@ bool KVncView::start() {
 		}
 
 		configureApp(quality);
-		useKWallet = hp->useKWallet();
+		useTDEWallet = hp->useTDEWallet();
 	}
 
 	setStatus(REMOTE_VIEW_CONNECTING);
@@ -403,8 +403,8 @@ void KVncView::customEvent(TQCustomEvent *e)
 			emit disconnected();
 		}
 		else if (m_status == REMOTE_VIEW_PREPARING) {
-			//Login was successfull: Write KWallet password if necessary.
-			if ( useKWallet && !password.isNull() && wallet && wallet->isOpen() && !wallet->hasEntry(host())) {
+			//Login was successfull: Write TDEWallet password if necessary.
+			if ( useTDEWallet && !password.isNull() && wallet && wallet->isOpen() && !wallet->hasEntry(host())) {
 				wallet->writePassword(host(), password);
 			}
 			delete wallet; wallet=0;
@@ -433,8 +433,8 @@ void KVncView::customEvent(TQCustomEvent *e)
 
 		// Do we need to open the wallet?
 		if ( !wallet ) {
-			TQString walletName = KWallet::Wallet::NetworkWallet();
-			wallet = KWallet::Wallet::openWallet(walletName);
+			TQString walletName = TDEWallet::Wallet::NetworkWallet();
+			wallet = TDEWallet::Wallet::openWallet(walletName);
 		}
 
 		if (wallet && wallet->isOpen()) {
@@ -494,7 +494,7 @@ void KVncView::customEvent(TQCustomEvent *e)
 			break;
 		case ERROR_AUTHENTICATION:
 			//Login failed: Remove wallet entry if there is one.
-			if ( useKWallet && wallet && wallet->isOpen() && wallet->hasEntry(host()) ) {
+			if ( useTDEWallet && wallet && wallet->isOpen() && wallet->hasEntry(host()) ) {
 				wallet->removeEntry(host());
 			}
 			KMessageBox::error(0,
@@ -771,7 +771,7 @@ int getPassword(char *passwd, int pwlen) {
 	}
 
 	//Try #2: Is there something in the wallet?
-	if ( !retV && useKWallet ) {
+	if ( !retV && useTDEWallet ) {
 		TQApplication::postEvent(kvncview, new WalletOpenEvent());
 		passwordWaiter.wait(&passwordLock); //block
 		if (!password.isNull()) retV = 1; //got it!
diff --git a/krdc/vnc/vnchostpref.cpp b/krdc/vnc/vnchostpref.cpp
index 05ac4139..1b27dd4e 100644
--- a/krdc/vnc/vnchostpref.cpp
+++ b/krdc/vnc/vnchostpref.cpp
@@ -24,7 +24,7 @@ const TQString VncHostPref::VncType = "VNC";
 VncHostPref::VncHostPref(TDEConfig *conf, const TQString &host, const TQString &type) :
 	HostPref(conf, host, type),
 	m_quality(0),
-	m_useKWallet(true),
+	m_useTDEWallet(true),
 	m_askOnConnect(true) {
 }
 
@@ -39,14 +39,14 @@ void VncHostPref::save() {
 		m_config->writeEntry(p+"exists", true);
 		m_config->writeEntry(p+"quality", m_quality);
 		m_config->writeEntry(p+"askOnConnect", m_askOnConnect);
-		m_config->writeEntry(p+"useKWallet", m_useKWallet);
+		m_config->writeEntry(p+"useTDEWallet", m_useTDEWallet);
 	}
 	else
 	{
 		m_config->setGroup( "VncDefaultSettings" );
 		m_config->writeEntry( "vncQuality", m_quality );
 		m_config->writeEntry( "vncShowHostPreferences", m_askOnConnect );
-		m_config->writeEntry( "vncUseKWallet", m_useKWallet );
+		m_config->writeEntry( "vncUseTDEWallet", m_useTDEWallet );
 	}
 }
 
@@ -57,7 +57,7 @@ void VncHostPref::load() {
 		TQString p = prefix();
 		m_quality = m_config->readNumEntry(p+"quality", 0);
 		m_askOnConnect = m_config->readBoolEntry(p+"askOnConnect", true);
-		m_useKWallet = m_config->readBoolEntry(p+"useKWallet", true);
+		m_useTDEWallet = m_config->readBoolEntry(p+"useTDEWallet", true);
 	}
 	else
 	{
@@ -77,7 +77,7 @@ void VncHostPref::setDefaults() {
 	m_config->setGroup("VncDefaultSettings");
 	m_quality = m_config->readNumEntry("vncQuality", 0);
 	m_askOnConnect = m_config->readBoolEntry("vncShowHostPreferences", true);
-	m_useKWallet = m_config->readBoolEntry("vncUseKWallet", true);
+	m_useTDEWallet = m_config->readBoolEntry("vncUseTDEWallet", true);
 }
 
 TQString VncHostPref::prefDescription() const {
@@ -95,8 +95,8 @@ TQString VncHostPref::prefDescription() const {
 	default:
 		Q_ASSERT(true);
 	}
-	return i18n("Show Preferences: %1, Quality: %2, KWallet: %3")
-	  .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(q).arg(m_useKWallet ? i18n("yes") : i18n("no"));
+	return i18n("Show Preferences: %1, Quality: %2, TDEWallet: %3")
+	  .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(q).arg(m_useTDEWallet ? i18n("yes") : i18n("no"));
 }
 
 void VncHostPref::setQuality(int q) {
@@ -117,11 +117,11 @@ bool VncHostPref::askOnConnect() const {
 	return m_askOnConnect;
 }
 
-void VncHostPref::setUseKWallet(bool use) {
-	m_useKWallet = use;
+void VncHostPref::setUseTDEWallet(bool use) {
+	m_useTDEWallet = use;
 	save();
 }
 
-bool VncHostPref::useKWallet() const {
-	return m_useKWallet;
+bool VncHostPref::useTDEWallet() const {
+	return m_useTDEWallet;
 }
diff --git a/krdc/vnc/vnchostpref.h b/krdc/vnc/vnchostpref.h
index 77f25208..1ede7bd9 100644
--- a/krdc/vnc/vnchostpref.h
+++ b/krdc/vnc/vnchostpref.h
@@ -26,7 +26,7 @@ protected:
 
 	int m_quality;
 	bool m_askOnConnect;
-	bool m_useKWallet;
+	bool m_useTDEWallet;
 
 	virtual void load();
 	virtual void setDefaults();
@@ -45,8 +45,8 @@ public:
 	int quality() const;
 	void setAskOnConnect(bool ask);
 	bool askOnConnect() const;
-	void setUseKWallet(bool);
-	bool useKWallet() const;
+	void setUseTDEWallet(bool);
+	bool useTDEWallet() const;
 };
 
 #endif
diff --git a/krdc/vnc/vncprefs.ui b/krdc/vnc/vncprefs.ui
index ad38431c..42dd2508 100644
--- a/krdc/vnc/vncprefs.ui
+++ b/krdc/vnc/vncprefs.ui
@@ -46,7 +46,7 @@
                 </widget>
 		<widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
 			<property name="name">
-				<cstring>cbUseKWallet</cstring>
+				<cstring>cbUseTDEWallet</cstring>
 			</property>
 			<property name="enabled">
 				<bool>true</bool>
@@ -55,7 +55,7 @@
 				<string>Use K&amp;Wallet for passwords</string>
 			</property>
 			<property name="whatsThis" stdset="0">
-				<string>Enable this option to store your passwords with KWallet.</string>
+				<string>Enable this option to store your passwords with TDEWallet.</string>
 			</property>
 		</widget>
                 <widget class="TQLabel" row="0" column="0">
@@ -157,8 +157,8 @@
     <function specifier="non virtual" returnType="int">showPrefs()</function>
     <function specifier="non virtual">setUseEncryption( bool b )</function>
     <function specifier="non virtual" returnType="bool">useEncryption()</function>
-    <function specifier="non virtual">setUseKWallet( bool b )</function>
-    <function specifier="non virtual" returnType="bool">useKWallet()</function>
+    <function specifier="non virtual">setUseTDEWallet( bool b )</function>
+    <function specifier="non virtual" returnType="bool">useTDEWallet()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/krdc/vnc/vncprefs.ui.h b/krdc/vnc/vncprefs.ui.h
index e6cc9432..e518db0a 100644
--- a/krdc/vnc/vncprefs.ui.h
+++ b/krdc/vnc/vncprefs.ui.h
@@ -42,12 +42,12 @@ bool VncPrefs::useEncryption()
   return cbUseEncryption->isChecked();
 }
 
-void VncPrefs::setUseKWallet( bool b )
+void VncPrefs::setUseTDEWallet( bool b )
 {
-  cbUseKWallet->setChecked(b);
+  cbUseTDEWallet->setChecked(b);
 }
 
-bool VncPrefs::useKWallet()
+bool VncPrefs::useTDEWallet()
 {
-  return cbUseKWallet->isChecked();
+  return cbUseTDEWallet->isChecked();
 }