Rename KWallet to TDEWallet

5 files changed, 32 insertions, 32 deletions

diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index e20399df..5188489b 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -41,7 +41,7 @@
 
 bool launch_Fullscreen_rdp = false;
 bool rdpAppDataConfigured = false;
-extern KWallet::Wallet *wallet;
+extern TDEWallet::Wallet *wallet;
 
 static KRdpView *krdpview;
 
@@ -165,7 +165,7 @@ bool KRdpView::editPreferences( HostPrefPtr host )
 	int hv = hp->height();
 	int cd = hp->colorDepth();
 	TQString kl = hp->layout();
-	bool tdewallet = hp->useKWallet();
+	bool tdewallet = hp->useTDEWallet();
 
 	// 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(tdewallet);
+	prefs->setUseTDEWallet(tdewallet);
 
 	if ( dlg->exec() == TQDialog::Rejected )
 		return false;
@@ -197,7 +197,7 @@ bool KRdpView::editPreferences( HostPrefPtr host )
 	hp->setHeight(hv);
 	hp->setColorDepth( prefs->colorDepth() );
 	hp->setLayout(kl);
-	hp->setUseKWallet(prefs->useKWallet());
+	hp->setUseTDEWallet(prefs->useTDEWallet());
 
 	delete dlg;
 	return true;
@@ -207,7 +207,7 @@ bool KRdpView::editPreferences( HostPrefPtr host )
 bool KRdpView::start()
 {
 	SmartPtr<RdpHostPref> hp, rdpDefaults;
-	bool useKWallet = false;
+	bool useTDEWallet = false;
 
 	TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop());
 
@@ -223,7 +223,7 @@ bool KRdpView::start()
 			hps->sync();
 		}
 
-		useKWallet = hp->useKWallet();
+		useTDEWallet = hp->useTDEWallet();
 	}
 
 	m_container->show();
@@ -246,7 +246,7 @@ bool KRdpView::start()
 	*m_process << "-k" << hp->layout();
 	if(!m_user.isEmpty())     { *m_process << "-u" << m_user; }
 
-	if(m_password.isEmpty() && useKWallet ) {
+	if(m_password.isEmpty() && useTDEWallet ) {
 		TQString krdc_folder = "KRDC-RDP";
 
 		// Bugfix: Check if wallet has been closed by an outside source
@@ -256,8 +256,8 @@ bool KRdpView::start()
 
 		// 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()) {
diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp
index e50dc7de..b86ea06a 100644
--- a/krdc/rdp/rdphostpref.cpp
+++ b/krdc/rdp/rdphostpref.cpp
@@ -30,7 +30,7 @@ RdpHostPref::RdpHostPref(TDEConfig *conf, const TQString &host, const TQString &
 	m_colorDepth(24),
 	m_layout("en-us"),
 	m_askOnConnect(true),
-	m_useKWallet(true)
+	m_useTDEWallet(true)
 {
 }
 
@@ -50,7 +50,7 @@ void RdpHostPref::save()
 		m_config->writeEntry(p+"colorDepth", m_colorDepth);
 		m_config->writeEntry(p+"layout", m_layout);
 		m_config->writeEntry(p+"askOnConnect", m_askOnConnect);
-		m_config->writeEntry(p+"useKWallet", m_useKWallet);
+		m_config->writeEntry(p+"useTDEWallet", m_useTDEWallet);
 	}
 	else
 	{
@@ -60,7 +60,7 @@ void RdpHostPref::save()
 		m_config->writeEntry( "rdpColorDepth", m_colorDepth);
 		m_config->writeEntry( "rdpKeyboardLayout", m_layout );
 		m_config->writeEntry( "rdpShowHostPreferences", m_askOnConnect );
-		m_config->writeEntry( "rdpUseKWallet", m_useKWallet );
+		m_config->writeEntry( "rdpUseTDEWallet", m_useTDEWallet );
 	}
 }
 
@@ -75,7 +75,7 @@ void RdpHostPref::load()
 		m_colorDepth = m_config->readNumEntry(p+"colorDepth", 24);
 		m_layout = m_config->readEntry(p+"layout", "en-us");
 		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
 	{
@@ -93,7 +93,7 @@ void RdpHostPref::remove()
 	m_config->deleteEntry(p+"colorDepth");
 	m_config->deleteEntry(p+"layout");
 	m_config->deleteEntry(p+"askOnConnect");
-	m_config->deleteEntry(p+"useKWallet");
+	m_config->deleteEntry(p+"useTDEWallet");
 }
 
 void RdpHostPref::setDefaults()
@@ -104,14 +104,14 @@ void RdpHostPref::setDefaults()
 	m_colorDepth = m_config->readNumEntry("rdpColorDepth", 24);
 	m_layout = m_config->readEntry("rdpKeyboardLayout", "en-us");
 	m_askOnConnect = m_config->readBoolEntry("rdpShowHostPreferences", true);
-	m_useKWallet = m_config->readBoolEntry("rdpUseKWallet", true);
+	m_useTDEWallet = m_config->readBoolEntry("rdpUseTDEWallet", true);
 }
 
 TQString RdpHostPref::prefDescription() const
 {
-	return i18n("Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, KWallet: %6")
+	return i18n("Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, TDEWallet: %6")
 	  .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(m_width).arg(m_height)
-	  .arg(m_colorDepth).arg(m_layout).arg(m_useKWallet ? i18n("yes") : i18n("no"));
+	  .arg(m_colorDepth).arg(m_layout).arg(m_useTDEWallet ? i18n("yes") : i18n("no"));
 }
 
 void RdpHostPref::setWidth(int w)
