TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KWallet to TDEWallet

Browse Source
pull/16/head
Timothy Pearson 11 years ago
parent 9b6f2dec92
commit bab94d8378
29 changed files with 380 additions and 380 deletions
Show Stats Download Patch File Download Diff File

2
TODO
Unescape View File

@ -178,7 +178,7 @@ that we would like to make for the next binary incompatible release.
- Rename KDirNotify_stub and update API (no need for '*' arguments anymore) - Rename KDirNotify_stub and update API (no need for '*' arguments anymore)
- KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog - TDEWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog
- Make libtdewalletclient part of libtdeio and get rid of libtdewalletclient. - Make libtdewalletclient part of libtdeio and get rid of libtdewalletclient.

2
mimetypes/application/x-kde-wallet.desktop
Unescape View File

@ -48,7 +48,7 @@ Comment[ms]=Fail TDE Wallet
Comment[nb]=TDE lommebokfil Comment[nb]=TDE lommebokfil
Comment[nds]="TDE Wallet"-Datei Comment[nds]="TDE Wallet"-Datei
Comment[ne]=TDE वालेट फाइल Comment[ne]=TDE वालेट फाइल
Comment[nl]=KWallet-portefeuillebestand Comment[nl]=TDEWallet-portefeuillebestand
Comment[nn]=TDE Wallet-fil Comment[nn]=TDE Wallet-fil
Comment[pa]=TDE ਵਾਲਿਟ ਫਾਇਲ Comment[pa]=TDE ਵਾਲਿਟ ਫਾਇਲ
Comment[pl]=Plik Portfela TDE Comment[pl]=Plik Portfela TDE

20
tdehtml/html/html_formimpl.cpp
Unescape View File

@ -428,8 +428,8 @@ void HTMLFormElementImpl::doAutoFill()
#ifndef TDEHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
const TQString key = calculateAutoFillKey(*this); const TQString key = calculateAutoFillKey(*this);
if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), if (TDEWallet::Wallet::keyDoesNotExist(TDEWallet::Wallet::NetworkWallet(),
KWallet::Wallet::FormDataFolder(), TDEWallet::Wallet::FormDataFolder(),
key)) key))
return; return;
@ -439,14 +439,14 @@ void HTMLFormElementImpl::doAutoFill()
} }
void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) { void HTMLFormElementImpl::walletOpened(TDEWallet::Wallet *w) {
#ifndef TDEHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
assert(w); assert(w);
const TQString key = calculateAutoFillKey(*this); const TQString key = calculateAutoFillKey(*this);
if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) { if (!w->hasFolder(TDEWallet::Wallet::FormDataFolder())) {
return; // failed return; // failed
} }
w->setFolder(KWallet::Wallet::FormDataFolder()); w->setFolder(TDEWallet::Wallet::FormDataFolder());
TQMap<TQString, TQString> map; TQMap<TQString, TQString> map;
if (w->readMap(key, map)) if (w->readMap(key, map))
return; // failed, abort return; // failed, abort
@ -578,17 +578,17 @@ void HTMLFormElementImpl::submit( )
gatherWalletData(); gatherWalletData();
} }
#ifndef TDEHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) { if (m_havePassword && !m_haveTextarea && TDEWallet::Wallet::isEnabled()) {
const TQString key = calculateAutoFillKey(*this); const TQString key = calculateAutoFillKey(*this);
const bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::FormDataFolder(), key); const bool doesnotexist = TDEWallet::Wallet::keyDoesNotExist(TDEWallet::Wallet::NetworkWallet(), TDEWallet::Wallet::FormDataFolder(), key);
KWallet::Wallet* const w = view->part()->wallet(); TDEWallet::Wallet* const w = view->part()->wallet();
bool login_changed = false; bool login_changed = false;
if (!doesnotexist && w) { if (!doesnotexist && w) {
// check if the login information changed from what // check if the login information changed from what
// we had so far. // we had so far.
if (w->hasFolder(KWallet::Wallet::FormDataFolder())) { if (w->hasFolder(TDEWallet::Wallet::FormDataFolder())) {
w->setFolder(KWallet::Wallet::FormDataFolder()); w->setFolder(TDEWallet::Wallet::FormDataFolder());
TQMap<TQString, TQString> map; TQMap<TQString, TQString> map;
if (!w->readMap(key, map)) { if (!w->readMap(key, map)) {
TQMapConstIterator<TQString, TQString> it = map.begin(); TQMapConstIterator<TQString, TQString> it = map.begin();

4
tdehtml/html/html_formimpl.h
Unescape View File

@ -49,7 +49,7 @@ namespace tdehtml
typedef TQValueList<TQCString> encodingList; typedef TQValueList<TQCString> encodingList;
} }
namespace KWallet { namespace TDEWallet {
class Wallet; class Wallet;
} }
@ -85,7 +85,7 @@ public:
bool autoComplete() const { return m_autocomplete; } bool autoComplete() const { return m_autocomplete; }
void doAutoFill(); void doAutoFill();
void walletOpened(KWallet::Wallet *w); void walletOpened(TDEWallet::Wallet *w);
virtual void parseAttribute(AttributeImpl *attr); virtual void parseAttribute(AttributeImpl *attr);

20
tdehtml/tdehtml_part.cpp
Unescape View File

@ -7163,11 +7163,11 @@ void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
} }
if (!d->m_wq) { if (!d->m_wq) {
KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous);
d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq = new TDEHTMLWalletQueue(this);
d->m_wq->wallet = wallet; d->m_wq->wallet = wallet;
connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
connect(d->m_wq, TQT_SIGNAL(walletOpened(KWallet::Wallet*)), this, TQT_SLOT(walletOpened(KWallet::Wallet*))); connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*)));
} }
assert(form); assert(form);
d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument())); d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument()));
@ -7191,10 +7191,10 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQStrin
if (d->m_wallet) { if (d->m_wallet) {
if (d->m_bWalletOpened) { if (d->m_bWalletOpened) {
if (d->m_wallet->isOpen()) { if (d->m_wallet->isOpen()) {
if (!d->m_wallet->hasFolder(KWallet::Wallet::FormDataFolder())) { if (!d->m_wallet->hasFolder(TDEWallet::Wallet::FormDataFolder())) {
d->m_wallet->createFolder(KWallet::Wallet::FormDataFolder()); d->m_wallet->createFolder(TDEWallet::Wallet::FormDataFolder());
} }
d->m_wallet->setFolder(KWallet::Wallet::FormDataFolder()); d->m_wallet->setFolder(TDEWallet::Wallet::FormDataFolder());
d->m_wallet->writeMap(key, data); d->m_wallet->writeMap(key, data);
return; return;
} }
@ -7205,11 +7205,11 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQStrin
} }
if (!d->m_wq) { if (!d->m_wq) {
KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous);
d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq = new TDEHTMLWalletQueue(this);
d->m_wq->wallet = wallet; d->m_wq->wallet = wallet;
connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
connect(d->m_wq, TQT_SIGNAL(walletOpened(KWallet::Wallet*)), this, TQT_SLOT(walletOpened(KWallet::Wallet*))); connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*)));
} }
d->m_wq->savers.append(qMakePair(key, data)); d->m_wq->savers.append(qMakePair(key, data));
#endif // TDEHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
@ -7235,7 +7235,7 @@ void TDEHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) {
} }
void TDEHTMLPart::walletOpened(KWallet::Wallet *wallet) { void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) {
#ifndef TDEHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
assert(!d->m_wallet); assert(!d->m_wallet);
assert(d->m_wq); assert(d->m_wq);
@ -7264,12 +7264,12 @@ void TDEHTMLPart::walletOpened(KWallet::Wallet *wallet) {
} else { } else {
TQToolTip::remove(d->m_statusBarWalletLabel); TQToolTip::remove(d->m_statusBarWalletLabel);
} }
TQToolTip::add(d->m_statusBarWalletLabel, i18n("The wallet '%1' is open and being used for form data and passwords.").arg(KWallet::Wallet::NetworkWallet())); TQToolTip::add(d->m_statusBarWalletLabel, i18n("The wallet '%1' is open and being used for form data and passwords.").arg(TDEWallet::Wallet::NetworkWallet()));
#endif // TDEHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
} }
KWallet::Wallet *TDEHTMLPart::wallet() TDEWallet::Wallet *TDEHTMLPart::wallet()
{ {
#ifndef TDEHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
TDEHTMLPart *p; TDEHTMLPart *p;

6
tdehtml/tdehtml_part.h
Unescape View File

@ -106,7 +106,7 @@ namespace KParts
class LiveConnectExtension; class LiveConnectExtension;
} }
namespace KWallet namespace TDEWallet
{ {
class Wallet; class Wallet;
} }
@ -1540,7 +1540,7 @@ private slots:
*/ */
void restoreScrollPosition(); void restoreScrollPosition();
void walletOpened(KWallet::Wallet*); void walletOpened(TDEWallet::Wallet*);
private: private:
@ -1564,7 +1564,7 @@ private:
bool processObjectRequest( tdehtml::ChildFrame *child, const KURL &url, const TQString &mimetype ); bool processObjectRequest( tdehtml::ChildFrame *child, const KURL &url, const TQString &mimetype );
KWallet::Wallet* wallet(); TDEWallet::Wallet* wallet();
void openWallet(DOM::HTMLFormElementImpl*); void openWallet(DOM::HTMLFormElementImpl*);
void saveToWallet(const TQString& key, const TQMap<TQString,TQString>& data); void saveToWallet(const TQString& key, const TQMap<TQString,TQString>& data);

12
tdehtml/tdehtmlpart_p.h
Unescape View File

