From cce87d87ca74d317dd4102d64ff0a8e784f539a2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 27 Aug 2013 23:21:05 -0500 Subject: Rename KWallet to TDEWallet --- krdc/main.cpp | 2 +- krdc/preferencesdialog.cpp | 8 ++++---- krdc/rdp/krdpview.cpp | 18 +++++++++--------- krdc/rdp/rdphostpref.cpp | 24 ++++++++++++------------ krdc/rdp/rdphostpref.h | 6 +++--- krdc/rdp/rdpprefs.ui | 8 ++++---- krdc/rdp/rdpprefs.ui.h | 8 ++++---- krdc/vnc/kvncview.cpp | 26 +++++++++++++------------- krdc/vnc/vnchostpref.cpp | 22 +++++++++++----------- krdc/vnc/vnchostpref.h | 6 +++--- krdc/vnc/vncprefs.ui | 8 ++++---- krdc/vnc/vncprefs.ui.h | 8 ++++---- 12 files changed, 72 insertions(+), 72 deletions(-) (limited to 'krdc') diff --git a/krdc/main.cpp b/krdc/main.cpp index 9252e6a0..1488df43 100644 --- a/krdc/main.cpp +++ b/krdc/main.cpp @@ -41,7 +41,7 @@ // opened multiple times. // 3) MainController is about the only thing that isn't deleted in between connection // attempts. -KWallet::Wallet *wallet = 0; +TDEWallet::Wallet *wallet = 0; static const char description[] = I18N_NOOP("Remote desktop connection"); diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp index 6ab55205..acb819ba 100644 --- a/krdc/preferencesdialog.cpp +++ b/krdc/preferencesdialog.cpp @@ -73,12 +73,12 @@ void PreferencesDialog::load() m_vncPrefs->setQuality( m_vncDefaults->quality() ); m_vncPrefs->setShowPrefs( m_vncDefaults->askOnConnect() ); - m_vncPrefs->setUseKWallet( m_vncDefaults->useKWallet() ); + m_vncPrefs->setUseTDEWallet( m_vncDefaults->useTDEWallet() ); m_rdpPrefs->setRdpWidth( m_rdpDefaults->width() ); m_rdpPrefs->setRdpHeight( m_rdpDefaults->height() ); m_rdpPrefs->setShowPrefs( m_rdpDefaults->askOnConnect() ); - m_rdpPrefs->setUseKWallet( m_rdpDefaults->useKWallet() ); + m_rdpPrefs->setUseTDEWallet( m_rdpDefaults->useTDEWallet() ); m_rdpPrefs->setColorDepth( m_rdpDefaults->colorDepth() ); m_rdpPrefs->setKbLayout( keymap2int( m_rdpDefaults->layout() )); m_rdpPrefs->setResolution(); @@ -90,13 +90,13 @@ void PreferencesDialog::save() m_vncDefaults->setQuality( m_vncPrefs->quality() ); m_vncDefaults->setAskOnConnect( m_vncPrefs->showPrefs() ); - m_vncDefaults->setUseKWallet( m_vncPrefs->useKWallet() ); + m_vncDefaults->setUseTDEWallet( m_vncPrefs->useTDEWallet() ); m_rdpDefaults->setWidth( m_rdpPrefs->rdpWidth() ); m_rdpDefaults->setHeight( m_rdpPrefs->rdpHeight() ); m_rdpDefaults->setLayout( int2keymap( m_rdpPrefs->kbLayout() )); m_rdpDefaults->setAskOnConnect( m_rdpPrefs->showPrefs() ); - m_rdpDefaults->setUseKWallet( m_rdpPrefs->useKWallet() ); + m_rdpDefaults->setUseTDEWallet( m_rdpPrefs->useTDEWallet() ); m_rdpDefaults->setColorDepth( m_rdpPrefs->colorDepth() ); HostPreferences *hp = HostPreferences::instance(); 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 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 @@ - cbUseKWallet + cbUseTDEWallet true @@ -371,7 +371,7 @@ Use K&Wallet for passwords - Enable this option to store your passwords with KWallet. + Enable this option to store your passwords with TDEWallet. @@ -506,8 +506,8 @@ kbLayout() setShowPrefs( bool b ) showPrefs() - setUseKWallet( bool b ) - useKWallet() + setUseTDEWallet( bool b ) + useTDEWallet() 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(); } 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 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 @@ - cbUseKWallet + cbUseTDEWallet true @@ -55,7 +55,7 @@ Use K&Wallet for passwords - Enable this option to store your passwords with KWallet. + Enable this option to store your passwords with TDEWallet. @@ -157,8 +157,8 @@ showPrefs() setUseEncryption( bool b ) useEncryption() - setUseKWallet( bool b ) - useKWallet() + setUseTDEWallet( bool b ) + useTDEWallet() 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(); } -- cgit v1.2.1