diff options
Diffstat (limited to 'kio/misc/kwalletd')
-rw-r--r-- | kio/misc/kwalletd/kbetterthankdialogbase.ui | 22 | ||||
-rw-r--r-- | kio/misc/kwalletd/ktimeout.cpp | 6 | ||||
-rw-r--r-- | kio/misc/kwalletd/kwalletd.cpp | 64 | ||||
-rw-r--r-- | kio/misc/kwalletd/kwalletd.h | 2 | ||||
-rw-r--r-- | kio/misc/kwalletd/kwalletwizard.ui | 84 |
5 files changed, 89 insertions, 89 deletions
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui index ecf2d236f..60b75da28 100644 --- a/kio/misc/kwalletd/kbetterthankdialogbase.ui +++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KBetterThanKDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KBetterThanKDialogBase</cstring> </property> @@ -37,14 +37,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>21</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layout1</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_allowOnce</cstring> </property> @@ -63,7 +63,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_allowAlways</cstring> </property> @@ -71,7 +71,7 @@ <string>Allow &Always</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_deny</cstring> </property> @@ -79,7 +79,7 @@ <string>&Deny</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_denyForever</cstring> </property> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -140,13 +140,13 @@ <include location="global" impldecl="in declaration">kactivelabel.h</include> <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">clicked()</slot> - <slot>setLabel( const QString & label )</slot> + <slot>setLabel( const TQString & label )</slot> <slot access="private">init()</slot> <slot access="protected">accept()</slot> <slot access="protected">reject()</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp index c431ecf69..d4c87bd28 100644 --- a/kio/misc/kwalletd/ktimeout.cpp +++ b/kio/misc/kwalletd/ktimeout.cpp @@ -39,7 +39,7 @@ void KTimeout::clear() { void KTimeout::removeTimer(int id) { - TQTimer *t = _timers.find(id); + TQTimer *t = _timers.tqfind(id); if (t != 0L) { _timers.remove(id); // autodeletes } @@ -47,7 +47,7 @@ void KTimeout::removeTimer(int id) { void KTimeout::addTimer(int id, int timeout) { - if (_timers.find(id) != 0L) { + if (_timers.tqfind(id) != 0L) { return; } @@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) { void KTimeout::resetTimer(int id, int timeout) { - TQTimer *t = _timers.find(id); + TQTimer *t = _timers.tqfind(id); if (t) { t->changeInterval(timeout); } diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 069575710..2cd8cd406 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -121,7 +121,7 @@ int KWalletD::generateHandle() { // ASSUMPTION: RAND_MAX is fairly large. do { rc = rand(); - } while (_wallets.find(rc) || rc == 0); + } while (_wallets.tqfind(rc) || rc == 0); return rc; } @@ -308,7 +308,7 @@ void KWalletD::checkActiveDialog() { } int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) { - if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet())) { + if (_firstUse && !wallets().tqcontains(KWallet::Wallet::LocalWallet())) { // First use wizard KWalletWizard *wiz = new KWalletWizard(0); setupDialog( wiz, wId, appid, modal ); @@ -529,11 +529,11 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool KApplication::startServiceByDesktopName("kwalletmanager-kwalletd"); } } else { - if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { + if (!_handles[appid].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { return -1; } _handles[appid].append(rc); - _wallets.find(rc)->ref(); + _wallets.tqfind(rc)->ref(); } return rc; @@ -567,7 +567,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W KConfig cfg("kwalletrc"); cfg.setGroup("Auto Allow"); TQStringList apps = cfg.readListEntry(wallet); - if (!apps.contains(thisApp)) { + if (!apps.tqcontains(thisApp)) { apps += thisApp; _implicitAllowMap[wallet] += thisApp; cfg.writeEntry(wallet, apps); @@ -578,7 +578,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W KConfig cfg("kwalletrc"); cfg.setGroup("Auto Deny"); TQStringList apps = cfg.readListEntry(wallet); - if (!apps.contains(thisApp)) { + if (!apps.tqcontains(thisApp)) { apps += thisApp; _implicitDenyMap[wallet] += thisApp; cfg.writeEntry(wallet, apps); @@ -646,7 +646,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin return; } - w = _wallets.find(handle); + w = _wallets.tqfind(handle); reclose = true; } else { handle = it.currentKey(); @@ -712,12 +712,12 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { const TQString& wallet = w->walletName(); assert(_passwords.contains(wallet)); if (w->refCount() == 0 || force) { - invalidateHandle(handle); + tqinvalidateHandle(handle); if (_closeIdle && _timeouts) { _timeouts->removeTimer(handle); } _wallets.remove(handle); - if (_passwords.contains(wallet)) { + if (_passwords.tqcontains(wallet)) { w->close(TQByteArray().duplicate(_passwords[wallet].data(), _passwords[wallet].length())); _passwords[wallet].fill(0); _passwords.remove(wallet); @@ -735,14 +735,14 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { int KWalletD::close(int handle, bool force) { TQCString appid = friendlyDCOPPeerName(); - KWallet::Backend *w = _wallets.find(handle); + KWallet::Backend *w = _wallets.tqfind(handle); bool contains = false; if (w) { // the handle is valid - if (_handles.contains(appid)) { // we know this app - if (_handles[appid].contains(handle)) { + if (_handles.tqcontains(appid)) { // we know this app + if (_handles[appid].tqcontains(handle)) { // the app owns this handle - _handles[appid].remove(_handles[appid].find(handle)); + _handles[appid].remove(_handles[appid].tqfind(handle)); contains = true; if (_handles[appid].isEmpty()) { _handles.remove(appid); @@ -757,9 +757,9 @@ int KWalletD::close(int handle, bool force) { } _wallets.remove(handle); if (force) { - invalidateHandle(handle); + tqinvalidateHandle(handle); } - if (_passwords.contains(w->walletName())) { + if (_passwords.tqcontains(w->walletName())) { w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length())); _passwords[w->walletName()].fill(0); _passwords.remove(w->walletName()); @@ -792,7 +792,7 @@ bool KWalletD::isOpen(int handle) { return false; } - KWallet::Backend *rc = _wallets.find(handle); + KWallet::Backend *rc = _wallets.tqfind(handle); if (rc == 0 && ++_failed > 5) { _failed = 0; @@ -812,8 +812,8 @@ TQStringList KWalletD::wallets() const { dir.setFilter(TQDir::Files | TQDir::NoSymLinks); - const QFileInfoList *list = dir.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = dir.entryInfoList(); + TQFileInfoListIterator it(*list); TQFileInfo *fi; while ((fi = it.current()) != 0L) { TQString fn = fi->fileName(); @@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke void KWalletD::slotAppUnregistered(const TQCString& app) { - if (_handles.contains(app)) { + if (_handles.tqcontains(app)) { TQValueList<int> l = _handles[app]; for (TQValueList<int>::Iterator i = l.begin(); i != l.end(); ++i) { _handles[app].remove(*i); - KWallet::Backend *w = _wallets.find(*i); + KWallet::Backend *w = _wallets.tqfind(*i); if (w && !_leaveOpen && 0 == w->deref()) { close(w->walletName(), true); } @@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) { } -void KWalletD::invalidateHandle(int handle) { +void KWalletD::tqinvalidateHandle(int handle) { for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin(); i != _handles.end(); ++i) { @@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) { return 0L; } - KWallet::Backend *w = _wallets.find(handle); + KWallet::Backend *w = _wallets.tqfind(handle); if (w) { // the handle is valid - if (_handles.contains(appid)) { // we know this app - if (_handles[appid].contains(handle)) { + if (_handles.tqcontains(appid)) { // we know this app + if (_handles[appid].tqcontains(handle)) { // the app owns this handle _failed = 0; if (_closeIdle && _timeouts) { @@ -1285,7 +1285,7 @@ TQStringList KWalletD::users(const TQString& wallet) const { ++it) { if (it.current()->walletName() == wallet) { for (TQMap<TQCString,TQValueList<int> >::ConstIterator hit = _handles.begin(); hit != _handles.end(); ++hit) { - if (hit.data().contains(it.currentKey())) { + if (hit.data().tqcontains(it.currentKey())) { rc += hit.key(); } } @@ -1302,7 +1302,7 @@ bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& ap it.current(); ++it) { if (it.current()->walletName() == wallet) { - if (_handles[application].contains(it.currentKey())) { + if (_handles[application].tqcontains(it.currentKey())) { _handles[application].remove(it.currentKey()); if (_handles[application].isEmpty()) { @@ -1416,7 +1416,7 @@ bool KWalletD::isEnabled() const { bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) { - if (!wallets().contains(wallet)) { + if (!wallets().tqcontains(wallet)) { return true; } @@ -1435,7 +1435,7 @@ bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) { - if (!wallets().contains(wallet)) { + if (!wallets().tqcontains(wallet)) { return true; } @@ -1454,12 +1454,12 @@ bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, c bool KWalletD::implicitAllow(const TQString& wallet, const TQCString& app) { - return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app)); + return _implicitAllowMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); } bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) { - return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app)); + return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); } @@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() { if (!dc) { return ""; } - return dc->senderId().replace(TQRegExp("-[0-9]+$"), ""); + return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), ""); } void KWalletD::timedOut(int id) { - KWallet::Backend *w = _wallets.find(id); + KWallet::Backend *w = _wallets.tqfind(id); if (w) { closeWallet(w, id, true); } diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h index 2aea371ba..ba83b4efc 100644 --- a/kio/misc/kwalletd/kwalletd.h +++ b/kio/misc/kwalletd/kwalletd.h @@ -161,7 +161,7 @@ class KWalletD : public KDEDModule { // Generate a new unique handle. int generateHandle(); // Invalidate a handle (remove it from the TQMap) - void invalidateHandle(int handle); + void tqinvalidateHandle(int handle); // Emit signals about closing wallets void doCloseSignals(int,const TQString&); void emitFolderUpdated(const TQString&, const TQString&); diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui index 609508e11..809993077 100644 --- a/kio/misc/kwalletd/kwalletwizard.ui +++ b/kio/misc/kwalletd/kwalletwizard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWalletWizard</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>KWalletWizard</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>KDE Wallet Wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page1</cstring> </property> @@ -36,14 +36,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -58,11 +58,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -83,11 +83,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QButtonGroup" row="2" column="1"> + <widget class="TQButtonGroup" row="2" column="1"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -104,7 +104,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>_basic</cstring> </property> @@ -115,7 +115,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>_advanced</cstring> </property> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>21</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>31</height> @@ -161,7 +161,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page4</cstring> </property> @@ -172,7 +172,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -185,7 +185,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page2</cstring> </property> @@ -196,7 +196,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -207,7 +207,7 @@ <enum>RichText</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> <cstring>layout7</cstring> </property> @@ -215,7 +215,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -223,7 +223,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -233,14 +233,14 @@ <property name="text"> <string>Enter a new password:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>_pass1</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -250,7 +250,7 @@ <property name="text"> <string>Verify password:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -259,7 +259,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -267,7 +267,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>_pass1</cstring> </property> @@ -278,7 +278,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>_pass2</cstring> </property> @@ -293,7 +293,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>_useWallet</cstring> </property> @@ -311,7 +311,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -328,7 +328,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>21</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>31</height> @@ -362,27 +362,27 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>70</height> </size> </property> </spacer> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>_matchLabel</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page3</cstring> </property> @@ -393,7 +393,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -403,7 +403,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -417,14 +417,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>121</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_networkWallet</cstring> </property> @@ -432,7 +432,7 @@ <string>Store network passwords and local passwords in separate wallet files</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>_closeIdle</cstring> </property> @@ -450,7 +450,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -530,16 +530,16 @@ <tabstop>_pass2</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">qcheckbox.h</include> + <include location="global" impldecl="in declaration">tqcheckbox.h</include> <include location="global" impldecl="in implementation">klocale.h</include> <include location="local" impldecl="in implementation">kwalletwizard.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">passwordPageUpdate()</slot> <slot access="private">init()</slot> <slot>setAdvanced()</slot> <slot>setBasic()</slot> <slot access="private">destroy()</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> </UI> |