@ -144,7 +144,7 @@ class TDEHTMLWalletQueue : public TQObject
#endif // TDEHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
} }
#ifndef TDEHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
KWallet::Wallet *wallet; TDEWallet::Wallet *wallet;
#endif // TDEHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller; typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
typedef TQValueList<Caller> CallerList; typedef TQValueList<Caller> CallerList;
@ -152,7 +152,7 @@ class TDEHTMLWalletQueue : public TQObject
TQValueList<QPair<TQString, TQMap<TQString, TQString> > > savers; TQValueList<QPair<TQString, TQMap<TQString, TQString> > > savers;
signals: signals:
void walletOpened(KWallet::Wallet*); void walletOpened(TDEWallet::Wallet*);
public slots: public slots:
void walletOpened(bool success) { void walletOpened(bool success) {
@ -163,15 +163,15 @@ class TDEHTMLWalletQueue : public TQObject
} }
emit walletOpened(wallet); emit walletOpened(wallet);
if (wallet) { if (wallet) {
if (!wallet->hasFolder(KWallet::Wallet::FormDataFolder())) { if (!wallet->hasFolder(TDEWallet::Wallet::FormDataFolder())) {
wallet->createFolder(KWallet::Wallet::FormDataFolder()); wallet->createFolder(TDEWallet::Wallet::FormDataFolder());
} }
for (CallerList::Iterator i = callers.begin(); i != callers.end(); ++i) { for (CallerList::Iterator i = callers.begin(); i != callers.end(); ++i) {
if ((*i).first && (*i).second) { if ((*i).first && (*i).second) {
(*i).first->walletOpened(wallet); (*i).first->walletOpened(wallet);
} }
} }
wallet->setFolder(KWallet::Wallet::FormDataFolder()); wallet->setFolder(TDEWallet::Wallet::FormDataFolder());
for (TQValueList<QPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) { for (TQValueList<QPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) {
wallet->writeMap((*i).first, (*i).second); wallet->writeMap((*i).first, (*i).second);
} }
@ -326,7 +326,7 @@ public:
TQString scheduledScript; TQString scheduledScript;
DOM::Node scheduledScriptNode; DOM::Node scheduledScriptNode;
KWallet::Wallet* m_wallet; TDEWallet::Wallet* m_wallet;
int m_runningScripts; int m_runningScripts;
bool m_bOpenMiddleClick :1; bool m_bOpenMiddleClick :1;
bool m_bBackRightClick :1; bool m_bBackRightClick :1;

24
tdeio/kpasswdserver/kpasswdserver.cpp
Unescape View File

@ -100,12 +100,12 @@ static TQString makeMapKey( const char* key, int entryNumber )
return str; return str;
} }
static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const TDEIO::AuthInfo &info ) static bool storeInWallet( TDEWallet::Wallet* wallet, const TQString& key, const TDEIO::AuthInfo &info )
{ {
if ( !wallet->hasFolder( KWallet::Wallet::PasswordFolder() ) ) if ( !wallet->hasFolder( TDEWallet::Wallet::PasswordFolder() ) )
if ( !wallet->createFolder( KWallet::Wallet::PasswordFolder() ) ) if ( !wallet->createFolder( TDEWallet::Wallet::PasswordFolder() ) )
return false; return false;
wallet->setFolder( KWallet::Wallet::PasswordFolder() ); wallet->setFolder( TDEWallet::Wallet::PasswordFolder() );
// Before saving, check if there's already an entry with this login. // Before saving, check if there's already an entry with this login.
// If so, replace it (with the new password). Otherwise, add a new entry. // If so, replace it (with the new password). Otherwise, add a new entry.
typedef TQMap<TQString,TQString> Map; typedef TQMap<TQString,TQString> Map;
@ -135,12 +135,12 @@ static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const T
} }
static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const TQString& realm, TQString& username, TQString& password, bool userReadOnly, TQMap<TQString,TQString>& knownLogins ) static bool readFromWallet( TDEWallet::Wallet* wallet, const TQString& key, const TQString& realm, TQString& username, TQString& password, bool userReadOnly, TQMap<TQString,TQString>& knownLogins )
{ {
//kdDebug(130) << "readFromWallet: key=" << key << " username=" << username << " password=" /*<< password*/ << " userReadOnly=" << userReadOnly << " realm=" << realm << endl; //kdDebug(130) << "readFromWallet: key=" << key << " username=" << username << " password=" /*<< password*/ << " userReadOnly=" << userReadOnly << " realm=" << realm << endl;
if ( wallet->hasFolder( KWallet::Wallet::PasswordFolder() ) ) if ( wallet->hasFolder( TDEWallet::Wallet::PasswordFolder() ) )
{ {
wallet->setFolder( KWallet::Wallet::PasswordFolder() ); wallet->setFolder( TDEWallet::Wallet::PasswordFolder() );
TQMap<TQString,TQString> map; TQMap<TQString,TQString> map;
if ( wallet->readMap( makeWalletKey( key, realm ), map ) == 0 ) if ( wallet->readMap( makeWalletKey( key, realm ), map ) == 0 )
@ -219,8 +219,8 @@ KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long
{ {
if (!result && if (!result &&
(info.username.isEmpty() || info.password.isEmpty()) && (info.username.isEmpty() || info.password.isEmpty()) &&
!KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), !TDEWallet::Wallet::keyDoesNotExist(TDEWallet::Wallet::NetworkWallet(),
KWallet::Wallet::PasswordFolder(), makeWalletKey(key, info.realmValue))) TDEWallet::Wallet::PasswordFolder(), makeWalletKey(key, info.realmValue)))
{ {
TQMap<TQString, TQString> knownLogins; TQMap<TQString, TQString> knownLogins;
if (openWallet(windowId)) { if (openWallet(windowId)) {
@ -304,8 +304,8 @@ KPasswdServer::openWallet( WId windowId )
m_wallet = 0; m_wallet = 0;
} }
if ( !m_wallet ) if ( !m_wallet )
m_wallet = KWallet::Wallet::openWallet( m_wallet = TDEWallet::Wallet::openWallet(
KWallet::Wallet::NetworkWallet(), windowId ); TDEWallet::Wallet::NetworkWallet(), windowId );
return m_wallet != 0; return m_wallet != 0;
} }
@ -359,7 +359,7 @@ KPasswdServer::processRequest()
TQMap<TQString, TQString> knownLogins; TQMap<TQString, TQString> knownLogins;
if ( ( username.isEmpty() || password.isEmpty() ) if ( ( username.isEmpty() || password.isEmpty() )
&& !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) ) && !TDEWallet::Wallet::keyDoesNotExist(TDEWallet::Wallet::NetworkWallet(), TDEWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) )
{ {
// no login+pass provided, check if tdewallet has one // no login+pass provided, check if tdewallet has one
if ( openWallet( request->windowId ) ) if ( openWallet( request->windowId ) )

4
tdeio/kpasswdserver/kpasswdserver.h
Unescape View File

@ -32,7 +32,7 @@
#include <tdeio/authinfo.h> #include <tdeio/authinfo.h>
#include <kded/kdedmodule.h> #include <kded/kdedmodule.h>
namespace KWallet { namespace TDEWallet {
class Wallet; class Wallet;
} }
@ -111,7 +111,7 @@ protected:
TQPtrList< Request > m_authWait; TQPtrList< Request > m_authWait;
TQIntDict<TQStringList> mWindowIdList; TQIntDict<TQStringList> mWindowIdList;
DCOPClient *m_dcopClient; DCOPClient *m_dcopClient;
KWallet::Wallet* m_wallet; TDEWallet::Wallet* m_wallet;
long m_seqNr; long m_seqNr;
}; };

4
tdeio/kssl/ksslkeygen.cc
Unescape View File

@ -103,10 +103,10 @@ void KSSLKeyGen::slotGenerate() {
kpd->progressBar()->setProgress(100); kpd->progressBar()->setProgress(100);
#ifndef Q_OS_WIN //TODO: reenable for WIN32 #ifndef Q_OS_WIN //TODO: reenable for WIN32
if (rc == 0 && KWallet::Wallet::isEnabled()) { if (rc == 0 && TDEWallet::Wallet::isEnabled()) {
rc = KMessageBox::questionYesNo(this, i18n("Do you wish to store the passphrase in your wallet file?"), TQString::null, i18n("Store"), i18n("Do Not Store")); rc = KMessageBox::questionYesNo(this, i18n("Do you wish to store the passphrase in your wallet file?"), TQString::null, i18n("Store"), i18n("Do Not Store"));
if (rc == KMessageBox::Yes) { if (rc == KMessageBox::Yes) {
KWallet::Wallet *w = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet(), winId()); TDEWallet::Wallet *w = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::LocalWallet(), winId());
if (w) { if (w) {
// FIXME: store passphrase in wallet // FIXME: store passphrase in wallet
delete w; delete w;

2
tdeio/magic
Unescape View File

@ -1035,7 +1035,7 @@
0 string #VRML model/vrml 0 string #VRML model/vrml
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# KWallet file # TDEWallet file
0 string KWALLET\012\015\000\015\012 application/x-kde-wallet 0 string KWALLET\012\015\000\015\012 application/x-kde-wallet
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

336
tdeio/misc/tdewalletd/tdewalletd.cpp
Unescape View File

@ -52,21 +52,21 @@
extern "C" { extern "C" {
KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) { KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
return new KWalletD(name); return new TDEWalletD(name);
} }
} }
class KWalletTransaction { class TDEWalletTransaction {
public: public:
KWalletTransaction() { TDEWalletTransaction() {
tType = Unknown; tType = Unknown;
transaction = 0L; transaction = 0L;
client = 0L; client = 0L;
modal = false; modal = false;
} }
~KWalletTransaction() { ~TDEWalletTransaction() {
// Don't delete these! // Don't delete these!
transaction = 0L; transaction = 0L;
client = 0L; client = 0L;
@ -84,7 +84,7 @@ class KWalletTransaction {
}; };
KWalletD::KWalletD(const TQCString &name) TDEWalletD::TDEWalletD(const TQCString &name)
: KDEDModule(name), _failed(0) { : KDEDModule(name), _failed(0) {
srand(time(0)); srand(time(0));
_showingFailureNotify = false; _showingFailureNotify = false;
@ -99,14 +99,14 @@ KWalletD::KWalletD(const TQCString &name)
TQT_SIGNAL(applicationRemoved(const TQCString&)), TQT_SIGNAL(applicationRemoved(const TQCString&)),
this, this,
TQT_SLOT(slotAppUnregistered(const TQCString&))); TQT_SLOT(slotAppUnregistered(const TQCString&)));
_dw = new KDirWatch(this, "KWallet Directory Watcher"); _dw = new KDirWatch(this, "TDEWallet Directory Watcher");
_dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet")); _dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
_dw->startScan(true); _dw->startScan(true);
connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty()));
} }
KWalletD::~KWalletD() { TDEWalletD::~TDEWalletD() {
delete _timeouts; delete _timeouts;
_timeouts = 0; _timeouts = 0;
@ -115,7 +115,7 @@ KWalletD::~KWalletD() {
} }
int KWalletD::generateHandle() { int TDEWalletD::generateHandle() {
int rc; int rc;
// ASSUMPTION: RAND_MAX is fairly large. // ASSUMPTION: RAND_MAX is fairly large.
@ -127,7 +127,7 @@ int KWalletD::generateHandle() {
} }
void KWalletD::processTransactions() { void TDEWalletD::processTransactions() {
static bool processing = false; static bool processing = false;
if (processing) { if (processing) {
@ -137,16 +137,16 @@ void KWalletD::processTransactions() {
processing = true; processing = true;
// Process remaining transactions // Process remaining transactions
KWalletTransaction *xact; TDEWalletTransaction *xact;
while (!_transactions.isEmpty()) { while (!_transactions.isEmpty()) {
xact = _transactions.first(); xact = _transactions.first();
TQCString replyType; TQCString replyType;
int res; int res;
assert(xact->tType != KWalletTransaction::Unknown); assert(xact->tType != TDEWalletTransaction::Unknown);
switch (xact->tType) { switch (xact->tType) {
case KWalletTransaction::Open: case TDEWalletTransaction::Open:
res = doTransactionOpen(xact->appid, xact->wallet, xact->wId, xact->modal); res = doTransactionOpen(xact->appid, xact->wallet, xact->wId, xact->modal);
replyType = "int"; replyType = "int";
if (!xact->returnObject.isEmpty()) { if (!xact->returnObject.isEmpty()) {
@ -157,8 +157,8 @@ void KWalletD::processTransactions() {
// should not produce multiple password // should not produce multiple password
// dialogs on a failure // dialogs on a failure
if (res < 0) { if (res < 0) {
TQPtrListIterator<KWalletTransaction> it(_transactions); TQPtrListIterator<TDEWalletTransaction> it(_transactions);
KWalletTransaction *x; TDEWalletTransaction *x;
while ((x = it.current()) && x != xact) { while ((x = it.current()) && x != xact) {
++it; ++it;
} }
@ -166,21 +166,21 @@ void KWalletD::processTransactions() {
++it; ++it;
} }
while ((x = it.current())) { while ((x = it.current())) {
if (xact->appid == x->appid && x->tType == KWalletTransaction::Open && x->wallet == xact->wallet && x->wId == xact->wId) { if (xact->appid == x->appid && x->tType == TDEWalletTransaction::Open && x->wallet == xact->wallet && x->wId == xact->wId) {
x->tType = KWalletTransaction::OpenFail; x->tType = TDEWalletTransaction::OpenFail;
} }
++it; ++it;
} }
} }
break; break;
case KWalletTransaction::OpenFail: case TDEWalletTransaction::OpenFail:
res = -1; res = -1;
replyType = "int"; replyType = "int";
if (!xact->returnObject.isEmpty()) { if (!xact->returnObject.isEmpty()) {
DCOPRef(xact->rawappid, xact->returnObject).send("walletOpenResult", res); DCOPRef(xact->rawappid, xact->returnObject).send("walletOpenResult", res);
} }
break; break;
case KWalletTransaction::ChangePassword: case TDEWalletTransaction::ChangePassword:
doTransactionChangePassword(xact->appid, xact->wallet, xact->wId); doTransactionChangePassword(xact->appid, xact->wallet, xact->wId);
// fall through - no return // fall through - no return
default: default:
@ -188,7 +188,7 @@ void KWalletD::processTransactions() {
continue; continue;
} }
if (xact->returnObject.isEmpty() && xact->tType != KWalletTransaction::ChangePassword) { if (xact->returnObject.isEmpty() && xact->tType != TDEWalletTransaction::ChangePassword) {
TQByteArray replyData; TQByteArray replyData;
TQDataStream stream(replyData, IO_WriteOnly); TQDataStream stream(replyData, IO_WriteOnly);
stream << res; stream << res;
@ -201,7 +201,7 @@ void KWalletD::processTransactions() {
} }
void KWalletD::openAsynchronous(const TQString& wallet, const TQCString& returnObject, uint wId) { void TDEWalletD::openAsynchronous(const TQString& wallet, const TQCString& returnObject, uint wId) {
DCOPClient *dc = callingDcopClient(); DCOPClient *dc = callingDcopClient();
if (!dc) { if (!dc) {
return; return;
@ -216,14 +216,14 @@ void KWalletD::openAsynchronous(const TQString& wallet, const TQCString& returnO
TQCString peerName = friendlyDCOPPeerName(); TQCString peerName = friendlyDCOPPeerName();
KWalletTransaction *xact = new KWalletTransaction; TDEWalletTransaction *xact = new TDEWalletTransaction;
xact->appid = peerName; xact->appid = peerName;
xact->rawappid = appid; xact->rawappid = appid;
xact->client = callingDcopClient(); xact->client = callingDcopClient();
xact->wallet = wallet; xact->wallet = wallet;
xact->wId = wId; xact->wId = wId;
xact->tType = KWalletTransaction::Open; xact->tType = TDEWalletTransaction::Open;
xact->returnObject = returnObject; xact->returnObject = returnObject;
_transactions.append(xact); _transactions.append(xact);
@ -234,7 +234,7 @@ void KWalletD::openAsynchronous(const TQString& wallet, const TQCString& returnO
} }
int KWalletD::openPath(const TQString& path, uint wId) { int TDEWalletD::openPath(const TQString& path, uint wId) {
if (!_enabled) { // guard if (!_enabled) { // guard
return -1; return -1;
} }
@ -245,7 +245,7 @@ int KWalletD::openPath(const TQString& path, uint wId) {
} }
int KWalletD::open(const TQString& wallet, uint wId) { int TDEWalletD::open(const TQString& wallet, uint wId) {
if (!_enabled) { // guard if (!_enabled) { // guard
return -1; return -1;
} }
@ -256,7 +256,7 @@ int KWalletD::open(const TQString& wallet, uint wId) {
TQCString appid = friendlyDCOPPeerName(); TQCString appid = friendlyDCOPPeerName();
KWalletTransaction *xact = new KWalletTransaction; TDEWalletTransaction *xact = new TDEWalletTransaction;
_transactions.append(xact); _transactions.append(xact);
xact->appid = appid; xact->appid = appid;
@ -264,7 +264,7 @@ int KWalletD::open(const TQString& wallet, uint wId) {
xact->transaction = xact->client->beginTransaction(); xact->transaction = xact->client->beginTransaction();
xact->wallet = wallet; xact->wallet = wallet;
xact->wId = wId; xact->wId = wId;
xact->tType = KWalletTransaction::Open; xact->tType = TDEWalletTransaction::Open;
xact->modal = true; // mark dialogs as modal, the app has blocking wait xact->modal = true; // mark dialogs as modal, the app has blocking wait
TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
checkActiveDialog(); checkActiveDialog();
@ -273,7 +273,7 @@ int KWalletD::open(const TQString& wallet, uint wId) {
// Sets up a dialog that will be shown by tdewallet. // Sets up a dialog that will be shown by tdewallet.
void KWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ) { void TDEWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ) {
if( wId != 0 ) if( wId != 0 )
KWin::setMainWindow( dialog, wId ); // correct, set dialog parent KWin::setMainWindow( dialog, wId ); // correct, set dialog parent
else { else {
@ -298,7 +298,7 @@ void KWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, b
// KWin properly handles focus changes and so on, but there's currently no support for multiple // KWin properly handles focus changes and so on, but there's currently no support for multiple
// dialog parents. Hopefully to be done in KDE4, for now just use all kinds of bad hacks to make // dialog parents. Hopefully to be done in KDE4, for now just use all kinds of bad hacks to make
// sure the user doesn't overlook the active dialog. // sure the user doesn't overlook the active dialog.
void KWalletD::checkActiveDialog() { void TDEWalletD::checkActiveDialog() {
if( !activeDialog || !activeDialog->isShown()) if( !activeDialog || !activeDialog->isShown())
return; return;
kapp->updateUserTimestamp(); kapp->updateUserTimestamp();
@ -307,10 +307,10 @@ void KWalletD::checkActiveDialog() {
KWin::forceActiveWindow( activeDialog->winId()); KWin::forceActiveWindow( activeDialog->winId());
} }
int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) { int TDEWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) {
if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet())) { if (_firstUse && !wallets().contains(TDEWallet::Wallet::LocalWallet())) {
// First use wizard // First use wizard
KWalletWizard *wiz = new KWalletWizard(0); TDEWalletWizard *wiz = new TDEWalletWizard(0);
setupDialog( wiz, wId, appid, modal ); setupDialog( wiz, wId, appid, modal );
int rc = wiz->exec(); int rc = wiz->exec();
if (rc == TQDialog::Accepted) { if (rc == TQDialog::Accepted) {
@ -329,12 +329,12 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
} }
// Create the wallet // Create the wallet
KWallet::Backend *b = new KWallet::Backend(KWallet::Wallet::LocalWallet()); TDEWallet::Backend *b = new TDEWallet::Backend(TDEWallet::Wallet::LocalWallet());
TQByteArray p; TQByteArray p;
p.duplicate(wiz->_pass1->text().utf8(), wiz->_pass1->text().length()); p.duplicate(wiz->_pass1->text().utf8(), wiz->_pass1->text().length());
b->open(p); b->open(p);
b->createFolder(KWallet::Wallet::PasswordFolder()); b->createFolder(TDEWallet::Wallet::PasswordFolder());
b->createFolder(KWallet::Wallet::FormDataFolder()); b->createFolder(TDEWallet::Wallet::FormDataFolder());
b->close(p); b->close(p);
p.fill(0); p.fill(0);
delete b; delete b;
@ -355,7 +355,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
return rc; return rc;
} }
int KWalletD::tryOpen(const TQString& wallet, const TQCString& password) int TDEWalletD::tryOpen(const TQString& wallet, const TQCString& password)
{ {
if (isOpen(wallet)) if (isOpen(wallet))
return 0; return 0;
@ -365,10 +365,10 @@ int KWalletD::tryOpen(const TQString& wallet, const TQCString& password)
return -1; return -1;
} }
if (!KWallet::Backend::exists(wallet)) if (!TDEWallet::Backend::exists(wallet))
return -2; return -2;
KWallet::Backend *b = new KWallet::Backend(wallet, false /*isPath*/); TDEWallet::Backend *b = new TDEWallet::Backend(wallet, false /*isPath*/);
int rc = b->open(TQByteArray().duplicate(password, strlen(password))); int rc = b->open(TQByteArray().duplicate(password, strlen(password)));
if (rc == 0) { if (rc == 0) {
_wallets.insert(rc = generateHandle(), b); _wallets.insert(rc = generateHandle(), b);
@ -394,7 +394,7 @@ int KWalletD::tryOpen(const TQString& wallet, const TQCString& password)
return rc; return rc;
} }
int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool isPath, WId w, bool modal) { int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool isPath, WId w, bool modal) {
int rc = -1; int rc = -1;
bool brandNew = false; bool brandNew = false;
@ -409,7 +409,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
return -1; return -1;
} }
for (TQIntDictIterator<KWallet::Backend> i(_wallets); i.current(); ++i) { for (TQIntDictIterator<TDEWallet::Backend> i(_wallets); i.current(); ++i) {
if (i.current()->walletName() == wallet) { if (i.current()->walletName() == wallet) {
rc = i.currentKey(); rc = i.currentKey();
break; break;
@ -422,16 +422,16 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
return -1; return -1;
} }
KWallet::Backend *b = new KWallet::Backend(wallet, isPath); TDEWallet::Backend *b = new TDEWallet::Backend(wallet, isPath);
KPasswordDialog *kpd = 0L; KPasswordDialog *kpd = 0L;
bool emptyPass = false; bool emptyPass = false;
if ((isPath && TQFile::exists(wallet)) || (!isPath && KWallet::Backend::exists(wallet))) { if ((isPath && TQFile::exists(wallet)) || (!isPath && TDEWallet::Backend::exists(wallet))) {
int pwless = b->open(TQByteArray()); int pwless = b->open(TQByteArray());
if (0 != pwless || !b->isOpen()) { if (0 != pwless || !b->isOpen()) {
if (pwless == 0) { if (pwless == 0) {
// release, start anew // release, start anew
delete b; delete b;
b = new KWallet::Backend(wallet, isPath); b = new TDEWallet::Backend(wallet, isPath);
} }
kpd = new KPasswordDialog(KPasswordDialog::Password, false, 0); kpd = new KPasswordDialog(KPasswordDialog::Password, false, 0);
if (appid.isEmpty()) { if (appid.isEmpty()) {
@ -444,8 +444,8 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
} else { } else {
emptyPass = true; emptyPass = true;
} }
} else if (wallet == KWallet::Wallet::LocalWallet() || } else if (wallet == TDEWallet::Wallet::LocalWallet() ||
wallet == KWallet::Wallet::NetworkWallet()) { wallet == TDEWallet::Wallet::NetworkWallet()) {
// Auto create these wallets. // Auto create these wallets.
kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0); kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0);
if (appid.isEmpty()) { if (appid.isEmpty()) {
@ -479,7 +479,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
p = kpd->password(); p = kpd->password();
int rc = b->open(TQByteArray().duplicate(p, strlen(p))); int rc = b->open(TQByteArray().duplicate(p, strlen(p)));
if (!b->isOpen()) { if (!b->isOpen()) {
kpd->setPrompt(i18n("<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br>(Error code %2: %3)").arg(TQStyleSheet::escape(wallet)).arg(rc).arg(KWallet::Backend::openRCToString(rc))); kpd->setPrompt(i18n("<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br>(Error code %2: %3)").arg(TQStyleSheet::escape(wallet)).arg(rc).arg(TDEWallet::Backend::openRCToString(rc)));
kpd->clearPassword(); kpd->clearPassword();
} }
} else { } else {
@ -510,8 +510,8 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
delete kpd; // don't refactor this!! Argh I hate KPassDlg delete kpd; // don't refactor this!! Argh I hate KPassDlg
if (brandNew) { if (brandNew) {
createFolder(rc, KWallet::Wallet::PasswordFolder()); createFolder(rc, TDEWallet::Wallet::PasswordFolder());
createFolder(rc, KWallet::Wallet::FormDataFolder()); createFolder(rc, TDEWallet::Wallet::FormDataFolder());
} }
b->ref(); b->ref();
@ -540,7 +540,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
} }
bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, WId w) { bool TDEWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, WId w) {
int response = 0; int response = 0;
TQCString thisApp; TQCString thisApp;
@ -592,7 +592,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
} }
int KWalletD::deleteWallet(const TQString& wallet) { int TDEWalletD::deleteWallet(const TQString& wallet) {
TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + TQDir::separator() + wallet + ".kwl"; TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + TQDir::separator() + wallet + ".kwl";
if (TQFile::exists(path)) { if (TQFile::exists(path)) {
@ -609,16 +609,16 @@ int KWalletD::deleteWallet(const TQString& wallet) {
} }
void KWalletD::changePassword(const TQString& wallet, uint wId) { void TDEWalletD::changePassword(const TQString& wallet, uint wId) {
TQCString appid = friendlyDCOPPeerName(); TQCString appid = friendlyDCOPPeerName();
KWalletTransaction *xact = new KWalletTransaction; TDEWalletTransaction *xact = new TDEWalletTransaction;
xact->appid = appid; xact->appid = appid;
xact->client = callingDcopClient(); xact->client = callingDcopClient();
xact->wallet = wallet; xact->wallet = wallet;
xact->wId = wId; xact->wId = wId;
xact->tType = KWalletTransaction::ChangePassword; xact->tType = TDEWalletTransaction::ChangePassword;
_transactions.append(xact); _transactions.append(xact);
@ -627,9 +627,9 @@ void KWalletD::changePassword(const TQString& wallet, uint wId) {
} }
void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQString& wallet, uint wId) { void TDEWalletD::doTransactionChangePassword(const TQCString& appid, const TQString& wallet, uint wId) {
TQIntDictIterator<KWallet::Backend> it(_wallets); TQIntDictIterator<TDEWallet::Backend> it(_wallets);
KWallet::Backend *w = 0L; TDEWallet::Backend *w = 0L;
int handle = -1; int handle = -1;
bool reclose = false; bool reclose = false;
@ -689,11 +689,11 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin
} }
int KWalletD::close(const TQString& wallet, bool force) { int TDEWalletD::close(const TQString& wallet, bool force) {
int handle = -1; int handle = -1;
KWallet::Backend *w = 0L; TDEWallet::Backend *w = 0L;
for (TQIntDictIterator<KWallet::Backend> it(_wallets); for (TQIntDictIterator<TDEWallet::Backend> it(_wallets);
it.current(); it.current();
++it) { ++it) {
if (it.current()->walletName() == wallet) { if (it.current()->walletName() == wallet) {
@ -707,7 +707,7 @@ int KWalletD::close(const TQString& wallet, bool force) {
} }
int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { int TDEWalletD::closeWallet(TDEWallet::Backend *w, int handle, bool force) {
if (w) { if (w) {
const TQString& wallet = w->walletName(); const TQString& wallet = w->walletName();
assert(_passwords.contains(wallet)); assert(_passwords.contains(wallet));
@ -733,9 +733,9 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) {
} }
int KWalletD::close(int handle, bool force) { int TDEWalletD::close(int handle, bool force) {
TQCString appid = friendlyDCOPPeerName(); TQCString appid = friendlyDCOPPeerName();
KWallet::Backend *w = _wallets.find(handle); TDEWallet::Backend *w = _wallets.find(handle);
bool contains = false; bool contains = false;
if (w) { // the handle is valid if (w) { // the handle is valid
@ -775,8 +775,8 @@ int KWalletD::close(int handle, bool force) {
} }
bool KWalletD::isOpen(const TQString& wallet) const { bool TDEWalletD::isOpen(const TQString& wallet) const {
for (TQIntDictIterator<KWallet::Backend> it(_wallets); for (TQIntDictIterator<TDEWallet::Backend> it(_wallets);
it.current(); it.current();
++it) { ++it) {
if (it.current()->walletName() == wallet) { if (it.current()->walletName() == wallet) {
@ -787,12 +787,12 @@ bool KWalletD::isOpen(const TQString& wallet) const {
} }
bool KWalletD::isOpen(int handle) { bool TDEWalletD::isOpen(int handle) {
if (handle == 0) { if (handle == 0) {
return false; return false;
} }
KWallet::Backend *rc = _wallets.find(handle); TDEWallet::Backend *rc = _wallets.find(handle);
if (rc == 0 && ++_failed > 5) { if (rc == 0 && ++_failed > 5) {
_failed = 0; _failed = 0;
@ -805,7 +805,7 @@ bool KWalletD::isOpen(int handle) {
} }
TQStringList KWalletD::wallets() const { TQStringList TDEWalletD::wallets() const {
TQString path = TDEGlobal::dirs()->saveLocation("tdewallet"); TQString path = TDEGlobal::dirs()->saveLocation("tdewallet");
TQDir dir(path, "*.kwl"); TQDir dir(path, "*.kwl");
TQStringList rc; TQStringList rc;
@ -827,8 +827,8 @@ TQStringList KWalletD::wallets() const {
} }
void KWalletD::sync(int handle) { void TDEWalletD::sync(int handle) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
TQByteArray p; TQByteArray p;
@ -840,8 +840,8 @@ void KWalletD::sync(int handle) {
} }
TQStringList KWalletD::folderList(int handle) { TQStringList TDEWalletD::folderList(int handle) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
return b->folderList(); return b->folderList();
@ -851,8 +851,8 @@ TQStringList KWalletD::folderList(int handle) {
} }
bool KWalletD::hasFolder(int handle, const TQString& f) { bool TDEWalletD::hasFolder(int handle, const TQString& f) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
return b->hasFolder(f); return b->hasFolder(f);
@ -862,8 +862,8 @@ bool KWalletD::hasFolder(int handle, const TQString& f) {
} }
bool KWalletD::removeFolder(int handle, const TQString& f) { bool TDEWalletD::removeFolder(int handle, const TQString& f) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
bool rc = b->removeFolder(f); bool rc = b->removeFolder(f);
@ -884,8 +884,8 @@ bool KWalletD::removeFolder(int handle, const TQString& f) {
} }
bool KWalletD::createFolder(int handle, const TQString& f) { bool TDEWalletD::createFolder(int handle, const TQString& f) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
bool rc = b->createFolder(f); bool rc = b->createFolder(f);
@ -906,13 +906,13 @@ bool KWalletD::createFolder(int handle, const TQString& f) {
} }
TQByteArray KWalletD::readMap(int handle, const TQString& folder, const TQString& key) { TQByteArray TDEWalletD::readMap(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
KWallet::Entry *e = b->readEntry(key); TDEWallet::Entry *e = b->readEntry(key);
if (e && e->type() == KWallet::Wallet::Map) { if (e && e->type() == TDEWallet::Wallet::Map) {
return e->map(); return e->map();
} }
} }
@ -921,17 +921,17 @@ TQByteArray KWalletD::readMap(int handle, const TQString& folder, const TQString
} }
TQMap<TQString,TQByteArray> KWalletD::readMapList(int handle, const TQString& folder, const TQString& key) { TQMap<TQString,TQByteArray> TDEWalletD::readMapList(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
TQPtrList<KWallet::Entry> e = b->readEntryList(key); TQPtrList<TDEWallet::Entry> e = b->readEntryList(key);
TQMap<TQString, TQByteArray> rc; TQMap<TQString, TQByteArray> rc;
TQPtrListIterator<KWallet::Entry> it(e); TQPtrListIterator<TDEWallet::Entry> it(e);
KWallet::Entry *entry; TDEWallet::Entry *entry;
while ((entry = it.current())) { while ((entry = it.current())) {
if (entry->type() == KWallet::Wallet::Map) { if (entry->type() == TDEWallet::Wallet::Map) {
rc.insert(entry->key(), entry->map()); rc.insert(entry->key(), entry->map());
} }
++it; ++it;
@ -943,12 +943,12 @@ TQMap<TQString,TQByteArray> KWalletD::readMapList(int handle, const TQString& fo
} }
TQByteArray KWalletD::readEntry(int handle, const TQString& folder, const TQString& key) { TQByteArray TDEWalletD::readEntry(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
KWallet::Entry *e = b->readEntry(key); TDEWallet::Entry *e = b->readEntry(key);
if (e) { if (e) {
return e->value(); return e->value();
} }
@ -958,15 +958,15 @@ TQByteArray KWalletD::readEntry(int handle, const TQString& folder, const TQStri
} }
TQMap<TQString, TQByteArray> KWalletD::readEntryList(int handle, const TQString& folder, const TQString& key) { TQMap<TQString, TQByteArray> TDEWalletD::readEntryList(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
TQPtrList<KWallet::Entry> e = b->readEntryList(key); TQPtrList<TDEWallet::Entry> e = b->readEntryList(key);
TQMap<TQString, TQByteArray> rc; TQMap<TQString, TQByteArray> rc;
TQPtrListIterator<KWallet::Entry> it(e); TQPtrListIterator<TDEWallet::Entry> it(e);
KWallet::Entry *entry; TDEWallet::Entry *entry;
while ((entry = it.current())) { while ((entry = it.current())) {
rc.insert(entry->key(), entry->value()); rc.insert(entry->key(), entry->value());
++it; ++it;
@ -978,8 +978,8 @@ TQMap<TQString, TQByteArray> KWalletD::readEntryList(int handle, const TQString&
} }
TQStringList KWalletD::entryList(int handle, const TQString& folder) { TQStringList TDEWalletD::entryList(int handle, const TQString& folder) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
@ -990,13 +990,13 @@ TQStringList KWalletD::entryList(int handle, const TQString& folder) {
} }
TQString KWalletD::readPassword(int handle, const TQString& folder, const TQString& key) { TQString TDEWalletD::readPassword(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
KWallet::Entry *e = b->readEntry(key); TDEWallet::Entry *e = b->readEntry(key);
if (e && e->type() == KWallet::Wallet::Password) { if (e && e->type() == TDEWallet::Wallet::Password) {
return e->password(); return e->password();
} }
} }
@ -1005,17 +1005,17 @@ TQString KWalletD::readPassword(int handle, const TQString& folder, const TQStri
} }
TQMap<TQString, TQString> KWalletD::readPasswordList(int handle, const TQString& folder, const TQString& key) { TQMap<TQString, TQString> TDEWalletD::readPasswordList(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
TQPtrList<KWallet::Entry> e = b->readEntryList(key); TQPtrList<TDEWallet::Entry> e = b->readEntryList(key);
TQMap<TQString, TQString> rc; TQMap<TQString, TQString> rc;
TQPtrListIterator<KWallet::Entry> it(e); TQPtrListIterator<TDEWallet::Entry> it(e);
KWallet::Entry *entry; TDEWallet::Entry *entry;
while ((entry = it.current())) { while ((entry = it.current())) {
if (entry->type() == KWallet::Wallet::Password) { if (entry->type() == TDEWallet::Wallet::Password) {
rc.insert(entry->key(), entry->password()); rc.insert(entry->key(), entry->password());
} }
++it; ++it;
@ -1027,15 +1027,15 @@ TQMap<TQString, TQString> KWalletD::readPasswordList(int handle, const TQString&
} }
int KWalletD::writeMap(int handle, const TQString& folder, const TQString& key, const TQByteArray& value) { int TDEWalletD::writeMap(int handle, const TQString& folder, const TQString& key, const TQByteArray& value) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
KWallet::Entry e; TDEWallet::Entry e;
e.setKey(key); e.setKey(key);
e.setValue(value); e.setValue(value);
e.setType(KWallet::Wallet::Map); e.setType(TDEWallet::Wallet::Map);
b->writeEntry(&e); b->writeEntry(&e);
// write changes to disk immediately // write changes to disk immediately
TQByteArray p; TQByteArray p;
@ -1051,15 +1051,15 @@ int KWalletD::writeMap(int handle, const TQString& folder, const TQString& key,
} }
int KWalletD::writeEntry(int handle, const TQString& folder, const TQString& key, const TQByteArray& value, int entryType) { int TDEWalletD::writeEntry(int handle, const TQString& folder, const TQString& key, const TQByteArray& value, int entryType) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
KWallet::Entry e; TDEWallet::Entry e;
e.setKey(key); e.setKey(key);
e.setValue(value); e.setValue(value);
e.setType(KWallet::Wallet::EntryType(entryType)); e.setType(TDEWallet::Wallet::EntryType(entryType));
b->writeEntry(&e); b->writeEntry(&e);
// write changes to disk immediately // write changes to disk immediately
TQByteArray p; TQByteArray p;
@ -1075,15 +1075,15 @@ int KWalletD::writeEntry(int handle, const TQString& folder, const TQString& key
} }
int KWalletD::writeEntry(int handle, const TQString& folder, const TQString& key, const TQByteArray& value) { int TDEWalletD::writeEntry(int handle, const TQString& folder, const TQString& key, const TQByteArray& value) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
KWallet::Entry e; TDEWallet::Entry e;
e.setKey(key); e.setKey(key);
e.setValue(value); e.setValue(value);
e.setType(KWallet::Wallet::Stream); e.setType(TDEWallet::Wallet::Stream);
b->writeEntry(&e); b->writeEntry(&e);
// write changes to disk immediately // write changes to disk immediately
TQByteArray p; TQByteArray p;
@ -1099,15 +1099,15 @@ int KWalletD::writeEntry(int handle, const TQString& folder, const TQString& key
} }
int KWalletD::writePassword(int handle, const TQString& folder, const TQString& key, const TQString& value) { int TDEWalletD::writePassword(int handle, const TQString& folder, const TQString& key, const TQString& value) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
KWallet::Entry e; TDEWallet::Entry e;
e.setKey(key); e.setKey(key);
e.setValue(value); e.setValue(value);
e.setType(KWallet::Wallet::Password); e.setType(TDEWallet::Wallet::Password);
b->writeEntry(&e); b->writeEntry(&e);
// write changes to disk immediately // write changes to disk immediately
TQByteArray p; TQByteArray p;
@ -1123,12 +1123,12 @@ int KWalletD::writePassword(int handle, const TQString& folder, const TQString&
} }
int KWalletD::entryType(int handle, const TQString& folder, const TQString& key) { int TDEWalletD::entryType(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
if (!b->hasFolder(folder)) { if (!b->hasFolder(folder)) {
return KWallet::Wallet::Unknown; return TDEWallet::Wallet::Unknown;
} }
b->setFolder(folder); b->setFolder(folder);
if (b->hasEntry(key)) { if (b->hasEntry(key)) {
@ -1136,12 +1136,12 @@ int KWalletD::entryType(int handle, const TQString& folder, const TQString& key)
} }
} }
return KWallet::Wallet::Unknown; return TDEWallet::Wallet::Unknown;
} }
bool KWalletD::hasEntry(int handle, const TQString& folder, const TQString& key) { bool TDEWalletD::hasEntry(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
if (!b->hasFolder(folder)) { if (!b->hasFolder(folder)) {
@ -1155,8 +1155,8 @@ bool KWalletD::hasEntry(int handle, const TQString& folder, const TQString& key)
} }
int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& key) { int TDEWalletD::removeEntry(int handle, const TQString& folder, const TQString& key) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
if (!b->hasFolder(folder)) { if (!b->hasFolder(folder)) {
@ -1178,12 +1178,12 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke
} }
void KWalletD::slotAppUnregistered(const TQCString& app) { void TDEWalletD::slotAppUnregistered(const TQCString& app) {
if (_handles.contains(app)) { if (_handles.contains(app)) {
TQValueList<int> l = _handles[app]; TQValueList<int> l = _handles[app];
for (TQValueList<int>::Iterator i = l.begin(); i != l.end(); ++i) { for (TQValueList<int>::Iterator i = l.begin(); i != l.end(); ++i) {
_handles[app].remove(*i); _handles[app].remove(*i);
KWallet::Backend *w = _wallets.find(*i); TDEWallet::Backend *w = _wallets.find(*i);
if (w && !_leaveOpen && 0 == w->deref()) { if (w && !_leaveOpen && 0 == w->deref()) {
close(w->walletName(), true); close(w->walletName(), true);
} }
@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) {
} }
void KWalletD::invalidateHandle(int handle) { void TDEWalletD::invalidateHandle(int handle) {
for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin(); for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin();
i != _handles.end(); i != _handles.end();
++i) { ++i) {
@ -1202,12 +1202,12 @@ void KWalletD::invalidateHandle(int handle) {
} }
KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) { TDEWallet::Backend *TDEWalletD::getWallet(const TQCString& appid, int handle) {
if (handle == 0) { if (handle == 0) {
return 0L; return 0L;
} }
KWallet::Backend *w = _wallets.find(handle); TDEWallet::Backend *w = _wallets.find(handle);
if (w) { // the handle is valid if (w) { // the handle is valid
if (_handles.contains(appid)) { // we know this app if (_handles.contains(appid)) { // we know this app
@ -1231,7 +1231,7 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) {
} }
void KWalletD::notifyFailures() { void TDEWalletD::notifyFailures() {
if (!_showingFailureNotify) { if (!_showingFailureNotify) {
_showingFailureNotify = true; _showingFailureNotify = true;
KMessageBox::information(0, i18n("There have been repeated failed attempts to gain access to a wallet. An application may be misbehaving."), i18n("TDE Wallet Service")); KMessageBox::information(0, i18n("There have been repeated failed attempts to gain access to a wallet. An application may be misbehaving."), i18n("TDE Wallet Service"));
@ -1240,7 +1240,7 @@ void KWalletD::notifyFailures() {
} }
void KWalletD::doCloseSignals(int handle, const TQString& wallet) { void TDEWalletD::doCloseSignals(int handle, const TQString& wallet) {
TQByteArray data; TQByteArray data;
TQDataStream ds(data, IO_WriteOnly); TQDataStream ds(data, IO_WriteOnly);
ds << handle; ds << handle;
@ -1257,8 +1257,8 @@ void KWalletD::doCloseSignals(int handle, const TQString& wallet) {
} }
int KWalletD::renameEntry(int handle, const TQString& folder, const TQString& oldName, const TQString& newName) { int TDEWalletD::renameEntry(int handle, const TQString& folder, const TQString& oldName, const TQString& newName) {
KWallet::Backend *b; TDEWallet::Backend *b;
if ((b = getWallet(friendlyDCOPPeerName(), handle))) { if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
b->setFolder(folder); b->setFolder(folder);
@ -1277,10 +1277,10 @@ int KWalletD::renameEntry(int handle, const TQString& folder, const TQString& ol
} }
TQStringList KWalletD::users(const TQString& wallet) const { TQStringList TDEWalletD::users(const TQString& wallet) const {
TQStringList rc; TQStringList rc;
for (TQIntDictIterator<KWallet::Backend> it(_wallets); for (TQIntDictIterator<TDEWallet::Backend> it(_wallets);
it.current(); it.current();
++it) { ++it) {
if (it.current()->walletName() == wallet) { if (it.current()->walletName() == wallet) {
@ -1297,8 +1297,8 @@ TQStringList KWalletD::users(const TQString& wallet) const {
} }
bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& application) { bool TDEWalletD::disconnectApplication(const TQString& wallet, const TQCString& application) {
for (TQIntDictIterator<KWallet::Backend> it(_wallets); for (TQIntDictIterator<TDEWallet::Backend> it(_wallets);
it.current(); it.current();
++it) { ++it) {
if (it.current()->walletName() == wallet) { if (it.current()->walletName() == wallet) {
@ -1328,7 +1328,7 @@ bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& ap
} }
void KWalletD::emitFolderUpdated(const TQString& wallet, const TQString& folder) { void TDEWalletD::emitFolderUpdated(const TQString& wallet, const TQString& folder) {
TQByteArray data; TQByteArray data;
TQDataStream ds(data, IO_WriteOnly); TQDataStream ds(data, IO_WriteOnly);
ds << wallet; ds << wallet;
@ -1337,12 +1337,12 @@ void KWalletD::emitFolderUpdated(const TQString& wallet, const TQString& folder)
} }
void KWalletD::emitWalletListDirty() { void TDEWalletD::emitWalletListDirty() {
emitDCOPSignal("walletListDirty()", TQByteArray()); emitDCOPSignal("walletListDirty()", TQByteArray());
} }
void KWalletD::reconfigure() { void TDEWalletD::reconfigure() {
TDEConfig cfg("tdewalletrc"); TDEConfig cfg("tdewalletrc");
cfg.setGroup("Wallet"); cfg.setGroup("Wallet");
_firstUse = cfg.readBoolEntry("First Use", true); _firstUse = cfg.readBoolEntry("First Use", true);
@ -1365,14 +1365,14 @@ void KWalletD::reconfigure() {
// Handle idle changes // Handle idle changes
if (_closeIdle) { if (_closeIdle) {
if (_idleTime != timeSave) { // Timer length changed if (_idleTime != timeSave) { // Timer length changed
TQIntDictIterator<KWallet::Backend> it(_wallets); TQIntDictIterator<TDEWallet::Backend> it(_wallets);
for (; it.current(); ++it) { for (; it.current(); ++it) {
_timeouts->resetTimer(it.currentKey(), _idleTime); _timeouts->resetTimer(it.currentKey(), _idleTime);
} }
} }
if (!idleSave) { // add timers for all the wallets if (!idleSave) { // add timers for all the wallets
TQIntDictIterator<KWallet::Backend> it(_wallets); TQIntDictIterator<TDEWallet::Backend> it(_wallets);
for (; it.current(); ++it) { for (; it.current(); ++it) {
_timeouts->addTimer(it.currentKey(), _idleTime); _timeouts->addTimer(it.currentKey(), _idleTime);
} }
@ -1400,7 +1400,7 @@ void KWalletD::reconfigure() {
// Update if wallet was enabled/disabled // Update if wallet was enabled/disabled
if (!_enabled) { // close all wallets if (!_enabled) { // close all wallets
while (!_wallets.isEmpty()) { while (!_wallets.isEmpty()) {
TQIntDictIterator<KWallet::Backend> it(_wallets); TQIntDictIterator<TDEWallet::Backend> it(_wallets);
if (!it.current()) { // necessary? if (!it.current()) { // necessary?
break; break;
} }
@ -1410,23 +1410,23 @@ void KWalletD::reconfigure() {
} }
bool KWalletD::isEnabled() const { bool TDEWalletD::isEnabled() const {
return _enabled; return _enabled;
} }
bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) { bool TDEWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) {
if (!wallets().contains(wallet)) { if (!wallets().contains(wallet)) {
return true; return true;
} }
for (TQIntDictIterator<KWallet::Backend> it(_wallets); it.current(); ++it) { for (TQIntDictIterator<TDEWallet::Backend> it(_wallets); it.current(); ++it) {
if (it.current()->walletName() == wallet) { if (it.current()->walletName() == wallet) {
return it.current()->folderDoesNotExist(folder); return it.current()->folderDoesNotExist(folder);
} }
} }
KWallet::Backend *b = new KWallet::Backend(wallet); TDEWallet::Backend *b = new TDEWallet::Backend(wallet);
b->open(TQByteArray()); b->open(TQByteArray());
bool rc = b->folderDoesNotExist(folder); bool rc = b->folderDoesNotExist(folder);
delete b; delete b;
@ -1434,18 +1434,18 @@ bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder
} }
bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) { bool TDEWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) {
if (!wallets().contains(wallet)) { if (!wallets().contains(wallet)) {
return true; return true;
} }
for (TQIntDictIterator<KWallet::Backend> it(_wallets); it.current(); ++it) { for (TQIntDictIterator<TDEWallet::Backend> it(_wallets); it.current(); ++it) {
if (it.current()->walletName() == wallet) { if (it.current()->walletName() == wallet) {
return it.current()->entryDoesNotExist(folder, key); return it.current()->entryDoesNotExist(folder, key);
} }
} }
KWallet::Backend *b = new KWallet::Backend(wallet); TDEWallet::Backend *b = new TDEWallet::Backend(wallet);
b->open(TQByteArray()); b->open(TQByteArray());
bool rc = b->entryDoesNotExist(folder, key); bool rc = b->entryDoesNotExist(folder, key);
delete b; delete b;
@ -1453,17 +1453,17 @@ bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, c
} }
bool KWalletD::implicitAllow(const TQString& wallet, const TQCString& app) { bool TDEWalletD::implicitAllow(const TQString& wallet, const TQCString& app) {
return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app)); return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app));
} }
bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) { bool TDEWalletD::implicitDeny(const TQString& wallet, const TQCString& app) {
return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app)); return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app));
} }
TQCString KWalletD::friendlyDCOPPeerName() { TQCString TDEWalletD::friendlyDCOPPeerName() {
DCOPClient *dc = callingDcopClient(); DCOPClient *dc = callingDcopClient();
if (!dc) { if (!dc) {
return ""; return "";
@ -1472,18 +1472,18 @@ TQCString KWalletD::friendlyDCOPPeerName() {
} }
void KWalletD::timedOut(int id) { void TDEWalletD::timedOut(int id) {
KWallet::Backend *w = _wallets.find(id); TDEWallet::Backend *w = _wallets.find(id);
if (w) { if (w) {
closeWallet(w, id, true); closeWallet(w, id, true);
} }
} }
void KWalletD::closeAllWallets() { void TDEWalletD::closeAllWallets() {
TQIntDict<KWallet::Backend> tw = _wallets; TQIntDict<TDEWallet::Backend> tw = _wallets;
for (TQIntDictIterator<KWallet::Backend> it(tw); it.current(); ++it) { for (TQIntDictIterator<TDEWallet::Backend> it(tw); it.current(); ++it) {
closeWallet(it.current(), it.currentKey(), true); closeWallet(it.current(), it.currentKey(), true);
} }
@ -1501,13 +1501,13 @@ void KWalletD::closeAllWallets() {
} }
TQString KWalletD::networkWallet() { TQString TDEWalletD::networkWallet() {
return KWallet::Wallet::NetworkWallet(); return TDEWallet::Wallet::NetworkWallet();
} }
TQString KWalletD::localWallet() { TQString TDEWalletD::localWallet() {
return KWallet::Wallet::LocalWallet(); return TDEWallet::Wallet::LocalWallet();
} }

224
tdeio/misc/tdewalletd/tdewalletd.desktop
Unescape View File

@ -6,146 +6,146 @@ X-TDE-Library=tdewalletd
X-TDE-FactoryName=tdewalletd X-TDE-FactoryName=tdewalletd
X-TDE-Kded-autoload=false X-TDE-Kded-autoload=false
X-TDE-Kded-load-on-demand=true X-TDE-Kded-load-on-demand=true
Name=KWallet Daemon Module Name=TDEWallet Daemon Module
Name[af]=KBeursie Bediener Module Name[af]=KBeursie Bediener Module
Name[ar]=مراقب وحدة KWallet Name[ar]=مراقب وحدة TDEWallet
Name[az]=KWallet Demon Modulu Name[az]=TDEWallet Demon Modulu
Name[be]=Модуль сервіса KWallet Name[be]=Модуль сервіса TDEWallet
Name[bg]=Демон Портфейл Name[bg]=Демон Портфейл
Name[bn]=কে-ওয়ালেট ডিমন মডিউল Name[bn]=কে-ওয়ালেট ডিমন মডিউল
Name[br]=Mollad an diaoul KWallet Name[br]=Mollad an diaoul TDEWallet
Name[ca]=Mòdul del dimoni KWallet Name[ca]=Mòdul del dimoni TDEWallet
Name[cs]=Modul démona KWallet Name[cs]=Modul démona TDEWallet
Name[csb]=Pòrtfel Name[csb]=Pòrtfel
Name[cy]=Modiwl Daemon KWaled Name[cy]=Modiwl Daemon KWaled
Name[da]=KWallet Dæmonmodul Name[da]=TDEWallet Dæmonmodul
Name[de]=Digitale Brieftasche Name[de]=Digitale Brieftasche
Name[el]=Άρθρωμα δαίμονα KWallet Name[el]=Άρθρωμα δαίμονα TDEWallet
Name[eo]=Sekreteja demono-modulo Name[eo]=Sekreteja demono-modulo
Name[es]=Módulo de demonio KWallet Name[es]=Módulo de demonio TDEWallet
Name[et]=KWalleti deemoni moodul Name[et]=TDEWalleti deemoni moodul
Name[eu]=KWallet daemon modulua Name[eu]=TDEWallet daemon modulua
Name[fa]=پیمانه شبح KWallet Name[fa]=پیمانه شبح TDEWallet
Name[fi]=KWallet-palvelinmoduuli Name[fi]=TDEWallet-palvelinmoduuli
Name[fr]=Module démon KWallet Name[fr]=Module démon TDEWallet
Name[ga]=Modúl Deamhain KWallet Name[ga]=Modúl Deamhain TDEWallet
Name[gl]=Módulo do Demo KWallet Name[gl]=Módulo do Demo TDEWallet
Name[he]=מודול תהליך הרקע של KWallet Name[he]=מודול תהליך הרקע של TDEWallet
Name[hi]=केवैलट डेमन मॉड्यूल Name[hi]=केवैलट डेमन मॉड्यूल
Name[hr]=Modul KWallet demona Name[hr]=Modul TDEWallet demona
Name[hu]=KWallet szolgáltatás Name[hu]=TDEWallet szolgáltatás
Name[id]=Modul Daemon KWallet Name[id]=Modul Daemon TDEWallet
Name[is]=KWallet þjónseining Name[is]=TDEWallet þjónseining
Name[it]=Modulo demone KWallet Name[it]=Modulo demone TDEWallet
Name[ja]=KWallet デーモンモジュール Name[ja]=TDEWallet デーモンモジュール
Name[ka]=KWallet გუშაგის მოდული Name[ka]=TDEWallet გუშაგის მოდული
Name[kk]=KWallet әмиян қызметтің модулі Name[kk]=TDEWallet әмиян қызметтің модулі
Name[km]=ម៉ូឌុល Daemon KWallet Name[km]=ម៉ូឌុល Daemon TDEWallet
Name[ko]=K지갑 데몬 모듈 Name[ko]=K지갑 데몬 모듈
Name[lb]=KWallet-Dämonmodul Name[lb]=TDEWallet-Dämonmodul
Name[lt]=TDE slaptažodinių tarnybos modulis Name[lt]=TDE slaptažodinių tarnybos modulis
Name[lv]=KWallet Dēmona Modulis Name[lv]=TDEWallet Dēmona Modulis
Name[mn]=KWallet Daemon Модул Name[mn]=TDEWallet Daemon Модул
Name[ms]=Modul Daemon KWallet Name[ms]=Modul Daemon TDEWallet
Name[nb]=KWallet nisseprogramtillegg Name[nb]=TDEWallet nisseprogramtillegg
Name[nds]=KWallet-Dämoon Name[nds]=TDEWallet-Dämoon
Name[ne]=KWallet डेइमन मोड्युल Name[ne]=TDEWallet डेइमन मोड्युल
Name[nl]=KWallet daemon-module Name[nl]=TDEWallet daemon-module
Name[nn]=KWallet-nissemodul Name[nn]=TDEWallet-nissemodul
Name[pa]=KWallet ਪੇਸ਼ਕਾਰੀ ਮੈਡੀਊਲ Name[pa]=TDEWallet ਪੇਸ਼ਕਾਰੀ ਮੈਡੀਊਲ
Name[pl]=Portfel Name[pl]=Portfel
Name[pt]=Módulo do Servidor do KWallet Name[pt]=Módulo do Servidor do TDEWallet
Name[pt_BR]=Módulo do Serviço do KWallet Name[pt_BR]=Módulo do Serviço do TDEWallet
Name[ro]=Modul demon KWallet Name[ro]=Modul demon TDEWallet
Name[ru]=Служба бумажника Name[ru]=Служба бумажника
Name[rw]=Igice Dayimoni KUruhago Name[rw]=Igice Dayimoni KUruhago
Name[se]=KWallet-bálvámoduvla Name[se]=TDEWallet-bálvámoduvla
Name[sk]=Modul démona KWallet Name[sk]=Modul démona TDEWallet
Name[sl]=Modul demona TDEListnica Name[sl]=Modul demona TDEListnica
Name[sq]=Demoni për Modulin KWallet Name[sq]=Demoni për Modulin TDEWallet
Name[sr]=KWallet демон модул Name[sr]=TDEWallet демон модул
Name[sr@Latn]=KWallet demon modul Name[sr@Latn]=TDEWallet demon modul
Name[sv]=Kwallet-demonmodul Name[sv]=Kwallet-demonmodul
Name[ta]=KWallet டெமான் பகுதி Name[ta]=TDEWallet டெமான் பகுதி
Name[te]=కెవాలెట్ సూత్రధారి మాడ్యూల్ Name[te]=కెవాలెట్ సూత్రధారి మాడ్యూల్
Name[tg]=Модули Демон KWallet Name[tg]=Модули Демон TDEWallet
Name[th]=โมดูลเดมอน KWallet Name[th]=โมดูลเดมอน TDEWallet
Name[tr]=KWallet Program Modülü Name[tr]=TDEWallet Program Modülü
Name[tt]=KWallet Xezmäteneñ Modulı Name[tt]=TDEWallet Xezmäteneñ Modulı
Name[uk]=Модуль демону KWallet Name[uk]=Модуль демону TDEWallet
Name[uz]=KWallet xizmatining moduli Name[uz]=TDEWallet xizmatining moduli
Name[uz@cyrillic]=KWallet хизматининг модули Name[uz@cyrillic]=TDEWallet хизматининг модули
Name[vi]=Mô-đun trình nền KWallet Name[vi]=Mô-đun trình nền TDEWallet
Name[zh_CN]=KWallet 守护进程模块 Name[zh_CN]=TDEWallet 守护进程模块
Name[zh_HK]=KWAllet 伺服程式模組 Name[zh_HK]=KWAllet 伺服程式模組
Name[zh_TW]=KWAllet 服務程式模組 Name[zh_TW]=KWAllet 服務程式模組
Comment=KWallet daemon module for KDED Comment=TDEWallet daemon module for KDED
Comment[af]=KBeursie bediener module vir KDED Comment[af]=KBeursie bediener module vir KDED
Comment[be]=Модуль сервіса KWallet для KDED Comment[be]=Модуль сервіса TDEWallet для KDED
Comment[bg]=Модул демон за системата Портфейл за KDED Comment[bg]=Модул демон за системата Портфейл за KDED
Comment[bn]=KDED-র জন্য কে-ওয়ালেট ডিমন মডিউল Comment[bn]=KDED-র জন্য কে-ওয়ালেট ডিমন মডিউল
Comment[br]=Mollad an diaoul KWallet evit KDED Comment[br]=Mollad an diaoul TDEWallet evit KDED
Comment[bs]=KWallet daemon modul za KDED Comment[bs]=TDEWallet daemon modul za KDED
Comment[ca]=Mòdul del dimoni KWallet per a KDED Comment[ca]=Mòdul del dimoni TDEWallet per a KDED
Comment[cs]=Modul démona KWallet pro KDED Comment[cs]=Modul démona TDEWallet pro KDED
Comment[csb]=Mòduł KWallet w KDED Comment[csb]=Mòduł TDEWallet w KDED
Comment[da]=KWallet Dæmonmodul for KDED Comment[da]=TDEWallet Dæmonmodul for KDED
Comment[de]=Unterstützung für die digitale Brieftasche "KWallet" Comment[de]=Unterstützung für die digitale Brieftasche "TDEWallet"
Comment[el]=Άρθρωμα δαίμονα KWallet για το KDED Comment[el]=Άρθρωμα δαίμονα TDEWallet για το KDED
Comment[eo]=Sekreteja demono-modulo por KDED Comment[eo]=Sekreteja demono-modulo por KDED
Comment[es]=Módulo de demonio KWallet para KDED Comment[es]=Módulo de demonio TDEWallet para KDED
Comment[et]=KDED KWalleti deemoni moodul Comment[et]=KDED TDEWalleti deemoni moodul
Comment[eu]=KWallet daemon modulua KDEDrako Comment[eu]=TDEWallet daemon modulua KDEDrako
Comment[fa]=پیمانۀ شبح KWallet برای KDED Comment[fa]=پیمانۀ شبح TDEWallet برای KDED
Comment[fi]=KWallet palvelinmoduuli KDED:lle Comment[fi]=TDEWallet palvelinmoduuli KDED:lle
Comment[fr]=Module démon KWallet pour KDED Comment[fr]=Module démon TDEWallet pour KDED
Comment[fy]=KWallet daemon module foar KDED Comment[fy]=TDEWallet daemon module foar KDED
Comment[ga]=Modúl deamhain KWallet le haghaidh KDED Comment[ga]=Modúl deamhain TDEWallet le haghaidh KDED
Comment[gl]=Demo de KWallet para KDED Comment[gl]=Demo de TDEWallet para KDED
Comment[he]=מודול תהליך רקע של KWallet עבור KDED Comment[he]=מודול תהליך רקע של TDEWallet עבור KDED
Comment[hi]=केडीईडी के लिए के-वॉलेट डेमन मॉड्यूल Comment[hi]=केडीईडी के लिए के-वॉलेट डेमन मॉड्यूल
Comment[hr]=KWallet demon modul za KDED Comment[hr]=TDEWallet demon modul za KDED
Comment[hu]=KWallet szolgáltatásmodul a KDED-hez Comment[hu]=TDEWallet szolgáltatásmodul a KDED-hez
Comment[id]=Modul daemon KWallet untuk KDED Comment[id]=Modul daemon TDEWallet untuk KDED
Comment[is]=KWallet þjónseining fyrir KDED Comment[is]=TDEWallet þjónseining fyrir KDED
Comment[it]=Modulo demone KWallet per KDED Comment[it]=Modulo demone TDEWallet per KDED
Comment[ja]=KDED 用の KWallet デーモンモジュール Comment[ja]=KDED 用の TDEWallet デーモンモジュール
Comment[ka]=KSSL მოდული TDE-სთვის Comment[ka]=KSSL მოდული TDE-სთვის
Comment[kk]=TDE KWallet әмиянін басқару қызметтің модулі Comment[kk]=TDE TDEWallet әмиянін басқару қызметтің модулі
Comment[km]=ម៉ូឌុល daemon KWallet សម្រាប់ KDED Comment[km]=ម៉ូឌុល daemon TDEWallet សម្រាប់ KDED
Comment[lb]=KWallet-Dämonmodul fir KDED Comment[lb]=TDEWallet-Dämonmodul fir KDED
Comment[lt]=TDE slaptažodinių tarnybos modulis skirtas KDED Comment[lt]=TDE slaptažodinių tarnybos modulis skirtas KDED
Comment[lv]=KWallet Dēmona Modulis priekš KDED Comment[lv]=TDEWallet Dēmona Modulis priekš KDED
Comment[mk]=KWallet даемон модул за KDED Comment[mk]=TDEWallet даемон модул за KDED
Comment[ms]=Modul Daemon KWallet untuk KDED Comment[ms]=Modul Daemon TDEWallet untuk KDED
Comment[nb]=KWallet nissemodul for KDED Comment[nb]=TDEWallet nissemodul for KDED
Comment[nds]=KWallet-Dämoonmoduul för KDED Comment[nds]=TDEWallet-Dämoonmoduul för KDED
Comment[ne]=KDED का लागि डेइमन मोड्युल KWallet Comment[ne]=KDED का लागि डेइमन मोड्युल TDEWallet
Comment[nl]=KWallet daemon-module voor KDED Comment[nl]=TDEWallet daemon-module voor KDED
Comment[nn]=KWallet-nissemodul for KDED Comment[nn]=TDEWallet-nissemodul for KDED
Comment[pa]=KDED ਲਈ KWallet ਪੇਸ਼ਕਾਰੀ ਮੈਡੀਊਲ Comment[pa]=KDED ਲਈ TDEWallet ਪੇਸ਼ਕਾਰੀ ਮੈਡੀਊਲ
Comment[pl]=Moduł KWallet w KDED Comment[pl]=Moduł TDEWallet w KDED
Comment[pt]=Módulo servidor do KWallet para o KDED Comment[pt]=Módulo servidor do TDEWallet para o KDED
Comment[pt_BR]=Módulo do serviço de carteira para o TDE Comment[pt_BR]=Módulo do serviço de carteira para o TDE
Comment[ro]=Modul demon KWallet pentru KDED Comment[ro]=Modul demon TDEWallet pentru KDED
Comment[ru]=Управление бумажником TDE Comment[ru]=Управление бумажником TDE
Comment[rw]=Igice cya dayimoni KUruhago cya KDED Comment[rw]=Igice cya dayimoni KUruhago cya KDED
Comment[se]=KDED:a KWallet-bálvámoduvla Comment[se]=KDED:a TDEWallet-bálvámoduvla
Comment[sk]=Modul démona KWallet pre KDED Comment[sk]=Modul démona TDEWallet pre KDED
Comment[sl]=Modul demona TDEListnica za KDED Comment[sl]=Modul demona TDEListnica za KDED
Comment[sr]=KWallet демон модул за KDED Comment[sr]=TDEWallet демон модул за KDED
Comment[sr@Latn]=KWallet demon modul za KDED Comment[sr@Latn]=TDEWallet demon modul za KDED
Comment[sv]=Kwallet-demonmodul för KDED Comment[sv]=Kwallet-demonmodul för KDED
Comment[ta]=KDEDக்கான KWallet Daemon தொகுதி Comment[ta]=KDEDக்கான TDEWallet Daemon தொகுதி
Comment[te]=కెడిఈడి కొరకు కెవాలెట్ సూత్రధారి మాడ్యూల్ Comment[te]=కెడిఈడి కొరకు కెవాలెట్ సూత్రధారి మాడ్యూల్
Comment[tg]=Модули Демон KWallet барои KDED Comment[tg]=Модули Демон TDEWallet барои KDED
Comment[th]=โมดูลเดมอน KWallet สำหรับ KDED Comment[th]=โมดูลเดมอน TDEWallet สำหรับ KDED
Comment[tr]=KDED için KWallet program modülü Comment[tr]=KDED için TDEWallet program modülü
Comment[tt]=KDED öçen KWallet xezmäteneñ modulı Comment[tt]=KDED öçen TDEWallet xezmäteneñ modulı
Comment[uk]=Модуль демону торбинок KWallet для KDED Comment[uk]=Модуль демону торбинок TDEWallet для KDED
Comment[uz]=KDED uchun KWallet xizmatining moduli Comment[uz]=KDED uchun TDEWallet xizmatining moduli
Comment[uz@cyrillic]=KDED учун KWallet хизматининг модули Comment[uz@cyrillic]=KDED учун TDEWallet хизматининг модули
Comment[vi]=Mô-đun trình nền KWallet cho KDED. Comment[vi]=Mô-đun trình nền TDEWallet cho KDED.
Comment[zh_CN]=KDED 的 KWallet 守护进程模块 Comment[zh_CN]=KDED 的 TDEWallet 守护进程模块
Comment[zh_HK]=KDED 的 KWallet 伺服程式模組 Comment[zh_HK]=KDED 的 TDEWallet 伺服程式模組
Comment[zh_TW]=KDED 的 KWallet 服務程式模組 Comment[zh_TW]=KDED 的 TDEWallet 服務程式模組

16
tdeio/misc/tdewalletd/tdewalletd.h
Unescape View File

@ -37,14 +37,14 @@ class KDirWatch;
class KTimeout; class KTimeout;
// @Private // @Private
class KWalletTransaction; class TDEWalletTransaction;
class KWalletD : public KDEDModule { class TDEWalletD : public KDEDModule {
Q_OBJECT Q_OBJECT
K_DCOP K_DCOP
public: public:
KWalletD(const TQCString &name); TDEWalletD(const TQCString &name);
virtual ~KWalletD(); virtual ~TDEWalletD();
k_dcop: k_dcop:
// Is the wallet enabled? If not, all open() calls fail. // Is the wallet enabled? If not, all open() calls fail.
@ -157,7 +157,7 @@ class KWalletD : public KDEDModule {
int internalOpen(const TQCString& appid, const TQString& wallet, bool isPath = false, WId w = 0, bool modal = false); int internalOpen(const TQCString& appid, const TQString& wallet, bool isPath = false, WId w = 0, bool modal = false);
bool isAuthorizedApp(const TQCString& appid, const TQString& wallet, WId w); bool isAuthorizedApp(const TQCString& appid, const TQString& wallet, WId w);
// This also validates the handle. May return NULL. // This also validates the handle. May return NULL.
KWallet::Backend* getWallet(const TQCString& appid, int handle); TDEWallet::Backend* getWallet(const TQCString& appid, int handle);
// Generate a new unique handle. // Generate a new unique handle.
int generateHandle(); int generateHandle();
// Invalidate a handle (remove it from the TQMap) // Invalidate a handle (remove it from the TQMap)
@ -166,7 +166,7 @@ class KWalletD : public KDEDModule {
void doCloseSignals(int,const TQString&); void doCloseSignals(int,const TQString&);
void emitFolderUpdated(const TQString&, const TQString&); void emitFolderUpdated(const TQString&, const TQString&);
// Internal - close this wallet. // Internal - close this wallet.
int closeWallet(KWallet::Backend *w, int handle, bool force); int closeWallet(TDEWallet::Backend *w, int handle, bool force);
// Implicitly allow access for this application // Implicitly allow access for this application
bool implicitAllow(const TQString& wallet, const TQCString& app); bool implicitAllow(const TQString& wallet, const TQCString& app);
bool implicitDeny(const TQString& wallet, const TQCString& app); bool implicitDeny(const TQString& wallet, const TQCString& app);
@ -178,7 +178,7 @@ class KWalletD : public KDEDModule {
void setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ); void setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal );
void checkActiveDialog(); void checkActiveDialog();
TQIntDict<KWallet::Backend> _wallets; TQIntDict<TDEWallet::Backend> _wallets;
TQMap<TQCString,TQValueList<int> > _handles; TQMap<TQCString,TQValueList<int> > _handles;
TQMap<TQString,TQCString> _passwords; TQMap<TQString,TQCString> _passwords;
KDirWatch *_dw; KDirWatch *_dw;
@ -191,7 +191,7 @@ class KWalletD : public KDEDModule {
KTimeout *_timeouts; KTimeout *_timeouts;
TQTimer _tryOpenBlocked; TQTimer _tryOpenBlocked;
TQPtrList<KWalletTransaction> _transactions; TQPtrList<TDEWalletTransaction> _transactions;
TQGuardedPtr< TQWidget > activeDialog; TQGuardedPtr< TQWidget > activeDialog;
}; };

20
tdeio/misc/tdewalletd/tdewalletwizard.ui
Unescape View File

@ -1,8 +1,8 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>KWalletWizard</class> <class>TDEWalletWizard</class>
<widget class="TQWizard"> <widget class="TQWizard">
<property name="name"> <property name="name">
<cstring>KWalletWizard</cstring> <cstring>TDEWalletWizard</cstring>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -53,7 +53,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;u&gt;KWallet&lt;/u&gt; - The KDE Wallet System</string> <string>&lt;u&gt;TDEWallet&lt;/u&gt; - The KDE Wallet System</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
@ -78,7 +78,7 @@
<number>26</number> <number>26</number>
</property> </property>
<property name="text"> <property name="text">
<string>Welcome to KWallet, the KDE Wallet System. KWallet allows you to store your passwords and other personal information on disk in an encrypted file, preventing others from viewing the information. This wizard will tell you about KWallet and help you configure it for the first time.</string> <string>Welcome to TDEWallet, the KDE Wallet System. TDEWallet allows you to store your passwords and other personal information on disk in an encrypted file, preventing others from viewing the information. This wizard will tell you about TDEWallet and help you configure it for the first time.</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
@ -398,7 +398,7 @@
<cstring>textLabel1_3</cstring> <cstring>textLabel1_3</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>The KDE Wallet system allows you to control the level of security of your personal data. Some of these settings do impact usability. While the default settings are generally acceptable for most users, you may wish to change some of them. You may further tune these settings from the KWallet control module.</string> <string>The KDE Wallet system allows you to control the level of security of your personal data. Some of these settings do impact usability. While the default settings are generally acceptable for most users, you may wish to change some of them. You may further tune these settings from the TDEWallet control module.</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
@ -494,31 +494,31 @@
<connection> <connection>
<sender>_useWallet</sender> <sender>_useWallet</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>KWalletWizard</receiver> <receiver>TDEWalletWizard</receiver>
<slot>passwordPageUpdate()</slot> <slot>passwordPageUpdate()</slot>
</connection> </connection>
<connection> <connection>
<sender>_pass1</sender> <sender>_pass1</sender>
<signal>textChanged(const TQString&amp;)</signal> <signal>textChanged(const TQString&amp;)</signal>
<receiver>KWalletWizard</receiver> <receiver>TDEWalletWizard</receiver>
<slot>passwordPageUpdate()</slot> <slot>passwordPageUpdate()</slot>
</connection> </connection>
<connection> <connection>
<sender>_pass2</sender> <sender>_pass2</sender>
<signal>textChanged(const TQString&amp;)</signal> <signal>textChanged(const TQString&amp;)</signal>
<receiver>KWalletWizard</receiver> <receiver>TDEWalletWizard</receiver>
<slot>passwordPageUpdate()</slot> <slot>passwordPageUpdate()</slot>
</connection> </connection>
<connection> <connection>
<sender>_advanced</sender> <sender>_advanced</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>KWalletWizard</receiver> <receiver>TDEWalletWizard</receiver>
<slot>setAdvanced()</slot> <slot>setAdvanced()</slot>
</connection> </connection>
<connection> <connection>
<sender>_basic</sender> <sender>_basic</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>KWalletWizard</receiver> <receiver>TDEWalletWizard</receiver>
<slot>setBasic()</slot> <slot>setBasic()</slot>
</connection> </connection>
</connections> </connections>

10
tdeio/misc/tdewalletd/tdewalletwizard.ui.h
Unescape View File

@ -7,7 +7,7 @@
** place of a destructor. ** place of a destructor.
*****************************************************************************/ *****************************************************************************/
void KWalletWizard::passwordPageUpdate() void TDEWalletWizard::passwordPageUpdate()
{ {
bool fe = !_useWallet->isChecked() || _pass1->text() == _pass2->text(); bool fe = !_useWallet->isChecked() || _pass1->text() == _pass2->text();
if (_basic->isChecked()) { if (_basic->isChecked()) {
@ -34,7 +34,7 @@ void KWalletWizard::passwordPageUpdate()
} }
void KWalletWizard::init() void TDEWalletWizard::init()
{ {
setHelpEnabled(page1, false); setHelpEnabled(page1, false);
setHelpEnabled(page2, false); setHelpEnabled(page2, false);
@ -46,7 +46,7 @@ void KWalletWizard::init()
} }
void KWalletWizard::setAdvanced() void TDEWalletWizard::setAdvanced()
{ {
setAppropriate(page3, true); setAppropriate(page3, true);
setAppropriate(page4, true); setAppropriate(page4, true);
@ -57,7 +57,7 @@ void KWalletWizard::setAdvanced()
} }
void KWalletWizard::setBasic() void TDEWalletWizard::setBasic()
{ {
setAppropriate(page3, false); setAppropriate(page3, false);
setAppropriate(page4, false); setAppropriate(page4, false);
@ -67,7 +67,7 @@ void KWalletWizard::setBasic()
} }
void KWalletWizard::destroy() void TDEWalletWizard::destroy()
{ {
_pass1->clear(); _pass1->clear();
_pass2->clear(); _pass2->clear();

2
tdeio/tdeio/tdeprotocolmanager.h
Unescape View File

@ -189,7 +189,7 @@ public:
* Please note the use of .kionetrc files is highly discouraged since * Please note the use of .kionetrc files is highly discouraged since
* password is stored in clear text. For future releases the ability * password is stored in clear text. For future releases the ability
* to store preset password for proxy servers will probably be supported * to store preset password for proxy servers will probably be supported
* through KWallet integration. * through TDEWallet integration.
*/ */
enum ProxyAuthMode enum ProxyAuthMode
{ {

4
tdewallet/README
Unescape View File

@ -6,8 +6,8 @@ It has been updated to 10/22/2003.
This directory consists of two libraries: tdewalletbackend and tdewalletclient This directory consists of two libraries: tdewalletbackend and tdewalletclient
KWallet::Backend is used inside kded to manage the actual files and TDEWallet::Backend is used inside kded to manage the actual files and
encryption. On the other hand, KWallet::Wallet is used to represent encryption. On the other hand, TDEWallet::Wallet is used to represent
wallet entries and to encapsulate communication to and from the wallet entries and to encapsulate communication to and from the
wallet server inside kded. wallet server inside kded.

18
tdewallet/backend/tdewalletbackend.cc
Unescape View File

@ -49,18 +49,18 @@
#define KWALLET_HASH_MD5 1 // unsupported #define KWALLET_HASH_MD5 1 // unsupported
using namespace KWallet; using namespace TDEWallet;
#define KWMAGIC "KWALLET\n\r\0\r\n" #define KWMAGIC "KWALLET\n\r\0\r\n"
#define KWMAGIC_LEN 12 #define KWMAGIC_LEN 12
static void initKWalletDir() static void initTDEWalletDir()
{ {
TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
} }
Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) { Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) {
initKWalletDir(); initTDEWalletDir();
if (isPath) { if (isPath) {
_path = name; _path = name;
} else { } else {
@ -244,7 +244,7 @@ static int password2hash(const TQByteArray& password, TQByteArray& hash) {
bool Backend::exists(const TQString& wallet) { bool Backend::exists(const TQString& wallet) {
initKWalletDir(); initTDEWalletDir();
TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + wallet + ".kwl"; TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + wallet + ".kwl";
// Note: 60 bytes is presently the minimum size of a wallet file. // Note: 60 bytes is presently the minimum size of a wallet file.
// Anything smaller is junk. // Anything smaller is junk.
@ -453,17 +453,17 @@ int Backend::open(const TQByteArray& password) {
for (size_t i = 0; i < n; i++) { for (size_t i = 0; i < n; i++) {
TQString key; TQString key;
KWallet::Wallet::EntryType et = KWallet::Wallet::Unknown; TDEWallet::Wallet::EntryType et = TDEWallet::Wallet::Unknown;
Entry *e = new Entry; Entry *e = new Entry;
eStream >> key; eStream >> key;
TQ_INT32 x = 0; // necessary to read properly TQ_INT32 x = 0; // necessary to read properly
eStream >> x; eStream >> x;
et = static_cast<KWallet::Wallet::EntryType>(x); et = static_cast<TDEWallet::Wallet::EntryType>(x);
switch (et) { switch (et) {
case KWallet::Wallet::Password: case TDEWallet::Wallet::Password:
case KWallet::Wallet::Stream: case TDEWallet::Wallet::Stream:
case KWallet::Wallet::Map: case TDEWallet::Wallet::Map:
break; break;
default: // Unknown entry default: // Unknown entry
delete e; delete e;

2
tdewallet/backend/tdewalletbackend.h
Unescape View File

@ -30,7 +30,7 @@
#include "tdewalletentry.h" #include "tdewalletentry.h"
namespace KWallet { namespace TDEWallet {
class MD5Digest; class MD5Digest;

2
tdewallet/backend/tdewalletentry.cc
Unescape View File

@ -21,7 +21,7 @@
#include "tdewalletentry.h" #include "tdewalletentry.h"
using namespace KWallet; using namespace TDEWallet;
Entry::Entry() { Entry::Entry() {

2
tdewallet/backend/tdewalletentry.h
Unescape View File

@ -27,7 +27,7 @@
#include "tdewallet.h" #include "tdewallet.h"
namespace KWallet { namespace TDEWallet {
/* @internal /* @internal
*/ */

4
tdewallet/backend/tests/backendtest.cpp
Unescape View File

@ -9,8 +9,8 @@
int main(int argc, char **argv) { int main(int argc, char **argv) {
TDEApplication a(argc, argv, "tdewalletbackendtest"); TDEApplication a(argc, argv, "tdewalletbackendtest");
KWallet::Backend be("ktestwallet"); TDEWallet::Backend be("ktestwallet");
printf("KWalletBackend constructed\n"); printf("TDEWalletBackend constructed\n");
TQByteArray apass, bpass, cpass; TQByteArray apass, bpass, cpass;

2
tdewallet/client/tdewallet.cc
Unescape View File

@ -30,7 +30,7 @@
#include <assert.h> #include <assert.h>
using namespace KWallet; using namespace TDEWallet;
const TQString Wallet::LocalWallet() { const TQString Wallet::LocalWallet() {

8
tdewallet/client/tdewallet.h
Unescape View File

@ -38,7 +38,7 @@
class DCOPRef; class DCOPRef;
/** Namespace collecting all the Wallet-related classes. */ /** Namespace collecting all the Wallet-related classes. */
namespace KWallet { namespace TDEWallet {
/** /**
* KDE Wallet * KDE Wallet
@ -55,14 +55,14 @@ class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
Q_OBJECT Q_OBJECT
protected: protected:
/** /**
* Construct a KWallet object. * Construct a TDEWallet object.
* @internal * @internal
* @param handle The handle for the wallet. * @param handle The handle for the wallet.
* @param name The name of the wallet. * @param name The name of the wallet.
*/ */
Wallet(int handle, const TQString& name); Wallet(int handle, const TQString& name);
/** /**
* Copy a KWallet object. * Copy a TDEWallet object.
* @internal * @internal
*/ */
Wallet(const Wallet&); Wallet(const Wallet&);
@ -71,7 +71,7 @@ class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
enum EntryType { Unknown=0, Password, Stream, Map, Unused=0xffff }; enum EntryType { Unknown=0, Password, Stream, Map, Unused=0xffff };
/** /**
* Destroy a KWallet object. Closes the wallet. * Destroy a TDEWallet object. Closes the wallet.
*/ */
virtual ~Wallet(); virtual ~Wallet();

2
tdewallet/tests/tdewalletasync.cpp
Unescape View File

@ -19,7 +19,7 @@ void openWallet()
_out << "About to ask for wallet async" << endl; _out << "About to ask for wallet async" << endl;
// we have no wallet: ask for one. // we have no wallet: ask for one.
KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous ); TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous );
WalletReceiver r; WalletReceiver r;
r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) ); r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) );

4
tdewallet/tests/tdewalletboth.cpp
Unescape View File

@ -19,14 +19,14 @@ void openWallet()
_out << "About to ask for wallet async" << endl; _out << "About to ask for wallet async" << endl;
// we have no wallet: ask for one. // we have no wallet: ask for one.
KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous ); TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous );
WalletReceiver r; WalletReceiver r;
r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) ); r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) );
_out << "About to ask for wallet sync" << endl; _out << "About to ask for wallet sync" << endl;
wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous ); wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Synchronous );
_out << "Got sync wallet: " << (wallet != 0) << endl; _out << "Got sync wallet: " << (wallet != 0) << endl;
_out << "About to start 30 second event loop" << endl; _out << "About to start 30 second event loop" << endl;

2
tdewallet/tests/tdewalletsync.cpp
Unescape View File

@ -16,7 +16,7 @@ void openWallet()
{ {
_out << "About to ask for wallet sync" << endl; _out << "About to ask for wallet sync" << endl;
KWallet::Wallet *w = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous ); TDEWallet::Wallet *w = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Synchronous );
_out << "Got sync wallet: " << (w != 0) << endl; _out << "Got sync wallet: " << (w != 0) << endl;
} }

2
tdewallet/tests/tdewallettest.h
Unescape View File

@ -3,7 +3,7 @@
#include <tqobject.h> #include <tqobject.h>
namespace KWallet { class Wallet; } namespace TDEWallet { class Wallet; }
class WalletReceiver : public TQObject class WalletReceiver : public TQObject
{ {

Write Preview
Loading…
Cancel
Save