summaryrefslogtreecommitdiffstats
path: root/kio/kpasswdserver/kpasswdserver.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
commitf7e71d47719ab6094cf4a9fafffa5ea351973522 (patch)
tree30834aa632d442019e14f88685001d94657d060b /kio/kpasswdserver/kpasswdserver.cpp
parentb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff)
downloadtdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz
tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio/kpasswdserver/kpasswdserver.cpp')
-rw-r--r--kio/kpasswdserver/kpasswdserver.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
index 42cbad3a4..858cad37b 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/kio/kpasswdserver/kpasswdserver.cpp
@@ -94,7 +94,7 @@ static TQString makeWalletKey( const TQString& key, const TQString& realm )
// Helper for storeInWallet/readFromWallet
static TQString makeMapKey( const char* key, int entryNumber )
{
- TQString str = TQString::fromLatin1( key );
+ TQString str = TQString::tqfromLatin1( key );
if ( entryNumber > 1 )
str += "-" + TQString::number( entryNumber );
return str;
@@ -115,12 +115,12 @@ static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const K
kdDebug(130) << "storeInWallet: walletKey=" << walletKey << " reading existing map" << endl;
if ( wallet->readMap( walletKey, map ) == 0 ) {
Map::ConstIterator end = map.end();
- Map::ConstIterator it = map.find( "login" );
+ Map::ConstIterator it = map.tqfind( "login" );
while ( it != end ) {
if ( it.data() == info.username ) {
break; // OK, overwrite this entry
}
- it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) );
+ it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) );
}
// If no entry was found, create a new entry - entryNumber is set already.
}
@@ -148,17 +148,17 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const
typedef TQMap<TQString,TQString> Map;
int entryNumber = 1;
Map::ConstIterator end = map.end();
- Map::ConstIterator it = map.find( "login" );
+ Map::ConstIterator it = map.tqfind( "login" );
while ( it != end ) {
//kdDebug(130) << "readFromWallet: found " << it.key() << "=" << it.data() << endl;
- Map::ConstIterator pwdIter = map.find( makeMapKey( "password", entryNumber ) );
+ Map::ConstIterator pwdIter = map.tqfind( makeMapKey( "password", entryNumber ) );
if ( pwdIter != end ) {
if ( it.data() == username )
password = pwdIter.data();
knownLogins.insert( it.data(), pwdIter.data() );
}
- it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) );
+ it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) );
}
//kdDebug(130) << knownLogins.count() << " known logins" << endl;
@@ -541,7 +541,7 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i)
const KPasswdServer::AuthInfo *
KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
{
- AuthInfoList *authList = m_authDict.find(key);
+ AuthInfoList *authList = m_authDict.tqfind(key);
if (!authList)
return 0;
@@ -579,7 +579,7 @@ KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
void
KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
{
- AuthInfoList *authList = m_authDict.find(key);
+ AuthInfoList *authList = m_authDict.tqfind(key);
if (!authList)
return;
@@ -606,7 +606,7 @@ KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info
void
KPasswdServer::addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled)
{
- AuthInfoList *authList = m_authDict.find(key);
+ AuthInfoList *authList = m_authDict.tqfind(key);
if (!authList)
{
authList = new AuthInfoList;
@@ -659,7 +659,7 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long
else if (windowId && (current->expire != AuthInfo::expNever))
{
current->expire = AuthInfo::expWindowClose;
- if (!current->windowList.contains(windowId))
+ if (!current->windowList.tqcontains(windowId))
current->windowList.append(windowId);
}
else if (current->expire == AuthInfo::expTime)
@@ -670,13 +670,13 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long
// Update mWindowIdList
if (windowId)
{
- TQStringList *keysChanged = mWindowIdList.find(windowId);
+ TQStringList *keysChanged = mWindowIdList.tqfind(windowId);
if (!keysChanged)
{
keysChanged = new TQStringList;
mWindowIdList.insert(windowId, keysChanged);
}
- if (!keysChanged->contains(key))
+ if (!keysChanged->tqcontains(key))
keysChanged->append(key);
}
}
@@ -684,14 +684,14 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long
void
KPasswdServer::removeAuthForWindowId(long windowId)
{
- TQStringList *keysChanged = mWindowIdList.find(windowId);
+ TQStringList *keysChanged = mWindowIdList.tqfind(windowId);
if (!keysChanged) return;
for(TQStringList::ConstIterator it = keysChanged->begin();
it != keysChanged->end(); ++it)
{
TQString key = *it;
- AuthInfoList *authList = m_authDict.find(key);
+ AuthInfoList *authList = m_authDict.tqfind(key);
if (!authList)
continue;