diff --git a/kpimidentities/identitycombo.cpp b/kpimidentities/identitycombo.cpp
index 0b9a1a9ed..b761ead76 100644
--- a/kpimidentities/identitycombo.cpp
+++ b/kpimidentities/identitycombo.cpp
@@ -1,149 +1,149 @@
 /*
   Copyright (c) 2002 Marc Mutz <mutz@kde.org>
 
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Library General Public License as published by
   the Free Software Foundation; either version 2 of the License, or (at your
   option) any later version.
 
   This library 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 Library General Public
   License for more details.
 
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to the
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
   02110-1301, USA.
 */
 /**
   @file
   This file is part of the API for handling user identities and defines the
   IdentityCombo class.
 
   @brief
   A combo box that always shows the up-to-date identity list.
 
   @author Marc Mutz \<mutz@kde.org\>
  */
 
 #include "identitycombo.h"
 #include "identity.h"
 #include "identitymanager.h"
 
 #include <klocale.h>
 
 #include <assert.h>
 
 using namespace KPIMIdentities;
 
 /**
   Private class that helps to provide binary compatibility between releases.
   @internal
 */
 //@cond PRIVATE
 class KPIMIdentities::IdentityCombo::Private
 {
 };
 //@endcond
 
 IdentityCombo::IdentityCombo( IdentityManager *manager, QWidget *parent )
-    : QComboBox( parent ), mIdentityManager( manager ), d( 0 )
+    : KComboBox( parent ), mIdentityManager( manager ), d( 0 )
 {
   reloadCombo();
   reloadUoidList();
   connect( this, SIGNAL( activated( int ) ), SLOT( slotEmitChanged( int ) ) );
   connect( manager, SIGNAL( changed() ),
            SLOT( slotIdentityManagerChanged() ) );
 }
 
 IdentityCombo::~IdentityCombo()
 {
   delete d;
 }
 
 QString IdentityCombo::currentIdentityName() const
 {
   return mIdentityManager->identities()[ currentIndex()];
 }
 
 uint IdentityCombo::currentIdentity() const
 {
   return mUoidList[ currentIndex()];
 }
 
 void IdentityCombo::setCurrentIdentity( const Identity &identity )
 {
   setCurrentIdentity( identity.uoid() );
 }
 
 void IdentityCombo::setCurrentIdentity( const QString &name )
 {
   int idx = mIdentityManager->identities().indexOf( name );
   if ( ( idx < 0 ) || ( idx == currentIndex() ) ) {
     return;
   }
 
   blockSignals( true );  // just in case Qt gets fixed to emit activated() here
   setCurrentIndex( idx );
   blockSignals( false );
 
   slotEmitChanged( idx );
 }
 
 void IdentityCombo::setCurrentIdentity( uint uoid )
 {
   int idx = mUoidList.indexOf( uoid );
   if ( ( idx < 0 ) || ( idx == currentIndex() ) ) {
     return;
   }
 
   blockSignals( true );  // just in case Qt gets fixed to emit activated() here
   setCurrentIndex( idx );
   blockSignals( false );
 
   slotEmitChanged( idx );
 }
 
 void IdentityCombo::reloadCombo()
 {
   QStringList identities = mIdentityManager->identities();
   // the IM should prevent this from happening:
   assert( !identities.isEmpty() );
   clear();
   addItems( identities );
 }
 
 void IdentityCombo::reloadUoidList()
 {
   mUoidList.clear();
   IdentityManager::ConstIterator it;
   for ( it = mIdentityManager->begin(); it != mIdentityManager->end(); ++it ) {
     mUoidList << ( *it ).uoid();
   }
 }
 
 void IdentityCombo::slotIdentityManagerChanged()
 {
   uint oldIdentity = mUoidList[ currentIndex()];
 
   reloadUoidList();
   int idx = mUoidList.indexOf( oldIdentity );
 
   blockSignals( true );
   reloadCombo();
   setCurrentIndex( idx < 0 ? 0 : idx );
   blockSignals( false );
 
   if ( idx < 0 ) {
     // apparently our oldIdentity got deleted:
     slotEmitChanged( currentIndex() );
   }
 }
 
 void IdentityCombo::slotEmitChanged( int idx )
 {
   emit identityChanged( mUoidList[idx] );
 }
 
 #include "identitycombo.moc"
diff --git a/kpimidentities/identitycombo.h b/kpimidentities/identitycombo.h
index baabf1ac9..642480d1b 100644
--- a/kpimidentities/identitycombo.h
+++ b/kpimidentities/identitycombo.h
@@ -1,93 +1,93 @@
 /*
   Copyright (c) 2002 Marc Mutz <mutz@kde.org>
 
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Library General Public License as published by
   the Free Software Foundation; either version 2 of the License, or (at your
   option) any later version.
 
   This library 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 Library General Public
   License for more details.
 
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to the
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
   02110-1301, USA.
 */
 /**
   @file
   This file is part of the API for handling user identities and defines the
   IdentityCombo class.
 
   @brief
   A combo box that always shows the up-to-date identity list.
 
   @author Marc Mutz \<mutz@kde.org\>
  */
 
 #ifndef KPIMIDENTITIES_IDENTITYCOMBO_H
 #define KPIMIDENTITIES_IDENTITYCOMBO_H
 
 #include "kpimidentities_export.h"
-#include <QtGui/QComboBox>
+#include <KDE/KComboBox>
 
 class QString;
 
 namespace KPIMIdentities
 {
 
   class IdentityManager;
   class Identity;
 
-  class KPIMIDENTITIES_EXPORT IdentityCombo : public QComboBox
+  class KPIMIDENTITIES_EXPORT IdentityCombo : public KComboBox
   {
       Q_OBJECT
     public:
       explicit IdentityCombo( IdentityManager *manager, QWidget *parent=0 );
 
       ~IdentityCombo();
       QString currentIdentityName() const;
       uint currentIdentity() const;
       void setCurrentIdentity( const QString &identityName );
       void setCurrentIdentity( const Identity &identity );
       void setCurrentIdentity( uint uoid );
 
     Q_SIGNALS:
 
       /**
         @em Really emitted whenever the current identity changes. Either
         by user intervention or on setCurrentIdentity() or if the
         current identity disappears.
 
         You might also want to listen to IdentityManager::changed,
         IdentityManager::deleted and IdentityManager::added.
       */
       void identityChanged( uint uoid );
 
     public Q_SLOTS:
       /**
         Connected to IdentityManager::changed(). Reloads the list of identities.
       */
       void slotIdentityManagerChanged();
 
     protected Q_SLOTS:
       void slotEmitChanged( int );
 
     protected:
       void reloadCombo();
       void reloadUoidList();
       QList<uint> mUoidList;
       IdentityManager *mIdentityManager;
 
     private:
       //@cond PRIVATE
       class Private;
       Private *const d;
       //@endcond
   };
 
 }
 
 #endif