@@ -170,11 +170,11 @@ bool RdpHostPref::askOnConnect() const
 	return m_askOnConnect;
 }
 
-void RdpHostPref::setUseKWallet(bool use) {
-	m_useKWallet = use;
+void RdpHostPref::setUseTDEWallet(bool use) {
+	m_useTDEWallet = use;
 	save();
 }
 
-bool RdpHostPref::useKWallet() const {
-	return m_useKWallet;
+bool RdpHostPref::useTDEWallet() const {
+	return m_useTDEWallet;
 }
diff --git a/krdc/rdp/rdphostpref.h b/krdc/rdp/rdphostpref.h
index af8fa8ae..26c77af2 100644
--- a/krdc/rdp/rdphostpref.h
+++ b/krdc/rdp/rdphostpref.h
@@ -95,7 +95,7 @@ class RdpHostPref : public HostPref
 		int      m_colorDepth;
 		TQString  m_layout;
 		bool     m_askOnConnect;
-		bool     m_useKWallet;
+		bool     m_useTDEWallet;
 
 		virtual void load();
 		virtual void setDefaults();
@@ -120,8 +120,8 @@ class RdpHostPref : public HostPref
 		TQString          layout() const;
 		void             setAskOnConnect(bool ask);
 		bool             askOnConnect() const;
-		bool             useKWallet() const;
-		void             setUseKWallet(bool);
+		bool             useTDEWallet() const;
+		void             setUseTDEWallet(bool);
 };
 
 #endif
diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui
index 338dff73..eb6d2b90 100644
--- a/krdc/rdp/rdpprefs.ui
+++ b/krdc/rdp/rdpprefs.ui
@@ -362,7 +362,7 @@
                 </widget>
 		<widget class="TQCheckBox" row="4" column="0">
 			<property name="name">
-				<cstring>cbUseKWallet</cstring>
+				<cstring>cbUseTDEWallet</cstring>
 			</property>
 			<property name="enabled">
 				<bool>true</bool>
@@ -371,7 +371,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">
@@ -506,8 +506,8 @@
     <function specifier="non virtual" returnType="int">kbLayout()</function>
     <function specifier="non virtual">setShowPrefs( bool b )</function>
     <function specifier="non virtual" returnType="bool">showPrefs()</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/rdp/rdpprefs.ui.h b/krdc/rdp/rdpprefs.ui.h
index f6fb7998..384d3b39 100644
--- a/krdc/rdp/rdpprefs.ui.h
+++ b/krdc/rdp/rdpprefs.ui.h
@@ -168,12 +168,12 @@ bool RdpPrefs::showPrefs()
   return cbShowPrefs->isChecked();
 }
 
-void RdpPrefs::setUseKWallet( bool b )
+void RdpPrefs::setUseTDEWallet( bool b )
 {
-  cbUseKWallet->setChecked(b);
+  cbUseTDEWallet->setChecked(b);
 }
 
-bool RdpPrefs::useKWallet()
+bool RdpPrefs::useTDEWallet()
 {
-  return cbUseKWallet->isChecked();
+  return cbUseTDEWallet->isChecked();
 }