Rename a number of libraries and executables to avoid conflicts with KDE4

5 files changed, 0 insertions, 947 deletions

diff --git a/kio/kpasswdserver/CMakeLists.txt b/kio/kpasswdserver/CMakeLists.txt
deleted file mode 100644
index 5209e53c9..000000000
--- a/kio/kpasswdserver/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-#################################################
-#
-#  (C) 2010 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${TQT_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/dcop
-  ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/tdewallet/client
-  ${CMAKE_SOURCE_DIR}/kio
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-#### kded_kpasswdserver ##############################
-
-set( target kded_kpasswdserver )
-
-set( ${target}_SRCS
-  kpasswdserver.cpp kpasswdserver.skel
-)
-
-tde_add_kpart( ${target} AUTOMOC
-  SOURCES ${${target}_SRCS}
-  LINK tdeinit_kded-shared
-  DEPENDENCIES dcopidl
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/kio/kpasswdserver/DESIGN b/kio/kpasswdserver/DESIGN
deleted file mode 100644
index 6a128f9df..000000000
--- a/kio/kpasswdserver/DESIGN
+++ /dev/null
@@ -1,56 +0,0 @@
-Sequence numbers
-================
-The idea is that whenever the user is queried for a password this 
-login/pw combination gets a seq-nr. When  a slave needs a  login/pw 
-it asks kpasswdserver and sends along the last seqnr it received. If 
-this seqnr is older (lower) than the seq nr of the login/pw 
-combination stored in kpasswdserver then appearantly the user has 
-already been prompted for a new login/pw combination since the last 
-time this slave asked for a login/pw and therefor it is not necessary 
-to prompt the user again but kpassword will send the io-slave this 
-new login/pw combination. If this new combination fails as well the 
-user is being prompted for a new login/pw combo since the one stored 
-in kpasswdserver doesn't work.
-
-Let me try to draw the situation I had in mind when writing this:
-
-Slave1		Slave2			kpasswdserver
-Asks for auth
-					asks user for login/pw (1)
-sends login/pw (1) to ftp site
-		Asks for auth
-					sends back login/pw (1)
-		sends login/pw (1) to ftp site
-gets login error,
-asks for new auth
-sends along seq.nr 1
-					seq.nr 1 == (1) -->
-					asks user for new login/pw (2)
-sends login/pw (2) to ftp site
-		gets login error,
-		asks for new auth
-		sends along seq.nr 1
-					seq.nr 1 < (2) -->
-					don't ask user for new login/pw
-					but send back login/pw (2) without asking
-		sends login/pw (2) to ftp site
-
-
-Actually, I had mostly http in mind, and not so much ftp. In http you 
-typically try without password first, and only when you get an 
-authentication error you ask for a password. The above scenario is 
-then suddenly a lot more common than with ftp because it can happen 
-that you have 4 requests /io-slaves who alll discover at about the 
-same time that they need to have authentication credentials. The 
-above scenario (and the seq. nrs) is to prevent that you get 4 login 
-dialogs in such case.
-
-Now the assumption in this all, looking back on it, seems to be that 
-when you ask for the same auth credentials twice in a row, it must be 
-that the credentials issued the first time where wrong, and you will 
-be prompted again. But if the user goes to ftp-site1, then 
-ftp-site2 and then back to ftp-site1 again, the credentials for ftp-site1
-are still valid. This is why we reset the seq.nr stored in the io-slave
-to 0 whenever the io-slave switches hosts (or logins).
-
-Waldo Bastian <bastian@kde.org>
diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am
deleted file mode 100644
index 9ba393ef3..000000000
--- a/kio/kpasswdserver/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Id$
-# Makefile.am of tdebase/kioslave/http
-
-INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
-
-####### Files
-
-kde_module_LTLIBRARIES = kded_kpasswdserver.la
-
-kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
-kded_kpasswdserver_la_METASOURCES = AUTO
-kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
deleted file mode 100644
index b6a9aa696..000000000
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
-    This file is part of the KDE Password Server
-
-    Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
-    Copyright (C) 2005 David Faure (faure@kde.org)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    version 2 as published by the Free Software Foundation.
-
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this library; see the file COPYING. If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-//----------------------------------------------------------------------------
-//
-// KDE Password Server
-// $Id$
-
-#include "kpasswdserver.h"
-
-#include <time.h>
-
-#include <tqtimer.h>
-
-#include <kapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kdebug.h>
-#include <kio/passdlg.h>
-#include <tdewallet.h>
-
-#include "config.h"
-#ifdef Q_WS_X11
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#endif
-
-extern "C" {
-    KDE_EXPORT KDEDModule *create_kpasswdserver(const TQCString &name)
-    {
-       return new KPasswdServer(name);
-    }
-}
-
-int
-KPasswdServer::AuthInfoList::compareItems(TQPtrCollection::Item n1, TQPtrCollection::Item n2)
-{
-   if (!n1 || !n2)
-      return 0;
-
-   AuthInfo *i1 = (AuthInfo *) n1;
-   AuthInfo *i2 = (AuthInfo *) n2;
-
-   int l1 = i1->directory.length();
-   int l2 = i2->directory.length();
-
-   if (l1 > l2)
-      return -1;
-   if (l1 < l2)
-      return 1;
-   return 0;
-}
-
-
-KPasswdServer::KPasswdServer(const TQCString &name)
- : KDEDModule(name)
-{
-    m_authDict.setAutoDelete(true);
-    m_authPending.setAutoDelete(true);
-    m_seqNr = 0;
-    m_wallet = 0;
-    connect(this, TQT_SIGNAL(windowUnregistered(long)),
-            this, TQT_SLOT(removeAuthForWindowId(long)));
-}
-
-KPasswdServer::~KPasswdServer()
-{
-    delete m_wallet;
-}
-
-// Helper - returns the wallet key to use for read/store/checking for existence.
-static TQString makeWalletKey( const TQString& key, const TQString& realm )
-{
-    return realm.isEmpty() ? key : key + '-' + realm;
-}
-
-// Helper for storeInWallet/readFromWallet
-static TQString makeMapKey( const char* key, int entryNumber )
-{
-    TQString str = TQString::fromLatin1( key );
-    if ( entryNumber > 1 )
-        str += "-" + TQString::number( entryNumber );
-    return str;
-}
-
-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() ) )
-            return false;
-    wallet->setFolder( KWallet::Wallet::PasswordFolder() );
-    // 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.
-    typedef TQMap<TQString,TQString> Map;
-    int entryNumber = 1;
-    Map map;
-    TQString walletKey = makeWalletKey( key, info.realmValue );
-    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" );
-        while ( it != end ) {
-            if ( it.data() == info.username ) {
-                break; // OK, overwrite this entry
-            }
-            it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) );
-        }
-        // If no entry was found, create a new entry - entryNumber is set already.
-    }
-    const TQString loginKey = makeMapKey( "login", entryNumber );
-    const TQString passwordKey = makeMapKey( "password", entryNumber );
-    kdDebug(130) << "storeInWallet: writing to " << loginKey << "," << passwordKey << endl;
-    // note the overwrite=true by default
-    map.insert( loginKey, info.username );
-    map.insert( passwordKey, info.password );
-    wallet->writeMap( walletKey, map );
-    return true;
-}
-
-
-static bool readFromWallet( KWallet::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;
-    if ( wallet->hasFolder( KWallet::Wallet::PasswordFolder() ) )
-    {
-        wallet->setFolder( KWallet::Wallet::PasswordFolder() );
-
-        TQMap<TQString,TQString> map;
-        if ( wallet->readMap( makeWalletKey( key, realm ), map ) == 0 )
-        {
-            typedef TQMap<TQString,TQString> Map;
-            int entryNumber = 1;
-            Map::ConstIterator end = map.end();
-            Map::ConstIterator it = map.find( "login" );
-            while ( it != end ) {
-                //kdDebug(130) << "readFromWallet: found " << it.key() << "=" << it.data() << endl;
-                Map::ConstIterator pwdIter = map.find( 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 ) );
-            }
-            //kdDebug(130) << knownLogins.count() << " known logins" << endl;
-
-            if ( !userReadOnly && !knownLogins.isEmpty() && username.isEmpty() ) {
-                // Pick one, any one...
-                username = knownLogins.begin().key();
-                password = knownLogins.begin().data();
-                //kdDebug(130) << "readFromWallet: picked the first one : " << username << endl;
-            }
-
-            return true;
-        }
-    }
-    return false;
-}
-
-TDEIO::AuthInfo
-KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId)
-{
-    return checkAuthInfo(info, windowId, 0);
-}
-
-TDEIO::AuthInfo
-KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long usertime)
-{
-    kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username
-              << ", WindowId = " << windowId << endl;
-    if( usertime != 0 )
-        kapp->updateUserTimestamp( usertime );
-
-    TQString key = createCacheKey(info);
-
-    Request *request = m_authPending.first();
-    TQString path2 = info.url.directory(false, false);
-    for(; request; request = m_authPending.next())
-    {
-       if (request->key != key)
-           continue;
-
-       if (info.verifyPath)
-       {
-          TQString path1 = request->info.url.directory(false, false);
-          if (!path2.startsWith(path1))
-             continue;
-       }
-
-       request = new Request;
-       request->client = callingDcopClient();
-       request->transaction = request->client->beginTransaction();
-       request->key = key;
-       request->info = info;
-       m_authWait.append(request);
-       return info;
-    }
-
-    const AuthInfo *result = findAuthInfoItem(key, info);
-    if (!result || result->isCanceled)
-    {
-       if (!result &&
-           (info.username.isEmpty() || info.password.isEmpty()) &&
-           !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
-                                             KWallet::Wallet::PasswordFolder(), makeWalletKey(key, info.realmValue)))
-       {
-          TQMap<TQString, TQString> knownLogins;
-          if (openWallet(windowId)) {
-              if (readFromWallet(m_wallet, key, info.realmValue, info.username, info.password,
-                             info.readOnly, knownLogins))
-	      {
-		      info.setModified(true);
-		      return info;
-	      }
-	  }
-       }
-
-       info.setModified(false);
-       return info;
-    }
-
-    updateAuthExpire(key, result, windowId, false);
-
-    return copyAuthInfo(result);
-}
-
-TDEIO::AuthInfo
-KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr)
-{
-    return queryAuthInfo(info, errorMsg, windowId, seqNr, 0 );
-}
-
-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;
-    if ( !info.password.isEmpty() ) // should we really allow the caller to pre-fill the password?
-        kdDebug(130) <<  "password was set by caller" << endl;
-    if( usertime != 0 )
-        kapp->updateUserTimestamp( usertime );
-
-    TQString key = createCacheKey(info);
-    Request *request = new Request;
-    request->client = callingDcopClient();
-    request->transaction = request->client->beginTransaction();
-    request->key = key;
-    request->info = info;
-    request->windowId = windowId;
-    request->seqNr = seqNr;
-    if (errorMsg == "<NoAuthPrompt>")
-    {
-       request->errorMsg = TQString::null;
-       request->prompt = false;
-    }
-    else
-    {
-       request->errorMsg = errorMsg;
-       request->prompt = true;
-    }
-    m_authPending.append(request);
-
-    if (m_authPending.count() == 1)
-       TQTimer::singleShot(0, this, TQT_SLOT(processRequest()));
-
-    return info;
-}
-
-void
-KPasswdServer::addAuthInfo(TDEIO::AuthInfo info, long windowId)
-{
-    kdDebug(130) << "KPasswdServer::addAuthInfo: User= " << info.username
-              << ", RealmValue= " << info.realmValue << ", WindowId = " << windowId << endl;
-    TQString key = createCacheKey(info);
-
-    m_seqNr++;
-
-    addAuthInfoItem(key, info, windowId, m_seqNr, false);
-}
-
-bool
-KPasswdServer::openWallet( WId windowId )
-{
-    if ( m_wallet && !m_wallet->isOpen() ) { // forced closed
-        delete m_wallet;
-        m_wallet = 0;
-    }
-    if ( !m_wallet )
-        m_wallet = KWallet::Wallet::openWallet(
-            KWallet::Wallet::NetworkWallet(), windowId );
-    return m_wallet != 0;
-}
-
-void
-KPasswdServer::processRequest()
-{
-    Request *request = m_authPending.first();
-    if (!request)
-       return;
-
-    TDEIO::AuthInfo &info = request->info;
-
-    kdDebug(130) << "KPasswdServer::processRequest: User= " << info.username
-              << ", Message= " << info.prompt << endl;
-    const AuthInfo *result = findAuthInfoItem(request->key, request->info);
-
-    if (result && (request->seqNr < result->seqNr))
-    {
-        kdDebug(130) << "KPasswdServer::processRequest: auto retry!" << endl;
-        if (result->isCanceled)
-        {
-           info.setModified(false);
-        }
-        else
-        {
-           updateAuthExpire(request->key, result, request->windowId, false);
-           info = copyAuthInfo(result);
-        }
-    }
-    else
-    {
-        m_seqNr++;
-        bool askPw = request->prompt;
-        if (result && !info.username.isEmpty() &&
-            !request->errorMsg.isEmpty())
-        {
-           TQString prompt = request->errorMsg;
-           prompt += i18n("  Do you want to retry?");
-           int dlgResult = KMessageBox::warningContinueCancelWId(request->windowId, prompt,
-                           i18n("Authentication"), i18n("Retry"));
-           if (dlgResult != KMessageBox::Continue)
-              askPw = false;
-        }
-
-        int dlgResult = TQDialog::Rejected;
-        if (askPw)
-        {
-            TQString username = info.username;
-            TQString password = info.password;
-            bool hasWalletData = false;
-            TQMap<TQString, TQString> knownLogins;
-
-            if ( ( username.isEmpty() || password.isEmpty() )
-                && !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) )
-            {
-                // no login+pass provided, check if tdewallet has one
-                if ( openWallet( request->windowId ) )
-                    hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins );
-            }
-
-            TDEIO::PasswordDialog dlg( info.prompt, username, info.keepPassword );
-            if (info.caption.isEmpty())
-               dlg.setPlainCaption( i18n("Authorization Dialog") );
-            else
-               dlg.setPlainCaption( info.caption );
-
-            if ( !info.comment.isEmpty() )
-               dlg.addCommentLine( info.commentLabel, info.comment );
-
-            if ( !password.isEmpty() )
-               dlg.setPassword( password );
-
-            if (info.readOnly)
-               dlg.setUserReadOnly( true );
-            else
-               dlg.setKnownLogins( knownLogins );
-
-            if (hasWalletData)
-                dlg.setKeepPassword( true );
-
-#ifdef Q_WS_X11
-            XSetTransientForHint( tqt_xdisplay(), dlg.winId(), request->windowId);
-#endif
-
-            dlgResult = dlg.exec();
-
-            if (dlgResult == TQDialog::Accepted)
-            {
-               info.username = dlg.username();
-               info.password = dlg.password();
-               info.keepPassword = dlg.keepPassword();
-
-               // When the user checks "keep password", that means:
-               // * if the wallet is enabled, store it there for long-term, and in kpasswdserver
-               // only for the duration of the window (#92928)
-               // * otherwise store in kpasswdserver for the duration of the KDE session.
-               if ( info.keepPassword ) {
-                   if ( openWallet( request->windowId ) ) {
-                       if ( storeInWallet( m_wallet, request->key, info ) )
-                           // password is in wallet, don't keep it in memory after window is closed
-                           info.keepPassword = false;
-                   }
-               }
-            }
-        }
-        if ( dlgResult != TQDialog::Accepted )
-        {
-            addAuthInfoItem(request->key, info, 0, m_seqNr, true);
-            info.setModified( false );
-        }
-        else
-        {
-            addAuthInfoItem(request->key, info, request->windowId, m_seqNr, false);
-            info.setModified( true );
-        }
-    }
-
-    TQCString replyType;
-    TQByteArray replyData;
-
-    TQDataStream stream2(replyData, IO_WriteOnly);
-    stream2 << info << m_seqNr;
-    replyType = "TDEIO::AuthInfo";
-    request->client->endTransaction( request->transaction,
-                                     replyType, replyData);
-
-    m_authPending.remove((unsigned int) 0);
-
-    // Check all requests in the wait queue.
-    for(Request *waitRequest = m_authWait.first();
-        waitRequest; )
-    {
-       bool keepQueued = false;
-       TQString key = waitRequest->key;
-
-       request = m_authPending.first();
-       TQString path2 = waitRequest->info.url.directory(false, false);
-       for(; request; request = m_authPending.next())
-       {
-           if (request->key != key)
-               continue;
-
-           if (info.verifyPath)
-           {
-               TQString path1 = request->info.url.directory(false, false);
-               if (!path2.startsWith(path1))
-                   continue;
-           }
-
-           keepQueued = true;
-           break;
-       }
-       if (keepQueued)
-       {
-           waitRequest = m_authWait.next();
-       }
-       else
-       {
-           const AuthInfo *result = findAuthInfoItem(waitRequest->key, waitRequest->info);
-
-           TQCString replyType;
-           TQByteArray replyData;
-
-           TQDataStream stream2(replyData, IO_WriteOnly);
-
-           if (!result || result->isCanceled)
-           {
-               waitRequest->info.setModified(false);
-               stream2 << waitRequest->info;
-           }
-           else
-           {
-               updateAuthExpire(waitRequest->key, result, waitRequest->windowId, false);
-               TDEIO::AuthInfo info = copyAuthInfo(result);
-               stream2 << info;
-           }
-
-           replyType = "TDEIO::AuthInfo";
-           waitRequest->client->endTransaction( waitRequest->transaction,
-                                                replyType, replyData);
-
-           m_authWait.remove();
-           waitRequest = m_authWait.current();
-       }
-    }
-
-    if (m_authPending.count())
-       TQTimer::singleShot(0, this, TQT_SLOT(processRequest()));
-
-}
-
-TQString KPasswdServer::createCacheKey( const TDEIO::AuthInfo &info )
-{
-    if( !info.url.isValid() ) {
-        // Note that a null key will break findAuthInfoItem later on...
-        kdWarning(130) << "createCacheKey: invalid URL " << info.url << endl;
-        return TQString::null;
-    }
-
-    // Generate the basic key sequence.
-    TQString key = info.url.protocol();
-    key += '-';
-    if (!info.url.user().isEmpty())
-    {
-       key += info.url.user();
-       key += "@";
-    }
-    key += info.url.host();
-    int port = info.url.port();
-    if( port )
-    {
-      key += ':';
-      key += TQString::number(port);
-    }
-
-    return key;
-}
-
-TDEIO::AuthInfo
-KPasswdServer::copyAuthInfo(const AuthInfo *i)
-{
-    TDEIO::AuthInfo result;
-    result.url = i->url;
-    result.username = i->username;
-    result.password = i->password;
-    result.realmValue = i->realmValue;
-    result.digestInfo = i->digestInfo;
-    result.setModified(true);
-
-    return result;
-}
-
-const KPasswdServer::AuthInfo *
-KPasswdServer::findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info)
-{
-   AuthInfoList *authList = m_authDict.find(key);
-   if (!authList)
-      return 0;
-
-   TQString path2 = info.url.directory(false, false);
-   for(AuthInfo *current = authList->first();
-       current; )
-   {
-       if ((current->expire == AuthInfo::expTime) &&
-          (difftime(time(0), current->expireTime) > 0))
-       {
-          authList->remove();
-          current = authList->current();
-          continue;
-       }
-
-       if (info.verifyPath)
-       {
-          TQString path1 = current->directory;
-          if (path2.startsWith(path1) &&
-              (info.username.isEmpty() || info.username == current->username))
-             return current;
-       }
-       else
-       {
-          if (current->realmValue == info.realmValue &&
-              (info.username.isEmpty() || info.username == current->username))
-             return current; // TODO: Update directory info,
-       }
-
-       current = authList->next();
-   }
-   return 0;
-}
-
-void
-KPasswdServer::removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info)
-{
-   AuthInfoList *authList = m_authDict.find(key);
-   if (!authList)
-      return;
-
-   for(AuthInfo *current = authList->first();
-       current; )
-   {
-       if (current->realmValue == info.realmValue)
-       {
-          authList->remove();
-          current = authList->current();
-       }
-       else
-       {
-          current = authList->next();
-       }
-   }
-   if (authList->isEmpty())
-   {
-       m_authDict.remove(key);
-   }
-}
-
-
-void
-KPasswdServer::addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled)
-{
-   AuthInfoList *authList = m_authDict.find(key);
-   if (!authList)
-   {
-      authList = new AuthInfoList;
-      m_authDict.insert(key, authList);
-   }
-   AuthInfo *current = authList->first();
-   for(; current; current = authList->next())
-   {
-       if (current->realmValue == info.realmValue)
-       {
-          authList->take();
-          break;
-       }
-   }
-
-   if (!current)
-   {
-      current = new AuthInfo;
-      current->expire = AuthInfo::expTime;
-      kdDebug(130) << "Creating AuthInfo" << endl;
-   }
-   else
-   {
-      kdDebug(130) << "Updating AuthInfo" << endl;
-   }
-
-   current->url = info.url;
-   current->directory = info.url.directory(false, false);
-   current->username = info.username;
-   current->password = info.password;
-   current->realmValue = info.realmValue;
-   current->digestInfo = info.digestInfo;
-   current->seqNr = seqNr;
-   current->isCanceled = canceled;
-
-   updateAuthExpire(key, current, windowId, info.keepPassword && !canceled);
-
-   // Insert into list, keep the list sorted "longest path" first.
-   authList->inSort(current);
-}
-
-void
-KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long windowId, bool keep)
-{
-   AuthInfo *current = const_cast<AuthInfo *>(auth);
-   if (keep)
-   {
-      current->expire = AuthInfo::expNever;
-   }
-   else if (windowId && (current->expire != AuthInfo::expNever))
-   {
-      current->expire = AuthInfo::expWindowClose;
-      if (!current->windowList.contains(windowId))
-         current->windowList.append(windowId);
-   }
-   else if (current->expire == AuthInfo::expTime)
-   {
-      current->expireTime = time(0)+10;
-   }
-
-   // Update mWindowIdList
-   if (windowId)
-   {
-      TQStringList *keysChanged = mWindowIdList.find(windowId);
-      if (!keysChanged)
-      {
-         keysChanged = new TQStringList;
-         mWindowIdList.insert(windowId, keysChanged);
-      }
-      if (!keysChanged->contains(key))
-         keysChanged->append(key);
-   }
-}
-
-void
-KPasswdServer::removeAuthForWindowId(long windowId)
-{
-   TQStringList *keysChanged = mWindowIdList.find(windowId);
-   if (!keysChanged) return;
-
-   for(TQStringList::ConstIterator it = keysChanged->begin();
-       it != keysChanged->end(); ++it)
-   {
-      TQString key = *it;
-      AuthInfoList *authList = m_authDict.find(key);
-      if (!authList)
-         continue;
-
-      AuthInfo *current = authList->first();
-      for(; current; )
-      {
-        if (current->expire == AuthInfo::expWindowClose)
-        {
-           if (current->windowList.remove(windowId) && current->windowList.isEmpty())
-           {
-              authList->remove();
-              current = authList->current();
-              continue;
-           }
-        }
-        current = authList->next();
-      }
-   }
-}
-
-#include "kpasswdserver.moc"
diff --git a/kio/kpasswdserver/kpasswdserver.h b/kio/kpasswdserver/kpasswdserver.h
deleted file mode 100644
index 46e7191db..000000000
--- a/kio/kpasswdserver/kpasswdserver.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    This file is part of the KDE Password Server
-
-    Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    version 2 as published by the Free Software Foundation.
-
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this library; see the file COPYING. If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-//----------------------------------------------------------------------------
-//
-// KDE Password Server
-// $Id$
-
-#ifndef KPASSWDSERVER_H
-#define KPASSWDSERVER_H
-
-#include <tqdict.h>
-#include <tqintdict.h>
-
-#include <dcopclient.h>
-#include <kio/authinfo.h>
-#include <kded/kdedmodule.h>
-
-namespace KWallet {
-    class Wallet;
-}
-
-class KPasswdServer : public KDEDModule
-{
-  Q_OBJECT
-  K_DCOP
-public:
-  KPasswdServer(const TQCString &);
-  ~KPasswdServer();
-
-k_dcop:
-  // KDE4 merge
-  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();
-  // Remove all authentication info associated with windowId
-  void removeAuthForWindowId(long windowId);
-
-protected:
-  struct 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 );
-
-  struct AuthInfo {
-    AuthInfo() { expire = expNever; isCanceled = false; seqNr = 0; }
-
-    KURL url;
-    TQString directory;
-    TQString username;
-    TQString password;
-    TQString realmValue;
-    TQString digestInfo;
-
-    enum { expNever, expWindowClose, expTime } expire;
-    TQValueList<long> windowList;
-    unsigned long expireTime;
-    long seqNr;
-
-    bool isCanceled;
-  };
-
-  class AuthInfoList : public TQPtrList<AuthInfo>
-  {
-    public:
-      AuthInfoList() { setAutoDelete(true); }
-      int compareItems(TQPtrCollection::Item n1, TQPtrCollection::Item n2);
-  };
-
-  TQDict< AuthInfoList > m_authDict;
-
-  struct Request {
-     DCOPClient *client;
-     DCOPClientTransaction *transaction;
-     TQString key;
-     TDEIO::AuthInfo info;
-     TQString errorMsg;
-     long windowId;
-     long seqNr;
-     bool prompt;
-  };
-
-  TQPtrList< Request > m_authPending;
-  TQPtrList< Request > m_authWait;
-  TQIntDict<TQStringList> mWindowIdList;
-  DCOPClient *m_dcopClient;
-  KWallet::Wallet* m_wallet;
-  long m_seqNr;
-};
-
-#endif