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 --- kopete/libkopete/kopetepassword.cpp | 14 +++++++------- kopete/libkopete/kopetepassword.h | 6 +++--- kopete/libkopete/kopetewalletmanager.cpp | 12 ++++++------ kopete/libkopete/kopetewalletmanager.h | 12 ++++++------ kopete/libkopete/tests/kopetewallettest_program.cpp | 4 ++-- kopete/libkopete/tests/kopetewallettest_program.h | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'kopete/libkopete') diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index 875e2edf..5fd729a7 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -57,7 +57,7 @@ public: } /** Reference count */ int refCount; - /** Group to use for TDEConfig and KWallet */ + /** Group to use for TDEConfig and TDEWallet */ const TQString configGroup; /** Is the password being remembered? */ bool remembered; @@ -92,10 +92,10 @@ public: void begin() { kdDebug( 14010 ) << k_funcinfo << endl; - Kopete::WalletManager::self()->openWallet( this, TQT_SLOT( walletReceived( KWallet::Wallet* ) ) ); + Kopete::WalletManager::self()->openWallet( this, TQT_SLOT( walletReceived( TDEWallet::Wallet* ) ) ); } - void walletReceived( KWallet::Wallet *wallet ) + void walletReceived( TDEWallet::Wallet *wallet ) { kdDebug( 14010 ) << k_funcinfo << endl; mWallet = wallet; @@ -112,7 +112,7 @@ public: protected: Kopete::Password mPassword; - KWallet::Wallet *mWallet; + TDEWallet::Wallet *mWallet; }; /** @@ -131,7 +131,7 @@ public: TQString grabPassword() { // Before trying to read from the wallet, check if the config file holds a password. - // If so, remove it from the config and set it through KWallet instead. + // If so, remove it from the config and set it through TDEWallet instead. TQString pwd; if ( mPassword.d->remembered && !mPassword.d->passwordFromTDEConfig.isNull() ) { @@ -281,7 +281,7 @@ public: return true; } - if ( KWallet::Wallet::isEnabled() ) + if ( TDEWallet::Wallet::isEnabled() ) { // If we end up here, the wallet is enabled, but failed somehow. // Ask the user what to do now. @@ -294,7 +294,7 @@ public: "do you want to save the password in the unsafe configuration file instead?" ), i18n( "Unable to Store Secure Password" ), KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ) ), - TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) != KMessageBox::Continue ) + TQString::fromLatin1( "TDEWalletFallbackToTDEConfig" ) ) != KMessageBox::Continue ) { return false; } diff --git a/kopete/libkopete/kopetepassword.h b/kopete/libkopete/kopetepassword.h index bd6826b9..d2ed5aa2 100644 --- a/kopete/libkopete/kopetepassword.h +++ b/kopete/libkopete/kopetepassword.h @@ -20,7 +20,7 @@ #include #include "kopete_export.h" -namespace KWallet { class Wallet; } +namespace TDEWallet { class Wallet; } class TQPixmap; @@ -40,7 +40,7 @@ namespace Kopete * The Kopete::Password object is responsible for storing and retrieving a * password for a plugin or account object. * - * If the KWallet is active, passwords will be stored in it, otherwise, they + * If the TDEWallet is active, passwords will be stored in it, otherwise, they * will be stored in the TDEConfig, in a slightly mangled form. */ class KOPETE_EXPORT Password : public TQObject @@ -212,7 +212,7 @@ class KopetePasswordRequestBase : public virtual TQObject signals: void requestFinished( const TQString &password ); public slots: - virtual void walletReceived( KWallet::Wallet *wallet ) = 0; + virtual void walletReceived( TDEWallet::Wallet *wallet ) = 0; virtual void slotOkPressed() = 0; virtual void slotCancelPressed() = 0; }; diff --git a/kopete/libkopete/kopetewalletmanager.cpp b/kopete/libkopete/kopetewalletmanager.cpp index 6ab2a5af..5d886ba9 100644 --- a/kopete/libkopete/kopetewalletmanager.cpp +++ b/kopete/libkopete/kopetewalletmanager.cpp @@ -39,7 +39,7 @@ public: Private() : wallet(0), signal(0) {} ~Private() { delete wallet; delete signal; } - KWallet::Wallet *wallet; + TDEWallet::Wallet *wallet; // we can't just connect every slot that wants the wallet to the // walletOpened signal - since we disconnect all the slots immediately @@ -77,8 +77,8 @@ void Kopete::WalletManager::openWallet( TQObject *object, const char *slot ) if ( !d->signal ) d->signal = new KopeteWalletSignal; // allow connecting to protected slots by calling object->connect - connect( d->signal, TQT_SIGNAL( walletOpened( KWallet::Wallet* ) ), object, slot ); - //object->connect( d->signal, TQT_SIGNAL( walletOpened( KWallet::Wallet* ) ), slot ); + connect( d->signal, TQT_SIGNAL( walletOpened( TDEWallet::Wallet* ) ), object, slot ); + //object->connect( d->signal, TQT_SIGNAL( walletOpened( TDEWallet::Wallet* ) ), slot ); openWalletInner(); } @@ -104,8 +104,8 @@ void Kopete::WalletManager::openWalletInner() kdDebug(14010) << k_funcinfo << " about to open wallet async" << endl; // we have no wallet: ask for one. - d->wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), - mainWindowID(), KWallet::Wallet::Asynchronous ); + d->wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), + mainWindowID(), TDEWallet::Wallet::Asynchronous ); connect( d->wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( slotWalletChangedStatus() ) ); } @@ -174,7 +174,7 @@ void Kopete::WalletManager::closeWallet() emit walletLost(); } -void Kopete::WalletManager::emitWalletOpened( KWallet::Wallet *wallet ) +void Kopete::WalletManager::emitWalletOpened( TDEWallet::Wallet *wallet ) { KopeteWalletSignal *signal = d->signal; d->signal = 0; diff --git a/kopete/libkopete/kopetewalletmanager.h b/kopete/libkopete/kopetewalletmanager.h index f12f826c..eef2d24b 100644 --- a/kopete/libkopete/kopetewalletmanager.h +++ b/kopete/libkopete/kopetewalletmanager.h @@ -23,7 +23,7 @@ #include "kopete_export.h" -namespace KWallet { class Wallet; } +namespace TDEWallet { class Wallet; } namespace Kopete { @@ -32,7 +32,7 @@ namespace Kopete * @author Richard Smith * * The Kopete::WalletManager class is a singleton, which looks after Kopete's - * KWallet connection. + * TDEWallet connection. */ class KOPETE_EXPORT WalletManager : public TQObject { @@ -47,11 +47,11 @@ public: ~WalletManager(); /** - * @brief Attempt to open the KWallet asyncronously, then signal an + * @brief Attempt to open the TDEWallet asyncronously, then signal an * object to indicate the task is complete. * * @param object The object to call back to - * @param slot The slot on object to call; must have signature slot( KWallet::Wallet* ) + * @param slot The slot on object to call; must have signature slot( TDEWallet::Wallet* ) * The parameter to the slot will be the wallet that was opened if the call * succeeded, or NULL if the wallet failed to open or the Kopete folder was * inaccessible. @@ -90,7 +90,7 @@ private slots: private: void openWalletInner(); - void emitWalletOpened( KWallet::Wallet *wallet ); + void emitWalletOpened( TDEWallet::Wallet *wallet ); class Private; Private *d; @@ -109,7 +109,7 @@ class KopeteWalletSignal : public TQObject friend class Kopete::WalletManager; signals: - void walletOpened( KWallet::Wallet *wallet ); + void walletOpened( TDEWallet::Wallet *wallet ); }; #endif diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index 58f2370e..f70535ce 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -46,10 +46,10 @@ void openWalletAsync() { WalletReciever *r = new WalletReciever; _out << "[ASYNC] About to open wallet, receiver: " << r << endl; - Kopete::WalletManager::self()->openWallet( r, TQT_SLOT( gotWallet( KWallet::Wallet* ) ) ); + Kopete::WalletManager::self()->openWallet( r, TQT_SLOT( gotWallet( TDEWallet::Wallet* ) ) ); } -void WalletReciever::gotWallet( KWallet::Wallet *w ) +void WalletReciever::gotWallet( TDEWallet::Wallet *w ) { _out << "[ASYNC] Received wallet pointer: " << w << " for receiver: " << this << endl; } diff --git a/kopete/libkopete/tests/kopetewallettest_program.h b/kopete/libkopete/tests/kopetewallettest_program.h index abea5a23..81f818ed 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.h +++ b/kopete/libkopete/tests/kopetewallettest_program.h @@ -3,7 +3,7 @@ #include -namespace KWallet { class Wallet; } +namespace TDEWallet { class Wallet; } class WalletReciever : public TQObject { @@ -12,7 +12,7 @@ class WalletReciever : public TQObject public slots: void timer(); private slots: - void gotWallet( KWallet::Wallet *w ); + void gotWallet( TDEWallet::Wallet *w ); }; #endif -- cgit v1.2.1