summaryrefslogtreecommitdiffstats
path: root/kio/kpasswdserver
diff options
context:
space:
mode:
Diffstat (limited to 'kio/kpasswdserver')
-rw-r--r--kio/kpasswdserver/kpasswdserver.cpp42
-rw-r--r--kio/kpasswdserver/kpasswdserver.h22
2 files changed, 32 insertions, 32 deletions
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
index 0f7b2cc58..7b140c467 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/kio/kpasswdserver/kpasswdserver.cpp
@@ -100,7 +100,7 @@ static TQString makeMapKey( const char* key, int entryNumber )
return str;
}
-static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const KIO::AuthInfo &info )
+static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const TDEIO::AuthInfo &info )
{
if ( !wallet->hasFolder( KWallet::Wallet::PasswordFolder() ) )
if ( !wallet->createFolder( KWallet::Wallet::PasswordFolder() ) )
@@ -175,14 +175,14 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const
return false;
}
-KIO::AuthInfo
-KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId)
+TDEIO::AuthInfo
+KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId)
{
return checkAuthInfo(info, windowId, 0);
}
-KIO::AuthInfo
-KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long usertime)
+TDEIO::AuthInfo
+KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long usertime)
{
kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username
<< ", WindowId = " << windowId << endl;
@@ -242,14 +242,14 @@ KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long us
return copyAuthInfo(result);
}
-KIO::AuthInfo
-KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr)
+TDEIO::AuthInfo
+KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr)
{
return queryAuthInfo(info, errorMsg, windowId, seqNr, 0 );
}
-KIO::AuthInfo
-KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr, unsigned long usertime)
+TDEIO::AuthInfo
+KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr, unsigned long usertime)
{
kdDebug(130) << "KPasswdServer::queryAuthInfo: User= " << info.username
<< ", Message= " << info.prompt << ", WindowId = " << windowId << endl;
@@ -285,7 +285,7 @@ KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowI
}
void
-KPasswdServer::addAuthInfo(KIO::AuthInfo info, long windowId)
+KPasswdServer::addAuthInfo(TDEIO::AuthInfo info, long windowId)
{
kdDebug(130) << "KPasswdServer::addAuthInfo: User= " << info.username
<< ", RealmValue= " << info.realmValue << ", WindowId = " << windowId << endl;
@@ -316,7 +316,7 @@ KPasswdServer::processRequest()
if (!request)
return;
- KIO::AuthInfo &info = request->info;
+ TDEIO::AuthInfo &info = request->info;
kdDebug(130) << "KPasswdServer::processRequest: User= " << info.username
<< ", Message= " << info.prompt << endl;
@@ -366,7 +366,7 @@ KPasswdServer::processRequest()
hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins );
}
- KIO::PasswordDialog dlg( info.prompt, username, info.keepPassword );
+ TDEIO::PasswordDialog dlg( info.prompt, username, info.keepPassword );
if (info.caption.isEmpty())
dlg.setPlainCaption( i18n("Authorization Dialog") );
else
@@ -428,7 +428,7 @@ KPasswdServer::processRequest()
TQDataStream stream2(replyData, IO_WriteOnly);
stream2 << info << m_seqNr;
- replyType = "KIO::AuthInfo";
+ replyType = "TDEIO::AuthInfo";
request->client->endTransaction( request->transaction,
replyType, replyData);
@@ -479,11 +479,11 @@ KPasswdServer::processRequest()
else
{
updateAuthExpire(waitRequest->key, result, waitRequest->windowId, false);
- KIO::AuthInfo info = copyAuthInfo(result);
+ TDEIO::AuthInfo info = copyAuthInfo(result);
stream2 << info;
}
- replyType = "KIO::AuthInfo";
+ replyType = "TDEIO::AuthInfo";
waitRequest->client->endTransaction( waitRequest->transaction,
replyType, replyData);
@@ -497,7 +497,7 @@ KPasswdServer::processRequest()
}
-TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info )
+TQString KPasswdServer::createCacheKey( const TDEIO::AuthInfo &info )
{
if( !info.url.isValid() ) {
// Note that a null key will break findAuthInfoItem later on...
@@ -524,10 +524,10 @@ TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info )
return key;
}
-KIO::AuthInfo
+TDEIO::AuthInfo
KPasswdServer::copyAuthInfo(const AuthInfo *i)
{
- KIO::AuthInfo result;
+ TDEIO::AuthInfo result;
result.url = i->url;
result.username = i->username;
result.password = i->password;
@@ -539,7 +539,7 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i)
}
const KPasswdServer::AuthInfo *
-KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
+KPasswdServer::findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info)
{
AuthInfoList *authList = m_authDict.find(key);
if (!authList)
@@ -577,7 +577,7 @@ KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
}
void
-KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
+KPasswdServer::removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info)
{
AuthInfoList *authList = m_authDict.find(key);
if (!authList)
@@ -604,7 +604,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)
+KPasswdServer::addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled)
{
AuthInfoList *authList = m_authDict.find(key);
if (!authList)
diff --git a/kio/kpasswdserver/kpasswdserver.h b/kio/kpasswdserver/kpasswdserver.h
index cf44681bf..46e7191db 100644
--- a/kio/kpasswdserver/kpasswdserver.h
+++ b/kio/kpasswdserver/kpasswdserver.h
@@ -46,11 +46,11 @@ public:
k_dcop:
// KDE4 merge
- KIO::AuthInfo checkAuthInfo(KIO::AuthInfo, long, unsigned long);
- KIO::AuthInfo checkAuthInfo(KIO::AuthInfo, long);
- KIO::AuthInfo queryAuthInfo(KIO::AuthInfo, TQString, long, long, unsigned long);
- KIO::AuthInfo queryAuthInfo(KIO::AuthInfo, TQString, long, long);
- void addAuthInfo(KIO::AuthInfo, long);
+ TDEIO::AuthInfo checkAuthInfo(TDEIO::AuthInfo, long, unsigned long);
+ TDEIO::AuthInfo checkAuthInfo(TDEIO::AuthInfo, long);
+ TDEIO::AuthInfo queryAuthInfo(TDEIO::AuthInfo, TQString, long, long, unsigned long);
+ TDEIO::AuthInfo queryAuthInfo(TDEIO::AuthInfo, TQString, long, long);
+ void addAuthInfo(TDEIO::AuthInfo, long);
public slots:
void processRequest();
@@ -60,11 +60,11 @@ public slots:
protected:
struct AuthInfo;
- TQString createCacheKey( const KIO::AuthInfo &info );
- const AuthInfo *findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
- void removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
- void addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled);
- KIO::AuthInfo copyAuthInfo(const AuthInfo *);
+ TQString createCacheKey( const TDEIO::AuthInfo &info );
+ const AuthInfo *findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info);
+ void removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info);
+ void addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled);
+ TDEIO::AuthInfo copyAuthInfo(const AuthInfo *);
void updateAuthExpire(const TQString &key, const AuthInfo *, long windowId, bool keep);
int findWalletEntry( const TQMap<TQString,TQString>& map, const TQString& username );
bool openWallet( WId windowId );
@@ -100,7 +100,7 @@ protected:
DCOPClient *client;
DCOPClientTransaction *transaction;
TQString key;
- KIO::AuthInfo info;
+ TDEIO::AuthInfo info;
TQString errorMsg;
long windowId;
long seqNr;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 08:05:20 +0000