summaryrefslogtreecommitdiffstats
path: root/kio/misc
diff options
context:
space:
mode:
Diffstat (limited to 'kio/misc')
-rw-r--r--kio/misc/kdesasl/kdesasl.cpp8
-rw-r--r--kio/misc/kpac/discovery.cpp2
-rw-r--r--kio/misc/kpac/proxyscout.cpp4
-rw-r--r--kio/misc/ksendbugmail/smtp.cpp12
-rw-r--r--kio/misc/kssld/kssld.cpp14
-rw-r--r--kio/misc/kwalletd/ktimeout.cpp6
-rw-r--r--kio/misc/kwalletd/kwalletd.cpp56
-rw-r--r--kio/misc/uiserver.cpp6
8 files changed, 54 insertions, 54 deletions
diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp
index e9bc75dc1..b547f7e6b 100644
--- a/kio/misc/kdesasl/kdesasl.cpp
+++ b/kio/misc/kdesasl/kdesasl.cpp
@@ -49,10 +49,10 @@ KDESasl::~KDESasl() {
TQCString KDESasl::chooseMethod(const TQStrIList aMethods)
{
- if (aMethods.tqcontains("DIGEST-MD5")) mMethod = "DIGEST-MD5";
- else if (aMethods.tqcontains("CRAM-MD5")) mMethod = "CRAM-MD5";
- else if (aMethods.tqcontains("PLAIN")) mMethod = "PLAIN";
- else if (aMethods.tqcontains("LOGIN")) mMethod = "LOGIN";
+ if (aMethods.contains("DIGEST-MD5")) mMethod = "DIGEST-MD5";
+ else if (aMethods.contains("CRAM-MD5")) mMethod = "CRAM-MD5";
+ else if (aMethods.contains("PLAIN")) mMethod = "PLAIN";
+ else if (aMethods.contains("LOGIN")) mMethod = "LOGIN";
else mMethod = TQCString();
return mMethod;
}
diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp
index 671c2a941..7a84958f7 100644
--- a/kio/misc/kpac/discovery.cpp
+++ b/kio/misc/kpac/discovery.cpp
@@ -126,7 +126,7 @@ namespace KPAC
return;
}
- int dot = m_hostname.tqfind( '.' );
+ int dot = m_hostname.find( '.' );
if ( dot >= 0 )
{
m_hostname.remove( 0, dot + 1 ); // remove one domain level
diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp
index 48ff7ae84..5d8b008bf 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/kio/misc/kpac/proxyscout.cpp
@@ -162,9 +162,9 @@ namespace KPAC
// this particular case, simply calling setProtocol() on
// it trashes the whole URL.
int len = proxyURL.protocol().length();
- if ( !proxyURL.isValid() || proxy.tqfind( ":/", len ) != len )
+ if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len )
proxy.prepend("http://");
- BlackList::Iterator it = m_blackList.tqfind( proxy );
+ BlackList::Iterator it = m_blackList.find( proxy );
if ( it == m_blackList.end() ) return proxy;
else if ( std::time( 0 ) - *it > 1800 ) // 30 minutes
{
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index ac3e7b74f..a9f69792d 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -74,22 +74,22 @@ void SMTP::setTimeOut(int timeout)
void SMTP::setSenderAddress(const TQString& sender)
{
senderAddress = sender;
- int index = senderAddress.tqfind('<');
+ int index = senderAddress.find('<');
if (index == -1)
return;
senderAddress = senderAddress.mid(index + 1);
- index = senderAddress.tqfind('>');
+ index = senderAddress.find('>');
if (index != -1)
senderAddress = senderAddress.left(index);
senderAddress = senderAddress.simplifyWhiteSpace();
while (1) {
- index = senderAddress.tqfind(' ');
+ index = senderAddress.find(' ');
if (index != -1)
senderAddress = senderAddress.mid(index + 1); // take one side
else
break;
}
- index = senderAddress.tqfind('@');
+ index = senderAddress.find('@');
if (index == -1)
senderAddress.append("@localhost"); // won't go through without a local mail system
@@ -218,7 +218,7 @@ void SMTP::socketRead(KSocket *socket)
readBuffer[n] = '\0';
lineBuffer += readBuffer;
- nl = lineBuffer.tqfind('\n');
+ nl = lineBuffer.find('\n');
if(nl == -1)
return;
lastLine = lineBuffer.left(nl);
@@ -249,7 +249,7 @@ void SMTP::processLine(TQString *line)
int i, stat;
TQString tmpstr;
- i = line->tqfind(' ');
+ i = line->find(' ');
tmpstr = line->left(i);
if(i > 3)
kdDebug() << "warning: SMTP status code longer then 3 digits: " << tmpstr << endl;
diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp
index 79b5998d1..45d523d2e 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/kio/misc/kssld/kssld.cpp
@@ -572,7 +572,7 @@ KSSLCNode *node;
return false;
}
- if (!node->hosts.tqcontains(host)) {
+ if (!node->hosts.contains(host)) {
node->hosts << host;
}
@@ -857,14 +857,14 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) {
cert->getEmails(mails);
for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) {
TQString email = static_cast<const TQString &>(*iter).lower();
- TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email);
+ TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email);
if (it == skEmail.end())
it = skEmail.insert(email, TQPtrVector<KSSLCertificate>());
TQPtrVector<KSSLCertificate> &elem = *it;
- if (elem.tqfindRef(cert) == -1) {
+ if (elem.findRef(cert) == -1) {
unsigned int n = 0;
for(; n < elem.size(); n++) {
if (!elem.tqat(n)) {
@@ -887,14 +887,14 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) {
TQStringList mails;
cert->getEmails(mails);
for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) {
- TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(static_cast<const TQString &>(*iter).lower());
+ TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(static_cast<const TQString &>(*iter).lower());
if (it == skEmail.end())
break;
TQPtrVector<KSSLCertificate> &elem = *it;
- int n = elem.tqfindRef(cert);
+ int n = elem.findRef(cert);
if (n != -1)
elem.remove(n);
}
@@ -903,7 +903,7 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) {
TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
TQStringList rc;
- TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email.lower());
+ TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email.lower());
kdDebug() << "GETKDEKey " << email.latin1() << endl;
@@ -924,7 +924,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
KSSLCertificate KSSLD::getCertByMD5Digest(const TQString &key) {
- TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.tqfind(key);
+ TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.find(key);
kdDebug() << "Searching cert for " << key.latin1() << endl;
diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp
index d4c87bd28..c431ecf69 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.tqfind(id);
+ TQTimer *t = _timers.find(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.tqfind(id) != 0L) {
+ if (_timers.find(id) != 0L) {
return;
}
@@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) {
void KTimeout::resetTimer(int id, int timeout) {
- TQTimer *t = _timers.tqfind(id);
+ TQTimer *t = _timers.find(id);
if (t) {
t->changeInterval(timeout);
}
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index b2b27d363..0513305bd 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.tqfind(rc) || rc == 0);
+ } while (_wallets.find(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().tqcontains(KWallet::Wallet::LocalWallet())) {
+ if (_firstUse && !wallets().contains(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].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
+ if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
return -1;
}
_handles[appid].append(rc);
- _wallets.tqfind(rc)->ref();
+ _wallets.find(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.tqcontains(thisApp)) {
+ if (!apps.contains(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.tqcontains(thisApp)) {
+ if (!apps.contains(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.tqfind(handle);
+ w = _wallets.find(handle);
reclose = true;
} else {
handle = it.currentKey();
@@ -710,14 +710,14 @@ int KWalletD::close(const TQString& wallet, bool force) {
int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) {
if (w) {
const TQString& wallet = w->walletName();
- assert(_passwords.tqcontains(wallet));
+ assert(_passwords.contains(wallet));
if (w->refCount() == 0 || force) {
invalidateHandle(handle);
if (_closeIdle && _timeouts) {
_timeouts->removeTimer(handle);
}
_wallets.remove(handle);
- if (_passwords.tqcontains(wallet)) {
+ if (_passwords.contains(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.tqfind(handle);
+ KWallet::Backend *w = _wallets.find(handle);
bool contains = false;
if (w) { // the handle is valid
- if (_handles.tqcontains(appid)) { // we know this app
- if (_handles[appid].tqcontains(handle)) {
+ if (_handles.contains(appid)) { // we know this app
+ if (_handles[appid].contains(handle)) {
// the app owns this handle
- _handles[appid].remove(_handles[appid].tqfind(handle));
+ _handles[appid].remove(_handles[appid].find(handle));
contains = true;
if (_handles[appid].isEmpty()) {
_handles.remove(appid);
@@ -759,7 +759,7 @@ int KWalletD::close(int handle, bool force) {
if (force) {
invalidateHandle(handle);
}
- if (_passwords.tqcontains(w->walletName())) {
+ if (_passwords.contains(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.tqfind(handle);
+ KWallet::Backend *rc = _wallets.find(handle);
if (rc == 0 && ++_failed > 5) {
_failed = 0;
@@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke
void KWalletD::slotAppUnregistered(const TQCString& app) {
- if (_handles.tqcontains(app)) {
+ if (_handles.contains(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.tqfind(*i);
+ KWallet::Backend *w = _wallets.find(*i);
if (w && !_leaveOpen && 0 == w->deref()) {
close(w->walletName(), true);
}
@@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) {
return 0L;
}
- KWallet::Backend *w = _wallets.tqfind(handle);
+ KWallet::Backend *w = _wallets.find(handle);
if (w) { // the handle is valid
- if (_handles.tqcontains(appid)) { // we know this app
- if (_handles[appid].tqcontains(handle)) {
+ if (_handles.contains(appid)) { // we know this app
+ if (_handles[appid].contains(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().tqcontains(it.currentKey())) {
+ if (hit.data().contains(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].tqcontains(it.currentKey())) {
+ if (_handles[application].contains(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().tqcontains(wallet)) {
+ if (!wallets().contains(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().tqcontains(wallet)) {
+ if (!wallets().contains(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].tqcontains(TQString::fromLocal8Bit(app));
+ return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app));
}
bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) {
- return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app));
+ return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app));
}
@@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() {
if (!dc) {
return "";
}
- return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), "");
+ return dc->senderId().replace(TQRegExp("-[0-9]+$"), "");
}
void KWalletD::timedOut(int id) {
- KWallet::Backend *w = _wallets.tqfind(id);
+ KWallet::Backend *w = _wallets.find(id);
if (w) {
closeWallet(w, id, true);
}
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 2ce91feb3..bf8b606dc 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -272,8 +272,8 @@ void ProgressItem::setPercent( unsigned long percent ) {
void ProgressItem::setInfoMessage( const TQString & msg ) {
TQString plainTextMsg(msg);
- plainTextMsg.tqreplace( TQRegExp( "</?b>" ), TQString() );
- plainTextMsg.tqreplace( TQRegExp( "<img.*>" ), TQString() );
+ plainTextMsg.replace( TQRegExp( "</?b>" ), TQString() );
+ plainTextMsg.replace( TQRegExp( "<img.*>" ), TQString() );
setText( ListProgress::TB_PROGRESS, plainTextMsg );
defaultProgress->slotInfoMessage( 0, msg );
@@ -1195,7 +1195,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta,
kdDebug(7024) << "ssl_cert_errors=" << meta["ssl_cert_errors"] << endl;
kid->setCertState(meta["ssl_cert_errors"]);
- TQString ip = meta.tqcontains("ssl_proxied") ? "" : meta["ssl_peer_ip"];
+ TQString ip = meta.contains("ssl_proxied") ? "" : meta["ssl_peer_ip"];
kid->setup( x,
ip,
url, // the URL
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 02:36:18 +0000