From 07d1a6f299edecf33f2e476e7a26a90e388bd990 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 27 Aug 2013 23:14:57 -0500 Subject: [PATCH] Rename KWallet to TDEWallet --- ChangeLog | 6 +++--- README | 2 +- doc/en/index.docbook | 2 +- po/de.po | 4 ++-- po/es.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 2 +- po/sv.po | 2 +- po/uk.po | 4 ++-- smb4k/configdlg/smb4kauthoptions.cpp | 6 +++--- smb4k/configdlg/smb4kauthoptions.h | 4 ++-- smb4k/core/smb4kerror.cpp | 2 +- smb4k/core/smb4kpasswordhandler.cpp | 4 ++-- smb4k/core/smb4kpasswordhandler.h | 6 +++--- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f5d336..9d6638a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ Smb4K 0.9.4: to Smb4TDEGlobal::timer(). - Smb4K will try to launch the wallet manager before it opens the wallet. This should prevent it from hanging on start-up (closes #12707). -- If the digital wallet could not be opened, KWallet support won't be +- If the digital wallet could not be opened, TDEWallet support won't be disabled completely anymore but only for the current session. - Fixed blocking of tooltips in the network browser. - Fixed invalid check in the network browser's tool tip code. @@ -815,8 +815,8 @@ Smb4K 0.6.1: needed. Smb4K 0.6.0: -- Rewrote password handling: Added KWallet support as default method - (closes #3695). If you do not want to use KWallet, login information +- Rewrote password handling: Added TDEWallet support as default method + (closes #3695). If you do not want to use TDEWallet, login information won't be saved but only stored temporarily. There is also the possibility to deny the password storage altogether. ATTENTION: If you deny access to the wallet on the first start-up, all diff --git a/README b/README index 88d82d5..17915c5 100644 --- a/README +++ b/README @@ -26,7 +26,7 @@ Features: - Support of advanced Samba options - Support of printer shares - Konqueror plugin -- KWallet support +- TDEWallet support - Synchronization of a remote share with a local copy and vice versa - Ability to define custom options for individual servers and shares diff --git a/doc/en/index.docbook b/doc/en/index.docbook index e4324e1..83c5306 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -91,7 +91,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Support of advanced Samba options Support of printer shares Konqueror plugin -KWallet support +TDEWallet support Synchronization of a remote share with a local copy and vice versa Ability to define custom options for each and every share or server diff --git a/po/de.po b/po/de.po index 55d06f2..7483e12 100644 --- a/po/de.po +++ b/po/de.po @@ -3228,11 +3228,11 @@ msgstr "" #: smb4k/core/smb4kerror.cpp:92 msgid "" -"The wallet \"%1\" could not be opened. KWallet support will be disabled for " +"The wallet \"%1\" could not be opened. TDEWallet support will be disabled for " "this session." msgstr "" "Die digitale Brieftasche \"%1\" konnte nicht geöffnet werden. Die " -"Unterstützung für KWallet wird für diese Sitzung ausgeschaltet." +"Unterstützung für TDEWallet wird für diese Sitzung ausgeschaltet." #: smb4k/core/smb4kerror.cpp:100 msgid "" diff --git a/po/es.po b/po/es.po index 718228f..5d451fe 100644 --- a/po/es.po +++ b/po/es.po @@ -2823,10 +2823,10 @@ msgstr "" #: smb4k/core/smb4kerror.cpp:92 #, fuzzy msgid "" -"The wallet \"%1\" could not be opened. KWallet support will be disabled for " +"The wallet \"%1\" could not be opened. TDEWallet support will be disabled for " "this session." msgstr "" -"La cartera '%1' no pudo ser abierta. El soporte para KWallet será " +"La cartera '%1' no pudo ser abierta. El soporte para TDEWallet será " "deshabilitado." #: smb4k/core/smb4kerror.cpp:100 diff --git a/po/it.po b/po/it.po index ba87cd2..701c33e 100644 --- a/po/it.po +++ b/po/it.po @@ -2838,10 +2838,10 @@ msgstr "" #: smb4k/core/smb4kerror.cpp:92 #, fuzzy msgid "" -"The wallet \"%1\" could not be opened. KWallet support will be disabled for " +"The wallet \"%1\" could not be opened. TDEWallet support will be disabled for " "this session." msgstr "" -"Il portafogli \"%1\" non può essere aperto. Il supporto a KWallet verrà " +"Il portafogli \"%1\" non può essere aperto. Il supporto a TDEWallet verrà " "disabilitato." #: smb4k/core/smb4kerror.cpp:100 diff --git a/po/ja.po b/po/ja.po index 6c5ffb1..5a2daee 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3052,7 +3052,7 @@ msgstr "" #: smb4k/core/smb4kerror.cpp:92 #, fuzzy msgid "" -"The wallet \"%1\" could not be opened. KWallet support will be disabled for " +"The wallet \"%1\" could not be opened. TDEWallet support will be disabled for " "this session." msgstr "" "ワレット \"%1\" を開くのに、失敗しました。Kワレットのサポートは、無効になりま" diff --git a/po/sv.po b/po/sv.po index d8b33c3..9a8c888 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3303,7 +3303,7 @@ msgstr "Detta katalogen kann inte avmonteras. Katalogtext är tom." #: smb4k/core/smb4kerror.cpp:92 #, fuzzy msgid "" -"The wallet \"%1\" could not be opened. KWallet support will be disabled for " +"The wallet \"%1\" could not be opened. TDEWallet support will be disabled for " "this session." msgstr "Att öppna Kwallet fungera inte." diff --git a/po/uk.po b/po/uk.po index 33a5350..e159d72 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2887,9 +2887,9 @@ msgstr "" #: smb4k/core/smb4kerror.cpp:92 #, fuzzy msgid "" -"The wallet \"%1\" could not be opened. KWallet support will be disabled for " +"The wallet \"%1\" could not be opened. TDEWallet support will be disabled for " "this session." -msgstr "Помилка відкриття торбинки \"%1\". Підтримку KWallet буде вимкнено." +msgstr "Помилка відкриття торбинки \"%1\". Підтримку TDEWallet буде вимкнено." #: smb4k/core/smb4kerror.cpp:100 #, fuzzy diff --git a/smb4k/configdlg/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp index 6a25740..68fea55 100644 --- a/smb4k/configdlg/smb4kauthoptions.cpp +++ b/smb4k/configdlg/smb4kauthoptions.cpp @@ -88,11 +88,11 @@ Smb4KAuthOptions::Smb4KAuthOptions( TQWidget *parent, const char *name ) grid->addItem( spacer2, 2, 0 ); connect( use_wallet, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotKWalletButtonState( int ) ) ); + this, TQT_SLOT( slotTDEWalletButtonState( int ) ) ); connect( default_auth, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotDefaultAuthButtonState( int ) ) ); - slotKWalletButtonState( use_wallet->state() ); + slotTDEWalletButtonState( use_wallet->state() ); slotDefaultAuthButtonState( default_auth->state() ); } @@ -105,7 +105,7 @@ Smb4KAuthOptions::~Smb4KAuthOptions() // TQT_SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// -void Smb4KAuthOptions::slotKWalletButtonState( int state ) +void Smb4KAuthOptions::slotTDEWalletButtonState( int state ) { if ( state == TQCheckBox::On ) { diff --git a/smb4k/configdlg/smb4kauthoptions.h b/smb4k/configdlg/smb4kauthoptions.h index 26b8c36..f15cdbf 100644 --- a/smb4k/configdlg/smb4kauthoptions.h +++ b/smb4k/configdlg/smb4kauthoptions.h @@ -65,12 +65,12 @@ class Smb4KAuthOptions : public TQWidget protected slots: /** - * This slot manages the toggling of the KWallet support button in the + * This slot manages the toggling of the TDEWallet support button in the * Authentication tab. * * @param state The toggle state */ - void slotKWalletButtonState( int state ); + void slotTDEWalletButtonState( int state ); /** * This slot manages the toggling of the default authentication button. * diff --git a/smb4k/core/smb4kerror.cpp b/smb4k/core/smb4kerror.cpp index 3fc0ce4..cfbdff5 100644 --- a/smb4k/core/smb4kerror.cpp +++ b/smb4k/core/smb4kerror.cpp @@ -89,7 +89,7 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details } case ERROR_OPENING_WALLET_FAILED: { - KMessageBox::error( 0, i18n( "The wallet \"%1\" could not be opened. KWallet support will be disabled for this session." ).arg( text ) ); + KMessageBox::error( 0, i18n( "The wallet \"%1\" could not be opened. TDEWallet support will be disabled for this session." ).arg( text ) ); break; } diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp index b6e2f15..bef5607 100644 --- a/smb4k/core/smb4kpasswordhandler.cpp +++ b/smb4k/core/smb4kpasswordhandler.cpp @@ -118,7 +118,7 @@ void Smb4KPasswordHandler::open_close_wallet() // Do nothing. --- Good luck! } - m_wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous ); + m_wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Synchronous ); if ( m_wallet ) { @@ -136,7 +136,7 @@ void Smb4KPasswordHandler::open_close_wallet() } else { - Smb4KError::error( ERROR_OPENING_WALLET_FAILED, KWallet::Wallet::NetworkWallet(), TQString() ); + Smb4KError::error( ERROR_OPENING_WALLET_FAILED, TDEWallet::Wallet::NetworkWallet(), TQString() ); delete m_wallet; m_wallet = NULL; diff --git a/smb4k/core/smb4kpasswordhandler.h b/smb4k/core/smb4kpasswordhandler.h index 1497569..e73caa7 100644 --- a/smb4k/core/smb4kpasswordhandler.h +++ b/smb4k/core/smb4kpasswordhandler.h @@ -236,9 +236,9 @@ class Smb4KPasswordHandler : public TQObject void convert_old_entries(); /** - * The KWallet object. + * The TDEWallet object. */ - KWallet::Wallet *m_wallet; + TDEWallet::Wallet *m_wallet; /** * The Smb4KAuthInfo object. For use with the askpass dialog. @@ -252,7 +252,7 @@ class Smb4KPasswordHandler : public TQObject /** * This list holds the authentication data the user supplied if he/she - * does not want to use KWallet. + * does not want to use TDEWallet. */ TQValueList m_auth_list;