Rename KWallet to TDEWallet

pull/1/head
Timothy Pearson 11 years ago
parent 6e38e50981
commit 969364e032

@ -22,7 +22,7 @@ version 1.0.0
* Passwords may hold in a memory cache until application ends * Passwords may hold in a memory cache until application ends
version 0.14.5 version 0.14.5
* fixed the problems accessing KWallet from within threads which let sometimes tdesvn die * fixed the problems accessing TDEWallet from within threads which let sometimes tdesvn die
version 0.14.4 version 0.14.4
* fix a binary compatible issue, see #329 * fix a binary compatible issue, see #329

@ -43,7 +43,7 @@ public:
m_Wallet=0; m_Wallet=0;
} }
KWallet::Wallet*getWallet(); TDEWallet::Wallet*getWallet();
typedef TQPair<TQString,TQString> userpw_type; typedef TQPair<TQString,TQString> userpw_type;
typedef TQMap<TQString, userpw_type> cache_type; typedef TQMap<TQString, userpw_type> cache_type;
@ -53,7 +53,7 @@ public:
TQMutex*getCacheMutex(); TQMutex*getCacheMutex();
protected: protected:
KWallet::Wallet* m_Wallet; TDEWallet::Wallet* m_Wallet;
}; };
@ -69,20 +69,20 @@ PwStorageData::cache_type*PwStorageData::getLoginCache()
return &_LoginCache; return &_LoginCache;
} }
KWallet::Wallet*PwStorageData::getWallet() TDEWallet::Wallet*PwStorageData::getWallet()
{ {
static bool walletOpenFailed = false; static bool walletOpenFailed = false;
if (m_Wallet && m_Wallet->isOpen()) { if (m_Wallet && m_Wallet->isOpen()) {
return m_Wallet; return m_Wallet;
} }
if (KWallet::Wallet::isEnabled()) { if (TDEWallet::Wallet::isEnabled()) {
WId window = 0; WId window = 0;
if ( tqApp->activeWindow() ) { if ( tqApp->activeWindow() ) {
window = tqApp->activeWindow()->winId(); window = tqApp->activeWindow()->winId();
} }
delete m_Wallet; delete m_Wallet;
m_Wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(),window); m_Wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(),window);
} }
if (!m_Wallet) { if (!m_Wallet) {
walletOpenFailed = true; walletOpenFailed = true;

Loading…
Cancel
Save