35 files changed, 950 insertions, 816 deletions
diff --git a/microkde/kdeui/kaction.cpp b/microkde/kdeui/kaction.cpp
index d38a6d5..c2df381 100644
--- a/microkde/kdeui/kaction.cpp
+++ b/microkde/kdeui/kaction.cpp
@@ -25,12 +25,15 @@
 #include "kaction.h"
 #include <assert.h>
 #include <qtooltip.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3ValueList>
 //US#include <qwhatsthis.h>
 //US#include <kaccel.h>
 //US#include <kaccelbase.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
@@ -39,15 +42,15 @@
 //US#include <kpopupmenu.h>
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 //US added this includefiles
 #include <qmenubar.h>
-#include <qtoolbar.h>
+#include <q3toolbar.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
-#include <qiconset.h>
+#include <qicon.h>
 /**
 * How it works.
 * KActionCollection is an organizing container for KActions.
 * KActionCollection keeps track of the information necessary to handle
 * configuration and shortcuts.
@@ -84,13 +87,13 @@ public:
  {
    m_kaccel = 0;
    m_configurable = true;
  }
  KAccel *m_kaccel;
-  QValueList<KAccel*> m_kaccelList;
+  Q3ValueList<KAccel*> m_kaccelList;
  QString m_groupText;
  QString m_group;
  KShortcut m_cut;
  KShortcut m_cutDefault;
@@ -104,13 +107,13 @@ public:
                                      m_id = s.m_id; m_representative = s.m_representative; }
    QWidget* m_container;
    int m_id;
    QWidget* m_representative;
  };
-  QValueList<Container> m_containers;
+  Q3ValueList<Container> m_containers;
 };
 //---------------------------------------------------------------------
 // KAction
 //---------------------------------------------------------------------
 KAction::KAction( const QString& text, const KShortcut& cut,
@@ -127,13 +130,13 @@ KAction::KAction( const QString& text, const QString& sIconName, const KShortcut
 : QObject( parent, name )
 {
        initPrivate( text, cut, receiver, slot );
  d->setIconName( sIconName );
 }
-KAction::KAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+KAction::KAction( const QString& text, const QIcon& pix, const KShortcut& cut,
        const QObject* receiver, const char* slot,
        KActionCollection* parent, const char* name )
 : QObject( parent, name )
 {
        initPrivate( text, cut, receiver, slot );
  d->setIconSet( pix );
@@ -161,13 +164,13 @@ KAction::KAction( const QString& text, const KShortcut& cut,
                  const QObject* receiver,
                  const char* slot, QObject* parent, const char* name )
 : QObject( parent, name )
 {
    initPrivate( text, cut, receiver, slot );
 }
-KAction::KAction( const QString& text, const QIconSet& pix,
+KAction::KAction( const QString& text, const QIcon& pix,
                  const KShortcut& cut,
                  QObject* parent, const char* name )
 : QObject( parent, name )
 {
    initPrivate( text, cut, 0, 0 );
    setIconSet( pix );
@@ -179,13 +182,13 @@ KAction::KAction( const QString& text, const QString& pix,
 : QObject( parent, name )
 {
    initPrivate( text, cut, 0, 0 );
    d->setIconName( pix );
 }
-KAction::KAction( const QString& text, const QIconSet& pix,
+KAction::KAction( const QString& text, const QIcon& pix,
                  const KShortcut& cut,
                  const QObject* receiver, const char* slot, QObject* parent,
                  const char* name )
 : QObject( parent, name )
 {
    initPrivate( text, cut, receiver, slot );
@@ -503,25 +506,25 @@ void KAction::setAccel( int keyQt )
 void KAction::updateShortcut( int i )
 {
  int id = itemId( i );
  QWidget* w = container( i );
-  if ( w->inherits( "QPopupMenu" ) ) {
+  if ( w->inherits( "Q3PopupMenu" ) ) {
-    QPopupMenu* menu = static_cast<QPopupMenu*>(w);
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>(w);
    updateShortcut( menu, id );
  }
  else if ( w->inherits( "QMenuBar" ) )
 //US    static_cast<QMenuBar*>(w)->setAccel( d->m_cut.keyCodeQt(), id );
 //US    (QMenuBar*)(w)->setAccel( d->m_cut.keyCodeQt(), id );
      ;   //qDebug("KAction::updateShortcut( int i ) ...1 has top be fixed");
 }
-void KAction::updateShortcut( QPopupMenu* menu, int id )
+void KAction::updateShortcut( Q3PopupMenu* menu, int id )
 {
 /*US
  //kdDebug(129) << "KAction::updateShortcut(): this = " << this << " d->m_kaccelList.count() = " << d->m_kaccelList.count() << endl;
  // If the action has a KAccel object,
  //  show the string representation of its shortcut.
  if ( d->m_kaccel || d->m_kaccelList.count() ) {
@@ -618,13 +621,13 @@ void KAction::updateToolTip( int i )
 {
    //qDebug("KAction::updateToolTip ...1 has top be fixed");
 QWidget *w = container( i );
  if ( w->inherits( "KToolBar" ) )
    QToolTip::add( static_cast<KToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() );
-  else if ( w->inherits( "QToolBar" ) )
+  else if ( w->inherits( "Q3ToolBar" ) )
    QToolTip::add( static_cast<KToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() );
 }
 QString KAction::toolTip() const
 {
  return d->toolTip();
@@ -643,15 +646,15 @@ int KAction::plug( QWidget *w, int index )
  // Check if action is permitted
 //US  if (kapp && !kapp->authorizeKAction(name()))
 //US    return -1;
  plugShortcut();
-  if ( w->inherits("QPopupMenu") )
+  if ( w->inherits("Q3PopupMenu") )
  {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( w );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( w );
    int id;
    // Don't insert shortcut into menu if it's already in a KAccel object.
    //qDebug("KAction::plug warning: real shortcuts not available yet.  ");
 //US    int keyQt = (d->m_kaccelList.count() || d->m_kaccel) ? 0 : d->m_cut.keyCodeQt();
    int keyQt = 0;
    
@@ -718,13 +721,13 @@ int KAction::plug( QWidget *w, int index )
        if ( icon.isEmpty() )
            icon = "unknown";
        bar->insertButton( icon, id_, SIGNAL( clicked() ), this,
                           SLOT( slotActivated() ),
                           d->isEnabled(), d->plainText(), index/*US, instance*/ );
    }
-    bar->getButton( id_ )->setName( QCString("toolbutton_")+name() );
+    bar->getButton( id_ )->setName( Q3CString("toolbutton_")+name() );
    
 //US    if ( !d->whatsThis().isEmpty() )
 //US        QWhatsThis::add( bar->getButton(id_), whatsThisWithIcon() );
    if ( !d->toolTip().isEmpty() )
      QToolTip::add( bar->getButton(id_), d->toolTip() );
@@ -746,15 +749,15 @@ void KAction::unplug( QWidget *w )
 {
  int i = findContainer( w );
  if ( i == -1 )
    return;
  int id = itemId( i );
-  if ( w->inherits( "QPopupMenu" ) )
+  if ( w->inherits( "Q3PopupMenu" ) )
  {
-    QPopupMenu *menu = static_cast<QPopupMenu *>( w );
+    Q3PopupMenu *menu = static_cast<Q3PopupMenu *>( w );
    menu->removeItem( id );
  }
  else if ( w->inherits( "KToolBar" ) )
  {
    KToolBar *bar = static_cast<KToolBar *>( w );
    bar->removeItemDelayed( id );
@@ -859,14 +862,14 @@ void KAction::setEnabled(bool enable)
 }
 void KAction::updateEnabled( int i )
 {
    QWidget *w = container( i );
-    if ( w->inherits("QPopupMenu") )
+    if ( w->inherits("Q3PopupMenu") )
-      static_cast<QPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
+      static_cast<Q3PopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
    else if ( w->inherits("QMenuBar") )
      static_cast<QMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
    else if ( w->inherits( "KToolBar" ) )
    {
      static_cast<KToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
    }
@@ -903,16 +906,16 @@ void KAction::setText( const QString& text )
 }
 void KAction::updateText( int i )
 {
  QWidget *w = container( i );
-  if ( w->inherits( "QPopupMenu" ) ) {
+  if ( w->inherits( "Q3PopupMenu" ) ) {
    int id = itemId( i );
-    static_cast<QPopupMenu*>(w)->changeItem( id, d->text() );
+    static_cast<Q3PopupMenu*>(w)->changeItem( id, d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), id );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), id );
  }
  else if ( w->inherits( "QMenuBar" ) )
    static_cast<QMenuBar*>(w)->changeItem( itemId( i ), d->text() );
  else if ( w->inherits( "KToolBar" ) )
  {
      //qDebug("KAction::updateText ...3 has top be fixed");
@@ -944,34 +947,34 @@ void KAction::setIcon( const QString &icon )
 }
 void KAction::updateIcon( int id )
 {
  QWidget* w = container( id );
-  if ( w->inherits( "QPopupMenu" ) ) {
+  if ( w->inherits( "Q3PopupMenu" ) ) {
    int itemId_ = itemId( id );
-    static_cast<QPopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() );
+    static_cast<Q3PopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), itemId_ );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), itemId_ );
  }
  else if ( w->inherits( "QMenuBar" ) )
    static_cast<QMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( KIcon::Small ), d->text() );
  else if ( w->inherits( "KToolBar" ) )
    static_cast<KToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
-  else if ( w->inherits( "QToolBar" ) )
+  else if ( w->inherits( "Q3ToolBar" ) )
  {
    qDebug("KAction::updateIcon has top be fixed");
 //US    static_cast<QToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
  }
 }
 QString KAction::icon() const
 {
  return d->iconName( );
 }
-void KAction::setIconSet( const QIconSet &iconset )
+void KAction::setIconSet( const QIcon &iconset )
 {
  d->setIconSet( iconset );
  int len = containerCount();
  for( int i = 0; i < len; ++i )
    updateIconSet( i );
@@ -979,30 +982,30 @@ void KAction::setIconSet( const QIconSet &iconset )
 void KAction::updateIconSet( int id )
 {
  QWidget *w = container( id );
-  if ( w->inherits( "QPopupMenu" ) )
+  if ( w->inherits( "Q3PopupMenu" ) )
  {
    int itemId_ = itemId( id );
-    static_cast<QPopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() );
+    static_cast<Q3PopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), itemId_ );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), itemId_ );
  }
  else if ( w->inherits( "QMenuBar" ) )
    static_cast<QMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() );
  else if ( w->inherits( "KToolBar" ) )
  {
    if ( icon().isEmpty() && d->hasIconSet() ) // only if there is no named icon ( scales better )
      static_cast<KToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() );
    else
      static_cast<KToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet( KIcon::Small ) );
  }
 }
-QIconSet KAction::iconSet( KIcon::Group group, int size ) const
+QIcon KAction::iconSet( KIcon::Group group, int size ) const
 {
  return d->iconSet( group, size );
 }
 bool KAction::hasIcon() const
 {
@@ -1019,13 +1022,13 @@ void KAction::setWhatsThis( const QString& text )
    updateWhatsThis( i );
 }
 void KAction::updateWhatsThis( int i )
 {
  qDebug("KAction::updateWhatsThis ...1 has top be fixed");
-  QPopupMenu* pm = popupMenu( i );
+  Q3PopupMenu* pm = popupMenu( i );
  if ( pm )
  {
    pm->setWhatsThis( itemId( i ), d->whatsThis() );
    return;
  }
@@ -1061,16 +1064,16 @@ QWidget* KAction::container( int index ) const
 KToolBar* KAction::toolBar( int index ) const
 {
 //US  return dynamic_cast<KToolBar *>( d->m_containers[ index ].m_container );
  return (KToolBar *)( d->m_containers[ index ].m_container );
 }
-QPopupMenu* KAction::popupMenu( int index ) const
+Q3PopupMenu* KAction::popupMenu( int index ) const
 {
 //US  return dynamic_cast<QPopupMenu *>( d->m_containers[ index ].m_container );
-    return (QPopupMenu *)( d->m_containers[ index ].m_container );
+    return (Q3PopupMenu *)( d->m_containers[ index ].m_container );
 }
 QWidget* KAction::representative( int index ) const
 {
  return d->m_containers[ index ].m_representative;
 }
@@ -1152,13 +1155,13 @@ void KAction::slotDestroyed()
 }
 int KAction::findContainer( const QWidget* widget ) const
 {
  int pos = 0;
-  QValueList<KActionPrivate::Container>::ConstIterator it = d->m_containers.begin();
+  Q3ValueList<KActionPrivate::Container>::ConstIterator it = d->m_containers.begin();
  while( it != d->m_containers.end() )
  {
    if ( (*it).m_representative == widget || (*it).m_container == widget )
      return pos;
    ++it;
    ++pos;
@@ -1167,13 +1170,13 @@ int KAction::findContainer( const QWidget* widget ) const
  return -1;
 }
 void KAction::removeContainer( int index )
 {
  int i = 0;
-  QValueList<KActionPrivate::Container>::Iterator it = d->m_containers.begin();
+  Q3ValueList<KActionPrivate::Container>::Iterator it = d->m_containers.begin();
  while( it != d->m_containers.end() )
  {
    if ( i == index )
    {
      d->m_containers.remove( it );
      return;
diff --git a/microkde/kdeui/kaction.h b/microkde/kdeui/kaction.h
index 13e2e1e..5c690ec 100644
--- a/microkde/kdeui/kaction.h
+++ b/microkde/kdeui/kaction.h
@@ -26,27 +26,29 @@
 #ifndef __kaction_h__
 #define __kaction_h__
 //US #include <qkeysequence.h>
 #include <qobject.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
 #include <kguiitem.h>
 #include <kshortcut.h>
 #include <kstdaction.h>
 //US#include <kicontheme.h>
 //US added the following files
 #include <kiconloader.h>
 class QMenuBar;
-class QPopupMenu;
+class Q3PopupMenu;
 //USclass QComboBox;
 //USclass QPoint;
-class QIconSet;
+class QIcon;
 class QString;
 class KToolBar;
 class KAccel;
 //USclass KAccelActions;
 //USclass KConfig;
@@ -256,13 +258,13 @@ public:
     * @param receiver The SLOT's parent.
     * @param slot The SLOT to invoke to execute this action.
     * @param parent This action's parent.
     * @param name An internal name for this action.
     */
     
-    KAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KAction( const QString& text, const QIcon& pix, const KShortcut& cut,
             const QObject* receiver, const char* slot,
             KActionCollection* parent, const char* name );
    /**
     * Constructs an action with text, icon, potential keyboard
     * shortcut, and a SLOT to call when this action is invoked by
@@ -305,23 +307,23 @@ public:
         */
        KAction( const QString& text, const KShortcut& cut,
                const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
        /**
         * @obsolete
         */
-        KAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+        KAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                QObject* parent = 0, const char* name = 0 );
        /**
         * @obsolete
         */
        KAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                QObject* parent = 0, const char* name = 0 );
        /**
         * @obsolete
         */
-        KAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+        KAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
        /**
         * @obsolete
         */
        KAction( const QString& text, const QString& pix, const KShortcut& cut,
                const QObject* receiver, const char* slot, QObject* parent,
@@ -458,16 +460,16 @@ public:
    virtual QString toolTip() const;
    /**
     * Get the QIconSet from which the icons used to display this action will
     * be chosen.
     */
-    virtual QIconSet iconSet( KIcon::Group group, int size=0 ) const;
+    virtual QIcon iconSet( KIcon::Group group, int size=0 ) const;
 #ifndef KDE_NO_COMPAT
-    QIconSet iconSet() const
+    QIcon iconSet() const
    {
      return iconSet( KIcon::Small );
    }
 #endif
    virtual QString icon() const;
@@ -515,13 +517,13 @@ public slots:
    virtual void setToolTip( const QString& );
    /**
     * Sets the QIconSet from which the icons used to display this action will
     * be chosen.
     */
-    virtual void setIconSet( const QIconSet &iconSet );
+    virtual void setIconSet( const QIcon &iconSet );
    virtual void setIcon( const QString& icon );
    /**
     * Enables or disables this action. All uses of this action (eg. in menus
     * or toolbars) will be updated to reflect the state of the action.
@@ -543,22 +545,22 @@ protected slots:
    virtual void slotDestroyed();
    virtual void slotKeycodeChanged();
    virtual void slotActivated();
 protected:
    KToolBar* toolBar( int index ) const;
-    QPopupMenu* popupMenu( int index ) const;
+    Q3PopupMenu* popupMenu( int index ) const;
    void removeContainer( int index );
    int findContainer( const QWidget* widget ) const;
    void plugMainWindowAccel( QWidget *w );
    void addContainer( QWidget* parent, int id );
    void addContainer( QWidget* parent, QWidget* representative );
    virtual void updateShortcut( int i );
-    virtual void updateShortcut( QPopupMenu* menu, int id );
+    virtual void updateShortcut( Q3PopupMenu* menu, int id );
    virtual void updateGroup( int id );
    virtual void updateText(int i );
    virtual void updateEnabled(int i);
    virtual void updateIconSet(int i);
    virtual void updateIcon( int i);
    virtual void updateToolTip( int id );
diff --git a/microkde/kdeui/kactionclasses.cpp b/microkde/kdeui/kactionclasses.cpp
index 82e6c8b..c611865 100644
--- a/microkde/kdeui/kactionclasses.cpp
+++ b/microkde/kdeui/kactionclasses.cpp
@@ -25,15 +25,17 @@
 #include "kactionclasses.h"
 #include <assert.h>
 #include <qfontdatabase.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 //US#include <qwhatsthis.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //US#include <kaccel.h>
 //US#include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 //US#include <kfontcombo.h>
@@ -45,19 +47,19 @@
 #include <ktoolbarbutton.h>
 #include <kurl.h>
 //US added the following includefiles
 #include <kconfigbase.h>
 #include <qwidget.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmenubar.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #include <qcombobox.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
+#include <qcoreapplication.h>
 static QFontDatabase *fontDataBase = 0;
 static void cleanupFontDatabase()
 {
    delete fontDataBase;
@@ -80,13 +82,13 @@ static void get_fonts( QStringList &lst )
        if ( !lst.contains( family ) )
            lst.append( family );
    }
    lst.sort();
 }
-static QValueList<int> get_standard_font_sizes()
+static Q3ValueList<int> get_standard_font_sizes()
 {
    if ( !fontDataBase ) {
        fontDataBase = new QFontDatabase();
        qAddPostRoutine( cleanupFontDatabase );
    }
    return fontDataBase->standardSizes();
@@ -117,13 +119,13 @@ KToggleAction::KToggleAction( const QString& text, const KShortcut& cut,
                              QObject* parent, const char* name )
  : KAction( text, cut, receiver, slot, parent, name )
 {
  d = new KToggleActionPrivate;
 }
-KToggleAction::KToggleAction( const QString& text, const QIconSet& pix,
+KToggleAction::KToggleAction( const QString& text, const QIcon& pix,
                              const KShortcut& cut,
                              QObject* parent, const char* name )
  : KAction( text, pix, cut, parent, name )
 {
  d = new KToggleActionPrivate;
 }
@@ -133,13 +135,13 @@ KToggleAction::KToggleAction( const QString& text, const QString& pix,
                              QObject* parent, const char* name )
 : KAction( text, pix, cut, parent, name )
 {
  d = new KToggleActionPrivate;
 }
-KToggleAction::KToggleAction( const QString& text, const QIconSet& pix,
+KToggleAction::KToggleAction( const QString& text, const QIcon& pix,
                              const KShortcut& cut,
                              const QObject* receiver,
                              const char* slot, QObject* parent,
                              const char* name )
  : KAction( text, pix, cut, receiver, slot, parent, name )
 {
@@ -166,13 +168,13 @@ KToggleAction::~KToggleAction()
 {
    delete d;
 }
 int KToggleAction::plug( QWidget* widget, int index )
 {
-  if ( !widget->inherits("QPopupMenu") && !widget->inherits("KToolBar") )
+  if ( !widget->inherits("Q3PopupMenu") && !widget->inherits("KToolBar") )
  {
    kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl;
    return -1;
  }
 /*US
@@ -181,17 +183,17 @@ int KToggleAction::plug( QWidget* widget, int index )
 */
  int _index = KAction::plug( widget, index );
  if ( _index == -1 )
    return _index;
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
  {
    int id = itemId( _index );
    
-    static_cast<QPopupMenu*>(widget)->setItemChecked( id, d->m_checked );
+    static_cast<Q3PopupMenu*>(widget)->setItemChecked( id, d->m_checked );
  } else if ( widget->inherits( "KToolBar" ) ) {
    KToolBar *bar = static_cast<KToolBar *>( widget );
    bar->setToggle( itemId( _index ), true );
    bar->setButton( itemId( _index ), isChecked() );
@@ -211,19 +213,18 @@ void KToggleAction::setChecked( bool c )
  int len = containerCount();
  for( int i = 0; i < len; ++i )
    updateChecked( i );
  if ( c && parent() && !exclusiveGroup().isEmpty() ) {
-    const QObjectList *list = parent()->children();
+    const QObjectList list = parent()->children();
-    if ( list ) {
+    if ( !list.empty() ) {
-      QObjectListIt it( *list );
+      for(QObjectList::const_iterator it=list.begin();it!=list.end();++it) {
-      for( ; it.current(); ++it ) {
+        if ( (*it)->inherits( "KToggleAction" ) && (*it) != this &&
-        if ( it.current()->inherits( "KToggleAction" ) && it.current() != this &&
+            static_cast<KToggleAction*>((*it))->exclusiveGroup() == exclusiveGroup() ) {
-            static_cast<KToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) {
+          KToggleAction *a = static_cast<KToggleAction*>(*it);
-          KToggleAction *a = static_cast<KToggleAction*>(it.current());
          if( a->isChecked() ) {
            a->setChecked( false );
            emit a->toggled( false );
          }
        }
      }
@@ -232,14 +233,14 @@ void KToggleAction::setChecked( bool c )
 }
 void KToggleAction::updateChecked( int id )
 {
  QWidget *w = container( id );
-  if ( w->inherits( "QPopupMenu" ) )
+  if ( w->inherits( "Q3PopupMenu" ) )
-    static_cast<QPopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
+    static_cast<Q3PopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
  else if ( w->inherits( "QMenuBar" ) )
    static_cast<QMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked );
  else if ( w->inherits( "KToolBar" ) )
  {
    QWidget* r = static_cast<KToolBar*>( w )->getButton( itemId( id ) );
    if ( r && r->inherits( "KToolBarButton" ) )
@@ -280,13 +281,13 @@ KRadioAction::KRadioAction( const QString& text, const KShortcut& cut,
                            const QObject* receiver, const char* slot,
                            QObject* parent, const char* name )
 : KToggleAction( text, cut, receiver, slot, parent, name )
 {
 }
-KRadioAction::KRadioAction( const QString& text, const QIconSet& pix,
+KRadioAction::KRadioAction( const QString& text, const QIcon& pix,
                            const KShortcut& cut,
                            QObject* parent, const char* name )
 : KToggleAction( text, pix, cut, parent, name )
 {
 }
@@ -294,13 +295,13 @@ KRadioAction::KRadioAction( const QString& text, const QString& pix,
                            const KShortcut& cut,
                            QObject* parent, const char* name )
 : KToggleAction( text, pix, cut, parent, name )
 {
 }
-KRadioAction::KRadioAction( const QString& text, const QIconSet& pix,
+KRadioAction::KRadioAction( const QString& text, const QIcon& pix,
                            const KShortcut& cut,
                            const QObject* receiver, const char* slot,
                            QObject* parent, const char* name )
 : KToggleAction( text, pix, cut, receiver, slot, parent, name )
 {
 }
@@ -346,13 +347,13 @@ public:
    m_menu = 0;
    m_current = -1;
    m_comboWidth = -1;
  }
  bool m_edit;
  bool m_menuAccelsEnabled;
-  QPopupMenu *m_menu;
+  Q3PopupMenu *m_menu;
  int m_current;
  int m_comboWidth;
  QStringList m_list;
  QString makeMenuText( const QString &_text )
  {
@@ -384,13 +385,13 @@ KSelectAction::KSelectAction( const QString& text, const KShortcut& cut,
                              QObject* parent, const char* name )
  : KAction( text, cut, receiver, slot, parent, name )
 {
  d = new KSelectActionPrivate;
 }
-KSelectAction::KSelectAction( const QString& text, const QIconSet& pix,
+KSelectAction::KSelectAction( const QString& text, const QIcon& pix,
                              const KShortcut& cut,
                              QObject* parent, const char* name )
  : KAction( text, pix, cut, parent, name )
 {
  d = new KSelectActionPrivate;
 }
@@ -400,13 +401,13 @@ KSelectAction::KSelectAction( const QString& text, const QString& pix,
                              QObject* parent, const char* name )
  : KAction( text, pix, cut, parent, name )
 {
  d = new KSelectActionPrivate;
 }
-KSelectAction::KSelectAction( const QString& text, const QIconSet& pix,
+KSelectAction::KSelectAction( const QString& text, const QIcon& pix,
                              const KShortcut& cut,
                              const QObject* receiver,
                              const char* slot, QObject* parent,
                              const char* name )
  : KAction( text, pix, cut, receiver, slot, parent, name )
 {
@@ -436,13 +437,13 @@ KSelectAction::~KSelectAction()
  delete d; d = 0;
 }
 void KSelectAction::setCurrentItem( int id )
 {
    if ( id >= (int)d->m_list.count() ) {
-        ASSERT(id < (int)d->m_list.count());
+        Q_ASSERT(id < (int)d->m_list.count());
        return;
    }
    if ( d->m_menu )
    {
        if ( d->m_current >= 0 )
@@ -476,19 +477,19 @@ void KSelectAction::setComboWidth( int width )
  int len = containerCount();
  for( int i = 0; i < len; ++i )
    updateComboWidth( i );
 }
-QPopupMenu* KSelectAction::popupMenu() const
+Q3PopupMenu* KSelectAction::popupMenu() const
 {
        kdDebug(129) << "KSelectAction::popupMenu()" << endl; // remove -- ellis
  if ( !d->m_menu )
  {
 //US    d->m_menu = new KPopupMenu(0L, "KSelectAction::popupMenu()");
-    d->m_menu = new QPopupMenu(0L, "QSelectAction::popupMenu()");
+    d->m_menu = new Q3PopupMenu(0L, "QSelectAction::popupMenu()");
    setupMenu();
    if ( d->m_current >= 0 )
      d->m_menu->setItemChecked( d->m_current, true );
  }
  return d->m_menu;
@@ -640,18 +641,18 @@ void KSelectAction::updateItems( int id )
 int KSelectAction::plug( QWidget *widget, int index )
 {
 //US  if (kapp && !kapp->authorizeKAction(name()))
 //US    return -1;
  
  kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
  {
    // Create the PopupMenu and store it in m_menu
    (void)popupMenu();
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
    int id;
    
    if ( hasIconSet() )
      id = menu->insertItem( iconSet(), text(), d->m_menu, -1, index );
    else
      id = menu->insertItem( text(), d->m_menu, -1, index );
@@ -679,13 +680,13 @@ int KSelectAction::plug( QWidget *widget, int index )
                      toolTip(), -1, index );
    KComboBox *cb = bar->getCombo( id_ );
    if ( cb )
    {
         cb->setMaximumHeight( 34 );
-      if (!isEditable()) cb->setFocusPolicy(QWidget::NoFocus);
+      if (!isEditable()) cb->setFocusPolicy(Qt::NoFocus);
      cb->setMinimumWidth( cb->sizeHint().width() );
      if ( d->m_comboWidth > 0 )
      {
        cb->setMinimumWidth( d->m_comboWidth );
        cb->setMaximumWidth( d->m_comboWidth );
      }
@@ -849,13 +850,13 @@ KListAction::KListAction( const QString& text, const KShortcut& cut,
 {
  d = new KListActionPrivate;
  if ( receiver )
    connect( this, SIGNAL( activated( int ) ), receiver, slot );
 }
-KListAction::KListAction( const QString& text, const QIconSet& pix,
+KListAction::KListAction( const QString& text, const QIcon& pix,
                          const KShortcut& cut,
                          QObject* parent, const char* name )
  : KSelectAction( text, pix, cut, parent, name )
 {
  d = new KListActionPrivate;
 }
@@ -865,13 +866,13 @@ KListAction::KListAction( const QString& text, const QString& pix,
                          QObject* parent, const char* name )
  : KSelectAction( text, pix, cut, parent, name )
 {
  d = new KListActionPrivate;
 }
-KListAction::KListAction( const QString& text, const QIconSet& pix,
+KListAction::KListAction( const QString& text, const QIcon& pix,
                          const KShortcut& cut, const QObject* receiver,
                          const char* slot, QObject* parent,
                          const char* name )
  : KSelectAction( text, pix, cut, parent, name )
 {
  d = new KListActionPrivate;
@@ -962,13 +963,13 @@ KRecentFilesAction::KRecentFilesAction( const QString& text,
  if ( receiver )
    connect( this,     SIGNAL(urlSelected(const KURL&)),
             receiver, slot );
 }
 KRecentFilesAction::KRecentFilesAction( const QString& text,
-                                        const QIconSet& pix,
+                                        const QIcon& pix,
                                        const KShortcut& cut,
                                        QObject* parent, const char* name,
                                        uint maxItems )
  : KListAction( text, pix, cut, parent, name)
 {
  d = new KRecentFilesActionPrivate;
@@ -988,13 +989,13 @@ KRecentFilesAction::KRecentFilesAction( const QString& text,
  d->m_maxItems = maxItems;
  init();
 }
 KRecentFilesAction::KRecentFilesAction( const QString& text,
-                                        const QIconSet& pix,
+                                        const QIcon& pix,
                                        const KShortcut& cut,
                                        const QObject* receiver,
                                        const char* slot,
                                        QObject* parent, const char* name,
                                        uint maxItems )
  : KListAction( text, pix, cut, parent, name)
@@ -1198,13 +1199,13 @@ KFontAction::KFontAction( const QString& text, const KShortcut& cut,
    d = new KFontActionPrivate;
    get_fonts( d->m_fonts );
    KSelectAction::setItems( d->m_fonts );
    setEditable( true );
 }
-KFontAction::KFontAction( const QString& text, const QIconSet& pix,
+KFontAction::KFontAction( const QString& text, const QIcon& pix,
                          const KShortcut& cut,
                          QObject* parent, const char* name )
    : KSelectAction( text, pix, cut, parent, name )
 {
    d = new KFontActionPrivate;
    get_fonts( d->m_fonts );
@@ -1220,13 +1221,13 @@ KFontAction::KFontAction( const QString& text, const QString& pix,
    d = new KFontActionPrivate;
    get_fonts( d->m_fonts );
    KSelectAction::setItems( d->m_fonts );
    setEditable( true );
 }
-KFontAction::KFontAction( const QString& text, const QIconSet& pix,
+KFontAction::KFontAction( const QString& text, const QIcon& pix,
                          const KShortcut& cut,
                          const QObject* receiver, const char* slot,
                          QObject* parent, const char* name )
    : KSelectAction( text, pix, cut, receiver, slot, parent, name )
 {
    d = new KFontActionPrivate;
@@ -1358,13 +1359,13 @@ KFontSizeAction::KFontSizeAction( const QString& text,
                                  QObject* parent, const char* name )
  : KSelectAction( text, cut, receiver, slot, parent, name )
 {
  init();
 }
-KFontSizeAction::KFontSizeAction( const QString& text, const QIconSet& pix,
+KFontSizeAction::KFontSizeAction( const QString& text, const QIcon& pix,
                                  const KShortcut& cut,
                                  QObject* parent, const char* name )
  : KSelectAction( text, pix, cut, parent, name )
 {
  init();
 }
@@ -1374,13 +1375,13 @@ KFontSizeAction::KFontSizeAction( const QString& text, const QString& pix,
                                  QObject* parent, const char* name )
  : KSelectAction( text, pix, cut, parent, name )
 {
  init();
 }
-KFontSizeAction::KFontSizeAction( const QString& text, const QIconSet& pix,
+KFontSizeAction::KFontSizeAction( const QString& text, const QIcon& pix,
                                  const KShortcut& cut,
                                  const QObject* receiver,
                                  const char* slot, QObject* parent,
                                  const char* name )
    : KSelectAction( text, pix, cut, receiver, slot, parent, name )
 {
@@ -1411,15 +1412,15 @@ KFontSizeAction::~KFontSizeAction()
 void KFontSizeAction::init()
 {
    d = new KFontSizeActionPrivate;
    setEditable( true );
-    QValueList<int> sizes = get_standard_font_sizes();
+    Q3ValueList<int> sizes = get_standard_font_sizes();
    QStringList lst;
-    for ( QValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it )
+    for ( Q3ValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it )
        lst.append( QString::number( *it ) );
    setItems( lst );
 }
 void KFontSizeAction::setFontSize( int size )
@@ -1434,26 +1435,26 @@ void KFontSizeAction::setFontSize( int size )
        return;
    }
    int index = items().findIndex( QString::number( size ) );
    if ( index == -1 ) {
        // Insert at the correct position in the list (to keep sorting)
-        QValueList<int> lst;
+        Q3ValueList<int> lst;
        // Convert to list of ints
        QStringList itemsList = items();
        for (QStringList::Iterator it = itemsList.begin() ; it != itemsList.end() ; ++it)
            lst.append( (*it).toInt() );
        // New size
        lst.append( size );
        // Sort the list
 qDebug("KFontSizeAction::setFontSize heapsort not found.");
 //US has to be fixed
 //US        qHeapSort( lst );
        // Convert back to string list
        QStringList strLst;
-        for (QValueList<int>::Iterator it = lst.begin() ; it != lst.end() ; ++it)
+        for (Q3ValueList<int>::Iterator it = lst.begin() ; it != lst.end() ; ++it)
            strLst.append( QString::number(*it) );
        KSelectAction::setItems( strLst );
        // Find new current item
        index = lst.findIndex( size );
        setCurrentItem( index );
    }
@@ -1489,23 +1490,23 @@ void KFontSizeAction::slotActivated( const QString& size )
 class KActionMenu::KActionMenuPrivate
 {
 public:
  KActionMenuPrivate()
  {
 //US    m_popup = new KPopupMenu(0L,"KActionMenu::KActionMenuPrivate");
-    m_popup = new QPopupMenu(0L,"KActionMenu::KActionMenuPrivate");
+    m_popup = new Q3PopupMenu(0L,"KActionMenu::KActionMenuPrivate");
    m_delayed = true;
    m_stickyMenu = true;
  }
  ~KActionMenuPrivate()
  {
    delete m_popup; m_popup = 0;
  }
  
 //US  KPopupMenu *m_popup;
-  QPopupMenu *m_popup;
+  Q3PopupMenu *m_popup;
  bool m_delayed;
  bool m_stickyMenu;
 };
 KActionMenu::KActionMenu( QObject* parent, const char* name )
  : KAction( parent, name )
@@ -1519,13 +1520,13 @@ KActionMenu::KActionMenu( const QString& text, QObject* parent,
  : KAction( text, 0, parent, name )
 {
  d = new KActionMenuPrivate;
  setShortcutConfigurable( false );
 }
-KActionMenu::KActionMenu( const QString& text, const QIconSet& icon,
+KActionMenu::KActionMenu( const QString& text, const QIcon& icon,
                          QObject* parent, const char* name )
  : KAction( text, icon, 0, parent, name )
 {
  d = new KActionMenuPrivate;
  setShortcutConfigurable( false );
 }
@@ -1549,13 +1550,13 @@ void KActionMenu::popup( const QPoint& global )
 {
  popupMenu()->popup( global );
 }
 //US KPopupMenu* KActionMenu::popupMenu() const
-QPopupMenu* KActionMenu::popupMenu() const
+Q3PopupMenu* KActionMenu::popupMenu() const
 {
  return d->m_popup;
 }
 void KActionMenu::insert( KAction* cmd, int index )
 {
@@ -1589,15 +1590,15 @@ int KActionMenu::plug( QWidget* widget, int index )
 {
 /*US  
  if (kapp && !kapp->authorizeKAction(name()))
    return -1;
 */    
  kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
  {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
    int id;
    if ( hasIconSet() )
      id = menu->insertItem( iconSet(), text(), d->m_popup, -1, index );
    else
      id = menu->insertItem( text(), d->m_popup, -1, index );
@@ -1778,18 +1779,18 @@ int KToolBarPopupAction::plug( QWidget *widget, int index )
  return KAction::plug( widget, index );
 }
 //US KPopupMenu *KToolBarPopupAction::popupMenu() const
-QPopupMenu *KToolBarPopupAction::popupMenu() const
+Q3PopupMenu *KToolBarPopupAction::popupMenu() const
 {
    if ( !m_popup ) {
        KToolBarPopupAction *that = const_cast<KToolBarPopupAction*>(this);
 //US        that->m_popup = new KPopupMenu;
-        that->m_popup = new QPopupMenu;
+        that->m_popup = new Q3PopupMenu;
    }
    return m_popup;
 }
 ////////
@@ -1950,13 +1951,13 @@ void KWidgetAction::unplug( QWidget *w )
 }
 void KWidgetAction::slotToolbarDestroyed()
 {
  //Q_ASSERT( m_widget ); // When exiting the app the widget could be destroyed before the toolbar.
-  ASSERT( isPlugged() );
+  Q_ASSERT( isPlugged() );
  if( !m_widget || !isPlugged() )
    return;
  // Don't let a toolbar being destroyed, delete my widget.
  m_widget->reparent( 0L, QPoint(), false /*showIt*/ );
 }
@@ -1971,15 +1972,15 @@ KActionSeparator::KActionSeparator( QObject *parent, const char *name )
 KActionSeparator::~KActionSeparator()
 {
 }
 int KActionSeparator::plug( QWidget *widget, int index )
 {
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
  {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
    int id = menu->insertSeparator( index );
    addContainer( menu, id );
    connect( menu, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
diff --git a/microkde/kdeui/kactionclasses.h b/microkde/kdeui/kactionclasses.h
index f6e7a0f..a9b9104 100644
--- a/microkde/kdeui/kactionclasses.h
+++ b/microkde/kdeui/kactionclasses.h
@@ -31,17 +31,20 @@
 //US#include <qkeysequence.h>
 //US#include <qobject.h>
 //US#include <qvaluelist.h>
 //US#include <qguardedptr.h>
 //US#include <kguiitem.h>
 #include <kshortcut.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PopupMenu>
 //US#include <kstdaction.h>
 //US#include <kicontheme.h>
 class QMenuBar;
-class QPopupMenu;
+class Q3PopupMenu;
 //USclass QComboBox;
 //USclass QPoint;
 //USclass QIconSet;
 //USclass QString;
 //USclass KToolBar;
@@ -51,13 +54,13 @@ class KConfig;
 //USclass KConfigBase;
 class KURL;
 //USclass KInstance;
 //US class KToolBar needs to be replaced
-class KToolBar;
+#include "ktoolbar.h"
 class KActionCollection;
 //US class KPopupMenu needs to be replaced
 //US class KPopupMenu;
 //USclass KMainWindow;
@@ -102,13 +105,13 @@ public:
     *  @param text The text that will be displayed.
     *  @param pix The icons that go with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
     *  @param parent This action's parent.
     *  @param name An internal name for this action.
     */
-    KToggleAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KToggleAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
             QObject* parent = 0, const char* name = 0 );
    /**
     *  @param text The text that will be displayed.
     *  @param pix The dynamically loaded icon that goes with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -124,13 +127,13 @@ public:
     *  @param cut The corresponding keyboard accelerator (shortcut).
     *  @param receiver The SLOT's parent.
     *  @param slot The SLOT to invoke to execute this action.
     *  @param parent This action's parent.
     *  @param name An internal name for this action.
     */
-    KToggleAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KToggleAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                   const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
    /**
     *  @param text The text that will be displayed.
     *  @param pix The dynamically loaded icon that goes with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -243,13 +246,13 @@ public:
     *  @param text The text that will be displayed.
     *  @param pix The icons that go with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
     *  @param parent This action's parent.
     *  @param name An internal name for this action.
     */
-    KRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KRadioAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                  QObject* parent = 0, const char* name = 0 );
    /**
     *  @param text The text that will be displayed.
     *  @param pix The dynamically loaded icon that goes with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -265,13 +268,13 @@ public:
     *  @param cut The corresponding keyboard accelerator (shortcut).
     *  @param receiver The SLOT's parent.
     *  @param slot The SLOT to invoke to execute this action.
     *  @param parent This action's parent.
     *  @param name An internal name for this action.
     */
-    KRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KRadioAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                  const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
    /**
     *  @param text The text that will be displayed.
     *  @param pix The dynamically loaded icon that goes with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -349,13 +352,13 @@ public:
     *  @param text The text that will be displayed.
     *  @param pix The icons that go with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
     *  @param parent This action's parent.
     *  @param name An internal name for this action.
     */
-    KSelectAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KSelectAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
             QObject* parent = 0, const char* name = 0 );
    /**
     *  @param text The text that will be displayed.
     *  @param pix The dynamically loaded icon that goes with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -371,13 +374,13 @@ public:
     *  @param cut The corresponding keyboard accelerator (shortcut).
     *  @param receiver The SLOT's parent.
     *  @param slot The SLOT to invoke to execute this action.
     *  @param parent This action's parent.
     *  @param name An internal name for this action.
     */
-    KSelectAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KSelectAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                   const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
    /**
     *  @param text The text that will be displayed.
     *  @param pix The dynamically loaded icon that goes with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -435,13 +438,13 @@ public:
    /**
     * When this action is plugged into a toolbar, it creates a combobox.
     * This returns the maximum width set by setComboWidth
     */
    virtual int comboWidth() const;
-    QPopupMenu* popupMenu() const;
+    Q3PopupMenu* popupMenu() const;
    /**
     * Deprecated. See @ref setMenuAccelsEnabled .
     * @since 3.1
     */
    void setRemoveAmpersandsInCombo( bool b );
@@ -564,13 +567,13 @@ public:
     *  @param text The text that will be displayed.
     *  @param pix The icons that go with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
     *  @param parent This action's parent.
     *  @param name An internal name for this action.
     */
-    KListAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KListAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                      QObject* parent = 0, const char* name = 0 );
    /**
     *  @param text The text that will be displayed.
     *  @param pix The dynamically loaded icon that goes with this action.
     *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -586,13 +589,13 @@ public:
     *  @param cut The corresponding keyboard accelerator (shortcut).
     *  @param receiver The SLOT's parent.
     *  @param slot The SLOT to invoke to execute this action.
     *  @param parent This action's parent.
     *  @param name An internal name for this action.
     */
-    KListAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KListAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                          const QObject* receiver, const char* slot, QObject* parent,
                  const char* name = 0 );
    /**
     *  @param text The text that will be displayed.
     *  @param pix The dynamically loaded icon that goes with this action.
@@ -682,13 +685,13 @@ public:
   *  @param pix The icons that go with this action.
   *  @param cut The corresponding keyboard accelerator (shortcut).
   *  @param parent This action's parent.
   *  @param name An internal name for this action.
   *  @param maxItems The maximum number of files to display
   */
-  KRecentFilesAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+  KRecentFilesAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                      QObject* parent, const char* name = 0,
                      uint maxItems = 10 );
  /**
   *  @param text The text that will be displayed.
   *  @param pix The dynamically loaded icon that goes with this action.
@@ -709,13 +712,13 @@ public:
   *  @param slot The SLOT to invoke when a URL is selected.
   *  Its signature is of the form slotURLSelected( const KURL & ).
   *  @param parent This action's parent.
   *  @param name An internal name for this action.
   *  @param maxItems The maximum number of files to display
   */
-  KRecentFilesAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+  KRecentFilesAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                      const QObject* receiver, const char* slot,
                      QObject* parent, const char* name = 0,
                      uint maxItems = 10 );
  /**
   *  @param text The text that will be displayed.
@@ -831,17 +834,17 @@ class KFontAction : public KSelectAction
 public:
    KFontAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0,
                 const char* name = 0 );
    KFontAction( const QString& text, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent,
                 const char* name = 0 );
-    KFontAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KFontAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                 QObject* parent = 0, const char* name = 0 );
    KFontAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                 QObject* parent = 0, const char* name = 0 );
-    KFontAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KFontAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent,
                 const char* name = 0 );
    KFontAction( const QString& text, const QString& pix, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent,
                 const char* name = 0 );
@@ -870,17 +873,17 @@ class KFontSizeAction : public KSelectAction
    Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 public:
    KFontSizeAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0,
                     const char* name = 0 );
    KFontSizeAction( const QString& text, const KShortcut& cut, const QObject* receiver,
                     const char* slot, QObject* parent, const char* name = 0 );
-    KFontSizeAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KFontSizeAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                     QObject* parent = 0, const char* name = 0 );
    KFontSizeAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                     QObject* parent = 0, const char* name = 0 );
-    KFontSizeAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KFontSizeAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                     const QObject* receiver, const char* slot,
                     QObject* parent, const char* name = 0 );
    KFontSizeAction( const QString& text, const QString& pix, const KShortcut& cut,
                     const QObject* receiver, const char* slot,
                     QObject* parent, const char* name = 0 );
    KFontSizeAction( QObject* parent = 0, const char* name = 0 );
@@ -928,24 +931,24 @@ class KActionMenu : public KAction
  Q_PROPERTY( bool delayed READ delayed WRITE setDelayed )
  Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
 public:
    KActionMenu( const QString& text, QObject* parent = 0,
                 const char* name = 0 );
-    KActionMenu( const QString& text, const QIconSet& icon,
+    KActionMenu( const QString& text, const QIcon& icon,
                 QObject* parent = 0, const char* name = 0 );
    KActionMenu( const QString& text, const QString& icon,
                 QObject* parent = 0, const char* name = 0 );
    KActionMenu( QObject* parent = 0, const char* name = 0 );
    virtual ~KActionMenu();
    virtual void insert( KAction*, int index = -1 );
    virtual void remove( KAction* );
 //US    KPopupMenu* popupMenu() const;
-    QPopupMenu* popupMenu() const;
+    Q3PopupMenu* popupMenu() const;
    void popup( const QPoint& global );
    /**
     * Returns true if this action creates a delayed popup menu
     * when plugged in a KToolbar.
     */
@@ -1064,13 +1067,13 @@ public:
    /**
     * The popup menu that is shown when clicking (some time) on the toolbar
     * button. You may want to plug items into it on creation, or connect to
     * aboutToShow for a more dynamic menu.
     */
 //US    KPopupMenu *popupMenu() const;
-    QPopupMenu *popupMenu() const;
+    Q3PopupMenu *popupMenu() const;
    /**
     * Returns true if this action creates a delayed popup menu
     * when plugged in a KToolbar.
     */
    bool delayed() const;
@@ -1095,13 +1098,13 @@ public:
     * Default: sticky.
     */
    void setStickyMenu(bool sticky);
 private:
 //US    KPopupMenu *m_popup;
-    QPopupMenu *m_popup;
+    Q3PopupMenu *m_popup;
    bool m_delayed:1;
    bool m_stickyMenu:1;
 protected:
    virtual void virtual_hook( int id, void* data );
 private:
    class KToolBarPopupActionPrivate;
@@ -1144,14 +1147,14 @@ public:
    }
 public slots:
    virtual void setChecked( bool );
 private:
-    QCString               m_toolBarName;
+    Q3CString               m_toolBarName;
-    QGuardedPtr<KToolBar>  m_toolBar;
+    QPointer<KToolBar>  m_toolBar;
 protected:
    virtual void virtual_hook( int id, void* data );
 private:
    class KToggleToolBarActionPrivate;
    KToggleToolBarActionPrivate *d;
 };
@@ -1192,13 +1195,13 @@ public:
     * destroyed. It will be hidden and reparented to 0L instead.
     */
    virtual void unplug( QWidget *w );
 protected slots:
    void slotToolbarDestroyed();
 private:
-    QGuardedPtr<QWidget> m_widget;
+    QPointer<QWidget> m_widget;
    bool                 m_autoSized;
 protected:
    virtual void virtual_hook( int id, void* data );
 private:
    class KWidgetActionPrivate;
    KWidgetActionPrivate *d;
diff --git a/microkde/kdeui/kactioncollection.cpp b/microkde/kdeui/kactioncollection.cpp
index 69e5d02..4d66c7f 100644
--- a/microkde/kdeui/kactioncollection.cpp
+++ b/microkde/kdeui/kactioncollection.cpp
@@ -23,24 +23,26 @@
    Boston, MA 02111-1307, USA.
 */
 #include "kactioncollection.h"
 //US#include "kactionshortcutlist.h"
-#include <qptrdict.h>
+#include <q3ptrdict.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //US#include <qvariant.h>
 //US#include <kaccel.h>
 //US#include <kaccelbase.h>
 //US#include <kapplication.h>
 #include <kdebug.h>
 //US#include <kxmlguifactory.h>
 //US I included the following files
-#include <qasciidict.h>
+#include <q3asciidict.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include "kaction.h"
 #include <kglobal.h>
 #include <qobject.h>
 #include <qwidget.h>
 class KActionCollection::KActionCollectionPrivate
@@ -64,19 +66,19 @@ public:
 //US  QString m_sXMLFile;
  bool m_bAutoConnectShortcuts;
  //bool m_bOneKAccelOnly;
  //int m_iWidgetCurrent;
  //QValueList<QWidget*> m_widgetList;
  //QValueList<KAccel*> m_kaccelList;
-  QValueList<KActionCollection*> m_docList;
+  Q3ValueList<KActionCollection*> m_docList;
  QWidget *m_widget;
  KAccel *m_kaccel;
  KAccel *m_builderKAccel;
-  QAsciiDict<KAction> m_actionDict;
+  Q3AsciiDict<KAction> m_actionDict;
-  QPtrDict< QPtrList<KAction> > m_dctHighlightContainers;
+  Q3PtrDict< Q3PtrList<KAction> > m_dctHighlightContainers;
  bool m_highlight;
  KAction *m_currentHighlightAction;
  bool m_statusCleared;
 };
 KActionCollection::KActionCollection( QWidget *parent, const char *name /*US,
@@ -130,13 +132,13 @@ KActionCollection::KActionCollection( const KActionCollection &copy )
 }
 // KDE 4: remove end
 KActionCollection::~KActionCollection()
 {
  kdDebug(129) << "KActionCollection::~KActionCollection(): this = " << this << endl;
-  for ( QAsciiDictIterator<KAction> it( d->m_actionDict ); it.current(); ++it ) {
+  for ( Q3AsciiDictIterator<KAction> it( d->m_actionDict ); it.current(); ++it ) {
    KAction* pAction = it.current();
    if ( pAction->m_parentCollection == this )
      pAction->m_parentCollection = 0L;
  }
 //US  delete d->m_kaccel;
@@ -362,13 +364,13 @@ KAction* KActionCollection::_take( KAction* action )
  emit removed( action );
  return a;
 }
 void KActionCollection::_clear()
 {
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
  while ( it.current() )
    _remove( it.current() );
 }
 void KActionCollection::insert( KAction* action )   { _insert( action ); }
 void KActionCollection::remove( KAction* action )   { _remove( action ); }
@@ -383,13 +385,13 @@ KAction* KActionCollection::action( const char* name, const char* classname ) co
  KAction* pAction = 0;
  if ( !classname && name )
    pAction = d->m_actionDict[ name ];
  else {
-    QAsciiDictIterator<KAction> it( d->m_actionDict );
+    Q3AsciiDictIterator<KAction> it( d->m_actionDict );
    for( ; it.current(); ++it )
    {
      if ( ( !name || strcmp( it.current()->name(), name ) == 0 ) &&
          ( !classname || strcmp( it.current()->className(), classname ) == 0 ) ) {
        pAction = it.current();
        break;
@@ -404,13 +406,13 @@ KAction* KActionCollection::action( const char* name, const char* classname ) co
  return pAction;
 }
 KAction* KActionCollection::action( int index ) const
 {
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
  it += index;
  return it.current();
 //  return d->m_actions.at( index );
 }
 /*US
 bool KActionCollection::readShortcutSettings( const QString& sConfigGroup, KConfigBase* pConfig )
@@ -429,25 +431,25 @@ uint KActionCollection::count() const
 }
 QStringList KActionCollection::groups() const
 {
  QStringList lst;
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
  for( ; it.current(); ++it )
    if ( !it.current()->group().isEmpty() && !lst.contains( it.current()->group() ) )
      lst.append( it.current()->group() );
  return lst;
 }
 KActionPtrList KActionCollection::actions( const QString& group ) const
 {
  KActionPtrList lst;
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
  for( ; it.current(); ++it )
    if ( it.current()->group() == group )
      lst.append( it.current() );
    else if ( it.current()->group().isEmpty() && group.isEmpty() )
      lst.append( it.current() );
@@ -455,13 +457,13 @@ KActionPtrList KActionCollection::actions( const QString& group ) const
 }
 KActionPtrList KActionCollection::actions() const
 {
  KActionPtrList lst;
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
  for( ; it.current(); ++it )
    lst.append( it.current() );
  return lst;
 }
@@ -505,27 +507,27 @@ bool KActionCollection::highlightingEnabled() const
 void KActionCollection::connectHighlight( QWidget *container, KAction *action )
 {
  if ( !d->m_highlight )
    return;
-  QPtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
+  Q3PtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
  if ( !actionList )
  {
-    actionList = new QPtrList<KAction>;
+    actionList = new Q3PtrList<KAction>;
-    if ( container->inherits( "QPopupMenu" ) )
+    if ( container->inherits( "Q3PopupMenu" ) )
    {
      connect( container, SIGNAL( highlighted( int ) ),
               this, SLOT( slotMenuItemHighlighted( int ) ) );
      connect( container, SIGNAL( aboutToHide() ),
               this, SLOT( slotMenuAboutToHide() ) );
    }
 //US    else if ( container->inherits( "KToolBar" ) )
-    else if ( container->inherits( "QToolBar" ) )
+    else if ( container->inherits( "Q3ToolBar" ) )
    {
      connect( container, SIGNAL( highlighted( int, bool ) ),
               this, SLOT( slotToolBarButtonHighlighted( int, bool ) ) );
    }
    connect( container, SIGNAL( destroyed() ),
@@ -539,13 +541,13 @@ void KActionCollection::connectHighlight( QWidget *container, KAction *action )
 void KActionCollection::disconnectHighlight( QWidget *container, KAction *action )
 {
  if ( !d->m_highlight )
    return;
-  QPtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
+  Q3PtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
  if ( !actionList )
    return;
  actionList->removeRef( action );
@@ -622,18 +624,18 @@ void KActionCollection::slotDestroyed()
 {
    d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<QObject *>(sender()) ) );
 }
 KAction *KActionCollection::findAction( QWidget *container, int id )
 {
-  QPtrList<KAction> *actionList = d->m_dctHighlightContainers[ reinterpret_cast<void *>( container ) ];
+  Q3PtrList<KAction> *actionList = d->m_dctHighlightContainers[ reinterpret_cast<void *>( container ) ];
  if ( !actionList )
    return 0;
-  QPtrListIterator<KAction> it( *actionList );
+  Q3PtrListIterator<KAction> it( *actionList );
  for (; it.current(); ++it )
    if ( it.current()->isPlugged( container, id ) )
      return it.current();
  return 0;
 }
@@ -641,15 +643,15 @@ KAction *KActionCollection::findAction( QWidget *container, int id )
 // KDE 4: remove
 KActionCollection KActionCollection::operator+(const KActionCollection &c ) const
 {
  kdWarning(129) << "KActionCollection::operator+(): function is severely deprecated." << endl;
  KActionCollection ret( *this );
-  QValueList<KAction *> actions = c.actions();
+  Q3ValueList<KAction *> actions = c.actions();
-  QValueList<KAction *>::ConstIterator it = actions.begin();
+  Q3ValueList<KAction *>::ConstIterator it = actions.begin();
-  QValueList<KAction *>::ConstIterator end = actions.end();
+  Q3ValueList<KAction *>::ConstIterator end = actions.end();
  for (; it != end; ++it )
    ret.insert( *it );
  return ret;
 }
@@ -667,13 +669,13 @@ KActionCollection &KActionCollection::operator=( const KActionCollection &copy )
  return *this;
 }
 KActionCollection &KActionCollection::operator+=( const KActionCollection &c )
 {
  kdWarning(129) << "KActionCollection::operator+=(): function is severely deprecated." << endl;
-  QAsciiDictIterator<KAction> it(c.d->m_actionDict);
+  Q3AsciiDictIterator<KAction> it(c.d->m_actionDict);
  for ( ; it.current(); ++it )
    insert( it.current() );
  return *this;
 }
 // KDE 4: remove end
diff --git a/microkde/kdeui/kactioncollection.h b/microkde/kdeui/kactioncollection.h
index b9466d0..50cb02a 100644
--- a/microkde/kdeui/kactioncollection.h
+++ b/microkde/kdeui/kactioncollection.h
@@ -27,12 +27,14 @@
 #define __kactioncollection_h__
 #include <kaction.h>
 //US #include <qkeysequence.h>
 #include <qobject.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //US#include <qvaluelist.h>
 //US#include <qguardedptr.h>
 //US #include <kguiitem.h>
 //US#include <kshortcut.h>
 //US#include <kstdaction.h>
 //US#include <kicontheme.h>
@@ -57,13 +59,13 @@
 //USclass KMainWindow;
 //US added inclidefiles
 class QWidget;
-typedef QValueList<KAction *> KActionPtrList;
+typedef Q3ValueList<KAction *> KActionPtrList;
 /**
 * A managed set of KAction objects.
 */
 class KActionCollection : public QObject
 {
diff --git a/microkde/kdeui/kbuttonbox.cpp b/microkde/kdeui/kbuttonbox.cpp
index 83d622a..3ea6703 100644
--- a/microkde/kdeui/kbuttonbox.cpp
+++ b/microkde/kdeui/kbuttonbox.cpp
@@ -46,37 +46,39 @@
 */
 //US #include "kbuttonbox.moc"
 
 #include <kbuttonbox.h>
 #include <qpushbutton.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 #include <assert.h>
 #define minButtonWidth 50
 class KButtonBox::Item {
 public:
  QPushButton *button;
  bool noexpand;
  unsigned short stretch;
  unsigned short actual_size;
 };
-template class QPtrList<KButtonBox::Item>;
+template class Q3PtrList<KButtonBox::Item>;
 class KButtonBoxPrivate {
 public:
  unsigned short border;
  unsigned short autoborder;
  unsigned short orientation;
  bool activated;
-  QPtrList<KButtonBox::Item> buttons;
+  Q3PtrList<KButtonBox::Item> buttons;
 };
-KButtonBox::KButtonBox(QWidget *parent, Orientation _orientation,
+KButtonBox::KButtonBox(QWidget *parent, Qt::Orientation _orientation,
                       int border, int autoborder)
  :  QWidget(parent)
 {
  data = new KButtonBoxPrivate;
  assert(data != 0);
@@ -146,13 +148,13 @@ void KButtonBox::layout() {
  setMinimumSize(sizeHint());
 }
 void KButtonBox::placeButtons() {
  unsigned int i;
-  if(data->orientation == Horizontal) {
+  if(data->orientation == Qt::Horizontal) {
    // calculate free size and stretches
    int fs = width() - 2 * data->border;
    int stretch = 0;
    for(i = 0; i < data->buttons.count(); i++) {
      Item *item = data->buttons.at(i);
      if(item->button != 0) {
@@ -248,32 +250,32 @@ QSize KButtonBox::sizeHint() const {
        QSize s;
        if(item->noexpand)
          s = that->buttonSizeHint(b);
        else
          s = bs;
-        if(data->orientation == Horizontal)
+        if(data->orientation == Qt::Horizontal)
          dw += s.width();
        else
          dw += s.height();
        if( i != data->buttons.count() - 1 )
          dw += data->autoborder;
      }
    }
-    if(data->orientation == Horizontal)
+    if(data->orientation == Qt::Horizontal)
        return QSize(dw, bs.height() + 2 * data->border);
    else
        return QSize(bs.width() + 2 * data->border, dw);
  }
 }
 QSizePolicy KButtonBox::sizePolicy() const
 {
-    return data->orientation == Horizontal?
+    return data->orientation == Qt::Horizontal?
        QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ) :
        QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum );
 }
 /*
 * Returns the best size for a button. If a button is less than
diff --git a/microkde/kdeui/kbuttonbox.h b/microkde/kdeui/kbuttonbox.h
index 1104366..2e0f41d 100644
--- a/microkde/kdeui/kbuttonbox.h
+++ b/microkde/kdeui/kbuttonbox.h
@@ -18,12 +18,14 @@
 */
 #ifndef __KBUTTONBOX__H__
 #define __KBUTTONBOX__H__
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 class QPushButton;
 class KButtonBoxPrivate;
 /**
 * Container widget for buttons. 
 * 
@@ -45,13 +47,13 @@ public:
    * Create an empty container for buttons.
    *
    * If @p _orientation is @p Vertical, the buttons inserted with 
    * @ref addButton() are laid out from top to bottom, otherwise they 
    * are laid out from left to right.
    */
-  KButtonBox(QWidget *parent, Orientation _orientation = Horizontal,
+  KButtonBox(QWidget *parent, Qt::Orientation _orientation = Qt::Horizontal,
             int border = 0, int _autoborder = 6);
  /**
    * Free private data field
    */
  ~KButtonBox();
diff --git a/microkde/kdeui/kguiitem.cpp b/microkde/kdeui/kguiitem.cpp
index 828c5e6..c91ffb7 100644
--- a/microkde/kdeui/kguiitem.cpp
+++ b/microkde/kdeui/kguiitem.cpp
@@ -17,13 +17,13 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #include <qregexp.h>
 #include <qstring.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qpixmap.h>
 #include <assert.h>
 //US #include <kiconloader.h>
 #include <kdebug.h>
@@ -59,13 +59,13 @@ public:
    QString m_text;
    QString m_toolTip;
    QString m_whatsThis;
    QString m_statusText;
    QString m_iconName;
-    QIconSet m_iconSet;
+    QIcon m_iconSet;
    bool m_hasIcon : 1;
    bool m_enabled : 1;
 };
 KGuiItem::KGuiItem() {
@@ -79,13 +79,13 @@ KGuiItem::KGuiItem( const QString &text,    const QString &iconName,
    d->m_text = text;
    d->m_toolTip =  toolTip;
    d->m_whatsThis = whatsThis;
    setIconName( iconName );
 }
-KGuiItem::KGuiItem( const QString &text,    const QIconSet &iconSet,
+KGuiItem::KGuiItem( const QString &text,    const QIcon &iconSet,
                    const QString &toolTip, const QString &whatsThis )
 {
    d = new KGuiItemPrivate;
    d->m_text = text;
    d->m_toolTip =  toolTip;
    d->m_whatsThis = whatsThis;
@@ -121,13 +121,13 @@ QString KGuiItem::plainText() const {
  QString stripped( d->m_text );
  stripped.replace( QRegExp( "&(?!&)" ), QString::null );
  return stripped;
 }
-QIconSet KGuiItem::iconSet( KIcon::Group group, int size /*US, KInstance* instance */ ) const
+QIcon KGuiItem::iconSet( KIcon::Group group, int size /*US, KInstance* instance */ ) const
 {
    if( d->m_hasIcon )
    {
        if( !d->m_iconName.isEmpty())
        {
 // some caching here would(?) come handy
@@ -145,13 +145,13 @@ QIconSet KGuiItem::iconSet( KIcon::Group group, int size /*US, KInstance* instan
        else
        {
            return d->m_iconSet;
        }
    }
    else
-        return QIconSet();
+        return QIcon();
 }
 QString KGuiItem::iconName() const
 {
    return d->m_iconName;
 }
@@ -174,23 +174,23 @@ bool KGuiItem::hasIcon() const
 }
 void KGuiItem::setText( const QString &text ) {
    d->m_text=text;
 }
-void KGuiItem::setIconSet( const QIconSet &iconset )
+void KGuiItem::setIconSet( const QIcon &iconset )
 {
    d->m_iconSet = iconset;
    d->m_iconName = QString::null;
    d->m_hasIcon = !iconset.isNull();
 }
 void KGuiItem::setIconName( const QString &iconName )
 {
    d->m_iconName = iconName;
-    d->m_iconSet = QIconSet();
+    d->m_iconSet = QIcon();
    d->m_hasIcon = !iconName.isEmpty();
 }
 void KGuiItem::setToolTip( const QString &toolTip) {
    d->m_toolTip = toolTip;
 }
diff --git a/microkde/kdeui/kguiitem.h b/microkde/kdeui/kguiitem.h
index 0079bb4..6f92137 100644
--- a/microkde/kdeui/kguiitem.h
+++ b/microkde/kdeui/kguiitem.h
@@ -20,15 +20,15 @@
 */
 #ifndef __kguiitem_h__
 #define __kguiitem_h__
 #include <qstring.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qpixmap.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 //US#include <kicontheme.h>
 #include <kglobal.h>
 //US added the following files
 #include <kiconloader.h>
@@ -39,40 +39,40 @@ public:
    KGuiItem( const QString &text, 
              const QString &iconName  = QString::null,
              const QString &toolTip   = QString::null, 
              const QString &whatsThis = QString::null );
-    KGuiItem( const QString &text, const QIconSet &iconSet, 
+    KGuiItem( const QString &text, const QIcon &iconSet, 
              const QString &toolTip   = QString::null, 
              const QString &whatsThis = QString::null );
    KGuiItem( const KGuiItem &rhs );
    KGuiItem &operator=( const KGuiItem &rhs );
    ~KGuiItem();
    QString text() const;
    QString plainText() const;
-    QIconSet iconSet( KIcon::Group, int size = 0/*US , KInstance* instance = KGlobal::instance()*/) const;
+    QIcon iconSet( KIcon::Group, int size = 0/*US , KInstance* instance = KGlobal::instance()*/) const;
 #ifndef KDE_NO_COMPAT
-    QIconSet iconSet() const { return iconSet( KIcon::Small); }
+    QIcon iconSet() const { return iconSet( KIcon::Small); }
 #endif
    QString iconName() const;
    QString toolTip() const;
    QString whatsThis() const;
    bool isEnabled() const;
    bool hasIcon() const;
 #ifndef KDE_NO_COMPAT
    bool hasIconSet() const { return hasIcon(); }
 #endif
    void setText( const QString &text );
-    void setIconSet( const QIconSet &iconset );
+    void setIconSet( const QIcon &iconset );
    void setIconName( const QString &iconName );
    void setToolTip( const QString &tooltip );
    void setWhatsThis( const QString &whatsThis );
    void setEnabled( bool enable );
 private:
diff --git a/microkde/kdeui/kjanuswidget.cpp b/microkde/kdeui/kjanuswidget.cpp
index 462c44f..3d9173d 100644
--- a/microkde/kdeui/kjanuswidget.cpp
+++ b/microkde/kdeui/kjanuswidget.cpp
@@ -19,21 +19,29 @@
 */
 #include <qpixmap.h>
 #include <qbitmap.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qtabwidget.h>
-#include <qlistview.h>
+#include <q3listview.h>
-#include <qhbox.h>
+#include <q3hbox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qgrid.h>
+#include <q3grid.h>
 #include <qpainter.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3Frame>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 /*US 
 #include <qbitmap.h>
 #include <qgrid.h>
 #include <qhbox.h>
 #include <qheader.h>
 #include <qlabel.h>
@@ -62,19 +70,19 @@
 #include <kdialog.h> // Access to some static members
 #include <kdebug.h>
 #include <klistview.h>
 #include "kjanuswidget.h"
-class KJanusWidget::IconListItem : public QListBoxItem
+class KJanusWidget::IconListItem : public Q3ListBoxItem
 {
  public:
-    IconListItem( QListBox *listbox, const QPixmap &pixmap,
+    IconListItem( Q3ListBox *listbox, const QPixmap &pixmap,
                   const QString &text );
-    virtual int height( const QListBox *lb ) const;
+    virtual int height( const Q3ListBox *lb ) const;
-    virtual int width( const QListBox *lb ) const;
+    virtual int width( const Q3ListBox *lb ) const;
    int expandMinimumWidth( int width );
  protected:
    const QPixmap &defaultPixmap();
    void paint( QPainter *painter );
@@ -95,27 +103,27 @@ public:
  // Reverse dictionary. Used because showPage() may be performance critical.
  QMap<QWidget*,int> mPageToInt;
  // Dictionary of title string associated with page.
  QMap<int, QString> mIntToTitle;
 };
-template class QPtrList<QListViewItem>;
+template class Q3PtrList<Q3ListViewItem>;
 KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
  : QWidget( parent, name ),
    mValid(false), mPageList(0),
    mTitleList(0), mFace(face), mTitleLabel(0), mActivePageWidget(0),
    mShowIconsInTreeList(false), d(0)
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this );
  if( mFace == TreeList || mFace == IconList )
  {
    d = new KJanusWidgetPrivate;
-    QFrame *page = 0;
+    Q3Frame *page = 0;
    if( mFace == TreeList )
    {
    //US
    qDebug("KJanusWidget::KJanusWidget TreeList not implemented yet");
 /*US    
      QSplitter *splitter = new QSplitter( this );
@@ -142,46 +150,46 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
      page = new QFrame( p );
      hbox->addWidget( page, 10 );
 */      
    }
    else
    {
-      QHBoxLayout *hbox = new QHBoxLayout( topLayout );
+      Q3HBoxLayout *hbox = new Q3HBoxLayout( topLayout );
      mIconList = new IconListBox( this );
      QFont listFont( mIconList->font() );
      listFont.setBold( true );
      mIconList->setFont( listFont );
      mIconList->verticalScrollBar()->installEventFilter( this );
      hbox->addWidget( mIconList );
      connect( mIconList, SIGNAL(selectionChanged()), SLOT(slotShowPage()));
      hbox->addSpacing( KDialog::marginHint() );
-      page = new QFrame( this );
+      page = new Q3Frame( this );
      hbox->addWidget( page, 10 );
    }
    //
    // Rest of page area. Title at top with a separator below and a
    // pagestack using all available space at bottom.
    //
-    QVBoxLayout *vbox = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    Q3VBoxLayout *vbox = new Q3VBoxLayout( page, 0, KDialog::spacingHint() );
    mTitleLabel = new QLabel( QString::fromLatin1("Empty page"), page, "KJanusWidgetTitleLabel" );
    vbox->addWidget( mTitleLabel );
    QFont titleFont( mTitleLabel->font() );
    titleFont.setBold( true );
    mTitleLabel->setFont( titleFont );
    mTitleSep = new KSeparator( page );
-    mTitleSep->setFrameStyle( QFrame::HLine|QFrame::Plain );
+    mTitleSep->setFrameStyle( Q3Frame::HLine|Q3Frame::Plain );
    vbox->addWidget( mTitleSep );
-    mPageStack = new QWidgetStack( page );
+    mPageStack = new Q3WidgetStack( page );
    connect(mPageStack, SIGNAL(aboutToShow(QWidget *)),
            SIGNAL(aboutToShowPage(QWidget *)));
    vbox->addWidget( mPageStack, 10 );
  }
  else if( mFace == Tabbed )
  {
@@ -196,13 +204,13 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
    mSwallowPage = new QWidget( this );
    topLayout->addWidget( mSwallowPage, 10 );
  }
  else
  {
    mFace = Plain;
-    mPlainPage = new QFrame( this );
+    mPlainPage = new Q3Frame( this );
    topLayout->addWidget( mPlainPage, 10 );
  }
 /*US
  if ( kapp )
    connect(kapp,SIGNAL(kdisplayFontChanged()),SLOT(slotFontChanged()));
 */    
@@ -242,13 +250,13 @@ KJanusWidget::~KJanusWidget()
 bool KJanusWidget::isValid() const
 {
  return( mValid );
 }
-QFrame *KJanusWidget::plainPage()
+Q3Frame *KJanusWidget::plainPage()
 {
  return( mPlainPage );
 }
 int KJanusWidget::face() const
@@ -263,135 +271,135 @@ QWidget *KJanusWidget::FindParent()
  }
  else {
    return this;
  }
 }
-QFrame *KJanusWidget::addPage( const QStringList &items, const QString &header,
+Q3Frame *KJanusWidget::addPage( const QStringList &items, const QString &header,
                               const QPixmap &pixmap )
 {
  if( mValid == false )
  {
    kdDebug() << "addPage: Invalid object" << endl;
    return( 0 );
  }
-  QFrame *page = new QFrame( FindParent(), "page" );
+  Q3Frame *page = new Q3Frame( FindParent(), "page" );
  addPageWidget( page, items, header, pixmap );
  return page;
 }
 void KJanusWidget::pageGone( QObject *obj )
 {
 //  QObject* obj = (QObject*)sender();
  removePage( static_cast<QWidget*>( obj ) );
 }
-void KJanusWidget::slotReopen( QListViewItem * item )
+void KJanusWidget::slotReopen( Q3ListViewItem * item )
 {
  if( item )
    item->setOpen( true );
 }
-QFrame *KJanusWidget::addPage( const QString &itemName, const QString &header,
+Q3Frame *KJanusWidget::addPage( const QString &itemName, const QString &header,
                               const QPixmap &pixmap )
 {
  QStringList items;
  items << itemName;
  return addPage(items, header, pixmap);
 }
-QVBox *KJanusWidget::addVBoxPage( const QStringList &items,
+Q3VBox *KJanusWidget::addVBoxPage( const QStringList &items,
                                  const QString &header,
                                  const QPixmap &pixmap )
 {
  if( mValid == false )
  {
      qDebug("addPage: Invalid object ");
    
    return( 0 );
  }
-  QVBox *page = new QVBox(FindParent() , "vbox_page" );
+  Q3VBox *page = new Q3VBox(FindParent() , "vbox_page" );
  page->setSpacing( KDialog::spacingHintSmall() );
  addPageWidget( page, items, header, pixmap );
  return page;
 }
-QVBox *KJanusWidget::addVBoxPage( const QString &itemName,
+Q3VBox *KJanusWidget::addVBoxPage( const QString &itemName,
                                  const QString &header,
                                  const QPixmap &pixmap )
 {
  QStringList items;
  items << itemName;
  return addVBoxPage(items, header, pixmap);
 }
-QHBox *KJanusWidget::addHBoxPage( const QStringList &items,
+Q3HBox *KJanusWidget::addHBoxPage( const QStringList &items,
                                  const QString &header,
                                  const QPixmap &pixmap )
 {
  if( mValid == false ) {
    kdDebug() << "addPage: Invalid object" << endl;
    return( 0 );
  }
-  QHBox *page = new QHBox(FindParent(), "hbox_page");
+  Q3HBox *page = new Q3HBox(FindParent(), "hbox_page");
  page->setSpacing( KDialog::spacingHint() );
  addPageWidget( page, items, header, pixmap );
  return page;
 }
-QHBox *KJanusWidget::addHBoxPage( const QString &itemName,
+Q3HBox *KJanusWidget::addHBoxPage( const QString &itemName,
                                  const QString &header,
                                  const QPixmap &pixmap )
 {
  QStringList items;
  items << itemName;
  return addHBoxPage(items, header, pixmap);
 }
-QGrid *KJanusWidget::addGridPage( int n, QGrid::Direction dir,
+Q3Grid *KJanusWidget::addGridPage( int n, Qt::Orientation dir,
                                  const QStringList &items,
                                  const QString &header,
                                  const QPixmap &pixmap )
 {
  if( mValid == false )
  {
    kdDebug() << "addPage: Invalid object" << endl;
    return( 0 );
  }
-  QGrid *page = new QGrid( n, dir, FindParent(), "page" );
+  Q3Grid *page = new Q3Grid( n, dir, FindParent(), "page" );
  page->setSpacing( KDialog::spacingHint() );
  addPageWidget( page, items, header, pixmap );
  return page;
 }
-QGrid *KJanusWidget::addGridPage( int n, QGrid::Direction dir,
+Q3Grid *KJanusWidget::addGridPage( int n, Qt::Orientation dir,
                                  const QString &itemName,
                                  const QString &header,
                                  const QPixmap &pixmap )
 {
  QStringList items;
  items << itemName;
  return addGridPage(n, dir, items, header, pixmap);
 }
-void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, QFrame *page)
+void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, Q3Frame *page)
 {
  bool isTop = true;
-  QListViewItem *curTop = 0, *child, *last, *newChild;
+  Q3ListViewItem *curTop = 0, *child, *last, *newChild;
  unsigned int index = 1;
  QStringList curPath;
  for ( QStringList::ConstIterator it = items.begin(); it != items.end(); ++it, index++ ) {
    QString name = (*it);
    bool isPath = ( index != items.count() );
@@ -409,15 +417,15 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
    for (last = 0; child && child->text(0) != name ; last = child, child = child->nextSibling());
    if (last == 0 && child == 0) {
      // This node didn't have any children at all, lets just insert the
      // new child.
      if (isTop)
-        newChild = new QListViewItem(mTreeList, name);
+        newChild = new Q3ListViewItem(mTreeList, name);
      else
-        newChild = new QListViewItem(curTop, name);
+        newChild = new Q3ListViewItem(curTop, name);
    }
    else if (child != 0) {
      // we found the given name in this child.
      if (!isPath) {
        kdDebug() << "The element inserted was already in the TreeList box!" << endl;
@@ -428,15 +436,15 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
        newChild  = child;
      }
    }
    else {
      // the node had some children, but we didn't find the given name
      if (isTop)
-        newChild = new QListViewItem(mTreeList, last, name);
+        newChild = new Q3ListViewItem(mTreeList, last, name);
      else
-        newChild = new QListViewItem(curTop, last, name);
+        newChild = new Q3ListViewItem(curTop, last, name);
    }
    // Now make the element expandable if it is a path component, and make
    // ready for next loop
    if (isPath) {
      newChild->setExpandable(true);
@@ -456,13 +464,13 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
      }
      mTreeListToPageStack.insert(newChild, page);
    }
  }
 }
-void KJanusWidget::addPageWidget( QFrame *page, const QStringList &items,
+void KJanusWidget::addPageWidget( Q3Frame *page, const QStringList &items,
                                  const QString &header,const QPixmap &pixmap )
 {
 /*US the following signal causes a segmentation fault while closing the dialog. 
  Why not just remove all pages in the destructor??
 */  
 //US  connect(page, SIGNAL(destroyed(QObject*)), this, SLOT(pageGone(QObject*)));
@@ -547,21 +555,21 @@ bool KJanusWidget::setSwallowedWidget( QWidget *widget )
  // Remove current layout and make a new.
  //
  if( mSwallowPage->layout() != 0 )
  {
    delete mSwallowPage->layout();
  }
-  QGridLayout *gbox = new QGridLayout( mSwallowPage, 1, 1, 0 );
+  Q3GridLayout *gbox = new Q3GridLayout( mSwallowPage, 1, 1, 0 );
  //
  // Hide old children
  //
-  QObjectList *l = (QObjectList*)mSwallowPage->children(); // silence please
+  QObjectList l = mSwallowPage->children(); // silence please
-  for( uint i=0; i < l->count(); i++ )
+  for( uint i=0; i < l.count(); i++ )
  {
-    QObject *o = l->at(i);
+    QObject *o = l.at(i);
    if( o->isWidgetType() )
    {
      ((QWidget*)o)->hide();
    }
  }
@@ -594,22 +602,22 @@ bool KJanusWidget::slotShowPage()
  {
    return( false );
  }
  if( mFace == TreeList )
  {
-    QListViewItem *node = mTreeList->selectedItem();
+    Q3ListViewItem *node = mTreeList->selectedItem();
    if( node == 0 ) { return( false ); }
    QWidget *stackItem = mTreeListToPageStack[node];
    // Make sure to call through the virtual function showPage(int)
    return showPage(d->mPageToInt[stackItem]);
  }
  else if( mFace == IconList )
  {
-    QListBoxItem *node = mIconList->item( mIconList->currentItem() );
+    Q3ListBoxItem *node = mIconList->item( mIconList->currentItem() );
    if( node == 0 ) { return( false ); }
    QWidget *stackItem = mIconListToPageStack[node];
    // Make sure to call through the virtual function showPage(int)
    return showPage(d->mPageToInt[stackItem]);
  }
@@ -643,27 +651,27 @@ bool KJanusWidget::showPage( QWidget *w )
    mActivePageWidget = w;
    int index = d->mPageToInt[w];
    mTitleLabel->setText( d->mIntToTitle[index] );
    if( mFace == TreeList )
    {
-      QMap<QListViewItem *, QWidget *>::Iterator it;
+      QMap<Q3ListViewItem *, QWidget *>::Iterator it;
      for (it = mTreeListToPageStack.begin(); it != mTreeListToPageStack.end(); ++it){
-        QListViewItem *key = it.key();
+        Q3ListViewItem *key = it.key();
        QWidget *val = it.data();
        if (val == w) {
          mTreeList->setSelected(key, true );
          break;
        }
      }
    }
    else
    {
-      QMap<QListBoxItem *, QWidget *>::Iterator it;
+      QMap<Q3ListBoxItem *, QWidget *>::Iterator it;
      for (it = mIconListToPageStack.begin(); it != mIconListToPageStack.end(); ++it){
-        QListBoxItem *key = it.key();
+        Q3ListBoxItem *key = it.key();
        QWidget *val = it.data();
        if (val == w) {
          mIconList->setSelected( key, true );
          break;
        }
      }
@@ -683,19 +691,19 @@ bool KJanusWidget::showPage( QWidget *w )
 }
 int KJanusWidget::activePageIndex() const
 {
  if( mFace == TreeList) {
-    QListViewItem *node = mTreeList->selectedItem();
+    Q3ListViewItem *node = mTreeList->selectedItem();
    if( node == 0 ) { return -1; }
    QWidget *stackItem = mTreeListToPageStack[node];
    return d->mPageToInt[stackItem];
  }
  else if (mFace == IconList) {
-    QListBoxItem *node = mIconList->item( mIconList->currentItem() );
+    Q3ListBoxItem *node = mIconList->item( mIconList->currentItem() );
    if( node == 0 ) { return( false ); }
    QWidget *stackItem = mIconListToPageStack[node];
    return d->mPageToInt[stackItem];
  }
  else if( mFace == Tabbed ) {
    QWidget *widget = mTabControl->currentPage();
@@ -758,13 +766,13 @@ void KJanusWidget::slotFontChanged()
    mIconList->invalidateWidth();
  }
 }
 */
 // makes the treelist behave like the list of kcontrol
-void KJanusWidget::slotItemClicked(QListViewItem *it)
+void KJanusWidget::slotItemClicked(Q3ListViewItem *it)
 {
  if(it && (it->childCount()>0))
    it->setOpen(!it->isOpen());
 }
 void KJanusWidget::setFocus()
@@ -892,17 +900,17 @@ void KJanusWidget::setRootIsDecorated( bool state )
 void KJanusWidget::unfoldTreeList( bool persist )
 {
  if( mFace == TreeList )
  {
    if( persist )
-      connect( mTreeList, SIGNAL( collapsed( QListViewItem * ) ), this, SLOT( slotReopen( QListViewItem * ) ) );
+      connect( mTreeList, SIGNAL( collapsed( Q3ListViewItem * ) ), this, SLOT( slotReopen( Q3ListViewItem * ) ) );
    else
-      disconnect( mTreeList, SIGNAL( collapsed( QListViewItem * ) ), this, SLOT( slotReopen( QListViewItem * ) ) );
+      disconnect( mTreeList, SIGNAL( collapsed( Q3ListViewItem * ) ), this, SLOT( slotReopen( Q3ListViewItem * ) ) );
-    for( QListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() )
+    for( Q3ListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() )
      item->setOpen( true );
  }
 }
 void KJanusWidget::showEvent( QShowEvent * )
 {
@@ -950,25 +958,25 @@ bool KJanusWidget::eventFilter( QObject *o, QEvent *e )
 //
 // Code for the icon list box
 //
 KJanusWidget::IconListBox::IconListBox( QWidget *parent, const char *name,
-                                        WFlags f )
+                                        Qt::WFlags f )
  :KListBox( parent, name, f ), mShowAll(false), mHeightValid(false),
   mWidthValid(false)
 {
 }
 void KJanusWidget::IconListBox::updateMinimumHeight()
 {
  if( mShowAll == true && mHeightValid == false )
  {
    int h = frameWidth()*2;
-    for( QListBoxItem *i = item(0); i != 0; i = i->next() )
+    for( Q3ListBoxItem *i = item(0); i != 0; i = i->next() )
    {
      h += i->height( this );
    }
    setMinimumHeight( h );
    mHeightValid = true;
  }
@@ -977,19 +985,19 @@ void KJanusWidget::IconListBox::updateMinimumHeight()
 void KJanusWidget::IconListBox::updateWidth()
 {
  if( mWidthValid == false )
  {
    int maxWidth = 10;
-    for( QListBoxItem *i = item(0); i != 0; i = i->next() )
+    for( Q3ListBoxItem *i = item(0); i != 0; i = i->next() )
    {
      int w = ((IconListItem *)i)->width(this);
      maxWidth = QMAX( w, maxWidth );
    }
-    for( QListBoxItem *i = item(0); i != 0; i = i->next() )
+    for( Q3ListBoxItem *i = item(0); i != 0; i = i->next() )
    {
      ((IconListItem *)i)->expandMinimumWidth( maxWidth );
    }
    if( verticalScrollBar()->isVisible() )
    {
@@ -1019,15 +1027,15 @@ void KJanusWidget::IconListBox::setShowAll( bool showAll )
  mShowAll = showAll;
  mHeightValid = false;
 }
-KJanusWidget::IconListItem::IconListItem( QListBox *listbox, const QPixmap &pixmap,
+KJanusWidget::IconListItem::IconListItem( Q3ListBox *listbox, const QPixmap &pixmap,
                                          const QString &text )
-  : QListBoxItem( listbox )
+  : Q3ListBoxItem( listbox )
 {
  mPixmap = pixmap;
  if( mPixmap.isNull() == true )
  {
    mPixmap = defaultPixmap();
  }
@@ -1080,26 +1088,26 @@ void KJanusWidget::IconListItem::paint( QPainter *painter )
  if( text().isEmpty() == false )
  {
    painter->drawText( 0, hp+7, mMinimumWidth, ht, Qt::AlignCenter, text() );
  }
 }
-int KJanusWidget::IconListItem::height( const QListBox *lb ) const
+int KJanusWidget::IconListItem::height( const Q3ListBox *lb ) const
 {
  if( text().isEmpty() == true )
  {
    return( mPixmap.height() );
  }
  else
  {
    return( mPixmap.height() + lb->fontMetrics().lineSpacing()+10 );
  }
 }
-int KJanusWidget::IconListItem::width( const QListBox *lb ) const
+int KJanusWidget::IconListItem::width( const Q3ListBox *lb ) const
 {
  int wt = lb->fontMetrics().boundingRect(text()).width()+10;
  int wp = mPixmap.width() + 10;
  int w  = QMAX( wt, wp );
  return( QMAX( w, mMinimumWidth ) );
 }
@@ -1119,13 +1127,13 @@ void KJanusWidget::removePage( QWidget *page )
  }
    
  int index = d->mPageToInt[page];
  
  if ( mFace == TreeList )
  {
-    QMap<QListViewItem*, QWidget *>::Iterator i;
+    QMap<Q3ListViewItem*, QWidget *>::Iterator i;
    for( i = mTreeListToPageStack.begin(); i != mTreeListToPageStack.end(); ++i )
      if (i.data()==page)
      {
        delete i.key();
        mPageStack->removeWidget(page);
        mTreeListToPageStack.remove(i);
@@ -1134,13 +1142,13 @@ void KJanusWidget::removePage( QWidget *page )
        d->mIntToPage.remove(index);
        break;
      }
  }
  else if ( mFace == IconList )
  {
-    QMap<QListBoxItem*, QWidget *>::Iterator i;
+    QMap<Q3ListBoxItem*, QWidget *>::Iterator i;
    for( i = mIconListToPageStack.begin(); i != mIconListToPageStack.end(); ++i )
      if (i.data()==page)
      {
        delete i.key();
        mPageStack->removeWidget(page);
        mIconListToPageStack.remove(i);
diff --git a/microkde/kdeui/kjanuswidget.h b/microkde/kdeui/kjanuswidget.h
index 6d3f23d..72465ea 100644
--- a/microkde/kdeui/kjanuswidget.h
+++ b/microkde/kdeui/kjanuswidget.h
@@ -17,16 +17,22 @@
 *  Boston, MA 02111-1307, USA.
 */
 #ifndef _KJANUS_WIDGET_H_
 #define _KJANUS_WIDGET_H_
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qwidget.h>
 #include <qmap.h>
-#include <qgrid.h>
+#include <q3grid.h>
+//Added by qt3to4:
+#include <QShowEvent>
+#include <Q3Frame>
+#include <QPixmap>
+#include <QLabel>
+#include <QEvent>
 #include <klistbox.h>
 /*US
 #include <qptrlist.h>
 #include <qpixmap.h>
 #include <qsplitter.h>
@@ -35,18 +41,18 @@
 #include <qmap.h>
 */
 class KSeparator;
 class KListView;
-class QWidgetStack;
+class Q3WidgetStack;
 class QLabel;
 class QTabWidget;
-class QListViewItem;
+class Q3ListViewItem;
-class QVBox;
+class Q3VBox;
-class QHBox;
+class Q3HBox;
 /**
 * Provides a number of ready to use layouts (faces). It is used
 * as an internal widget in @ref KDialogBase, but can also used as a
 * widget of its own.
 *
@@ -99,13 +105,13 @@ class KJanusWidget : public QWidget
  Q_OBJECT
  private:
    class IconListBox : public KListBox
    {
      public:
-        IconListBox( QWidget *parent=0, const char *name=0, WFlags f=0 );
+        IconListBox( QWidget *parent=0, const char *name=0, Qt::WFlags f=0 );
        void updateMinimumHeight();
        void updateWidth();
        void invalidateHeight();
        void invalidateWidth();
        void setShowAll( bool showAll );
@@ -190,13 +196,13 @@ class KJanusWidget : public QWidget
    /**
     * Returns the empty widget that is available in Plain mode.
     *
     * @return The widget or 0 if the face in not Plain.
     */
-    virtual QFrame *plainPage();
+    virtual Q3Frame *plainPage();
    /**
     * Add a new page when the class is used in TreeList, IconList or Tabbed
     * mode. The returned widget is empty and you must add your widgets
     * as children to this widget. In most cases you must create a layout
     * manager and associate it with this widget as well.
@@ -211,13 +217,13 @@ class KJanusWidget : public QWidget
     * @param pixmap Used in IconList mode or in TreeList mode. You should
     *        prefer a pixmap with size 32x32 pixels.
     *
     * @return The empty page or 0 if the face is not TreeList, IconList or
     *         Tabbed.
     */
-    virtual QFrame *addPage(const QString &item,const QString &header=QString::null,
+    virtual Q3Frame *addPage(const QString &item,const QString &header=QString::null,
                    const QPixmap &pixmap=QPixmap() );
    /**
     * This is like addPage just above, with the difference that the first
     * element is a list of strings. These strings are used to form a path
     * of folders down to the given page. The initial elements are names
@@ -228,13 +234,13 @@ class KJanusWidget : public QWidget
            * Deleting the returned frame will cause the listitem or tab to be
         * removed (you can re-add a page with the same name later.
     *
         * Deleting the returned frame will cause the listitem or tab to be
         * removed (you can re-add a page with the same name later.
     **/
-     virtual QFrame *addPage(const QStringList &items, const QString &header=QString::null,
+     virtual Q3Frame *addPage(const QStringList &items, const QString &header=QString::null,
                    const QPixmap &pixmap=QPixmap() );
    /**
     * Add a new page when the class is used in TreeList, IconList or Tabbed
     * mode. The returned widget is empty and you must add your widgets
     * as children to this widget. The returned widget is a @ref QVBox
@@ -250,13 +256,13 @@ class KJanusWidget : public QWidget
     *        will be used instead.
     * @param pixmap Used in IconList mode or in TreeList mode. You should
     *        prefer a pixmap with size 32x32 pixels.
     *
     * @return The empty page or 0 if the face is not TreeList, IconList or
     *         Tabbed.  */
-    virtual QVBox *addVBoxPage( const QString &item,
+    virtual Q3VBox *addVBoxPage( const QString &item,
                        const QString &header=QString::null,
                        const QPixmap &pixmap=QPixmap() );
    /**
     * This is like addVBoxPage just above, with the difference that the first
     * element is a list of strings. These strings are used to form a path
@@ -266,13 +272,13 @@ class KJanusWidget : public QWidget
     * be added for the IconList face too. In other faces than the
     * TreeList, all the strings except the last one is ignored.
     *
     * Deleting the returned frame will cause the listitem or tab to be
     * removed (you can re-add a page with the same name later.
     **/
-    virtual QVBox *addVBoxPage( const QStringList &items,
+    virtual Q3VBox *addVBoxPage( const QStringList &items,
                        const QString &header=QString::null,
                        const QPixmap &pixmap=QPixmap() );
    /**
     * Add a new page when the class is used in TreeList, IconList or Tabbed
     * mode. The returned widget is empty and you must add your widgets
@@ -290,13 +296,13 @@ class KJanusWidget : public QWidget
     * @param pixmap Used in IconList mode or in TreeList mode. You should
     *        prefer a pixmap with size 32x32 pixels.
     *
     * @return The empty page or 0 if the face is not TreeList, IconList or
     *         Tabbed.
     */
-    virtual QHBox *addHBoxPage( const QString &itemName,
+    virtual Q3HBox *addHBoxPage( const QString &itemName,
                        const QString &header=QString::null,
                        const QPixmap &pixmap=QPixmap() );
    /**
     * This is like addHBoxPage just above, with the difference that the first
     * element is a list of strings. These strings are used to form a path
@@ -306,13 +312,13 @@ class KJanusWidget : public QWidget
     * be added for the IconList face too. In other faces than the
     * TreeList, all the strings except the last one is ignored.
     *
     * Deleting the returned frame will cause the listitem or tab to be
     * removed (you can re-add a page with the same name later.
     **/
-    virtual QHBox *addHBoxPage( const QStringList &items,
+    virtual Q3HBox *addHBoxPage( const QStringList &items,
                        const QString &header=QString::null,
                        const QPixmap &pixmap=QPixmap() );
    /**
     * Add a new page when the class is used in either TreeList or Tabbed
     * mode. The returned widget is empty and you must add your widgets
@@ -334,13 +340,13 @@ class KJanusWidget : public QWidget
     *        prefer a pixmap with size 32x32 pixels.
     *
     * @return The empty page or 0 if the face is not TreeList, IconList or
     *         Tabbed.
     */
 //US changed Orientation into Direction for compatibility
-    virtual QGrid *addGridPage( int n, QGrid::Direction dir,
+    virtual Q3Grid *addGridPage( int n, Qt::Orientation dir,
                        const QString &itemName,
                        const QString &header=QString::null,
                        const QPixmap &pixmap=QPixmap() );
    /**
     * This is like addGridPage just above, with the difference that the first
@@ -352,13 +358,13 @@ class KJanusWidget : public QWidget
     * TreeList, all the strings except the last one is ignored.
     *
     * Deleting the returned frame will cause the listitem or tab to be
     * removed (you can re-add a page with the same name later.
     **/
 //US changed Orientation into Direction for compatibility
-    virtual QGrid *addGridPage( int n, QGrid::Direction dir,
+    virtual Q3Grid *addGridPage( int n, Qt::Orientation dir,
                        const QStringList &items,
                        const QString &header=QString::null,
                        const QPixmap &pixmap=QPixmap() );
    /**
     * @short Removes a page created with @ref addPage, @ref addVBoxPage,
@@ -514,44 +520,44 @@ class KJanusWidget : public QWidget
     */
    virtual bool eventFilter( QObject *o, QEvent *e );
  private slots:
    bool slotShowPage();
 //US not yet implemented    void slotFontChanged();
-    void slotItemClicked(QListViewItem *it);
+    void slotItemClicked(Q3ListViewItem *it);
    void pageGone( QObject *obj); // signal from the added page's "destroyed" signal
-    void slotReopen(QListViewItem *item);
+    void slotReopen(Q3ListViewItem *item);
  protected:
    bool showPage( QWidget *w );
-    void addPageWidget( QFrame *page, const QStringList &items,
+    void addPageWidget( Q3Frame *page, const QStringList &items,
                        const QString &header, const QPixmap &pixmap );
-    void InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, QFrame *page);
+    void InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, Q3Frame *page);
    QWidget *FindParent();
  private:
    bool mValid;
    // Obsolete members. Remove in KDE 4.
-    QPtrList<QWidget> *mPageList;
+    Q3PtrList<QWidget> *mPageList;
    QStringList *mTitleList;
    int          mFace;
    KListView    *mTreeList;
    IconListBox  *mIconList;
-    QWidgetStack *mPageStack;
+    Q3WidgetStack *mPageStack;
    QLabel       *mTitleLabel;
    QTabWidget   *mTabControl;
-    QFrame       *mPlainPage;
+    Q3Frame       *mPlainPage;
    QWidget      *mSwallowPage;
    QWidget      *mActivePageWidget;
    KSeparator   *mTitleSep;
 //US    QSplitter::ResizeMode mTreeListResizeMode;
    bool         mShowIconsInTreeList;
-    QMap<QListViewItem *, QWidget *> mTreeListToPageStack;
+    QMap<Q3ListViewItem *, QWidget *> mTreeListToPageStack;
-    QMap<QListBoxItem *, QWidget *> mIconListToPageStack;
+    QMap<Q3ListBoxItem *, QWidget *> mIconListToPageStack;
    QMap<QString, QPixmap> mFolderIconMap;
    QMap<QString, QStringList> mChildrenNames;
    QMap<QString, QWidget *> mChildPages;
  public:
    class IconListItem;
diff --git a/microkde/kdeui/klistbox.cpp b/microkde/kdeui/klistbox.cpp
index c65b892..71020b3 100644
--- a/microkde/kdeui/klistbox.cpp
+++ b/microkde/kdeui/klistbox.cpp
@@ -13,38 +13,44 @@
   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., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 #include <qtimer.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QFocusEvent>
 #include <kglobalsettings.h>
 //US#include <kcursor.h>
 #include <kapplication.h>
 //US#include <kipc.h>
 #include <kdebug.h>
 #include "klistbox.h"
 #ifdef Q_WS_X11
+#include <QX11Info>
 #include <X11/Xlib.h>
 #endif
 #ifdef _WIN32_
 #define Q_WS_QWS
 #endif
-KListBox::KListBox( QWidget *parent, const char *name, WFlags f )
+KListBox::KListBox( QWidget *parent, const char *name, Qt::WFlags f )
-    : QListBox( parent, name, f )
+    : Q3ListBox( parent, name, f )
 {
    connect( this, SIGNAL( onViewport() ),
             this, SLOT( slotOnViewport() ) );
-    connect( this, SIGNAL( onItem( QListBoxItem * ) ),
+    connect( this, SIGNAL( onItem( Q3ListBoxItem * ) ),
-             this, SLOT( slotOnItem( QListBoxItem * ) ) );
+             this, SLOT( slotOnItem( Q3ListBoxItem * ) ) );
-    connect( this, SIGNAL( mouseButtonClicked( int, QListBoxItem *, 
+    connect( this, SIGNAL( mouseButtonClicked( int, Q3ListBoxItem *, 
        const QPoint & ) ),
-              this, SLOT( slotMouseButtonClicked( int, QListBoxItem *,
+              this, SLOT( slotMouseButtonClicked( int, Q3ListBoxItem *,
        const QPoint & ) ) );
 /*US    
    slotSettingsChanged(KApplication::SETTINGS_MOUSE);
    if (kapp)
    {
@@ -57,13 +63,13 @@ KListBox::KListBox( QWidget *parent, const char *name, WFlags f )
    m_bUseSingle = true;
    m_pAutoSelect = new QTimer( this );
    connect( m_pAutoSelect, SIGNAL( timeout() ),
      this, SLOT( slotAutoSelect() ) );
 }
-void KListBox::slotOnItem( QListBoxItem *item )
+void KListBox::slotOnItem( Q3ListBoxItem *item )
 {
 /*US
    if ( item && m_bChangeCursorOverItem && m_bUseSingle )
        viewport()->setCursor( KCursor().handCursor() );
 */
    if ( item && (m_autoSelectDelay > -1) && m_bUseSingle ) {
@@ -136,17 +142,17 @@ void KListBox::slotAutoSelect()
 #ifdef Q_WS_X11 //FIXME
  Window root;
  Window child;
  int root_x, root_y, win_x, win_y;
  uint keybstate;
-  XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child,
+  XQueryPointer( x11Info().display(), x11Info().appRootWindow(), &root, &child,
                 &root_x, &root_y, &win_x, &win_y, &keybstate );
 #endif
-  QListBoxItem* previousItem = item( currentItem() ); 
+  Q3ListBoxItem* previousItem = item( currentItem() ); 
  setCurrentItem( m_pCurrentItem );
  if( m_pCurrentItem ) {
 #ifndef Q_WS_QWS //FIXME
    //Shift pressed?
    if( (keybstate & ShiftMask) ) {
@@ -164,13 +170,13 @@ void KListBox::slotAutoSelect()
 //US      bool select = !m_pCurrentItem->isSelected();
      bool select = !m_pCurrentItem->selected();
      bool update = viewport()->isUpdatesEnabled();
      viewport()->setUpdatesEnabled( false );
      bool down = index( previousItem ) < index( m_pCurrentItem );
-      QListBoxItem* it = down ? previousItem : m_pCurrentItem;
+      Q3ListBoxItem* it = down ? previousItem : m_pCurrentItem;
      for (;it ; it = it->next() ) {
        if ( down && it == m_pCurrentItem ) {
          setSelected( m_pCurrentItem, select );
          break;
        }
        if ( !down && it == previousItem ) {
@@ -183,13 +189,13 @@ void KListBox::slotAutoSelect()
      blockSignals( block );
      viewport()->setUpdatesEnabled( update );
      triggerUpdate( false );
      emit selectionChanged();
-      if( selectionMode() == QListBox::Single )
+      if( selectionMode() == Q3ListBox::Single )
        emit selectionChanged( m_pCurrentItem );
    }
 #ifndef Q_WS_QWS //FIXME
    else if( (keybstate & ControlMask) )
      setSelected( m_pCurrentItem, !m_pCurrentItem->isSelected() );
 #endif
@@ -210,20 +216,20 @@ void KListBox::slotAutoSelect()
  }
  else
    kdDebug() << "Thats not supposed to happen!!!!" << endl;
 #endif
 }
-void KListBox::emitExecute( QListBoxItem *item, const QPoint &pos )
+void KListBox::emitExecute( Q3ListBoxItem *item, const QPoint &pos )
 {
 #ifdef Q_WS_X11 //FIXME
  Window root;
  Window child;
  int root_x, root_y, win_x, win_y;
  uint keybstate;
-  XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child,
+  XQueryPointer( x11Info().display(), x11Info().appRootWindow(), &root, &child,
                 &root_x, &root_y, &win_x, &win_y, &keybstate );
 #endif
    
  m_pAutoSelect->stop();
  
 #ifndef Q_WS_QWS //FIXME
@@ -243,71 +249,71 @@ void KListBox::emitExecute( QListBoxItem *item, const QPoint &pos )
 // F1 (and combinations) and Escape since these are used
 // to start help or close the dialog. This functionality
 // should be done in QListView but it is not (at least now)
 //
 void KListBox::keyPressEvent(QKeyEvent *e)
 {
-  if( e->key() == Key_Escape )
+  if( e->key() == Qt::Key_Escape )
  {
    e->ignore();
  }
-  else if( e->key() == Key_F1 )
+  else if( e->key() == Qt::Key_F1 )
  {
    e->ignore();
  }
  else
  {
-    QListBox::keyPressEvent(e);
+    Q3ListBox::keyPressEvent(e);
  }
 }
 void KListBox::focusOutEvent( QFocusEvent *fe )
 {
  m_pAutoSelect->stop();
-  QListBox::focusOutEvent( fe );
+  Q3ListBox::focusOutEvent( fe );
 }
 void KListBox::leaveEvent( QEvent *e ) 
 {
  m_pAutoSelect->stop();
-  QListBox::leaveEvent( e );
+  Q3ListBox::leaveEvent( e );
 }
 void KListBox::contentsMousePressEvent( QMouseEvent *e )
 {
-  if( (selectionMode() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) ) {
+  if( (selectionMode() == Extended) && (e->state() & Qt::ShiftButton) && !(e->state() & Qt::ControlButton) ) {
    bool block = signalsBlocked();
    blockSignals( true );
    clearSelection();
    blockSignals( block );
  }
-  QListBox::contentsMousePressEvent( e );
+  Q3ListBox::contentsMousePressEvent( e );
 }
 void KListBox::contentsMouseDoubleClickEvent ( QMouseEvent * e )
 {
-  QListBox::contentsMouseDoubleClickEvent( e );
+  Q3ListBox::contentsMouseDoubleClickEvent( e );
-  QListBoxItem* item = itemAt( e->pos() );
+  Q3ListBoxItem* item = itemAt( e->pos() );
  if( item ) {
    emit doubleClicked( item, e->globalPos() );
-    if( (e->button() == LeftButton) && !m_bUseSingle )
+    if( (e->button() == Qt::LeftButton) && !m_bUseSingle )
      emitExecute( item, e->globalPos() );
  }
 }
-void KListBox::slotMouseButtonClicked( int btn, QListBoxItem *item, const QPoint &pos )
+void KListBox::slotMouseButtonClicked( int btn, Q3ListBoxItem *item, const QPoint &pos )
 {
-  if( (btn == LeftButton) && item )
+  if( (btn == Qt::LeftButton) && item )
    emitExecute( item, pos );
 }
 void KListBox::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
diff --git a/microkde/kdeui/klistbox.h b/microkde/kdeui/klistbox.h
index 8023780..5ec514b 100644
--- a/microkde/kdeui/klistbox.h
+++ b/microkde/kdeui/klistbox.h
@@ -15,13 +15,18 @@
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 #ifndef KLISTBOX_H
 #define KLISTBOX_H
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QFocusEvent>
+#include <QKeyEvent>
+#include <QEvent>
 /**
 * Extends the functionality of @ref QListBox to honor the system
 * wide settings for Single Click/Double Click mode, Auto Selection and
 * Change Cursor over Link.
 *
@@ -32,18 +37,18 @@
 * mentioned. This way you don't need to care about the current
 * settings.  If you want to get informed when the user selects
 * something connect to the @ref QListBox::selectionChanged() signal.
 * 
 * @short A variant of @ref QListBox that honors KDE's system-wide settings.
 **/
-class KListBox : public QListBox
+class KListBox : public Q3ListBox
 {
    Q_OBJECT
 public:
-  KListBox( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+  KListBox( QWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0 );
 signals:
  /**
   * Emitted whenever the user executes an listbox item. 
   *
@@ -51,26 +56,26 @@ signals:
   * setting the user clicked or double clicked on that item.
   * @param item is the pointer to the executed listbox item. 
   *
   * Note that you may not delete any @ref QListBoxItem objects in slots 
   * connected to this signal.
   */
-  void executed( QListBoxItem *item );
+  void executed( Q3ListBoxItem *item );
  /**
   * Emitted whenever the user executes an listbox item. 
   *
   * That means depending on the KDE wide Single Click/Double Click 
   * setting the user clicked or double clicked on that item.
   * @param item is the pointer to the executed listbox item. 
   * @param pos is the position where the user has clicked
   *
   * Note that you may not delete any @ref QListBoxItem objects in slots 
   * connected to this signal.
   */
-  void executed( QListBoxItem *item, const QPoint &pos );
+  void executed( Q3ListBoxItem *item, const QPoint &pos );
  /**
   * This signal gets emitted whenever the user double clicks into the 
   * listbox. 
   *
   * @param item The pointer to the clicked listbox item. 
@@ -80,27 +85,27 @@ signals:
   * connected to this signal.  
   *
   * This signal is more or less here for the sake of completeness.
   * You should normally not need to use this. In most cases it's better
   * to use @ref executed() instead.
   */
-  void doubleClicked( QListBoxItem *item, const QPoint &pos );
+  void doubleClicked( Q3ListBoxItem *item, const QPoint &pos );
 protected slots:
-  void slotOnItem( QListBoxItem *item );
+  void slotOnItem( Q3ListBoxItem *item );
  void slotOnViewport();
 //US  void slotSettingsChanged(int);
  /**
   * Auto selection happend.
   */
  void slotAutoSelect();
 protected:
-  void emitExecute( QListBoxItem *item, const QPoint &pos );
+  void emitExecute( Q3ListBoxItem *item, const QPoint &pos );
  /**
   * @reimplemented
   */
  virtual void keyPressEvent(QKeyEvent *e);
  /**
@@ -120,19 +125,19 @@ protected:
   */
  virtual void contentsMouseDoubleClickEvent ( QMouseEvent *e );
  bool m_bUseSingle;
 //US  bool m_bChangeCursorOverItem;
-  QListBoxItem* m_pCurrentItem;
+  Q3ListBoxItem* m_pCurrentItem;
  QTimer* m_pAutoSelect;
  int m_autoSelectDelay;
 private slots:
-  void slotMouseButtonClicked( int btn, QListBoxItem *item, const QPoint &pos );
+  void slotMouseButtonClicked( int btn, Q3ListBoxItem *item, const QPoint &pos );
 protected:
  virtual void virtual_hook( int id, void* data );
 private:
  class KListBoxPrivate;
  KListBoxPrivate *d;
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp
index 60f3084..0e98160 100644
--- a/microkde/kdeui/klistview.cpp
+++ b/microkde/kdeui/klistview.cpp
@@ -15,19 +15,33 @@
   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., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qtimer.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qcursor.h>
 #include <qtooltip.h>
 #include <qstyle.h>
 #include <qpainter.h>
+//Added by qt3to4:
+#include <QDragLeaveEvent>
+#include <QKeyEvent>
+#include <Q3ValueList>
+#include <Q3PtrList>
+#include <QPixmap>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QEvent>
+#include <QPaintEvent>
 #include <kglobalsettings.h>
 #include <kconfig.h>
 #include <kconfigbase.h>
 //US #include <kcursor.h>
 #include <kapplication.h>
@@ -35,23 +49,24 @@
 #include <kdebug.h>
 #ifdef _WIN32_
 #define Q_WS_QWS
 #endif
 #ifndef _WIN32_
 #define private public
-#include <qlistview.h>
+#include <q3listview.h>
 #undef private
 #endif
 #include "klistview.h"
 //US #include "klistviewlineedit.h"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
+#include <Q3Action>
 // /*US
-class KListView::Tooltip : public QToolTip
+class KListView::Tooltip /* TODO:hacker:TODO: : public QToolTip */
 {
 public:
  Tooltip (KListView* parent, QToolTipGroup* group = 0L);
  virtual ~Tooltip () {}
 protected:
@@ -64,13 +79,13 @@ protected:
 private:
  KListView* mParent;
 };
 KListView::Tooltip::Tooltip (KListView* parent, QToolTipGroup* group)
-  : QToolTip (parent, group),
+  : /* XXX:hacker:XXX: QToolTip (parent, group), */
        mParent (parent)
 {
 }
 void KListView::Tooltip::maybeTip (const QPoint&)
 {
@@ -120,26 +135,26 @@ public:
  ~KListViewPrivate ()
  {
 //US    delete editor;
  }
-  QListViewItem* pCurrentItem;
+  Q3ListViewItem* pCurrentItem;
  QTimer autoSelect;
  int autoSelectDelay;
  QTimer dragExpand;
-  QListViewItem* dragOverItem;
+  Q3ListViewItem* dragOverItem;
  QPoint dragOverPoint;
  
  QPoint startDragPos;
  int dragDelay;
 //US  KListViewLineEdit *editor;
-  QValueList<int> renameable;
+  Q3ValueList<int> renameable;
  bool cursorInExecuteArea:1;
  bool bUseSingle:1;
  bool bChangeCursorOverItem:1;
  bool itemsMovable:1;
  bool selectedBySimpleMove : 1;
@@ -167,14 +182,14 @@ public:
  int contextMenuKey;
  bool showContextMenusOnPress;
  QRect mOldDropVisualizer;
  int mDropVisualizerWidth;
  QRect mOldDropHighlighter;
-  QListViewItem *afterItemDrop;
+  Q3ListViewItem *afterItemDrop;
-  QListViewItem *parentItemDrop;
+  Q3ListViewItem *parentItemDrop;
  QColor alternateBackground;
 };
 /*US
 KListViewLineEdit::KListViewLineEdit(KListView *parent)
@@ -223,47 +238,47 @@ void KListViewLineEdit::load(QListViewItem *i, int c)
 }
 */
        /*Helper functions to for
         *tabOrderedRename functionality.
 */
-static int nextCol (KListView *pl, QListViewItem *pi, int start, int dir)
+static int nextCol (KListView *pl, Q3ListViewItem *pi, int start, int dir)
 {
        if (pi)
        {
                        //Find the next renameable column in the current row
                for (; ((dir == +1) ? (start < pl->columns()) : (start >= 0)); start += dir)
                        if (pl->isRenameable(start))
                                return start;
        }
        return -1;
 }
-static QListViewItem *prevItem (QListViewItem *pi)
+static Q3ListViewItem *prevItem (Q3ListViewItem *pi)
 {
-        QListViewItem *pa = pi->itemAbove();
+        Q3ListViewItem *pa = pi->itemAbove();
                /*Does what the QListViewItem::previousSibling()
                 *of my dreams would do.
         */
        if (pa && pa->parent() == pi->parent())
                return pa;
        return NULL;
 }
-static QListViewItem *lastQChild (QListViewItem *pi)
+static Q3ListViewItem *lastQChild (Q3ListViewItem *pi)
 {
        if (pi)
        {
                        /*Since there's no QListViewItem::lastChild().
                         *This finds the last sibling for the given
                         *item.
                 */
-                for (QListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling())
+                for (Q3ListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling())
                        pi = pt;
        }
        return pi;
 }
 /*US
@@ -325,16 +340,16 @@ bool KListViewLineEdit::event (QEvent *pe)
        if (pe->type() == QEvent::KeyPress)
        {
                QKeyEvent *k = (QKeyEvent *) pe;
            if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) &&
                        p->tabOrderedRenaming() && p->itemsRenameable() &&
-                        !(k->state() & ControlButton || k->state() & AltButton))
+                        !(k->state() & Qt::ControlButton || k->state() & AltButton))
                {
                        selectNextCell(item, col,
-                                (k->key() == Key_Tab && !(k->state() & ShiftButton)));
+                                (k->key() == Key_Tab && !(k->state() & Qt::ShiftButton)));
                        return true;
            }
        }
        return KLineEdit::event(pe);
 }
@@ -403,25 +418,25 @@ void KListViewLineEdit::slotSelectionChanged()
    col = 0;
    hide();
 }
 */
 KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse  )
-  : QListView( parent, name ),
+  : Q3ListView( parent, name ),
        d (new KListViewPrivate (this))
 {
 #ifndef DESKTOP_VERSION
    if ( emulateRightMouse )
        QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
 //US  setDragAutoScroll(true);
  connect( this, SIGNAL( onViewport() ),
                   this, SLOT( slotOnViewport() ) );
-  connect( this, SIGNAL( onItem( QListViewItem * ) ),
+  connect( this, SIGNAL( onItem( Q3ListViewItem * ) ),
-                   this, SLOT( slotOnItem( QListViewItem * ) ) );
+                   this, SLOT( slotOnItem( Q3ListViewItem * ) ) );
  connect (this, SIGNAL(contentsMoving(int,int)),
                   this, SLOT(cleanDropVisualizer()));
  connect (this, SIGNAL(contentsMoving(int,int)),
                   this, SLOT(cleanItemHighlighter()));
@@ -442,23 +457,23 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse
  connect(&d->dragExpand, SIGNAL( timeout() ),
                  this, SLOT( slotDragExpand() ) );
  // context menu handling
  if (d->showContextMenusOnPress)
        {
-          connect (this, SIGNAL (rightButtonPressed (QListViewItem*, const QPoint&, int)),
+          connect (this, SIGNAL (rightButtonPressed (Q3ListViewItem*, const QPoint&, int)),
-                           this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int)));
+                           this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int)));
        }
  else
        {
-          connect (this, SIGNAL (rightButtonClicked (QListViewItem*, const QPoint&, int)),
+          connect (this, SIGNAL (rightButtonClicked (Q3ListViewItem*, const QPoint&, int)),
-                           this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int)));
+                           this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int)));
        }
-  connect (this, SIGNAL (menuShortCutPressed (KListView*, QListViewItem*)),
+  connect (this, SIGNAL (menuShortCutPressed (KListView*, Q3ListViewItem*)),
-                   this, SLOT (emitContextMenu (KListView*, QListViewItem*)));
+                   this, SLOT (emitContextMenu (KListView*, Q3ListViewItem*)));
  
 
  //qDebug("KListView::KListView make alternate color configurable");  
  d->alternateBackground = KGlobalSettings::alternateBackgroundColor();
 }
@@ -477,13 +492,13 @@ bool KListView::isExecuteArea( const QPoint& point )
  return false;
 }
 QSize KListView::sizeHint() const
 {
    //qDebug("KListView::QSize sizeHint() ");
 #ifdef DESKTOP_VERSION
-    return QListView::sizeHint();
+    return Q3ListView::sizeHint();
 #else
    return QSize ( 40, 40 );
 #endif
 }
 bool KListView::isExecuteArea( int x )
@@ -500,13 +515,13 @@ bool KListView::isExecuteArea( int x )
    x += contentsX(); // in case of a horizontal scrollbar
    return ( x > offset && x < ( offset + width ) );
  }
 }
-void KListView::slotOnItem( QListViewItem *item )
+void KListView::slotOnItem( Q3ListViewItem *item )
 {
  QPoint vp = viewport()->mapFromGlobal( QCursor::pos() );
  if ( item && isExecuteArea( vp.x() ) && (d->autoSelectDelay > -1) && d->bUseSingle ) {
    d->autoSelect.start( d->autoSelectDelay, true );
    d->pCurrentItem = item;
  }
@@ -531,18 +546,18 @@ void KListView::slotSettingsChanged(int category)
    //US I create my private category (=1) to set the settings
  case 1:
    d->dragDelay = 2;
    //US set explicitly d->bUseSingle = KGlobalSettings::singleClick();
    //    qDebug("KListView::slotSettingsChanged: single%i", d->bUseSingle);
-    disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
+    disconnect(this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)),
-               this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int)));
+               this, SLOT (slotMouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)));
    if( d->bUseSingle )
-      connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
+      connect (this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)),
-               this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int)));
+               this, SLOT (slotMouseButtonClicked( int, Q3ListViewItem*, const QPoint &, int)));
    //US d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon();
    //US d->autoSelectDelay = KGlobalSettings::autoSelectDelay();
    if( !d->bUseSingle || !d->bChangeCursorOverItem )
       viewport()->unsetCursor();
@@ -608,13 +623,13 @@ void KListView::slotAutoSelect()
        }
  //Give this widget the keyboard focus.
  if( !hasFocus() )
    setFocus();
-  QListViewItem* previousItem = currentItem();
+  Q3ListViewItem* previousItem = currentItem();
  setCurrentItem( d->pCurrentItem );
 #if 0
 #ifndef Q_WS_QWS
  // FIXME(E): Implement for Qt Embedded
  if( d->pCurrentItem ) {
@@ -629,13 +644,13 @@ void KListView::slotAutoSelect()
      bool select = !d->pCurrentItem->isSelected();
      bool update = viewport()->isUpdatesEnabled();
      viewport()->setUpdatesEnabled( false );
      bool down = previousItem->itemPos() < d->pCurrentItem->itemPos();
-      QListViewItemIterator lit( down ? previousItem : d->pCurrentItem );
+      Q3ListViewItemIterator lit( down ? previousItem : d->pCurrentItem );
      for ( ; lit.current(); ++lit ) {
                if ( down && lit.current() == d->pCurrentItem ) {
                  d->pCurrentItem->setSelected( select );
                  break;
                }
                if ( !down && lit.current() == previousItem ) {
@@ -648,13 +663,13 @@ void KListView::slotAutoSelect()
      blockSignals( block );
      viewport()->setUpdatesEnabled( update );
      triggerUpdate();
      emit selectionChanged();
-      if( selectionMode() == QListView::Single )
+      if( selectionMode() == Q3ListView::Single )
                emit selectionChanged( d->pCurrentItem );
    }
    else if( (keybstate & ControlMask) )
      setSelected( d->pCurrentItem, !d->pCurrentItem->isSelected() );
    else {
      bool block = signalsBlocked();
@@ -681,13 +696,13 @@ void KListView::slotHeaderChanged()
    int w = 0;
    for (int i = 0; i < columns() - 1; ++i) w += columnWidth(i);
    setColumnWidth( columns() - 1, viewport()->width() - w - 1 );
  }
 }
-void KListView::emitExecute( int buttonstate, QListViewItem *item, const QPoint &pos, int c)
+void KListView::emitExecute( int buttonstate, Q3ListViewItem *item, const QPoint &pos, int c)
 {
  //  qDebug("KListView::emitExecute buttonstate=%i", buttonstate);
    if( isExecuteArea( viewport()->mapFromGlobal(pos) ) ) {
        // Double click mode ?
        if ( !d->bUseSingle )
@@ -698,26 +713,26 @@ void KListView::emitExecute( int buttonstate, QListViewItem *item, const QPoint
        else
        {
          //US special implementation for embedded systems
            d->autoSelect.stop();
            //Dont emit executed if in SC mode and Shift or Ctrl are pressed
-            if( !( (buttonstate==ShiftButton) || (buttonstate==ControlButton) )) {
+            if( !( (buttonstate==Qt::ShiftButton) || (buttonstate==Qt::ControlButton) )) {
              //            if( !( ((keybstate & ShiftMask) || (keybstate & ControlMask)) ) ) {
                emit executed( item );
                emit executed( item, pos, c );
            }
        }
    }
 }
 void KListView::focusInEvent( QFocusEvent *fe )
 {
 //   kdDebug()<<"KListView::focusInEvent()"<<endl;
-  QListView::focusInEvent( fe );
+  Q3ListView::focusInEvent( fe );
  if ((d->selectedBySimpleMove)
      && (d->selectionMode == FileManager)
      && (fe->reason()!=QFocusEvent::Popup)
      && (fe->reason()!=QFocusEvent::ActiveWindow)
      && (currentItem()!=0))
  {
@@ -744,37 +759,37 @@ void KListView::focusOutEvent( QFocusEvent *fe )
  {
      currentItem()->setSelected(false);
      currentItem()->repaint();
      emit selectionChanged();
  };
-  QListView::focusOutEvent( fe );
+  Q3ListView::focusOutEvent( fe );
 }
 void KListView::leaveEvent( QEvent *e )
 {
  d->autoSelect.stop();
-  QListView::leaveEvent( e );
+  Q3ListView::leaveEvent( e );
 }
 bool KListView::event( QEvent *e )
 {
  if (e->type() == QEvent::ApplicationPaletteChange) {
    //qDebug("KListView::event make alternate color configurable");  
 //US  d->alternateBackground=KGlobalSettings::alternateBackgroundColor();
  d->alternateBackground = QColor(240, 240, 240);
  }
-  return QListView::event(e);
+  return Q3ListView::event(e);
 }
 void KListView::contentsMousePressEvent( QMouseEvent *e )
 {
  //qDebug("KListView::contentsMousePressEvent");
-  if( (selectionModeExt() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) )
+  if( (selectionModeExt() == Extended) && (e->state() & Qt::ShiftButton) && !(e->state() & Qt::ControlButton) )
  {
    bool block = signalsBlocked();
    blockSignals( true );
    clearSelection();
@@ -790,44 +805,44 @@ void KListView::contentsMousePressEvent( QMouseEvent *e )
        currentItem()->repaint();
 //        emit selectionChanged();
     };
  };
  QPoint p( contentsToViewport( e->pos() ) );
-  QListViewItem *at = itemAt (p);
+  Q3ListViewItem *at = itemAt (p);
  // true if the root decoration of the item "at" was clicked (i.e. the +/- sign)
  bool rootDecoClicked = at
           && ( p.x() <= header()->cellPos( header()->mapToActual( 0 ) ) +
                treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() )
           && ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) );
-  if (e->button() == LeftButton && !rootDecoClicked)
+  if (e->button() == Qt::LeftButton && !rootDecoClicked)
  {
    //Start a drag
    d->startDragPos = e->pos();
    if (at)
    {
      d->validDrag = true;
      d->pressedOnSelected = at->isSelected();
    }
  }
-  QListView::contentsMousePressEvent( e );
+  Q3ListView::contentsMousePressEvent( e );
 }
 void KListView::contentsMouseMoveEvent( QMouseEvent *e )
 {
    if (!dragEnabled() || d->startDragPos.isNull() || !d->validDrag) {
-      QListView::contentsMouseMoveEvent (e);
+      Q3ListView::contentsMouseMoveEvent (e);
      return;
    }
  QPoint vp = contentsToViewport(e->pos());
-  QListViewItem *item = itemAt( vp );
+  Q3ListViewItem *item = itemAt( vp );
  //do we process cursor changes at all?
  if ( item && d->bChangeCursorOverItem && d->bUseSingle )
    {
      //Cursor moved on a new item or in/out the execute area
      if( (item != d->pCurrentItem) ||
@@ -850,28 +865,28 @@ void KListView::contentsMouseMoveEvent( QMouseEvent *e )
      (newPos.x() > d->startDragPos.x()+d->dragDelay ||
       newPos.x() < d->startDragPos.x()-d->dragDelay ||
       newPos.y() > d->startDragPos.y()+d->dragDelay ||
       newPos.y() < d->startDragPos.y()-d->dragDelay))
    //(d->startDragPos - e->pos()).manhattanLength() > QApplication::startDragDistance())
    {
-      QListView::contentsMouseReleaseEvent( 0 );
+      Q3ListView::contentsMouseReleaseEvent( 0 );
      startDrag();
      d->startDragPos = QPoint();
      d->validDrag = false;
    }
 }
 void KListView::contentsMouseReleaseEvent( QMouseEvent *e )
 {
-  if (e->button() == LeftButton)
+  if (e->button() == Qt::LeftButton)
  {
    // If the row was already selected, maybe we want to start an in-place editing
    if ( d->pressedOnSelected && itemsRenameable() )
    {
      QPoint p( contentsToViewport( e->pos() ) );
-      QListViewItem *at = itemAt (p);
+      Q3ListViewItem *at = itemAt (p);
      if ( at )
      {
        // true if the root decoration of the item "at" was clicked (i.e. the +/- sign)
        bool rootDecoClicked =
                  ( p.x() <= header()->cellPos( header()->mapToActual( 0 ) ) +
                    treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() )
@@ -887,46 +902,46 @@ void KListView::contentsMouseReleaseEvent( QMouseEvent *e )
    }
    d->pressedOnSelected = false;
    d->validDrag = false;
    d->startDragPos = QPoint();
  }
-  QListView::contentsMouseReleaseEvent( e );
+  Q3ListView::contentsMouseReleaseEvent( e );
 }
 void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e )
 {
  //qDebug("KListView::contentsMouseDoubleClickEvent");
  // We don't want to call the parent method because it does setOpen,
  // whereas we don't do it in single click mode... (David)
  //QListView::contentsMouseDoubleClickEvent( e );
  QPoint vp = contentsToViewport(e->pos());
-  QListViewItem *item = itemAt( vp );
+  Q3ListViewItem *item = itemAt( vp );
-  emit QListView::doubleClicked( item ); // we do it now
+  emit Q3ListView::doubleClicked( item ); // we do it now
  int col = item ? header()->mapToLogical( header()->cellAt( vp.x() ) ) : -1;
  if( item ) {
    //qDebug("KListView::contentsMouseDoubleClickEvent: emit doubleClicked");
    emit doubleClicked( item, e->globalPos(), col );
-    if( (e->button() == LeftButton) && !d->bUseSingle ) {
+    if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) {
      //qDebug("KListView::contentsMouseDoubleClickEvent: emitExecute");
      emitExecute( e->button(), item, e->globalPos(), col);
    }
  }
 }
-void KListView::slotMouseButtonClicked( int btn, QListViewItem *item, const QPoint &pos, int c )
+void KListView::slotMouseButtonClicked( int btn, Q3ListViewItem *item, const QPoint &pos, int c )
 {
  //qDebug("KListView::slotMouseButtonClicked");
-  if( (btn == LeftButton) && item ) {
+  if( (btn == Qt::LeftButton) && item ) {
    //qDebug("KListView::slotMouseButtonClicked: emitExecute");
    emitExecute(btn, item, pos, c);
  }
 }
@@ -958,31 +973,31 @@ qDebug("KListView::contentsDropEvent drag&drop not supported yet");
    }
  }
 */
  
 }
-void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme)
+void KListView::movableDropEvent (Q3ListViewItem* parent, Q3ListViewItem* afterme)
 {
-  QPtrList<QListViewItem> items, afterFirsts, afterNows;
+  Q3PtrList<Q3ListViewItem> items, afterFirsts, afterNows;
-  QListViewItem *current=currentItem();
+  Q3ListViewItem *current=currentItem();
  bool hasMoved=false;
-  for (QListViewItem *i = firstChild(), *iNext=0; i != 0; i = iNext)
+  for (Q3ListViewItem *i = firstChild(), *iNext=0; i != 0; i = iNext)
  {
    iNext=i->itemBelow();
    if (!i->isSelected())
      continue;
    // don't drop an item after itself, or else
    // it moves to the top of the list
    if (i==afterme)
      continue;
    i->setSelected(false);
-    QListViewItem *afterFirst = i->itemAbove();
+    Q3ListViewItem *afterFirst = i->itemAbove();
        if (!hasMoved)
        {
                emit aboutToMove();
                hasMoved=true;
        }
@@ -997,13 +1012,13 @@ void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme)
    afterFirsts.append (afterFirst);
    afterNows.append (afterme);
    afterme = i;
  }
  clearSelection();
-  for (QListViewItem *i=items.first(); i != 0; i=items.next() )
+  for (Q3ListViewItem *i=items.first(); i != 0; i=items.next() )
    i->setSelected(true);
  if (current)
    setCurrentItem(current);
  emit moved(items,afterFirsts,afterNows);
@@ -1083,20 +1098,20 @@ void KListView::cleanDropVisualizer()
 int KListView::depthToPixels( int depth )
 {
    return treeStepSize() * ( depth + (rootIsDecorated() ? 1 : 0) ) + itemMargin();
 }
-void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewItem *&after)
+void KListView::findDrop(const QPoint &pos, Q3ListViewItem *&parent, Q3ListViewItem *&after)
 {
  QPoint p (contentsToViewport(pos));
  // Get the position to put it in
-  QListViewItem *atpos = itemAt(p);
+  Q3ListViewItem *atpos = itemAt(p);
-  QListViewItem *above;
+  Q3ListViewItem *above;
  if (!atpos) // put it at the end
    above = lastItem();
  else
  {
    // Get the closest item before us ('atpos' or the one above, if any)
      if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
@@ -1120,14 +1135,14 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte
              return;
          }
      }
      // Ok, there's one more level of complexity. We may want to become a new
      // sibling, but of an upper-level group, rather than the "above" item
-      QListViewItem * betterAbove = above->parent();
+      Q3ListViewItem * betterAbove = above->parent();
-      QListViewItem * last = above;
+      Q3ListViewItem * last = above;
      while ( betterAbove )
      {
          // We are allowed to become a sibling of "betterAbove" only if we are
          // after its last child
          if ( last->nextSibling() == 0 )
          {
@@ -1143,27 +1158,27 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte
  }
  // set as sibling
  after = above;
  parent = after ? after->parent() : 0L ;
 }
-QListViewItem* KListView::lastChild () const
+Q3ListViewItem* KListView::lastChild () const
 {
-  QListViewItem* lastchild = firstChild();
+  Q3ListViewItem* lastchild = firstChild();
  if (lastchild)
        for (; lastchild->nextSibling(); lastchild = lastchild->nextSibling());
  return lastchild;
 }
-QListViewItem *KListView::lastItem() const
+Q3ListViewItem *KListView::lastItem() const
 {
-  QListViewItem* last = lastChild();
+  Q3ListViewItem* last = lastChild();
-  for (QListViewItemIterator it (last); it.current(); ++it)
+  for (Q3ListViewItemIterator it (last); it.current(); ++it)
    last = it.current();
  return last;
 }
 KLineEdit *KListView::renameLineEdit() const
@@ -1184,18 +1199,18 @@ qDebug("KListView::startDrag drag&drop not supported yet.");
  if (drag->drag() && drag->target() != viewport())
    emit moved();
 */    
 }
-QDragObject *KListView::dragObject()
+Q3DragObject *KListView::dragObject()
 {
  if (!currentItem())
        return 0;
-  return new QStoredDrag("application/x-qlistviewitem", viewport());
+  return new Q3StoredDrag("application/x-qlistviewitem", viewport());
 }
 void KListView::setItemsMovable(bool b)
 {
  d->itemsMovable=b;
 }
@@ -1243,25 +1258,25 @@ bool KListView::dropVisualizer() const
 void KListView::setDropVisualizer(bool b)
 {
  d->dropVisualizer=b;
 }
-QPtrList<QListViewItem> KListView::selectedItems() const
+Q3PtrList<Q3ListViewItem> KListView::selectedItems() const
 {
-  QPtrList<QListViewItem> list;
+  Q3PtrList<Q3ListViewItem> list;
-  for (QListViewItem *i=firstChild(); i!=0; i=i->itemBelow())
+  for (Q3ListViewItem *i=firstChild(); i!=0; i=i->itemBelow())
        if (i->isSelected()) list.append(i);
  return list;
 }
-void KListView::moveItem(QListViewItem *item, QListViewItem *parent, QListViewItem *after)
+void KListView::moveItem(Q3ListViewItem *item, Q3ListViewItem *parent, Q3ListViewItem *after)
 {
  // sanity check - don't move a item into it's own child structure
-  QListViewItem *i = parent;
+  Q3ListViewItem *i = parent;
  while(i)
    {
      if(i == item)
        return;
      i = i->parent();
    }
@@ -1293,25 +1308,25 @@ qDebug("KListView::contentsDragEnterEvent drag&drop not supported yet.");
 void KListView::setDropVisualizerWidth (int w)
 {
  d->mDropVisualizerWidth = w > 0 ? w : 1;
 }
-QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent,
+QRect KListView::drawDropVisualizer(QPainter *p, Q3ListViewItem *parent,
-                                    QListViewItem *after)
+                                    Q3ListViewItem *after)
 {
    QRect insertmarker;
    if (!after && !parent)
        insertmarker = QRect (0, 0, viewport()->width(), d->mDropVisualizerWidth/2);
    else
    {
        int level = 0;
        if (after)
        {
-            QListViewItem* it = 0L;
+            Q3ListViewItem* it = 0L;
            if (after->isOpen())
            {
                // Look for the last child (recursively)
                it = after->firstChild();
                if (it)
                    while (it->nextSibling() || it->firstChild())
@@ -1335,18 +1350,18 @@ QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent,
        insertmarker.setBottom (insertmarker.bottom() + d->mDropVisualizerWidth/2);
    }
    // This is not used anymore, at least by KListView itself (see viewportPaintEvent)
    // Remove for KDE 3.0.
    if (p)
-        p->fillRect(insertmarker, Dense4Pattern);
+        p->fillRect(insertmarker, Qt::Dense4Pattern);
    return insertmarker;
 }
-QRect KListView::drawItemHighlighter(QPainter *painter, QListViewItem *item)
+QRect KListView::drawItemHighlighter(QPainter *painter, Q3ListViewItem *item)
 {
  QRect r;
  if (item)
  {
    r = itemRect(item);
@@ -1373,13 +1388,13 @@ void KListView::cleanItemHighlighter ()
    QRect rect=d->mOldDropHighlighter;
    d->mOldDropHighlighter = QRect();
    viewport()->repaint(rect, true);
  }
 }
-void KListView::rename(QListViewItem *item, int c)
+void KListView::rename(Q3ListViewItem *item, int c)
 {
  if (d->renameable.contains(c))
  {
    ensureItemVisible(item);
 //US    d->editor->load(item,c);
 qDebug("KListView::rename has to be verified");  
@@ -1400,13 +1415,13 @@ void KListView::setRenameable (int col, bool yesno)
  if (yesno && d->renameable.find(col)==d->renameable.end())
    d->renameable+=col;
  else if (!yesno && d->renameable.find(col)!=d->renameable.end())
    d->renameable.remove(col);
 }
-void KListView::doneEditing(QListViewItem *item, int row)
+void KListView::doneEditing(Q3ListViewItem *item, int row)
 {
  emit itemRenamed(item, item->text(row), row);
  emit itemRenamed(item);
 }
 bool KListView::acceptDrag(QDropEvent* e) const
@@ -1444,18 +1459,18 @@ void KListView::setDropHighlighter(bool b)
 bool KListView::dropHighlighter() const
 {
        return d->dropHighlighter;
 }
-bool KListView::showTooltip(QListViewItem *item, const QPoint &, int column) const
+bool KListView::showTooltip(Q3ListViewItem *item, const QPoint &, int column) const
 {
        return ((tooltip(item, column).length()>0) && (column==tooltipColumn()));
 }
-QString KListView::tooltip(QListViewItem *item, int column) const
+QString KListView::tooltip(Q3ListViewItem *item, int column) const
 {
        return item->text(column);
 }
 void KListView::setTabOrderedRenaming(bool b)
 {
@@ -1479,13 +1494,13 @@ void KListView::keyPressEvent (QKeyEvent* e)
        {
          emit signalDelete ( );
          return;
        }
  if (d->selectionMode != FileManager)
-        QListView::keyPressEvent (e);
+        Q3ListView::keyPressEvent (e);
  else
        fileManagerKeyPressEvent (e);
 }
 void KListView::activateAutomaticSelection()
 {
@@ -1510,76 +1525,76 @@ bool KListView::automaticSelection() const
   return d->selectedBySimpleMove;
 }
 void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
 {
   //don't care whether it's on the keypad or not
-    int e_state=(e->state() & ~Keypad);
+    int e_state=(e->state() & ~Qt::Keypad);
    int oldSelectionDirection(d->selectionDirection);
-    if ((e->key()!=Key_Shift) && (e->key()!=Key_Control)
+    if ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control)
-        && (e->key()!=Key_Meta) && (e->key()!=Key_Alt))
+        && (e->key()!=Qt::Key_Meta) && (e->key()!=Qt::Key_Alt))
    {
-       if ((e_state==ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove))
+       if ((e_state==Qt::ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove))
          selectAll(FALSE);
       d->selectionDirection=0;
-       d->wasShiftEvent = (e_state == ShiftButton);
+       d->wasShiftEvent = (e_state == Qt::ShiftButton);
    };
-    //d->wasShiftEvent = (e_state == ShiftButton);
+    //d->wasShiftEvent = (e_state == Qt::ShiftButton);
-    QListViewItem* item = currentItem();
+    Q3ListViewItem* item = currentItem();
    if (item==0) return;
-    QListViewItem* repaintItem1 = item;
+    Q3ListViewItem* repaintItem1 = item;
-    QListViewItem* repaintItem2 = 0L;
+    Q3ListViewItem* repaintItem2 = 0L;
-    QListViewItem* visItem = 0L;
+    Q3ListViewItem* visItem = 0L;
-    QListViewItem* nextItem = 0L;
+    Q3ListViewItem* nextItem = 0L;
    int items = 0;
-    bool shiftOrCtrl((e_state==ControlButton) || (e_state==ShiftButton));
+    bool shiftOrCtrl((e_state==Qt::ControlButton) || (e_state==Qt::ShiftButton));
    int selectedItems(0);
-    for (QListViewItem *tmpItem=firstChild(); tmpItem!=0; tmpItem=tmpItem->nextSibling())
+    for (Q3ListViewItem *tmpItem=firstChild(); tmpItem!=0; tmpItem=tmpItem->nextSibling())
       if (tmpItem->isSelected()) selectedItems++;
    if (((selectedItems==0) || ((selectedItems==1) && (d->selectedUsingMouse)))
-        && (e_state==NoButton)
+        && (e_state==Qt::NoButton)
-        && ((e->key()==Key_Down)
+        && ((e->key()==Qt::Key_Down)
-        || (e->key()==Key_Up)
+        || (e->key()==Qt::Key_Up)
-        || (e->key()==Key_Next)
+        || (e->key()==Qt::Key_Next)
-        || (e->key()==Key_Prior)
+        || (e->key()==Qt::Key_Prior)
-        || (e->key()==Key_Home)
+        || (e->key()==Qt::Key_Home)
-        || (e->key()==Key_End)))
+        || (e->key()==Qt::Key_End)))
    {
       d->selectedBySimpleMove=true;
       d->selectedUsingMouse=false;
    }
    else if (selectedItems>1)
       d->selectedBySimpleMove=false;
    bool emitSelectionChanged(false);
    switch (e->key())
    {
-    case Key_Escape:
+      case Qt::Key_Escape:
       selectAll(FALSE);
       emitSelectionChanged=TRUE;
       break;
-    case Key_Space:
+      case Qt::Key_Space:
       //toggle selection of current item
       if (d->selectedBySimpleMove)
          d->selectedBySimpleMove=false;
       item->setSelected(!item->isSelected());
       emitSelectionChanged=TRUE;
       break;
-    case Key_Insert:
+      case Qt::Key_Insert:
       //toggle selection of current item and move to the next item
       if (d->selectedBySimpleMove)
       {
          d->selectedBySimpleMove=false;
          if (!item->isSelected()) item->setSelected(TRUE);
       }
@@ -1597,13 +1612,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
          setCurrentItem(nextItem);
       };
       d->selectionDirection=1;
       emitSelectionChanged=TRUE;
       break;
-    case Key_Down:
+      case Qt::Key_Down:
       nextItem=item->itemBelow();
       //toggle selection of current item and move to the next item
       if (shiftOrCtrl)
       {
          d->selectionDirection=1;
          if (d->selectedBySimpleMove)
@@ -1630,13 +1645,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
          repaintItem2=nextItem;
          visItem=nextItem;
          setCurrentItem(nextItem);
       };
       break;
-    case Key_Up:
+      case Qt::Key_Up:
       nextItem=item->itemAbove();
       d->selectionDirection=-1;
       //move to the prev. item and toggle selection of this one
       // => No, can't select the last item, with this. For symmetry, let's
       // toggle selection and THEN move up, just like we do in down (David)
       if (shiftOrCtrl)
@@ -1665,13 +1680,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
          repaintItem2=nextItem;
          visItem=nextItem;
          setCurrentItem(nextItem);
       };
       break;
-    case Key_End:
+      case Qt::Key_End:
       //move to the last item and toggle selection of all items inbetween
       nextItem=item;
       if (d->selectedBySimpleMove)
          item->setSelected(false);
       if (shiftOrCtrl)
          d->selectedBySimpleMove=false;
@@ -1690,13 +1705,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
          }
          nextItem=nextItem->itemBelow();
       }
       emitSelectionChanged=TRUE;
       break;
-    case Key_Home:
+      case Qt::Key_Home:
       // move to the first item and toggle selection of all items inbetween
       nextItem = firstChild();
       visItem = nextItem;
       repaintItem2 = visItem;
       if (d->selectedBySimpleMove)
          item->setSelected(false);
@@ -1712,13 +1727,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
          item->setSelected( !item->isSelected() );
       }
       setCurrentItem( firstChild() );
       emitSelectionChanged=TRUE;
       break;
-    case Key_Next:
+      case Qt::Key_Next:
       items=visibleHeight()/item->height();
       nextItem=item;
       if (d->selectedBySimpleMove)
          item->setSelected(false);
       if (shiftOrCtrl)
       {
@@ -1748,13 +1763,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
             return;
          }
          nextItem=nextItem->itemBelow();
       }
       break;
-    case Key_Prior:
+      case Qt::Key_Prior:
       items=visibleHeight()/item->height();
       nextItem=item;
       if (d->selectedBySimpleMove)
          item->setSelected(false);
       if (shiftOrCtrl)
       {
@@ -1782,31 +1797,31 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
             return;
          }
          nextItem=nextItem->itemAbove();
       }
       break;
-    case Key_Minus:
+      case Qt::Key_Minus:
       if ( item->isOpen() )
          setOpen( item, FALSE );
       break;
-    case Key_Plus:
+      case Qt::Key_Plus:
       if (  !item->isOpen() && (item->isExpandable() || item->childCount()) )
          setOpen( item, TRUE );
       break;
    default:
-       bool realKey = ((e->key()!=Key_Shift) && (e->key()!=Key_Control)
+       bool realKey = ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control)
-                        && (e->key()!=Key_Meta) && (e->key()!=Key_Alt));
+                        && (e->key()!=Qt::Key_Meta) && (e->key()!=Qt::Key_Alt));
       bool selectCurrentItem = (d->selectedBySimpleMove) && (item->isSelected());
       if (realKey && selectCurrentItem)
          item->setSelected(false);
       //this is mainly for the "goto filename beginning with pressed char" feature (aleXXX)
-       QListView::SelectionMode oldSelectionMode = selectionMode();
+       Q3ListView::SelectionMode oldSelectionMode = selectionMode();
-       setSelectionMode (QListView::Multi);
+       setSelectionMode (Q3ListView::Multi);
-       QListView::keyPressEvent (e);
+       Q3ListView::keyPressEvent (e);
       setSelectionMode (oldSelectionMode);
       if (realKey && selectCurrentItem)
       {
          currentItem()->setSelected(true);
          emitSelectionChanged=TRUE;
       }
@@ -1847,17 +1862,17 @@ void KListView::setSelectionModeExt (SelectionModeExt mode)
    switch (mode)
    {
    case Single:
    case Multi:
    case Extended:
    case NoSelection:
-        setSelectionMode (static_cast<QListView::SelectionMode>(static_cast<int>(mode)));
+        setSelectionMode (static_cast<Q3ListView::SelectionMode>(static_cast<int>(mode)));
        break;
    case FileManager:
-        setSelectionMode (QListView::Extended);
+        setSelectionMode (Q3ListView::Extended);
        break;
    default:
        kdWarning () << "Warning: illegal selection mode " << int(mode) << " set!" << endl;
        break;
    }
@@ -1865,63 +1880,63 @@ void KListView::setSelectionModeExt (SelectionModeExt mode)
 KListView::SelectionModeExt KListView::selectionModeExt () const
 {
  return d->selectionMode;
 }
-int KListView::itemIndex( const QListViewItem *item ) const
+int KListView::itemIndex( const Q3ListViewItem *item ) const
 {
    if ( !item )
        return -1;
    if ( item == firstChild() )
        return 0;
    else {
-        QListViewItemIterator it(firstChild());
+        Q3ListViewItemIterator it(firstChild());
        uint j = 0;
        for (; it.current() && it.current() != item; ++it, ++j );
        if( !it.current() )
          return -1;
        return j;
    }
 }
-QListViewItem* KListView::itemAtIndex(int index)
+Q3ListViewItem* KListView::itemAtIndex(int index)
 {
   if (index<0)
      return 0;
   int j(0);
-   for (QListViewItemIterator it=firstChild(); it.current(); it++)
+   for (Q3ListViewItemIterator it=firstChild(); it.current(); it++)
   {
      if (j==index)
         return it.current();
      j++;
   };
   return 0;
 }
-void KListView::emitContextMenu (KListView*, QListViewItem* i)
+void KListView::emitContextMenu (KListView*, Q3ListViewItem* i)
 {
  QPoint p;
  //    qDebug("KListView::emitContextMenu ");
  if (i)
        p = viewport()->mapToGlobal(itemRect(i).center());
  else
        p = mapToGlobal(rect().center());
  emit contextMenu (this, i, p);
 }
-void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col)
+void KListView::emitContextMenu (Q3ListViewItem* i, const QPoint& p, int col)
 {
-    QListViewItem* item = i;
+    Q3ListViewItem* item = i;
    int c = col;
    // do not trust the values for QListViewItem* i and int col;
    //    qDebug("KListView::emitContextMenu col");
    if ( col == -1 ) {
        QPoint pp =  viewport()->mapFromGlobal(p);
        item = itemAt( pp);
@@ -1930,32 +1945,32 @@ void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col)
    emit contextRequest( item, p,  c );
    emit contextMenu (this, item, p);
 }
 void KListView::setAcceptDrops (bool val)
 {
-  QListView::setAcceptDrops (val);
+  Q3ListView::setAcceptDrops (val);
  viewport()->setAcceptDrops (val);
 }
 int KListView::dropVisualizerWidth () const
 {
        return d->mDropVisualizerWidth;
 }
 void KListView::viewportPaintEvent(QPaintEvent *e)
 {
-  QListView::viewportPaintEvent(e);
+  Q3ListView::viewportPaintEvent(e);
  if (d->mOldDropVisualizer.isValid() && e->rect().intersects(d->mOldDropVisualizer))
    {
      QPainter painter(viewport());
      // This is where we actually draw the drop-visualizer
-      painter.fillRect(d->mOldDropVisualizer, Dense4Pattern);
+      painter.fillRect(d->mOldDropVisualizer, Qt::Dense4Pattern);
    }
  if (d->mOldDropHighlighter.isValid() && e->rect().intersects(d->mOldDropHighlighter))
    {
      QPainter painter(viewport());
 qDebug("KListView::viewportPaintEvent has to be verified");  
@@ -1985,39 +2000,39 @@ bool KListView::fullWidth() const
 {
  return d->fullWidth;
 }
 int KListView::addColumn(const QString& label, int width)
 {
-  int result = QListView::addColumn(label, width);
+  int result = Q3ListView::addColumn(label, width);
  if (d->fullWidth) {
 //US    header()->setStretchEnabled(false, columns()-2);
 //US    header()->setStretchEnabled(true, columns()-1);
  }
  return result;
 }
-int KListView::addColumn(const QIconSet& iconset, const QString& label, int width)
+int KListView::addColumn(const QIcon& iconset, const QString& label, int width)
 {
-  int result = QListView::addColumn(iconset, label, width);
+  int result = Q3ListView::addColumn(iconset, label, width);
  if (d->fullWidth) {
 //US    header()->setStretchEnabled(false, columns()-2);
 //US    header()->setStretchEnabled(true, columns()-1);
  }
  return result;
 }
 void KListView::removeColumn(int index)
 {
-  QListView::removeColumn(index);
+  Q3ListView::removeColumn(index);
 //US  if (d->fullWidth && index == columns()) header()->setStretchEnabled(true, columns()-1);
 }
 void KListView::viewportResizeEvent(QResizeEvent* e)
 {
-  QListView::viewportResizeEvent(e);
+  Q3ListView::viewportResizeEvent(e);
 }
 const QColor &KListView::alternateBackground() const
 {
  return d->alternateBackground;
 }
@@ -2067,77 +2082,77 @@ void KListView::restoreLayout(KConfig *config, const QString &group)
 }
 void KListView::setSorting(int column, bool ascending)
 {
  d->sortColumn = column;
  d->sortAscending = ascending;
-  QListView::setSorting(column, ascending);
+  Q3ListView::setSorting(column, ascending);
 }
 int KListView::columnSorted(void) const
 {
  return d->sortColumn;
 }
 bool KListView::ascendingSort(void) const
 {
  return d->sortAscending;
 }
-KListViewItem::KListViewItem(QListView *parent)
+KListViewItem::KListViewItem(Q3ListView *parent)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
  init();
 }
-KListViewItem::KListViewItem(QListViewItem *parent)
+KListViewItem::KListViewItem(Q3ListViewItem *parent)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
  init();
 }
-KListViewItem::KListViewItem(QListView *parent, QListViewItem *after)
+KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after)
-  : QListViewItem(parent, after)
+  : Q3ListViewItem(parent, after)
 {
  init();
 }
-KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after)
+KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after)
-  : QListViewItem(parent, after)
+  : Q3ListViewItem(parent, after)
 {
  init();
 }
-KListViewItem::KListViewItem(QListView *parent,
+KListViewItem::KListViewItem(Q3ListView *parent,
    QString label1, QString label2, QString label3, QString label4,
    QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
  init();
 }
-KListViewItem::KListViewItem(QListViewItem *parent,
+KListViewItem::KListViewItem(Q3ListViewItem *parent,
    QString label1, QString label2, QString label3, QString label4,
    QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
  init();
 }
-KListViewItem::KListViewItem(QListView *parent, QListViewItem *after,
+KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after,
    QString label1, QString label2, QString label3, QString label4,
    QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
  init();
 }
-KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after,
+KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after,
    QString label1, QString label2, QString label3, QString label4,
    QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
  init();
 }
 KListViewItem::~KListViewItem()
 {
@@ -2209,18 +2224,18 @@ void KListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, in
        _cg.setBrush(QColorGroup::Base, QBrush(backgroundColor(), *pm));
        QPoint o = p->brushOrigin();
        p->setBrushOrigin( o.x()-listView()->contentsX(), o.y()-listView()->contentsY() );
  }
  else if (isAlternate()) {
 //US       if (listView()->viewport()->backgroundMode()==Qt::FixedColor)
-       if (listView()->viewport()->backgroundMode()==QWidget::PaletteBackground)
+       if (listView()->viewport()->backgroundMode()==Qt::PaletteBackground)
            _cg.setColor(QColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground());
       else
        _cg.setColor(QColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground());
  }
-  QListViewItem::paintCell(p, _cg, column, width, alignment);
+  Q3ListViewItem::paintCell(p, _cg, column, width, alignment);
 }
 //US we do not have a "global KDE" variable to setup singleClick functionality
 void KListView::setSingleClick(bool s)
 {
  d->bUseSingle = s;
diff --git a/microkde/kdeui/klistview.h b/microkde/kdeui/klistview.h
index 9f0d9fd..2176525 100644
--- a/microkde/kdeui/klistview.h
+++ b/microkde/kdeui/klistview.h
@@ -17,23 +17,34 @@
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 #ifndef KLISTVIEW_H
 #define KLISTVIEW_H
-#include <qlistview.h>
+#include <q3listview.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QDragEnterEvent>
 //US 
 class QDropEvent;
 class QDragLeaveEvent;
 class QDragMoveEvent;
 class QDragEnterEvent;
-class QDragObject;
+class Q3DragObject;
 class KConfig;
 class KLineEdit;
 /**
 * This Widget extends the functionality of QListView to honor the system
 * wide settings for Single Click/Double Click mode, AutoSelection and
 * ChangeCursorOverLink (TM).
@@ -54,13 +65,13 @@ class KLineEdit;
 * KListView is drag-enabled, too: to benefit from that you've got derive from it.
 * Reimplement @ref dragObject() and (possibly) @ref startDrag(),
 * and @ref setDragEnabled(true).
 *
 * @version $Id$
 */
-class KListView : public QListView
+class KListView : public Q3ListView
 {
  Q_OBJECT
  Q_ENUMS( SelectionModeExt )
  Q_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth )
  Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
  Q_PROPERTY( bool itemsRenameable READ itemsRenameable WRITE setItemsRenameable )
@@ -103,21 +114,21 @@ public:
   *    Additionally the current item is always selected automatically when
   *    navigating using the keyboard, except other items were selected explicitely.
   *
   *   This way e.g. SHIFT+up/PgUp then SHIFT+down/PgDn leaves no item selected
   */
  enum SelectionModeExt {
-        Single = QListView::Single,
+        Single = Q3ListView::Single,
-        Multi = QListView::Multi,
+        Multi = Q3ListView::Multi,
-        Extended = QListView::Extended,
+        Extended = Q3ListView::Extended,
-        NoSelection = QListView::NoSelection,
+        NoSelection = Q3ListView::NoSelection,
        FileManager
  };
  void repaintContents( bool erase = true )
        {
-            QScrollView::repaintContents( contentsX(), contentsY(),
+            Q3ScrollView::repaintContents( contentsX(), contentsY(),
                                          visibleWidth(), visibleHeight(), erase );
        };
  /**
   * Constructor.
   *
   * The parameters @p parent and @p name are handled by
@@ -158,32 +169,32 @@ public:
   */
  bool isExecuteArea( int x );
  /**
   * @return a list containing the currently selected items.
   */
-  QPtrList<QListViewItem> selectedItems() const; // ### BIC: KDE 4: use an implicitly shared class! (QValueList?)
+  Q3PtrList<Q3ListViewItem> selectedItems() const; // ### BIC: KDE 4: use an implicitly shared class! (QValueList?)
  /**
   * Arbitrarily move @p item to @p parent, positioned immediately after item @p after.
   */
-  void moveItem(QListViewItem *item, QListViewItem *parent, QListViewItem *after);
+  void moveItem(Q3ListViewItem *item, Q3ListViewItem *parent, Q3ListViewItem *after);
  /**
   * @return the last item (not child!) of this listview.
   *
   * @see lastChild()
   */
-  QListViewItem *lastItem() const;
+  Q3ListViewItem *lastItem() const;
  /**
   * @return the last child of this listview.
   *
   * @see lastItem()
   */
-  QListViewItem* lastChild () const;
+  Q3ListViewItem* lastChild () const;
  /**
   * @return the lineedit used for inline renaming.
   * Use that to setup a @ref KCompletion or @ref QValidator for the lineedit
   *
   * @since 3.2
@@ -273,20 +284,20 @@ public:
  /**
   * Returns the index of @p item within the item tree or -1 if
   * @p item doesn't exist in this list view. This function takes
   * all items into account not only the visible ones.
   */
-  int itemIndex( const QListViewItem *item ) const;
+  int itemIndex( const Q3ListViewItem *item ) const;
  /**
   * Returns the item of @p index within the item tree or 0 if
   * @p index doesn't exist in this list view. This function takes
   * all items into account not only the visible ones.
   */
-  QListViewItem* itemAtIndex(int index);
+  Q3ListViewItem* itemAtIndex(int index);
  /**
   * @deprecated
   * @see #setFullWidth()
   */
  void setFullWidth();
@@ -311,13 +322,13 @@ public:
   * @see #removeColumn()
   */
  virtual int addColumn(const QString& label, int width = -1);
  /**
   * Reimplemented for full width support
   */
-  virtual int addColumn(const QIconSet& iconset, const QString& label, int width = -1);
+  virtual int addColumn(const QIcon& iconset, const QString& label, int width = -1);
  /**
   * Reimplemented for full width support
   *
   * @see #addColumn()
   */
  virtual void removeColumn(int index);
@@ -385,26 +396,26 @@ signals:
   * setting the user clicked or double clicked on that item.
   * @param item is the pointer to the executed listview item.
   *
   * Note that you may not delete any @ref QListViewItem objects in slots
   * connected to this signal.
   */
-  void executed( QListViewItem *item );
+  void executed( Q3ListViewItem *item );
  /**
   * This signal is emitted whenever the user executes an listview item.
   * That means depending on the KDE wide Single Click/Double Click
   * setting the user clicked or double clicked on that item.
   * @param item is the pointer to the executed listview item.
   * @param pos is the position where the user has clicked
   * @param c is the column into which the user clicked.
   *
   * Note that you may not delete any @ref QListViewItem objects in slots
   * connected to this signal.
   */
-  void executed( QListViewItem *item, const QPoint &pos, int c );
+  void executed( Q3ListViewItem *item, const QPoint &pos, int c );
  /**
   * This signal gets emitted whenever the user double clicks into the
   * listview.
   * @param item is the pointer to the clicked listview item.
   * @param pos is the position where the user has clicked, and
@@ -414,26 +425,26 @@ signals:
   * connected to this signal.
   *
   * This signal is more or less here for the sake of completeness.
   * You should normally not need to use this. In most cases its better
   * to use @ref #executed() instead.
   */
-  void doubleClicked( QListViewItem *item, const QPoint &pos, int c );
+  void doubleClicked( Q3ListViewItem *item, const QPoint &pos, int c );
-  void contextRequest( QListViewItem *item, const QPoint &pos, int c );
+  void contextRequest( Q3ListViewItem *item, const QPoint &pos, int c );
  /**
   * This signal gets emitted whenever something acceptable is
   * dropped onto the listview.
   *
   * @param e is the drop event itself (it has already been accepted)
   * @param after is the item after which the drop occured (or 0L, if
   * the drop was above all items)
   *
   * @see #acceptDrop()
   */
-  void dropped (QDropEvent * e, QListViewItem *after);
+  void dropped (QDropEvent * e, Q3ListViewItem *after);
  /**
   * This signal gets emitted whenever something acceptable is
   * dropped onto the listview.
   *
   * This is an overloaded version of the above (provided to simplify
@@ -441,13 +452,13 @@ signals:
   *
   * @param list is the listview
   * @param e is the drop event itself (it has already been accepted)
   * @param after is the item after which the drop occured (or 0L, if
   * the drop was above all items
   */
-  void dropped (KListView* list, QDropEvent* e, QListViewItem* after);
+  void dropped (KListView* list, QDropEvent* e, Q3ListViewItem* after);
  /**
   * This signal gets emitted whenever something acceptable is
   * dropped onto the listview.
   *
   * This function also provides a parent, in the event that your listview
@@ -455,26 +466,26 @@ signals:
   * @param list is the listview
   * @param e is the drop event itself (it has already been accepted)
   * @param parent the item that is to be the parent of the new item
   * @param after is the item after which the drop occured (or 0L, if
   * the drop was above all items
   */
-  void dropped (KListView* list, QDropEvent* e, QListViewItem* parent, QListViewItem* after);
+  void dropped (KListView* list, QDropEvent* e, Q3ListViewItem* parent, Q3ListViewItem* after);
  /**
   * This signal gets emitted whenever something acceptable is
   * dropped onto the listview.
   *
   * This function also provides a parent, in the event that your listview
   * is a tree
   * @param e is the drop event itself (it has already been accepted)
   * @param parent the item that is to be the parent of the new item
   * @param after is the item after which the drop occured (or 0L, if
   * the drop was above all items
   */
-  void dropped (QDropEvent* e, QListViewItem* parent, QListViewItem* after);
+  void dropped (QDropEvent* e, Q3ListViewItem* parent, Q3ListViewItem* after);
  /**
   * This signal is emitted when ever the user moves an item in the list via
   * DnD.
   * If more than one item is moved at the same time, this signal is only emitted
   * once.
@@ -499,64 +510,64 @@ signals:
   * This differs from @ref moved(), so be careful. All the items will have been
   * moved before @ref moved() is emitted, which is not true in this method. // FIXME
   * @param item the item that was moved
   * @param afterFirst the item that parameter item was in before the move, in the list
   * @param afterNow the item it's currently after.
   */
-  void moved (QListViewItem *item, QListViewItem *afterFirst, QListViewItem *afterNow);
+  void moved (Q3ListViewItem *item, Q3ListViewItem *afterFirst, Q3ListViewItem *afterNow);
  /**
   * This signal is emitted after all the items have been moved. It reports info for
   * each and every item moved, in order.  The first element in @p items associates
   * with the first of afterFirst and afterNow.
   */
-  void moved(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &afterFirst, QPtrList<QListViewItem> &afterNow);
+  void moved(Q3PtrList<Q3ListViewItem> &items, Q3PtrList<Q3ListViewItem> &afterFirst, Q3PtrList<Q3ListViewItem> &afterNow);
  /**
   * This signal gets emitted when an item is renamed via in-place renaming.
   *
   * @param item is the renamed item.
   * @param str is the new value of column @p col.
   * @param col is the renamed column.
   */
-  void itemRenamed(QListViewItem* item, const QString &str, int col);
+  void itemRenamed(Q3ListViewItem* item, const QString &str, int col);
  /**
   * Same as above, but without the extra information.
   */
-  void itemRenamed(QListViewItem* item);
+  void itemRenamed(Q3ListViewItem* item);
  void signalDelete();
  /**
   * This signal is emitted when the shortcut key for popup-menus is pressed.
   *
   * Normally you should not use this, just connect a slot to signal
   * @ref contextMenu (KListView*, QListViewItem*, const QPoint&) to correctly
   * handle showing context menus regardless of settings.
   *
   * @param list is this listview.
   * @param item is the @ref currentItem() at the time the key was pressed. May be 0L.
   */
-  void menuShortCutPressed (KListView* list, QListViewItem* item);
+  void menuShortCutPressed (KListView* list, Q3ListViewItem* item);
  /**
   * This signal is emitted whenever a context-menu should be shown for item @p i.
   * It automatically adjusts for all settings involved (Menu key, showMenuOnPress/Click).
   *
   * @param l is this listview.
   * @param i is the item for which the menu should be shown. May be 0L.
   * @param p is the point at which the menu should be shown.
   */
-  void contextMenu (KListView* l, QListViewItem* i, const QPoint& p);
+  void contextMenu (KListView* l, Q3ListViewItem* i, const QPoint& p);
 public slots:
  /**
   * Rename column @p c of @p item.
   */
-  virtual void rename(QListViewItem *item, int c);
+  virtual void rename(Q3ListViewItem *item, int c);
  /**
   * By default, if you called setItemsRenameable(true),
   * only the first column is renameable.
   * Use this function to enable the feature on other columns.
   *
@@ -670,13 +681,13 @@ protected:
   * It differs from the above only in what arguments it takes.
   *
   * @param i the item whose rect() is passed to the above function.
   * @param p is translated from contents coordinates to viewport coordinates
   * before being passed to the above function.
   */
-  inline bool below (QListViewItem* i, const QPoint& p)
+  inline bool below (Q3ListViewItem* i, const QPoint& p)
  {
        return below (itemRect(i), contentsToViewport(p));
  }
  /**
   * Reimplemented to reload the alternate background in palette changes.
@@ -686,13 +697,13 @@ protected:
  /**
   * Emit signal @ref #executed.
   * @internal
   */
  //US I added buttonstate to pass the current keyboard status 
-  void emitExecute( int buttonstate, QListViewItem *item, const QPoint &pos, int c);
+  void emitExecute( int buttonstate, Q3ListViewItem *item, const QPoint &pos, int c);
  /**
   * Reimplemented for internal reasons.
   * Further reimplementations should call this function or else
   * some features may not work correctly.
   *
@@ -718,18 +729,18 @@ protected:
   */
  virtual void leaveEvent( QEvent *e );
  /**
   * @return the tooltip for @p column of @p item.
   */
-  virtual QString tooltip(QListViewItem* item, int column) const;
+  virtual QString tooltip(Q3ListViewItem* item, int column) const;
  /**
   * @return whether the tooltip for @p column of @p item shall be shown at point @p pos.
   */
-  virtual bool showTooltip(QListViewItem *item, const QPoint &pos, int column) const;
+  virtual bool showTooltip(Q3ListViewItem *item, const QPoint &pos, int column) const;
  /**
   * Reimplemented for internal reasons.
   * Further reimplementations should call this function or else
   * some features may not work correctly.
   *
@@ -802,13 +813,13 @@ protected:
  /**
   * @return a dragobject encoding the current selection.
   *
   * @see setDragEnabled()
   */
-  virtual QDragObject *dragObject();
+  virtual Q3DragObject *dragObject();
  /**
   * @return true if the @p event provides some acceptable
   * format.
   * A common mistake is to forget the "const" in your reimplementation
   */
@@ -818,21 +829,21 @@ protected:
   * Paint the drag line. If painter is null, don't try to :)
   *
   * If after == 0 then the marker should be drawn at the top.
   *
   * @return the rectangle that you painted to.
   */
-  virtual QRect drawDropVisualizer (QPainter *p, QListViewItem *parent, QListViewItem *after);
+  virtual QRect drawDropVisualizer (QPainter *p, Q3ListViewItem *parent, Q3ListViewItem *after);
  /**
   * Paint the drag rectangle. If painter is null, don't try to :)
   *
   *
   * @return the rectangle that you painted to.
   */
-  virtual QRect drawItemHighlighter(QPainter *painter, QListViewItem *item);
+  virtual QRect drawItemHighlighter(QPainter *painter, Q3ListViewItem *item);
  /**
   * This method calls @ref dragObject() and starts the drag.
   *
   * Reimplement it to do fancy stuff like setting a pixmap or
   * using a non-default DragMode
@@ -883,14 +894,14 @@ protected slots:
  /**
   * Update internal settings whenever the global ones change.
   * @internal
   */
  void slotSettingsChanged(int);
-  void slotMouseButtonClicked( int btn, QListViewItem *item, const QPoint &pos, int c );
+  void slotMouseButtonClicked( int btn, Q3ListViewItem *item, const QPoint &pos, int c );
-  void doneEditing(QListViewItem *item, int row);
+  void doneEditing(Q3ListViewItem *item, int row);
  /**
   * Repaint the rect where I was drawing the drop line.
   */
  void cleanDropVisualizer();
@@ -899,24 +910,24 @@ protected slots:
   */
  void cleanItemHighlighter();
  /**
   * Emit the @ref contextMenu signal. This slot is for mouse actions.
   */
-  void emitContextMenu (QListViewItem*, const QPoint&, int);
+  void emitContextMenu (Q3ListViewItem*, const QPoint&, int);
  /**
   * Emit the @ref #contextMenu signal. This slot is for key presses.
   */
-  void emitContextMenu (KListView*, QListViewItem*);
+  void emitContextMenu (KListView*, Q3ListViewItem*);
  /**
   * Accessory slot for AutoSelect
   * @internal
   */
-  void slotOnItem( QListViewItem *item );
+  void slotOnItem( Q3ListViewItem *item );
  /**
   * Accessory slot for AutoSelect/ChangeCursorOverItem
   * @internal
   */
  void slotOnViewport();
@@ -936,21 +947,21 @@ protected slots:
  void slotHeaderChanged();
 protected:
  /**
   * Handle dropEvent when itemsMovable() is set to true.
   */
-  virtual void movableDropEvent (QListViewItem* parent, QListViewItem* afterme);
+  virtual void movableDropEvent (Q3ListViewItem* parent, Q3ListViewItem* afterme);
  /**
   * Where is the nearest QListViewItem that I'm going to drop?
   *
   * FIXME KDE 4.0: Make this method const so it can be called from an
   * acceptDrag method without ugly casts
   */
-  virtual void findDrop(const QPoint &pos, QListViewItem *&parent, QListViewItem *&after);
+  virtual void findDrop(const QPoint &pos, Q3ListViewItem *&parent, Q3ListViewItem *&after);
  /**
   * A special keyPressEvent (for FileManager selection mode).
   */
  void fileManagerKeyPressEvent (QKeyEvent*);
@@ -971,45 +982,45 @@ private:
 /**
 * A listview item with support for alternate background colours. It is
 * a drop-in replacement for @ref QListViewItem
 *
 * @short listview item with alternate background colour support
 */
-class KListViewItem : public QListViewItem
+class KListViewItem : public Q3ListViewItem
 {
 public:
  /**
   * constructors. The semantics remain as in @ref QListViewItem.
   * Although they accept a @ref QListViewItem as parent, please
   * don't mix KListViewItem (or subclasses) with QListViewItem
   * (or subclasses).
   */
-  KListViewItem(QListView *parent);
+  KListViewItem(Q3ListView *parent);
-  KListViewItem(QListViewItem *parent);
+  KListViewItem(Q3ListViewItem *parent);
-  KListViewItem(QListView *parent, QListViewItem *after);
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *after);
-  KListViewItem(QListViewItem *parent, QListViewItem *after);
+  KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after);
-  KListViewItem(QListView *parent,
+  KListViewItem(Q3ListView *parent,
    QString, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null);
-  KListViewItem(QListViewItem *parent,
+  KListViewItem(Q3ListViewItem *parent,
    QString, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null);
-  KListViewItem(QListView *parent, QListViewItem *after,
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *after,
    QString, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null);
-  KListViewItem(QListViewItem *parent, QListViewItem *after,
+  KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after,
    QString, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null);
  virtual ~KListViewItem();
diff --git a/microkde/kdeui/kmainwindow.cpp b/microkde/kdeui/kmainwindow.cpp
index fa678f2..bac0db8 100644
--- a/microkde/kdeui/kmainwindow.cpp
+++ b/microkde/kdeui/kmainwindow.cpp
@@ -18,18 +18,24 @@
     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., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qstringlist.h>
 #include <qtimer.h>
 #include <qmenubar.h>
 #include <qstatusbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QChildEvent>
+#include <Q3PtrList>
 
 #include "kdebug.h"
 #include "kmainwindow.h"
 #include "kglobalsettings.h"
 #include "kactioncollection.h"
@@ -51,13 +57,13 @@ public:
    QRect defaultWindowSize;
 };
 static bool no_query_exit = false;
 KMainWindow::KMainWindow( QWidget* parent, const char *name )
-    : QMainWindow( parent, name ) /*LR, f ) with the default widget flag we cannot have fastload */ /*US, KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )*/
+    : Q3MainWindow( parent, name ) /*LR, f ) with the default widget flag we cannot have fastload */ /*US, KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )*/
 {
    mQToolBar = 0;
    initKMainWindow(name);
 }
 void KMainWindow::parseGeometry(bool parsewidth)
@@ -273,13 +279,13 @@ void KMainWindow::setCaption( const QString &caption, bool modified )
 //US    setPlainCaption( kapp->makeStdCaption(caption, true, modified) );
    setPlainCaption( caption + "modified:" );
 }
 void KMainWindow::setPlainCaption( const QString &caption )
 {
-    QMainWindow::setCaption( caption );
+    Q3MainWindow::setCaption( caption );
 #ifndef Q_WS_QWS
 //US the following is disabled for the embedded version
 //US    NETWinInfo info( qt_xdisplay(), winId(), qt_xrootwin(), 0 );
 //US    info.setName( caption.utf8().data() );
 #endif
 }
@@ -418,16 +424,16 @@ void KMainWindow::createStandardStatusBarAction(){
    connect(d->showStatusBarAction, SIGNAL(toggled(bool)), statusBar(), SLOT(setShown(bool)));
    if(internalStatusBar())
      d->showStatusBarAction->setChecked(!internalStatusBar()->isHidden());
  }
 }
-QToolBar *KMainWindow::tBar(  )
+Q3ToolBar *KMainWindow::tBar(  )
 {
    if  ( ! mQToolBar )
-      mQToolBar =   new QToolBar( this );
+      mQToolBar =   new Q3ToolBar( this );
    return mQToolBar;
 }
 KToolBar *KMainWindow::toolBar( const char * name )
 {
   
@@ -440,39 +446,40 @@ KToolBar *KMainWindow::toolBar( const char * name )
 /*US
    if ( builderClient() )
        return new KToolBar(this, name, honor_mode); // XMLGUI constructor
    else
 */    
-      return new KToolBar(this, Top, false, name, honor_mode ); // non-XMLGUI
+      return new KToolBar(this, Qt::Top, false, name, honor_mode ); // non-XMLGUI
 }
-QPtrListIterator<KToolBar> KMainWindow::toolBarIterator()
+Q3PtrListIterator<KToolBar> KMainWindow::toolBarIterator()
 {
    toolbarList.clear();
-    QPtrList<QToolBar> lst;
+    QList<Q3ToolBar*> lst;
-    for ( int i = (int)QMainWindow::Unmanaged; i <= (int)Minimized; ++i ) {
+    for ( int i = (int)Qt::Unmanaged; i <= (int)Qt::Minimized; ++i ) {
-        lst = toolBars( (ToolBarDock)i );
+        lst = toolBars( (Qt::ToolBarDock)i );
-        for ( QToolBar *tb = lst.first(); tb; tb = lst.next() ) {
+        for(QList<Q3ToolBar*>::iterator i=lst.begin();i!=lst.end();++i) {
+            Q3ToolBar *tb = *i;
            if ( !tb->inherits( "KToolBar" ) )
                continue;
            toolbarList.append( (KToolBar*)tb );
        }
    }
-    return QPtrListIterator<KToolBar>( toolbarList );
+    return Q3PtrListIterator<KToolBar>( toolbarList );
 }
 void KMainWindow::setAutoSaveSettings( const QString & groupName, bool saveWindowSize )
 {
    d->autoSaveSettings = true;
    d->autoSaveGroup = groupName;
    d->autoSaveWindowSize = saveWindowSize;
    // Get notified when the user moves a toolbar around
 //US    connect( this, SIGNAL( dockWindowPositionChanged( QDockWindow * ) ),
 //US             this, SLOT( setSettingsDirty() ) );
-    connect( this, SIGNAL( toolBarPositionChanged(QToolBar *) ),
+    connect( this, SIGNAL( toolBarPositionChanged(Q3ToolBar *) ),
             this, SLOT( setSettingsDirty() ) );
             
    // Get default values
 //US    int scnum = QApplication::desktop()->screenNumber(parentWidget());
 //US    QRect desk = QApplication::desktop()->screenGeometry(scnum);
@@ -500,13 +507,13 @@ QString KMainWindow::autoSaveGroup() const
 {
    return d->autoSaveGroup;
 }
 void KMainWindow::saveAutoSaveSettings()
 {
-    ASSERT( d->autoSaveSettings );
+    Q_ASSERT( d->autoSaveSettings );
    //kdDebug(200) << "KMainWindow::saveAutoSaveSettings -> saving settings" << endl;
    saveMainWindowSettings( KGlobal::config(), d->autoSaveGroup );
    KGlobal::config()->sync();
    d->settingsDirty = false;
    if ( d->settingsTimer )
        d->settingsTimer->stop();
@@ -636,13 +643,13 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const QString &configG
        else
          config->deleteEntry(QString::fromLatin1("MenuBar"));
    }
    int n = 1; // Toolbar counter. toolbars are counted from 1,
    KToolBar *toolbar = 0;
-    QPtrListIterator<KToolBar> it( toolBarIterator() );
+    Q3PtrListIterator<KToolBar> it( toolBarIterator() );
    while ( ( toolbar = it.current() ) ) {
        ++it;
        QString group;
        if (!configGroup.isEmpty())
        {
           // Give a number to the toolbar, but prefer a name if there is one,
@@ -711,25 +718,27 @@ void KMainWindow::applyMainWindowSettings(KConfig *config, const QString &config
    QMenuBar* mb = internalMenuBar();
    if (mb) {
        entryList.clear();
 //US        i = config->readListEntry (QString::fromLatin1("MenuBar"), entryList, ';');
        entryList = config->readListEntry (QString::fromLatin1("MenuBar"));
-        entry = entryList.first();
+        if(!entryList.empty()) {
-        if (entry==QString::fromLatin1("Disabled"))
+            entry = entryList.first();
-        {
+            if (entry==QString::fromLatin1("Disabled"))
-            mb->hide(); 
+            {
-        } else
+                mb->hide(); 
-        {
+            } else
-            mb->show();
+            {
-        }
+                mb->show();
+            }
+        }
    }
        int n = 1; // Toolbar counter. toolbars are counted from 1,
        KToolBar *toolbar;
-        QPtrListIterator<KToolBar> it( toolBarIterator() ); // must use own iterator
+        Q3PtrListIterator<KToolBar> it( toolBarIterator() ); // must use own iterator
        for ( ; it.current(); ++it) {
            toolbar= it.current();
            QString group;
            if (!configGroup.isEmpty())
            {
@@ -753,13 +762,13 @@ void KMainWindow::finalizeGUI( bool force )
    // of the other toolbars, so in theory it should be called only once per
    // toolbar, but in increasing order of indexes.
    // Since we can't do that immediately, we move them, and _then_
    // we call positionYourself again for each of them, but this time
    // the toolbariterator should give them in the proper order.
    // Both the XMLGUI and applySettings call this, hence "force" for the latter.
-    QPtrListIterator<KToolBar> it( toolBarIterator() );
+    Q3PtrListIterator<KToolBar> it( toolBarIterator() );
    for ( ; it.current() ; ++ it )
            it.current()->positionYourself( force );
    d->settingsDirty = false;
 }
@@ -848,13 +857,13 @@ QString KMainWindow::settingsGroup() const
 }
 void KMainWindow::resizeEvent( QResizeEvent * e)
 {
    if ( d->autoSaveWindowSize )
        setSettingsDirty(); 
-    QMainWindow::resizeEvent( e ); 
+    Q3MainWindow::resizeEvent( e ); 
 }
 bool KMainWindow::hasMenuBar()
 {
        return (internalMenuBar());
 }
@@ -866,13 +875,13 @@ QMenuBar *KMainWindow::menuBar()
    QMenuBar * mb = internalMenuBar();
    if ( !mb ) {
 //US        mb = new KMenuBar( this );
        mb = new QMenuBar( this );
        // trigger a re-layout and trigger a call to the private
        // setMenuBar method.
-        QMainWindow::menuBar();
+        Q3MainWindow::menuBar();
    }
    return mb;
 }
 //US KStatusBar *KMainWindow::statusBar()
 QStatusBar *KMainWindow::statusBar()
@@ -881,13 +890,13 @@ QStatusBar *KMainWindow::statusBar()
    QStatusBar * sb = internalStatusBar();
    if ( !sb ) {
 //US        sb = new KStatusBar( this );
        sb = new QStatusBar( this );
        // trigger a re-layout and trigger a call to the private
        // setStatusBar method.
-        QMainWindow::statusBar();
+        Q3MainWindow::statusBar();
    }
    return sb;
 }
 void KMainWindow::shuttingDown()
 {
@@ -905,48 +914,36 @@ void KMainWindow::shuttingDown()
 }
 //US KMenuBar *KMainWindow::internalMenuBar()
 QMenuBar *KMainWindow::internalMenuBar()
 {
 //US    QObjectList *l = queryList( "KMenuBar", 0, false, false );
-    QObjectList *l = queryList( "QMenuBar", 0, false, false );
+    QObjectList l = queryList( "QMenuBar", 0, false, false );
-    if ( !l || !l->first() ) {
+    if(l.empty())
-        delete l;
+        return 0;
-        return 0;
+    return (QMenuBar*)l.front();
-    }
-//US    KMenuBar *m = (KMenuBar*)l->first();
-    QMenuBar *m = (QMenuBar*)l->first();
-    delete l;
-    return m;
 }
 //US KStatusBar *KMainWindow::internalStatusBar()
 QStatusBar *KMainWindow::internalStatusBar()
 {
 //US    QObjectList *l = queryList( "KStatusBar", 0, false, false );
-    QObjectList *l = queryList( "QStatusBar", 0, false, false );
+    QObjectList l = queryList( "QStatusBar", 0, false, false );
-    if ( !l || !l->first() ) {
+    if(l.empty())
-        delete l;
+        return 0;
-        return 0;
+    return (QStatusBar*)l.front();
-    }
-//US    KStatusBar *s = (KStatusBar*)l->first();
-    QStatusBar *s = (QStatusBar*)l->first();
-    delete l;
-    return s;
 }
 void KMainWindow::childEvent( QChildEvent* e)
 {
-    QMainWindow::childEvent( e );
+    Q3MainWindow::childEvent( e );
 }
 void KMainWindow::paintEvent( QPaintEvent * e)
 {
-    QMainWindow::paintEvent( e );
+    Q3MainWindow::paintEvent( e );
 }
 QSize KMainWindow::sizeForCentralWidgetSize(QSize size)
 {
    KToolBar *tb = (KToolBar*)child( "mainToolBar", "KToolBar" );
    if (tb && !tb->isHidden()) {
diff --git a/microkde/kdeui/kmainwindow.h b/microkde/kdeui/kmainwindow.h
index 2dc8033..a3ac82f 100644
--- a/microkde/kdeui/kmainwindow.h
+++ b/microkde/kdeui/kmainwindow.h
@@ -1,6 +1,11 @@
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QChildEvent>
+#include <QCloseEvent>
+#include <QPaintEvent>
 /*
    This file is part of the KDE libraries
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
@@ -47,18 +52,18 @@ class QStatusBar;
 class KMainWindowPrivate;
 class KAction;
 #include <ktoolbar.h>
 #include <ktoolbarhandler.h>
 #include <kxmlguiclient.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 class KActionCollection;
-class KMainWindow : public QMainWindow, virtual public KXMLGUIClient
+class KMainWindow : public Q3MainWindow, virtual public KXMLGUIClient
 {
  Q_OBJECT
 private:
 //US create private defaultconstructor
    KMainWindow() {;};
@@ -317,18 +322,18 @@ public:
     *             specified "mainToolBar" is assumed.
     *
     * @return A pointer to the toolbar
     **/
    KToolBar *toolBar( const char *name=0 );
    // method for getting rid of KDE-Crap
-    QToolBar *tBar( );
+    Q3ToolBar *tBar( );
    /**
     * @return An iterator over the list of all toolbars for this window.
     */
-    QPtrListIterator<KToolBar> toolBarIterator();
+    Q3PtrListIterator<KToolBar> toolBarIterator();
    /**
     * @return A KAccel instance bound to this mainwindow. Used automatically
     * by KAction to make keybindings work in all cases.
     */
    KAccel *accel();
@@ -755,22 +760,22 @@ private slots:
    */
    void shuttingDown();
    void saveAutoSaveSettings();
            
 private:
-    QToolBar * mQToolBar;
+    Q3ToolBar * mQToolBar;
 //US    KMenuBar *internalMenuBar();
    QMenuBar *internalMenuBar();
 //US    KStatusBar *internalStatusBar();
    QStatusBar *internalStatusBar();
    
    KMainWindowPrivate *d;
    void initKMainWindow(const char *name);
-    QPtrList<KToolBar> toolbarList;
+    Q3PtrList<KToolBar> toolbarList;
 protected:
    virtual void virtual_hook( int id, void* data );
    
 };
diff --git a/microkde/kdeui/knuminput.cpp b/microkde/kdeui/knuminput.cpp
index 335d6f4..da01a20 100644
--- a/microkde/kdeui/knuminput.cpp
+++ b/microkde/kdeui/knuminput.cpp
@@ -39,12 +39,15 @@
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qsize.h>
 #include <qslider.h>
 #include <qspinbox.h>
 #include <qstyle.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QEvent>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include "knumvalidator.h"
@@ -103,17 +106,17 @@ void KNumInput::setLabel(const QString & label, int a)
        m_label = 0;
        m_alignment = 0;
    }
    else {
        if (m_label) m_label->setText(label);
        else m_label = new QLabel(label, this, "KNumInput::QLabel");
-        m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter)))
+        m_label->setAlignment((a & (~(Qt::AlignTop|Qt::AlignBottom|Qt::AlignVCenter)))
-                              | AlignVCenter);
+                              | Qt::AlignVCenter);
        // if no vertical alignment set, use Top alignment
-        if(!(a & (AlignTop|AlignBottom|AlignVCenter)))
+        if(!(a & (Qt::AlignTop|Qt::AlignBottom|Qt::AlignVCenter)))
-           a |= AlignTop;
+           a |= Qt::AlignTop;
        m_alignment = a;
    }
    layout(true);
 }
@@ -128,13 +131,13 @@ void KNumInput::layout(bool deep)
    int w1 = m_colw1;
    int w2 = m_colw2;
    // label sizeHint
    m_sizeLabel = (m_label ? m_label->sizeHint() : QSize(0,0));
-    if(m_label && (m_alignment & AlignVCenter))
+    if(m_label && (m_alignment & Qt::AlignVCenter))
        m_colw1 = m_sizeLabel.width() + 4;
    else
        m_colw1 = 0;
    // slider sizeHint
    m_sizeSlider = (m_slider ? m_slider->sizeHint() : QSize(0, 0));
@@ -199,26 +202,26 @@ void KNumInput::setSteps(int minor, int major)
 // ----------------------------------------------------------------------------
 KIntSpinBox::KIntSpinBox(QWidget *parent, const char *name)
    : QSpinBox(0, 99, 1, parent, name)
 {
-    editor()->setAlignment(AlignRight);
+    setAlignment(Qt::AlignRight);
    val_base = 10;
    setValue(0);
 }
 KIntSpinBox::~KIntSpinBox()
 {
 }
 KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base,
                         QWidget* parent, const char* name)
    : QSpinBox(lower, upper, step, parent, name)
 {
-    editor()->setAlignment(AlignRight);
+    setAlignment(Qt::AlignRight);
    val_base = base;
    setValue(value);
 }
 void KIntSpinBox::setBase(int base)
 {
@@ -240,15 +243,15 @@ int KIntSpinBox::mapTextToValue(bool* ok)
 {
    return cleanText().toInt(ok, val_base);
 }
 void KIntSpinBox::setEditFocus(bool mark)
 {
-    editor()->setFocus();
+    setFocus();
    if(mark)
-        editor()->selectAll();
+        selectAll();
 }
 // ----------------------------------------------------------------------------
 class KIntNumInput::KIntNumInputPrivate {
@@ -322,20 +325,20 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
    upper = kMax(upper, lower);
    lower = kMin(upper, lower);
    m_spin->setMinValue(lower);
    m_spin->setMaxValue(upper);
    m_spin->setLineStep(step);
-    step = m_spin->lineStep(); // maybe QRangeControl didn't like out lineStep?
+    step = m_spin->singleStep(); // maybe QRangeControl didn't like out lineStep?
    if(slider) {
        if (m_slider)
            m_slider->setRange(lower, upper);
        else {
            m_slider = new QSlider(lower, upper, step, m_spin->value(),
-                                   QSlider::Horizontal, this);
+                                   Qt::Horizontal, this);
            m_slider->setTickmarks(QSlider::Below);
            connect(m_slider, SIGNAL(valueChanged(int)),
                    m_spin, SLOT(setValue(int)));
        }
        // calculate (upper-lower)/10 without overflowing int's:
@@ -355,23 +358,23 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
    layout(true);
 }
 void KIntNumInput::setMinValue(int min)
 {
-    setRange(min, m_spin->maxValue(), m_spin->lineStep(), m_slider);
+    setRange(min, m_spin->maxValue(), m_spin->singleStep(), m_slider);
 }
 int KIntNumInput::minValue() const
 {
    return m_spin->minValue();
 }
 void KIntNumInput::setMaxValue(int max)
 {
-    setRange(m_spin->minValue(), max, m_spin->lineStep(), m_slider);
+    setRange(m_spin->minValue(), max, m_spin->singleStep(), m_slider);
 }
 int KIntNumInput::maxValue() const
 {
    return m_spin->maxValue();
 }
@@ -412,22 +415,22 @@ QSize KIntNumInput::minimumSizeHint() const
    int w;
    int h;
    h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height());
    // if in extra row, then count it here
-    if(m_label && (m_alignment & (AlignBottom|AlignTop)))
+    if(m_label && (m_alignment & (Qt::AlignBottom|Qt::AlignTop)))
        h += 4 + m_sizeLabel.height();
    else
        // label is in the same row as the other widgets
        h = QMAX(h, m_sizeLabel.height() + 2);
    w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
    w += m_colw1 + m_colw2;
-    if(m_alignment & (AlignTop|AlignBottom))
+    if(m_alignment & (Qt::AlignTop|Qt::AlignBottom))
        w = QMAX(w, m_sizeLabel.width() + 4);
    return QSize(w, h);
 }
 void KIntNumInput::doLayout()
@@ -441,29 +444,29 @@ void KIntNumInput::doLayout()
 void KIntNumInput::resizeEvent(QResizeEvent* e)
 {
    int w = m_colw1;
    int h = 0;
-    if(m_label && (m_alignment & AlignTop)) {
+    if(m_label && (m_alignment & Qt::AlignTop)) {
        m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
        h += m_sizeLabel.height() + 4;
    }
-    if(m_label && (m_alignment & AlignVCenter))
+    if(m_label && (m_alignment & Qt::AlignVCenter))
        m_label->setGeometry(0, 0, w, m_sizeSpin.height());
    m_spin->setGeometry(w, h, m_slider ? m_colw2 : QMAX(m_colw2, e->size().width() - w), m_sizeSpin.height());
    w += m_colw2 + 8;
    if(m_slider)
        m_slider->setGeometry(w, h, e->size().width() - w, m_sizeSpin.height());
    h += m_sizeSpin.height() + 2;
-    if(m_label && (m_alignment & AlignBottom))
+    if(m_label && (m_alignment & Qt::AlignBottom))
        m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
 }
 KIntNumInput::~KIntNumInput()
 {
        delete d;
@@ -643,50 +646,50 @@ QSize KDoubleNumInput::minimumSizeHint() const
    int w;
    int h;
    h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height());
    // if in extra row, then count it here
-    if(m_label && (m_alignment & (AlignBottom|AlignTop)))
+    if(m_label && (m_alignment & (Qt::AlignBottom|Qt::AlignTop)))
        h += 4 + m_sizeLabel.height();
    else
        // label is in the same row as the other widgets
        h = QMAX(h, m_sizeLabel.height() + 2);
    w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
    w += m_colw1 + m_colw2;
-    if(m_alignment & (AlignTop|AlignBottom))
+    if(m_alignment & (Qt::AlignTop|Qt::AlignBottom))
        w = QMAX(w, m_sizeLabel.width() + 4);
    return QSize(w, h);
 }
 void KDoubleNumInput::resizeEvent(QResizeEvent* e)
 {
    int w = m_colw1;
    int h = 0;
-    if(m_label && (m_alignment & AlignTop)) {
+    if(m_label && (m_alignment & Qt::AlignTop)) {
        m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
        h += m_sizeLabel.height() + 4;
    }
-    if(m_label && (m_alignment & AlignVCenter))
+    if(m_label && (m_alignment & Qt::AlignVCenter))
        m_label->setGeometry(0, 0, w, m_sizeEdit.height());
    d->spin->setGeometry(w, h, m_slider ? m_colw2
                                          : e->size().width() - w, m_sizeEdit.height());
    w += m_colw2 + 8;
    if(m_slider)
        m_slider->setGeometry(w, h, e->size().width() - w, m_sizeEdit.height());
    h += m_sizeEdit.height() + 2;
-    if(m_label && (m_alignment & AlignBottom))
+    if(m_label && (m_alignment & Qt::AlignBottom))
        m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
 }
 void KDoubleNumInput::doLayout()
 {
    m_sizeEdit = d->spin->sizeHint();
@@ -727,20 +730,20 @@ void KDoubleNumInput::setRange(double lower, double upper, double step,
    if(slider) {
        // upcast to base type to get the min/maxValue in int form:
        QSpinBox * spin = d->spin;
        int slmax = spin->maxValue();
        int slmin = spin->minValue();
        int slvalue = spin->value();
-        int slstep = spin->lineStep();
+        int slstep = spin->singleStep();
        if (m_slider) {
            m_slider->setRange(slmin, slmax);
            m_slider->setLineStep(slstep);
            m_slider->setValue(slvalue);
        } else {
            m_slider = new QSlider(slmin, slmax, slstep, slvalue,
-                                   QSlider::Horizontal, this);
+                                   Qt::Horizontal, this);
            m_slider->setTickmarks(QSlider::Below);
            // feedback line: when one moves, the other moves, too:
            connect(m_slider, SIGNAL(valueChanged(int)),
                    SLOT(sliderMoved(int)) );
        }
        connect(spin, SIGNAL(valueChanged(int)),
@@ -909,23 +912,23 @@ public:
  KDoubleValidator * mValidator;
 };
 KDoubleSpinBox::KDoubleSpinBox( QWidget * parent, const char * name )
  : QSpinBox( parent, name )
 {
-  editor()->setAlignment( Qt::AlignRight );
+  setAlignment( Qt::AlignRight );
  d = new Private();
  updateValidator();
 }
 KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step,
                                double value, int precision,
                                QWidget * parent, const char * name )
  : QSpinBox( parent, name )
 {
-  editor()->setAlignment( Qt::AlignRight );
+  setAlignment( Qt::AlignRight );
  d = new Private();
  setRange( lower, upper, step, precision );
  setValue( value );
  connect( this, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)) );
 }
@@ -1024,13 +1027,13 @@ void KDoubleSpinBox::setMaxValue( double value ) {
  if ( !ok ) return;
  base::setMaxValue( max );
  updateValidator();
 }
 double KDoubleSpinBox::lineStep() const {
-  return d->mapToDouble( base::lineStep() );
+  return d->mapToDouble( base::singleStep() );
 }
 void KDoubleSpinBox::setLineStep( double step ) {
  bool ok = false;
  if ( step > maxValue() - minValue() )
    base::setLineStep( 1 );
@@ -1069,13 +1072,13 @@ void KDoubleSpinBox::slotValueChanged( int value ) {
 }
 void KDoubleSpinBox::updateValidator() {
  if ( !d->mValidator ) {
    d->mValidator =  new KDoubleValidator( minValue(), maxValue(), precision(),
                                           this, "d->mValidator" );
-    base::setValidator( d->mValidator );
+    lineEdit()->setValidator( d->mValidator );
  } else
    d->mValidator->setRange( minValue(), maxValue(), precision() );
 }
 void KNumInput::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
diff --git a/microkde/kdeui/knuminput.h b/microkde/kdeui/knuminput.h
index 123fefa..9f9e200 100644
--- a/microkde/kdeui/knuminput.h
+++ b/microkde/kdeui/knuminput.h
@@ -26,12 +26,17 @@
 #ifndef K_NUMINPUT_H
 #define K_NUMINPUT_H
 #include <qwidget.h>
 #include <qspinbox.h>
+#include <QLineEdit>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
+#include <QEvent>
 class QLabel;
 class QSlider;
 class QLineEdit;
 class QLayout;
 class QValidator;
@@ -78,13 +83,13 @@ public:
     *
     *     @li @p AlignTop     The label is placed above the edit/slider
     *     @li @p AlignVCenter The label is placed left beside the edit
     *     @li @p AlignBottom  The label is placed below the edit/slider
     *
     */
-    virtual void setLabel(const QString & label, int a = AlignLeft | AlignTop);
+    virtual void setLabel(const QString & label, int a = Qt::AlignLeft | Qt::AlignTop);
    /**
     * @return the text of the label.
     */
    QString label() const;
@@ -299,13 +304,13 @@ public:
     */
    void setSpecialValueText(const QString& text);
    /**
     * @reimplemented
     */
-    virtual void setLabel(const QString & label, int a = AlignLeft | AlignTop);
+    virtual void setLabel(const QString & label, int a = Qt::AlignLeft | Qt::AlignTop);
    /**
     * This method returns the minimum size necessary to display the
     * control. The minimum size is enough to show all the labels
     * in the current font (font change may invalidate the return value).
     *
@@ -585,13 +590,13 @@ public:
     */
    void setSpecialValueText(const QString& text);
    /**
     * @reimplemented
     */
-    virtual void setLabel(const QString & label, int a = AlignLeft | AlignTop);
+    virtual void setLabel(const QString & label, int a = Qt::AlignLeft | Qt::AlignTop);
    /**
     * @reimplemented
     */
    virtual QSize minimumSizeHint() const;
    /**
     * @reimplemented
@@ -755,12 +760,16 @@ public:
    /**
     * sets focus and optionally marks all text
     *
     */
    void setEditFocus(bool mark);
+    void setValidator(const QValidator *v) {
+        lineEdit()->setValidator(v);
+    }
 protected:
    /**
     *  Overloaded the method in QSpinBox
     *  to make use of the base given in the constructor.
     */
diff --git a/microkde/kdeui/kpopupmenu.cpp b/microkde/kdeui/kpopupmenu.cpp
index 96d2a87..7e1503c 100644
--- a/microkde/kdeui/kpopupmenu.cpp
+++ b/microkde/kdeui/kpopupmenu.cpp
@@ -1,13 +1,16 @@
 #include <kpopupmenu.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <QFocusEvent>
+#include <Q3PopupMenu>
 KPopupMenu::KPopupMenu ( QWidget * parent, const char * name )
-    : QPopupMenu ( parent, name ) {;}
+    : Q3PopupMenu ( parent, name ) {;}
 KMenuBar::KMenuBar ( QWidget * parent, const char * name )
    : QPEMenuBar ( parent, name ) {}
diff --git a/microkde/kdeui/kpopupmenu.h b/microkde/kdeui/kpopupmenu.h
index fd00f36..1c903ad 100644
--- a/microkde/kdeui/kpopupmenu.h
+++ b/microkde/kdeui/kpopupmenu.h
@@ -1,18 +1,20 @@
 #ifndef KPOPUPMENU_H
 #define KPOPUPMENU_H
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <QFocusEvent>
 #ifdef DESKTOP_VERSION
 #include <qmenubar.h>
 #define QPEMenuBar QMenuBar
 #else
 #include <qpe/qpemenubar.h>
 #endif
-class KPopupMenu : public QPopupMenu
+class KPopupMenu : public Q3PopupMenu
 {
 Q_OBJECT
    public:
    KPopupMenu ( QWidget * parent=0, const char * name=0 );
 };
diff --git a/microkde/kdeui/kseparator.cpp b/microkde/kdeui/kseparator.cpp
index d028420..66000f0 100644
--- a/microkde/kdeui/kseparator.cpp
+++ b/microkde/kdeui/kseparator.cpp
@@ -15,56 +15,58 @@
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 */
 #include <qstyle.h>
+//Added by qt3to4:
+#include <Q3Frame>
 #include <kdebug.h>
 //US #include <kapplication.h>
 //US #include "kseparator.moc"
 #include "kseparator.h"
-KSeparator::KSeparator(QWidget* parent, const char* name, WFlags f)
+KSeparator::KSeparator(QWidget* parent, const char* name, Qt::WFlags f)
-   : QFrame(parent, name, f)
+   : Q3Frame(parent, name, f)
 {
   setLineWidth(1);
   setMidLineWidth(0);
   setOrientation( HLine );
 }
-KSeparator::KSeparator(int orientation, QWidget* parent, const char* name, WFlags f)
+KSeparator::KSeparator(int orientation, QWidget* parent, const char* name, Qt::WFlags f)
-   : QFrame(parent, name, f)
+   : Q3Frame(parent, name, f)
 {
   setLineWidth(1);
   setMidLineWidth(0);
   setOrientation( orientation );
 }
 void KSeparator::setOrientation(int orientation)
 {
   switch(orientation)
   {
-      case Vertical:
+       case Qt::Vertical:
      case VLine:
-         setFrameStyle( QFrame::VLine | QFrame::Sunken );
+         setFrameStyle( Q3Frame::VLine | Q3Frame::Sunken );
         setMinimumSize(2, 0);
         break;
      
      default:
         kdWarning() << "KSeparator::setOrientation(): invalid orientation, using default orientation HLine" << endl;
         
-      case Horizontal:
+      case Qt::Horizontal:
      case HLine:
-         setFrameStyle( QFrame::HLine | QFrame::Sunken );
+         setFrameStyle( Q3Frame::HLine | Q3Frame::Sunken );
         setMinimumSize(0, 2);
         break;
   }
 }
diff --git a/microkde/kdeui/kseparator.h b/microkde/kdeui/kseparator.h
index 6d2712a..c673475 100644
--- a/microkde/kdeui/kseparator.h
+++ b/microkde/kdeui/kseparator.h
@@ -17,37 +17,37 @@
 *
 */
 #ifndef __KSEPARATOR_H__
 #define __KSEPARATOR_H__
-#include <qframe.h>
+#include <q3frame.h>
 /**
 * Standard horizontal or vertical separator.
 *
 * @author Michael Roth <mroth@wirlweb.de>
 * @version $Id$
 */
-class KSeparator : public QFrame
+class KSeparator : public Q3Frame
 {
  Q_OBJECT
  Q_PROPERTY( int orientation READ orientation WRITE setOrientation )
 public:
  /**
   * Constructor.
   **/
-  KSeparator(QWidget* parent=0, const char* name=0, WFlags f=0);
+  KSeparator(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
  /**
   * Constructor.
   *
   * @param orientation Set the orientation of the separator.
   * Possible values are HLine or Horizontal and VLine or Vertical.
   **/
  KSeparator(int orientation, QWidget* parent=0, const char* name=0, 
-             WFlags f=0);
+             Qt::WFlags f=0);
  
  /**
   * Returns the orientation of the separator.
   *
   * Possible values are VLine and HLine.
   **/
diff --git a/microkde/kdeui/ksqueezedtextlabel.cpp b/microkde/kdeui/ksqueezedtextlabel.cpp
index 37fa29a..e2c61fd 100644
--- a/microkde/kdeui/ksqueezedtextlabel.cpp
+++ b/microkde/kdeui/ksqueezedtextlabel.cpp
@@ -15,12 +15,15 @@
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 #include "ksqueezedtextlabel.h"
 #include <qtooltip.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 KSqueezedTextLabel::KSqueezedTextLabel( const QString &text , QWidget *parent, const char *name )
 : QLabel ( parent, name ) {
  setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
  fullText = text;
  squeezeTextToLabel();
diff --git a/microkde/kdeui/ksqueezedtextlabel.h b/microkde/kdeui/ksqueezedtextlabel.h
index 1634adc..487d0b0 100644
--- a/microkde/kdeui/ksqueezedtextlabel.h
+++ b/microkde/kdeui/ksqueezedtextlabel.h
@@ -17,12 +17,14 @@
 */
 #ifndef KSQUEEZEDTEXTLABEL_H
 #define KSQUEEZEDTEXTLABEL_H
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 /**
 * A label class that squeezes its text into the label
 *
 * If the text is too long to fit into the label it is divided into
 * remaining left and right parts which are separated by three dots.
diff --git a/microkde/kdeui/kstdaction.cpp b/microkde/kdeui/kstdaction.cpp
index cfd7b54..f0d162d 100644
--- a/microkde/kdeui/kstdaction.cpp
+++ b/microkde/kdeui/kstdaction.cpp
@@ -16,13 +16,13 @@
   Boston, MA 02111-1307, USA.
 */
 #include "kstdaction.h"
 #include <qtoolbutton.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 //US #include <kaboutdata.h>
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 027e5e9..02db316 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -22,28 +22,39 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #ifdef KDE_USE_FINAL
 #undef Always
-#include <qdockwindow.h>
+#include <q3dockwindow.h>
 #endif
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
+#include <QPixmap>
+#include <Q3Frame>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QShowEvent>
+#include <QDesktopWidget>
+#include <QBoxLayout>
 #include "ktoolbar.h"
 #include "kmainwindow.h"
 #include <string.h>
 #include <qpainter.h>
 #include <qtooltip.h>
 #include <qdrawutil.h>
 #include <qstring.h>
 #include <qrect.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qtimer.h>
 #include <qstyle.h>
 #include <qapplication.h>
 //US #include <config.h>
@@ -66,14 +77,14 @@
 #include "ktoolbarbutton.h"
 //US 
 #include "kconfigbase.h"
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 enum {
    CONTEXT_TOP = 0,
    CONTEXT_LEFT = 1,
    CONTEXT_RIGHT = 2,
    CONTEXT_BOTTOM = 3,
@@ -99,13 +110,13 @@ public:
        m_enableContext  = true;
        m_xmlguiClient   = 0;
        m_configurePlugged = false;
 //US        oldPos = Qt::DockUnmanaged;
-        oldPos = QMainWindow::Unmanaged;
+        oldPos = Qt::Unmanaged;
        modified = m_isHorizontal = positioned = FALSE;
        HiddenDefault = false;
        IconSizeDefault = 0;
        IconTextDefault = "IconOnly";
@@ -126,60 +137,60 @@ public:
    bool m_configurePlugged : 1;
    bool modified : 1;
    bool positioned : 1;
    QWidget *m_parent;
-    QMainWindow::ToolBarDock oldPos;
+    Qt::ToolBarDock oldPos;
    KXMLGUIClient *m_xmlguiClient;
    struct ToolBarInfo
    {
 //US        ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( Qt::DockTop ) {}
-        ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( QMainWindow::Top ) {}
+        ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( Qt::DockTop ) {}
 //US        ToolBarInfo( Qt::Dock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {}
-        ToolBarInfo( QMainWindow::ToolBarDock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {}
+        ToolBarInfo( Qt::ToolBarDock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {}
        int index, offset;
        bool newline;
 //US        Qt::Dock dock;
-        QMainWindow::ToolBarDock dock;
+        Qt::ToolBarDock dock;
    };
    ToolBarInfo toolBarInfo;
-    QValueList<int> iconSizes;
+    Q3ValueList<int> iconSizes;
    QTimer repaintTimer;
  // Default Values.
  bool HiddenDefault;
  int IconSizeDefault;
  QString IconTextDefault;
  int IndexDefault;
  bool NewLineDefault;
  int OffsetDefault;
  QString PositionDefault;
-   QPtrList<QWidget> idleButtons;
+   Q3PtrList<QWidget> idleButtons;
 };
-KToolBarSeparator::KToolBarSeparator(Orientation o , bool l, QToolBar *parent,
+KToolBarSeparator::KToolBarSeparator(Qt::Orientation o , bool l, Q3ToolBar *parent,
                                     const char* name )
-    :QFrame( parent, name ), line( l )
+    :Q3Frame( parent, name ), line( l )
 {
-    connect( parent, SIGNAL(orientationChanged(Orientation)),
+    connect( parent, SIGNAL(orientationChanged(Qt::Orientation)),
-             this, SLOT(setOrientation(Orientation)) );
+             this, SLOT(setOrientation(Qt::Orientation)) );
    setOrientation( o );
    setBackgroundMode( parent->backgroundMode() );
    setBackgroundOrigin( ParentOrigin );
 }
-void KToolBarSeparator::setOrientation( Orientation o )
+void KToolBarSeparator::setOrientation( Qt::Orientation o )
 {
    orient = o;
    if ( line ) {
-        if ( orientation() == Vertical )
+        if ( orientation() == Qt::Vertical )
            setFrameStyle( HLine + Sunken );
        else
            setFrameStyle( VLine + Sunken );
    } else {
            setFrameStyle( NoFrame );
    }
@@ -189,54 +200,54 @@ void KToolBarSeparator::styleChange( QStyle& )
 {
    setOrientation( orient );
 }
 QSize KToolBarSeparator::sizeHint() const
 {
-    return orientation() == Vertical ? QSize( 0, 6 ) : QSize( 6, 0 );
+    return orientation() == Qt::Vertical ? QSize( 0, 6 ) : QSize( 6, 0 );
 }
 QSizePolicy KToolBarSeparator::sizePolicy() const
 {
    return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
 }
 KToolBar::KToolBar( QWidget *parent, const char *name, bool honorStyle, bool readConfig )
 #ifdef DESKTOP_VERSION
-    : QToolBar( QString::fromLatin1( name ),
+    : Q3ToolBar( QString::fromLatin1( name ),
-      parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
+      parent && parent->inherits( "Q3MainWindow" ) ? static_cast<Q3MainWindow*>(parent) : 0,
      parent, FALSE,
      name ? name : "mainToolBar")
 #else
-  : QPEToolBar( parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
+  : QPEToolBar( parent && parent->inherits( "Q3MainWindow" ) ? static_cast<Q3MainWindow*>(parent) : 0,
                QString::fromLatin1( name ))
 #endif
 {
    init( readConfig, honorStyle );
 }
-KToolBar::KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
+KToolBar::KToolBar( Q3MainWindow *parentWindow, Qt::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
 #ifdef DESKTOP_VERSION
-    : QToolBar( QString::fromLatin1( name ),
+    : Q3ToolBar( QString::fromLatin1( name ),
      parentWindow, dock, newLine,
      name ? name : "mainToolBar")
 #else
  : QPEToolBar( parentWindow,QString::fromLatin1( name ))
 #endif
 {
    init( readConfig, honorStyle );
 }
-KToolBar::KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
+KToolBar::KToolBar( Q3MainWindow *parentWindow, QWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
 #ifdef DESKTOP_VERSION
-    : QToolBar( QString::fromLatin1( name ),
+    : Q3ToolBar( QString::fromLatin1( name ),
      parentWindow, dock, newLine,
      name ? name : "mainToolBar")
 #else
  : QPEToolBar( parentWindow,QString::fromLatin1( name ))
@@ -277,14 +288,14 @@ void KToolBar::init( bool readConfig, bool honorStyle )
 */
    // finally, read in our configurable settings
    if ( readConfig )
        slotReadConfig();
    if ( mainWindow() )
-        connect( mainWindow(), SIGNAL( toolBarPositionChanged( QToolBar * ) ),
+        connect( mainWindow(), SIGNAL( toolBarPositionChanged( Q3ToolBar * ) ),
-                 this, SLOT( toolBarPosChanged( QToolBar * ) ) );
+                 this, SLOT( toolBarPosChanged( Q3ToolBar * ) ) );
    // Hack to make sure we recalculate our size when we dock.
 //US    connect( this, SIGNAL(placeChanged(QDockWindow::Place)), SLOT(rebuildLayout()) );
 }
 int KToolBar::insertButton(const QString& icon, int id, bool enabled,
@@ -338,25 +349,25 @@ int KToolBar::insertButton(const QPixmap& pixmap, int id, const char *signal,
    connect( button, signal, receiver, slot );
    doConnections( button );
    return index;
 }
-int KToolBar::insertButton(const QString& icon, int id, QPopupMenu *popup,
+int KToolBar::insertButton(const QString& icon, int id, Q3PopupMenu *popup,
                            bool enabled, const QString &text, int index )
 {
    KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text );
    insertWidgetInternal( button, index, id );
    button->setEnabled( enabled );
    button->setPopup( popup );
    doConnections( button );
    return index;
 }
-int KToolBar::insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup,
+int KToolBar::insertButton(const QPixmap& pixmap, int id, Q3PopupMenu *popup,
                            bool enabled, const QString &text, int index )
 {
    KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text );
    insertWidgetInternal( button, index, id );
    button->setEnabled( enabled );
    button->setPopup( popup );
@@ -537,25 +548,25 @@ void KToolBar::setButtonIcon( int id, const QString& _icon )
 //US    KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
    KToolBarButton * button = (KToolBarButton *)( *it );
    if ( button )
        button->setIcon( _icon );
 }
-void KToolBar::setButtonIconSet( int id, const QIconSet& iconset )
+void KToolBar::setButtonIconSet( int id, const QIcon& iconset )
 {
    Id2WidgetMap::Iterator it = id2widget.find( id );
    if ( it == id2widget.end() )
        return;
 //US    KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
    KToolBarButton * button = (KToolBarButton *)( *it );
    if ( button )
        button->setIconSet( iconset );
 }
-void KToolBar::setDelayedPopup (int id , QPopupMenu *_popup, bool toggle )
+void KToolBar::setDelayedPopup (int id , Q3PopupMenu *_popup, bool toggle )
 {
    Id2WidgetMap::Iterator it = id2widget.find( id );
    if ( it == id2widget.end() )
        return;
 //US    KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
    KToolBarButton * button = (KToolBarButton *)( *it );
@@ -784,13 +795,13 @@ void KToolBar::setItemAutoSized (int id, bool yes )
        setStretchableWidget( w );
 }
 void KToolBar::clear ()
 {
-    QToolBar::clear();
+    Q3ToolBar::clear();
    widget2id.clear();
    id2widget.clear();
 }
 void KToolBar::removeItem(int id)
@@ -873,27 +884,27 @@ void KToolBar::enableMoving(bool flag )
 void KToolBar::setBarPos (BarPosition bpos)
 {
    if ( !mainWindow() )
        return;
 //US    mainWindow()->moveDockWindow( this, (Dock)bpos );
-    mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos );
+    mainWindow()->moveToolBar( this, (Qt::ToolBarDock)bpos );
 }
 const KToolBar::BarPosition KToolBar::barPos()
 {
-    if ( !(QMainWindow*)mainWindow() )
+    if ( !(Q3MainWindow*)mainWindow() )
        return KToolBar::Top;
 //US    Dock dock;
-    QMainWindow::ToolBarDock dock;
+    Qt::ToolBarDock dock;
    int dm1, dm2;
    bool dm3;
-    ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 );
+    ((Q3MainWindow*)mainWindow())->getLocation( (Q3ToolBar*)this, dock, dm1, dm3, dm2 );
 //US    if ( dock == DockUnmanaged ) {
-    if ( dock == QMainWindow::Unmanaged ) {
+    if ( dock == Qt::Unmanaged ) {
        return (KToolBar::BarPosition)Top;
    }
    return (BarPosition)dock;
 }
@@ -964,13 +975,13 @@ void KToolBar::setIconText(IconText icontext, bool update)
    if (doUpdate)
        emit modechange(); // tell buttons what happened
    // ugly hack to force a QMainWindow::triggerLayout( TRUE )
    if ( mainWindow() ) {
-        QMainWindow *mw = mainWindow();
+        Q3MainWindow *mw = mainWindow();
        mw->setUpdatesEnabled( FALSE );
        mw->setToolBarsMovable( !mw->toolBarsMovable() );
        mw->setToolBarsMovable( !mw->toolBarsMovable() );
        mw->setUpdatesEnabled( TRUE );
    }
 }
@@ -1001,13 +1012,13 @@ void KToolBar::setIconSize(int size, bool update)
    if (doUpdate)
        emit modechange(); // tell buttons what happened
    // ugly hack to force a QMainWindow::triggerLayout( TRUE )
    if ( mainWindow() ) {
-        QMainWindow *mw = mainWindow();
+        Q3MainWindow *mw = mainWindow();
        mw->setUpdatesEnabled( FALSE );
        mw->setToolBarsMovable( !mw->toolBarsMovable() );
        mw->setToolBarsMovable( !mw->toolBarsMovable() );
        mw->setUpdatesEnabled( TRUE );
    }
 }
@@ -1059,16 +1070,16 @@ void KToolBar::setItemNoStyle(int id, bool no_style )
 void KToolBar::setFlat (bool flag)
 {
    if ( !mainWindow() )
        return;
    if ( flag )
 //US        mainWindow()->moveDockWindow( this, DockMinimized );
-        mainWindow()->moveToolBar( this, QMainWindow::Minimized );
+        mainWindow()->moveToolBar( this, Qt::Minimized );
    else
 //US        mainWindow()->moveDockWindow( this, DockTop );
-        mainWindow()->moveToolBar( this, QMainWindow::Top );
+        mainWindow()->moveToolBar( this, Qt::Top );
    // And remember to save the new look later
 /*US    
    if ( mainWindow()->inherits( "KMainWindow" ) )
        static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
 */        
 }
@@ -1246,40 +1257,40 @@ void KToolBar::doConnections( KToolBarButton *button )
 }
 void KToolBar::mousePressEvent ( QMouseEvent *m )
 {
    if ( !mainWindow() )
        return;
-    QMainWindow *mw = mainWindow();
+    Q3MainWindow *mw = mainWindow();
    if ( mw->toolBarsMovable() && d->m_enableContext ) {
-        if ( m->button() == RightButton ) {
+        if ( m->button() == Qt::RightButton ) {
            int i = contextMenu()->exec( m->globalPos(), 0 );
            switch ( i ) {
            case -1:
                return; // popup cancelled
            case CONTEXT_LEFT:
 //US                mw->moveDockWindow( this, DockLeft );
-                mw->moveToolBar( this, QMainWindow::Left );
+                mw->moveToolBar( this, Qt::Left );
                break;
            case CONTEXT_RIGHT:
 //US                mw->moveDockWindow( this, DockRight );
-                mw->moveToolBar( this, QMainWindow::Right );
+                mw->moveToolBar( this, Qt::Right );
                break;
            case CONTEXT_TOP:
 //US                mw->moveDockWindow( this, DockTop );
-                mw->moveToolBar( this, QMainWindow::Top );
+                mw->moveToolBar( this, Qt::Top );
                break;
            case CONTEXT_BOTTOM:
 //US                mw->moveDockWindow( this, DockBottom );
-                mw->moveToolBar( this, QMainWindow::Bottom );
+                mw->moveToolBar( this, Qt::Bottom );
                break;
            case CONTEXT_FLOAT:
                break;
            case CONTEXT_FLAT:
 //US                mw->moveDockWindow( this, DockMinimized );
-                mw->moveToolBar( this, QMainWindow::Minimized );
+                mw->moveToolBar( this, Qt::Minimized );
                break;
            case CONTEXT_ICONS:
                setIconText( IconOnly );
                break;
            case CONTEXT_TEXTRIGHT:
                setIconText( IconTextRight );
@@ -1329,13 +1340,13 @@ void KToolBar::rebuildLayout()
        if ( w->inherits( "KToolBarSeparator" ) &&
             !( (KToolBarSeparator*)w )->showLine() ) {
            l->addSpacing( 6 );
            w->hide();
            continue;
        }
-        if ( w->inherits( "QPopupMenu" ) )
+        if ( w->inherits( "Q3PopupMenu" ) )
            continue;
        l->addWidget( w );
        w->show();
    }
    if ( rightAligned ) {
        l->addStretch();
@@ -1361,41 +1372,41 @@ void KToolBar::rebuildLayout()
 void KToolBar::childEvent( QChildEvent *e )
 {
    if ( e->child()->isWidgetType() ) {
        QWidget * w = (QWidget*)e->child();
        if ( e->type() == QEvent::ChildInserted ) {
-            if ( !e->child()->inherits( "QPopupMenu" ) &&
+            if ( !e->child()->inherits( "Q3PopupMenu" ) &&
                 ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) {
                // prevent items that have been explicitly inserted by insert*() from
                // being inserted again
                if ( !widget2id.contains( w ) )
                {
                    int dummy = -1;
                    insertWidgetInternal( w, dummy, -1 );
                }
            }
-        } else {
+        } else if( e->type() == QEvent::ChildRemoved ) {
            removeWidgetInternal( w );
        }
-        if ( isVisibleTo( 0 ) )
+        /* TODO:hacker: if ( isVisibleTo( 0 ) )
        {
            QBoxLayout *l = boxLayout();
            // QLayout *l = layout();
            // clear the old layout so that we don't get unnecassery layout
            // changes till we have rebuild the thing
            QLayoutIterator it = l->iterator();
            while ( it.current() ) {
               it.deleteCurrent();
            }
            layoutTimer->start( 50, TRUE );
-        }
+        } */
    }
-    QToolBar::childEvent( e );
+    Q3ToolBar::childEvent( e );
 }
 void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id )
 {
    // we can't have it in widgets, or something is really wrong
    //widgets.removeRef( w );
@@ -1413,39 +1424,39 @@ void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id )
    id2widget.insert( id, w );
    widget2id.insert( w, id );
 }
 void KToolBar::repaintMe()
 {
    setUpdatesEnabled( true );
-    QToolBar::repaint( true );
+    Q3ToolBar::repaint( true );
    qDebug(" KToolBar::repaintMe() ");
 }
 void KToolBar::showEvent( QShowEvent *e )
 {
    rebuildLayout();
-    QToolBar::showEvent( e );
+    Q3ToolBar::showEvent( e );
 }
 void KToolBar::setStretchableWidget( QWidget *w )
 {
-    QToolBar::setStretchableWidget( w );
+    Q3ToolBar::setStretchableWidget( w );
    stretchableWidget = w;
 }
 QSizePolicy KToolBar::sizePolicy() const
 {
-    if ( orientation() == Horizontal )
+    if ( orientation() == Qt::Horizontal )
        return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
    else
        return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding );
 }
 QSize KToolBar::sizeHint() const
 {  
-    QSize sh = QToolBar::sizeHint();
+    QSize sh = Q3ToolBar::sizeHint();
    //qDebug("%x KToolBar::sizeHint() %d %d ",this, QToolBar::sizeHint().width(),QToolBar::sizeHint().height() );
    if ( sh.height() <= 20 || sh.width() < 60 )
        return QSize(  sizeHintW, sizeHintH );
    KToolBar* ttt =  (KToolBar*) this;
    ttt->sizeHintW = sh.width();
    ttt->sizeHintH = sh.height();
@@ -1505,13 +1516,13 @@ QSize KToolBar::sizeHint() const
       minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ));
 */       
       minSize += QSize(margin*2, margin*2);
       break;
     default:
-       minSize = QToolBar::sizeHint();
+       minSize = Q3ToolBar::sizeHint();
       break;
    }
    return minSize;
 #endif
 }
@@ -1529,25 +1540,25 @@ bool KToolBar::highlight() const
 {
    return d->m_highlight;
 }
 void KToolBar::hide()
 {
-    QToolBar::hide();
+    Q3ToolBar::hide();
 }
 void KToolBar::show()
 {
-    QToolBar::show();
+    Q3ToolBar::show();
 }
 void KToolBar::resizeEvent( QResizeEvent *e )
 {
    bool b = isUpdatesEnabled();
    setUpdatesEnabled( FALSE );
-    QToolBar::resizeEvent( e );
+    Q3ToolBar::resizeEvent( e );
    if (b)
       d->repaintTimer.start( 100, true );
 }
 void KToolBar::slotIconChanged(int group)
 {
@@ -1723,13 +1734,13 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGr
    // ...and check if the icon size has changed
    if (iconsize != d->m_iconSize) {
        setIconSize(iconsize, false);
        doUpdate = true;
    }
-    QMainWindow *mw = mainWindow();
+    Q3MainWindow *mw = mainWindow();
    // ...and if we should highlight
    if ( highlight != d->m_highlight ) {
        d->m_highlight = highlight;
        doUpdate = true;
    }
@@ -1802,35 +1813,35 @@ void KToolBar::applySettings(KConfig *config, const QString &_configGroup)
            pos = DockRight;
        else if ( position == "Floating" )
            pos = DockTornOff;
        else if ( position == "Flat" )
            pos = DockMinimized;
 */
-        QMainWindow::ToolBarDock pos(QMainWindow::Top);
+        Qt::ToolBarDock pos(Qt::DockTop);
        if ( position == "Top" )
-            pos = QMainWindow::Top;
+            pos = Qt::Top;
        else if ( position == "Bottom" )
-            pos = QMainWindow::Bottom;
+            pos = Qt::Bottom;
        else if ( position == "Left" )
-            pos = QMainWindow::Left;
+            pos = Qt::Left;
        else if ( position == "Right" )
-            pos = QMainWindow::Right;
+            pos = Qt::Right;
        else if ( position == "Floating" )
-            pos = QMainWindow::TornOff;
+            pos = Qt::TornOff;
        else if ( position == "Flat" )
-            pos = QMainWindow::Minimized;
+            pos = Qt::Minimized;
            
        //kdDebug(220) << "KToolBar::applySettings hidden=" << hidden << endl;
        if (hidden)
            hide();
        else
            show();
        if ( mainWindow() )
        {
-            QMainWindow *mw = mainWindow();
+            Q3MainWindow *mw = mainWindow();
            //kdDebug(220) << "KToolBar::applySettings updating ToolbarInfo" << endl;
            d->toolBarInfo = KToolBarPrivate::ToolBarInfo( pos, index, newLine, offset );
            // moveDockWindow calls QDockArea which does a reparent() on us with
            // showIt = true, so we loose our visibility status
@@ -1859,13 +1870,13 @@ bool KToolBar::event( QEvent *e )
       // it will show() the inserted child and we don't want to
       // do that until we have rebuild the layout.
       childEvent((QChildEvent *)e);
       return true;
    }
-    return QToolBar::event( e );
+    return Q3ToolBar::event( e );
 }
 void KToolBar::slotRepaint()
 {
    setUpdatesEnabled( FALSE );
    // Send a resizeEvent to update the "toolbar extension arrow"
@@ -1877,20 +1888,20 @@ void KToolBar::slotRepaint()
    QApplication::sendPostedEvents( this, QEvent::LayoutHint );
    //#endif //DESKTOP_VERSION   
    setUpdatesEnabled( TRUE );
    repaint( TRUE );
 }
-void KToolBar::toolBarPosChanged( QToolBar *tb )
+void KToolBar::toolBarPosChanged( Q3ToolBar *tb )
 {
    if ( tb != this )
        return;
 //US    if ( d->oldPos == DockMinimized )
-    if ( d->oldPos == QMainWindow::Minimized )
+    if ( d->oldPos == Qt::Minimized )
        rebuildLayout();
-    d->oldPos = (QMainWindow::ToolBarDock)barPos();
+    d->oldPos = (Qt::ToolBarDock)barPos();
 /*US    
    if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) )
        static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
 */        
 }
@@ -2028,13 +2039,13 @@ void KToolBar::getAttributes( QString &position, QString &icontext, int &index )
    default:
        position = "Top";
        break;
    }
    if ( mainWindow() ) {
-        QMainWindow::ToolBarDock dock;
+        Qt::ToolBarDock dock;
        bool newLine;
        int offset;
        mainWindow()->getLocation( this, dock, index, newLine, offset );
    }
    switch (d->m_iconText) {
@@ -2097,58 +2108,58 @@ void KToolBar::positionYourself( bool force )
        hide();
    // This method can only have an effect once - unless force is set
    d->positioned = TRUE;
 }
 //US KPopupMenu *KToolBar::contextMenu()
-QPopupMenu *KToolBar::contextMenu()
+Q3PopupMenu *KToolBar::contextMenu()
 {
  if ( context )
    return context;
  // Construct our context popup menu. Name it qt_dockwidget_internal so it
  // won't be deleted by QToolBar::clear().
 //US  context = new KPopupMenu( this, "qt_dockwidget_internal" );
-  context = new QPopupMenu( this, "qt_dockwidget_internal" );
+  context = new Q3PopupMenu( this, "qt_dockwidget_internal" );
 //US  context->insertTitle(i18n("Toolbar Menu"));
 //US  KPopupMenu *orient = new KPopupMenu( context, "orient" );
-  QPopupMenu *orient = new QPopupMenu( context, "orient" );
+  Q3PopupMenu *orient = new Q3PopupMenu( context, "orient" );
  orient->insertItem( i18n("toolbar position string","Top"),  CONTEXT_TOP );
  orient->insertItem( i18n("toolbar position string","Left"), CONTEXT_LEFT );
  orient->insertItem( i18n("toolbar position string","Right"), CONTEXT_RIGHT );
  orient->insertItem( i18n("toolbar position string","Bottom"), CONTEXT_BOTTOM );
  orient->insertSeparator(-1);
  //orient->insertItem( i18n("toolbar position string","Floating"), CONTEXT_FLOAT );
  orient->insertItem( i18n("min toolbar", "Flat"), CONTEXT_FLAT );
 //US  KPopupMenu *mode = new KPopupMenu( context, "mode" );
-  QPopupMenu *mode = new QPopupMenu( context, "mode" );
+  Q3PopupMenu *mode = new Q3PopupMenu( context, "mode" );
  mode->insertItem( i18n("Icons Only"), CONTEXT_ICONS );
  mode->insertItem( i18n("Text Only"), CONTEXT_TEXT );
  mode->insertItem( i18n("Text Alongside Icons"), CONTEXT_TEXTRIGHT );
  mode->insertItem( i18n("Text Under Icons"), CONTEXT_TEXTUNDER );
 //US  KPopupMenu *size = new KPopupMenu( context, "size" );
-  QPopupMenu *size = new QPopupMenu( context, "size" );
+  Q3PopupMenu *size = new Q3PopupMenu( context, "size" );
  size->insertItem( i18n("Default"), CONTEXT_ICONSIZES );
  // Query the current theme for available sizes
-  QValueList<int> avSizes;
+  Q3ValueList<int> avSizes;
 /*US  
  KIconTheme *theme = KGlobal::instance()->iconLoader()->theme();
  if (!::qstrcmp(QObject::name(), "mainToolBar"))
      avSizes = theme->querySizes( KIcon::MainToolbar);
  else
      avSizes = theme->querySizes( KIcon::Toolbar);
 */
  avSizes << 16;
  avSizes << 32;
  
  d->iconSizes = avSizes;
-  QValueList<int>::Iterator it;
+  Q3ValueList<int>::Iterator it;
  for (it=avSizes.begin(); it!=avSizes.end(); it++) {
      QString text;
      if ( *it < 19 )
          text = i18n("Small (%1x%2)").arg(*it).arg(*it);
      else if (*it < 25)
          text = i18n("Medium (%1x%2)").arg(*it).arg(*it);
@@ -2215,14 +2226,14 @@ void KToolBar::slotContextAboutToShow()
            break;
        case IconTextBottom:
            context->setItemChecked(CONTEXT_TEXTUNDER, true);
            break;
  }
-  QValueList<int>::ConstIterator iIt = d->iconSizes.begin();
+  Q3ValueList<int>::ConstIterator iIt = d->iconSizes.begin();
-  QValueList<int>::ConstIterator iEnd = d->iconSizes.end();
+  Q3ValueList<int>::ConstIterator iEnd = d->iconSizes.end();
  for (; iIt != iEnd; ++iIt )
      context->setItemChecked( CONTEXT_ICONSIZES + *iIt, false );
  context->setItemChecked( CONTEXT_ICONSIZES, false );
  context->setItemChecked( CONTEXT_ICONSIZES + d->m_iconSize, true );
diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 3319fa8..4e00abd 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -23,33 +23,41 @@
 #ifndef KTOOLBAR_H
 #define KTOOLBAR_H
 #ifndef DESKTOP_VERSION
 #define private public
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #undef private
 #include <qpe/qpetoolbar.h>
 #else
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #endif
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 #include <qcombobox.h>
 #include <qmap.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QResizeEvent>
+#include <Q3PopupMenu>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QShowEvent>
 #include <kglobal.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
-#include <qframe.h>
+#include <q3frame.h>
-#include <qiconset.h>
+#include <qicon.h>
 class QDomElement;
 class QSize;
 class QPixmap;
-class QPopupMenu;
+class Q3PopupMenu;
 class QStringList;
 class QDomDocument;
 class QTimer;
 class KLineEdit;
 class KToolBar;
@@ -60,28 +68,28 @@ class KToolBoxManager;
 //US class KInstance;
 class KComboBox;
 class KXMLGUIClient;
 class KToolBarPrivate;
-class KToolBarSeparator : public QFrame
+class KToolBarSeparator : public Q3Frame
 {
    Q_OBJECT
 public:
-    KToolBarSeparator( Orientation, bool l, QToolBar *parent, const char* name=0 );
+    KToolBarSeparator( Qt::Orientation, bool l, Q3ToolBar *parent, const char* name=0 );
    QSize sizeHint() const;
-    Orientation orientation() const { return orient; }
+    Qt::Orientation orientation() const { return orient; }
    QSizePolicy sizePolicy() const;
    bool showLine() const { return line; }
 public slots:
-   void setOrientation( Orientation );
+   void setOrientation( Qt::Orientation );
 protected:
    void styleChange( QStyle& );
 private:
-    Orientation orient;
+    Qt::Orientation orient;
    bool line;
 };
 /**
  * A KDE-style toolbar.
@@ -108,29 +116,29 @@ private:
  */
 // strange things are happening ... so I have to use strange define methods ...
 // porting KToolBar back to Qt2 really needs some strange hacks
 #ifndef DESKTOP_VERSION
-#define QToolBar QPEToolBar
+#define Q3ToolBar QPEToolBar
 #endif
- class KToolBar : public QToolBar
+ class KToolBar : public Q3ToolBar
 {
    Q_OBJECT
    Q_ENUMS( IconText BarPosition )
     
    Q_PROPERTY( IconText iconText READ iconText WRITE setIconText )
    Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos )
    Q_PROPERTY( bool fullSize READ fullSize WRITE setFullSize )
    Q_PROPERTY( int iconSize READ iconSize WRITE setIconSize )
    Q_PROPERTY( QString text READ text WRITE setText )
 #ifndef DESKTOP_VERSION
-#undef QToolBar
+#undef Q3ToolBar
 #endif    
 public:
    enum IconText{IconOnly = 0, IconTextRight, TextOnly, IconTextBottom};
    /**
     * The state of the status bar.
     * @deprecated
@@ -172,13 +180,13 @@ public:
   * @param dock        The position of the toolbar. Usually QMainWindow::Top.
   * @param newLine     If true, start a new line in the dock for this toolbar.
   * @param name        The standard internal name
   * @param honor_style If true, then global settings for IconSize and IconText will be honored
   * @param readConfig  whether to apply the configuration (global and application-specific)
   */
-    KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock /*= QMainWindow::Top*/, bool newLine = false,
+    KToolBar( Q3MainWindow *parentWindow, Qt::ToolBarDock dock /*= QMainWindow::Top*/, bool newLine = false,
              const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
  /**
   * Constructor for non-XML-GUI applications.
   *
   * The toolbar will read in various global config settings for
@@ -190,13 +198,13 @@ public:
   * @param dock        Another widget than the mainwindow to dock toolbar to.
   * @param newLine     If true, start a new line in the dock for this toolbar.
   * @param name        The standard internal name
   * @param honor_style If true, then global settings for IconSize and IconText will be honored
   * @param readConfig  whether to apply the configuration (global and application-specific)
   */
-    KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine = false,
+    KToolBar( Q3MainWindow *parentWindow, QWidget *dock, bool newLine = false,
              const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
    virtual ~KToolBar();
  /**
   * Insert a button (a @ref KToolBarButton) with a pixmap.  The
@@ -300,13 +308,13 @@ public:
   * @ref KButton::clicked() or @ref KButton::doubleClicked() are @p not
   * emmited by
   * this button (see @ref setDelayedPopup() for that).
   * You can add custom popups which inherit @ref QPopupMenu to get popups
   * with tables, drawings etc. Just don't fiddle with events there.
   */
-    int insertButton(const QString& icon, int id, QPopupMenu *popup,
+    int insertButton(const QString& icon, int id, Q3PopupMenu *popup,
                     bool enabled, const QString&_text, int index=-1);
  /**
   * Inserts a button with popupmenu.
   *
   * Button will have small
@@ -315,13 +323,13 @@ public:
   * @ref KButton::clicked() or @ref KButton::doubleClicked() are @p not
   * emmited by
   * this button (see @ref setDelayedPopup() for that).
   * You can add custom popups which inherit @ref QPopupMenu to get popups
   * with tables, drawings etc. Just don't fiddle with events there.
   */
-    int insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup,
+    int insertButton(const QPixmap& pixmap, int id, Q3PopupMenu *popup,
                     bool enabled, const QString&_text, int index=-1);
  /**
   * Inserts a @ref KLineEdit. You have to specify signals and slots to
   * which KLineEdit will be connected. KLineEdit has all slots QLineEdit
   * has, plus signals @ref KLineEdit::completion and @ref KLineEdit::textRotation
@@ -356,13 +364,13 @@ public:
   */
    int insertCombo (const QStringList &list, int id, bool writable,
                     const char *signal, const QObject *receiver,
                     const char *slot, bool enabled=true,
                     const QString& tooltiptext=QString::null,
                     int size=70, int index=-1,
-                     QComboBox::Policy policy = QComboBox::AtBottom);
+                     QComboBox::Policy policy = QComboBox::InsertAtBottom);
  /**
   * Insert a @ref KComboBox with text.
   *
   *  The rest is the same as above.
   * @see setItemAutoSized()
@@ -372,13 +380,13 @@ public:
   */
    int insertCombo (const QString& text, int id, bool writable,
                     const char *signal, QObject *recevier,
                     const char *slot, bool enabled=true,
                     const QString& tooltiptext=QString::null,
                     int size=70, int index=-1,
-                     QComboBox::Policy policy = QComboBox::AtBottom);
+                     QComboBox::Policy policy = QComboBox::InsertAtBottom);
    /**
     * Inserts a separator into the toolbar with the given id.
     * Returns the separator's index
     */
    int insertSeparator( int index = -1, int id = -1 );
@@ -462,13 +470,13 @@ public:
  /**
   * Sets a button icon from a QIconSet.
   *
   * Can be used while button is visible.
   */
-    void setButtonIconSet( int id, const QIconSet& iconset );
+    void setButtonIconSet( int id, const QIcon& iconset );
  /**
   * Sets a delayed popup for a button.
   *
   * Delayed popup is what you see in
   * Netscape Navigator's Previous and Next buttons: If you click them you
@@ -488,13 +496,13 @@ public:
   * Don't add delayed popups to buttons which have normal popups.
   *
   * You may add popups which are derived from @ref QPopupMenu. You may
   * add popups that are already in the menu bar or are submenus of
   * other popups.
   */
-    void setDelayedPopup (int id , QPopupMenu *_popup, bool toggle = false);
+    void setDelayedPopup (int id , Q3PopupMenu *_popup, bool toggle = false);
  /**
   * Turns a button into an autorepeat button.
   *
   * Toggle buttons, buttons with menus, or
   * buttons with delayed menus cannot be made into autorepeat buttons.
@@ -1057,13 +1065,13 @@ public:
     * @return global setting for "Icon Text"
     */
    static IconText iconTextSetting();
 public slots:
    virtual void setIconText( const QString &txt )
-    { QToolBar::setIconText( txt ); }
+    { Q3ToolBar::setIconText( txt ); }
    void slotRepaint();
 protected:
    void mousePressEvent( QMouseEvent * );
    void childEvent( QChildEvent *e );
    void showEvent( QShowEvent *e );
@@ -1074,35 +1082,35 @@ protected:
 private slots:
    void rebuildLayout();
    void slotReadConfig ();
    void slotAppearanceChanged();
    void slotIconChanged(int);
-    void toolBarPosChanged( QToolBar *tb );
+    void toolBarPosChanged( Q3ToolBar *tb );
    void slotContextAboutToShow();
    void widgetDestroyed();
 private: 
    int sizeHintW;
    int sizeHintH;
    void init( bool readConfig = true, bool honorStyle = false );
    void doConnections( KToolBarButton *button );
    void insertWidgetInternal( QWidget *w, int &index, int id );
    void removeWidgetInternal( QWidget *w );
    void getAttributes( QString &position, QString &icontext, int &index );
 //US    KPopupMenu *contextMenu();
-    QPopupMenu *contextMenu();
+    Q3PopupMenu *contextMenu();
    QMap<QWidget*, int > widget2id;
    typedef QMap<int, QWidget* > Id2WidgetMap;
    Id2WidgetMap id2widget;
 //US    KPopupMenu *context;
-    QPopupMenu *context;
+    Q3PopupMenu *context;
-    QPtrList<QWidget> widgets;
+    Q3PtrList<QWidget> widgets;
    QTimer *layoutTimer;
-    QGuardedPtr<QWidget> stretchableWidget, rightAligned;
+    QPointer<QWidget> stretchableWidget, rightAligned;
 protected:
    virtual void virtual_hook( int id, void* data );
 private:
    KToolBarPrivate *d;
    bool inshutdownprocess;
 };
diff --git a/microkde/kdeui/ktoolbarbutton.cpp b/microkde/kdeui/ktoolbarbutton.cpp
index 1d5d0e5..7b98b32 100644
--- a/microkde/kdeui/ktoolbarbutton.cpp
+++ b/microkde/kdeui/ktoolbarbutton.cpp
@@ -30,28 +30,32 @@
 #include <qstyle.h>
 #include <qimage.h>
 #include <qtimer.h>
 #include <qdrawutil.h>
 #include <qtooltip.h>
 #include <qbitmap.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QEvent>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 //US #include <kiconeffect.h>
 #include <kiconloader.h>
 // needed to get our instance
 #include <kmainwindow.h>
-template class QIntDict<KToolBarButton>;
+template class Q3IntDict<KToolBarButton>;
 class KToolBarButtonPrivate
 {
 public:
  KToolBarButtonPrivate()
  {
@@ -112,13 +116,13 @@ KToolBarButton::KToolBarButton( const QString& _icon, int _id,
  d->m_id     = _id;
  d->m_parent = (KToolBar*)_parent;
  QToolButton::setTextLabel(_txt);
 //US  d->m_instance = _instance;
-  setFocusPolicy( NoFocus );
+  setFocusPolicy( Qt::NoFocus );
  // connect all of our slots and start trapping events
  connect(d->m_parent, SIGNAL( modechange() ),
          this,         SLOT( modeChange() ));
  connect(this, SIGNAL( clicked() ),
@@ -143,13 +147,13 @@ KToolBarButton::KToolBarButton( const QPixmap& pixmap, int _id,
  d = new KToolBarButtonPrivate;
  d->m_id       = _id;
  d->m_parent   = (KToolBar *) _parent;
  QToolButton::setTextLabel(txt);
-  setFocusPolicy( NoFocus );
+  setFocusPolicy( Qt::NoFocus );
  // connect all of our slots and start trapping events
  connect(d->m_parent, SIGNAL( modechange()),
          this,        SLOT(modeChange()));
  connect(this, SIGNAL( clicked() ),
@@ -158,13 +162,13 @@ KToolBarButton::KToolBarButton( const QPixmap& pixmap, int _id,
          this, SLOT( slotPressed() ));
  connect(this, SIGNAL( released() ),
          this, SLOT( slotReleased() ));
  installEventFilter(this);
  // set our pixmap and do our initial setup
-  setIconSet( QIconSet( pixmap ));
+  setIconSet( QIcon( pixmap ));
  modeChange();
 }
 KToolBarButton::~KToolBarButton()
 {
  delete d; d = 0;
@@ -289,87 +293,87 @@ void KToolBarButton::setIcon( const QString &icon )
 /*US    QToolButton::setIconSet(d->m_instance->iconLoader()->loadIconSet(
        d->m_iconName, KIcon::Toolbar, d->m_iconSize ));
 */        
    QToolButton::setIconSet(KGlobal::iconLoader()->loadIconSet(d->m_iconName));
 }
-void KToolBarButton::setIconSet( const QIconSet &iconset )
+void KToolBarButton::setIconSet( const QIcon &iconset )
 {
  QToolButton::setIconSet( iconset );
 }
 // remove?
 void KToolBarButton::setPixmap( const QPixmap &pixmap )
 {
  if( pixmap.isNull()) // called by QToolButton
  {
    QToolButton::setPixmap( pixmap );
    return;
  }
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Active );
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Active );
  QToolButton::setIconSet( set );
 }
 void KToolBarButton::setDefaultPixmap( const QPixmap &pixmap )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Normal );
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Normal );
  QToolButton::setIconSet( set );
 }
 void KToolBarButton::setDisabledPixmap( const QPixmap &pixmap )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Disabled );
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Disabled );
  QToolButton::setIconSet( set );
 }
 void KToolBarButton::setDefaultIcon( const QString& icon )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
  QPixmap pm;
  if (!strcmp(d->m_parent->name(), "mainToolBar"))
    pm = /*US d->m_instance->iconLoader()*/KGlobal::iconLoader()->loadIcon( icon, KIcon::MainToolbar,
        d->m_iconSize );
  else
    pm = /*US d->m_instance->iconLoader()*/KGlobal::iconLoader()->loadIcon( icon, KIcon::Toolbar,
        d->m_iconSize );
-  set.setPixmap( pm, QIconSet::Automatic, QIconSet::Normal );
+  set.setPixmap( pm, QIcon::Automatic, QIcon::Normal );
  QToolButton::setIconSet( set );
 }
 void KToolBarButton::setDisabledIcon( const QString& icon )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
  QPixmap pm;
  if (!strcmp(d->m_parent->name(), "mainToolBar"))
    pm = /*US d->m_instance->iconLoader()*/ KGlobal::iconLoader()->loadIcon( icon, KIcon::MainToolbar,
        d->m_iconSize );
  else
    pm = /*US d->m_instance->iconLoader()*/ KGlobal::iconLoader()->loadIcon( icon, KIcon::Toolbar,
        d->m_iconSize );
-  set.setPixmap( pm, QIconSet::Automatic, QIconSet::Disabled );
+  set.setPixmap( pm, QIcon::Automatic, QIcon::Disabled );
  QToolButton::setIconSet( set );
 }
-QPopupMenu *KToolBarButton::popup()
+QMenu *KToolBarButton::popup()
 {
  // obsolete
  // KDE4: remove me
  return QToolButton::popup();
 }
-void KToolBarButton::setPopup(QPopupMenu *p, bool)
+void KToolBarButton::setPopup(Q3PopupMenu *p, bool)
 {
  QToolButton::setPopup(p);
  QToolButton::setPopupDelay(1);
 }
-void KToolBarButton::setDelayedPopup (QPopupMenu *p, bool)
+void KToolBarButton::setDelayedPopup (Q3PopupMenu *p, bool)
 {
  QToolButton::setPopup(p);
 //US  QToolButton::setPopupDelay(QApplication::startDragTime());
 }
 void KToolBarButton::leaveEvent(QEvent *)
@@ -448,27 +452,33 @@ bool KToolBarButton::eventFilter(QObject *o, QEvent *ev)
  return QToolButton::eventFilter(o, ev);
 }
 void KToolBarButton::drawButton( QPainter *_painter )
 {
 #ifdef DESKTOP_VERSION
-  QStyle::SFlags flags   = QStyle::Style_Default;
+  QStyle::State flags   = QStyle::State_None;
-  QStyle::SCFlags active = QStyle::SC_None;
+  QStyle::SubControls active = QStyle::SC_None;
  if (isDown()) {
-    flags  |= QStyle::Style_Down;
+    flags  |= QStyle::State_DownArrow;
    active |= QStyle::SC_ToolButton;
  }
-          if (isEnabled()) flags |= QStyle::Style_Enabled;
+          if (isEnabled()) flags |= QStyle::State_Enabled;
-          if (isOn())   flags |= QStyle::Style_On;
+          if (isOn())   flags |= QStyle::State_On;
-          if (isEnabled() && d->m_isRaised)flags |= QStyle::Style_Raised;
+          if (isEnabled() && d->m_isRaised)flags |= QStyle::State_Raised;
-          if (hasFocus())flags |= QStyle::Style_HasFocus;
+          if (hasFocus())flags |= QStyle::State_HasFocus;
+  QStyleOptionToolButton qsotb;
+  qsotb.initFrom(this);
+  qsotb.state = flags;
+  qsotb.activeSubControls = active;
+  qsotb.rect = rect();
+  qsotb.palette = palette();
  // Draw a styled toolbutton
-  style().drawComplexControl(QStyle::CC_ToolButton, _painter, this, rect(),
+  style()->drawComplexControl(QStyle::CC_ToolButton, &qsotb, _painter, this);
-        colorGroup(), flags, QStyle::SC_ToolButton, active, QStyleOption());
 #else
  style().drawToolButton(_painter, rect().x(), rect().y(), rect().width(), rect().height(), colorGroup());
 #endif
  int dx, dy;
  QFont tmp_font(KGlobalSettings::toolBarFont());
@@ -481,15 +491,15 @@ void KToolBarButton::drawButton( QPainter *_painter )
 /*US  
    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
                    QIconSet::Disabled,
        isOn() ? QIconSet::On : QIconSet::Off );
 */        
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
-                    QIconSet::Disabled);
+                    QIcon::Disabled);
    
    if( !pixmap.isNull())
    {
      dx = ( width() - pixmap.width() ) / 2;
      dy = ( height() - pixmap.height() ) / 2;
      if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
@@ -505,15 +515,15 @@ void KToolBarButton::drawButton( QPainter *_painter )
 /*US    
    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
                    QIconSet::Disabled,
        isOn() ? QIconSet::On : QIconSet::Off );
 */        
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
-                    QIconSet::Disabled);
+                    QIcon::Disabled);
    
    if( !pixmap.isNull())
    {
      dx = 4;
      dy = ( height() - pixmap.height() ) / 2;
      if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
@@ -523,13 +533,13 @@ void KToolBarButton::drawButton( QPainter *_painter )
      }
      _painter->drawPixmap( dx, dy, pixmap );
    }
    if (!textLabel().isNull())
    {
-      textFlags = AlignVCenter|AlignLeft;
+      textFlags = Qt::AlignVCenter|Qt::AlignLeft;
      if (!pixmap.isNull())
        dx = 4 + pixmap.width() + 2;
      else
        dx = 4;
      dy = 0;
      if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
@@ -541,13 +551,13 @@ void KToolBarButton::drawButton( QPainter *_painter )
    }
  }
  else if (d->m_iconText == KToolBar::TextOnly)
  {
    if (!textLabel().isNull())
    {
-      textFlags = AlignVCenter|AlignLeft;
+      textFlags = Qt::AlignVCenter|Qt::AlignLeft;
      dx = (width() - fm.width(textLabel())) / 2;
      dy = (height() - fm.lineSpacing()) / 2;
      if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
      {
        ++dx;
        ++dy;
@@ -560,15 +570,15 @@ void KToolBarButton::drawButton( QPainter *_painter )
 /*US    
    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
                    QIconSet::Disabled,
        isOn() ? QIconSet::On : QIconSet::Off );
 */    
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
-                    QIconSet::Disabled);
+                    QIcon::Disabled);
    
    if( !pixmap.isNull())
    {
      dx = (width() - pixmap.width()) / 2;
      dy = (height() - fm.lineSpacing() - pixmap.height()) / 2;
      if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
@@ -578,13 +588,13 @@ void KToolBarButton::drawButton( QPainter *_painter )
      }
      _painter->drawPixmap( dx, dy, pixmap );
    }
    if (!textLabel().isNull())
    {
-      textFlags = AlignBottom|AlignHCenter;
+      textFlags = Qt::AlignBottom|Qt::AlignHCenter;
      dx = (width() - fm.width(textLabel())) / 2;
      dy = height() - fm.lineSpacing() - 4;
      if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
      {
        ++dx;
@@ -607,20 +617,24 @@ void KToolBarButton::drawButton( QPainter *_painter )
      _painter->drawText(textRect, textFlags, textLabel());
  }
  if (QToolButton::popup())
  {
 #ifdef DESKTOP_VERSION
-    QStyle::SFlags arrowFlags = QStyle::Style_Default;
+    QStyle::State arrowFlags = QStyle::State_None;
+            if (isDown())arrowFlags |= QStyle::State_DownArrow;
+            if (isEnabled()) arrowFlags |= QStyle::State_Enabled;
-            if (isDown())arrowFlags |= QStyle::Style_Down;
+    QStyleOption qso;
-            if (isEnabled()) arrowFlags |= QStyle::Style_Enabled;
+    qso.initFrom(this);
+    qso.state = arrowFlags;
+    qso.rect = QRect(width()-7, height()-7, 7, 7);
+    qso.palette = palette();
-      style().drawPrimitive(QStyle::PE_ArrowDown, _painter,
+      style()->drawPrimitive(QStyle::PE_IndicatorArrowDown, &qso, _painter);
-          QRect(width()-7, height()-7, 7, 7), colorGroup(),
-          arrowFlags, QStyleOption() );
 #else  
      style().drawArrow(_painter, Qt::DownArrow, isDown(),
          width()-7, height()-7, 7, 7, colorGroup(), isEnabled() );
 #endif
          
  }
diff --git a/microkde/kdeui/ktoolbarbutton.h b/microkde/kdeui/ktoolbarbutton.h
index 9aaa13c..ad02e4e 100644
--- a/microkde/kdeui/ktoolbarbutton.h
+++ b/microkde/kdeui/ktoolbarbutton.h
@@ -23,21 +23,24 @@
 // $Id$
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 #include <qpixmap.h>
 #include <qtoolbutton.h>
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <Q3PopupMenu>
 #include <kglobal.h>
 class KToolBar;
 class KToolBarButtonPrivate;
 //USclass KInstance;
 class QEvent;
-class QPopupMenu;
+class Q3PopupMenu;
 class QPainter;
 /**
 * A toolbar button. This is used internally by @ref KToolBar, use the
 * KToolBar methods instead.
 * @internal
@@ -147,13 +150,13 @@ public:
  /**
   * Set the pixmaps for this toolbar button from a QIconSet.
   * If you call this you don't need to call any of the other methods
   * that set icons or pixmaps.
   * @param iconset  The iconset to use
   */
-  virtual void setIconSet( const QIconSet &iconset );
+  virtual void setIconSet( const QIcon &iconset );
 #ifndef KDE_NO_COMPAT
  /**
   * @deprecated
   * Set the active icon for this button.  The pixmap itself is loaded
   * internally based on the icon size...  .. the disabled and default
@@ -206,13 +209,13 @@ public:
   */
  void setToggle(bool toggle = true);
  /**
   * Return a pointer to this button's popup menu (if it exists)
   */
-  QPopupMenu *popup();
+  QMenu *popup();
  /**
   * Returns the button's id.
   * @since 3.2
   */
  int id() const;
@@ -221,24 +224,24 @@ public:
   * Give this button a popup menu.  There will not be a delay when
   * you press the button.  Use @ref setDelayedPopup if you want that
   * behavior. 
   *
   * @param p The new popup menu
   */
-  void setPopup (QPopupMenu *p, bool unused = false);
+  void setPopup (Q3PopupMenu *p, bool unused = false);
  /**
   * Gives this button a delayed popup menu.
   *
   * This function allows you to add a delayed popup menu to the button.
   * The popup menu is then only displayed when the button is pressed and
   * held down for about half a second.
   *
   * @param p the new popup menu
   */
-  void setDelayedPopup(QPopupMenu *p, bool unused = false);
+  void setDelayedPopup(Q3PopupMenu *p, bool unused = false);
  /**
   * Turn this button into a radio button
   *
   * @param f true or false
   */
@@ -300,13 +303,13 @@ private:
 /**
 * List of @ref KToolBarButton objects.
 * @internal
 * @version $Id$
 */
-class KToolBarButtonList : public QIntDict<KToolBarButton>
+class KToolBarButtonList : public Q3IntDict<KToolBarButton>
 {
 public:
   KToolBarButtonList();
   ~KToolBarButtonList() {}
 };
diff --git a/microkde/kdeui/ktoolbarhandler.cpp b/microkde/kdeui/ktoolbarhandler.cpp
index 7b97233..4d3ace7 100644
--- a/microkde/kdeui/ktoolbarhandler.cpp
+++ b/microkde/kdeui/ktoolbarhandler.cpp
@@ -15,13 +15,15 @@
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 #include "ktoolbarhandler.h"
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #include <kapplication.h>
 #include <ktoolbar.h>
 #include <kmainwindow.h>
 #include <klocale.h>
 #include <kaction.h>
 #include <assert.h>
@@ -41,13 +43,13 @@ namespace
    const char *resourceFileName = "barhandler.rc";
    class BarActionBuilder
    {
    public:
-        BarActionBuilder( KActionCollection *actionCollection, KMainWindow *mainWindow, QPtrList<KToolBar> &oldToolBarList )
+        BarActionBuilder( KActionCollection *actionCollection, KMainWindow *mainWindow, Q3PtrList<KToolBar> &oldToolBarList )
            : m_actionCollection( actionCollection ), m_mainWindow( mainWindow ), m_needsRebuild( false )
        {
 /*US        
            QPtrList<QDockWindow> dockWindows = m_mainWindow->dockWindows();
            QPtrListIterator<QDockWindow> dockWindowIt( dockWindows );
            for ( ; dockWindowIt.current(); ++dockWindowIt ) {
@@ -67,42 +69,42 @@ namespace
                m_needsRebuild = ( oldToolBarList.count() != m_toolBars.count() );
                
        }
        bool needsRebuild() const { return m_needsRebuild; }
-        QPtrList<KAction> create()
+        Q3PtrList<KAction> create()
        {
            if ( !m_needsRebuild )
-                return QPtrList<KAction>();
+                return Q3PtrList<KAction>();
-            QPtrListIterator<KToolBar> toolBarIt( m_toolBars );
+            Q3PtrListIterator<KToolBar> toolBarIt( m_toolBars );
            for ( ; toolBarIt.current(); ++toolBarIt ) 
                handleToolBar( toolBarIt.current() );
-            QPtrList<KAction> actions;
+            Q3PtrList<KAction> actions;
            if ( m_toolBarActions.count() == 0 )
                return actions;
            if ( m_toolBarActions.count() == 1 ) {
                m_toolBarActions.getFirst()->setText( i18n( "Show Toolbar" ) );
                return m_toolBarActions;
            }
            KActionMenu *menuAction = new KActionMenu( i18n( "Toolbars" ), m_actionCollection, "toolbars_submenu_action" );
-            QPtrListIterator<KAction> actionIt( m_toolBarActions );
+            Q3PtrListIterator<KAction> actionIt( m_toolBarActions );
            for ( ; actionIt.current(); ++actionIt )
                menuAction->insert( actionIt.current() );
            actions.append( menuAction );
            return actions;
        }
-        const QPtrList<KToolBar> &toolBars() const { return m_toolBars; }
+        const Q3PtrList<KToolBar> &toolBars() const { return m_toolBars; }
    private:
        void handleToolBar( KToolBar *toolBar )
        {
            KAction *action = new KToggleToolBarAction( toolBar,
                                                        i18n( "Show %1" ).arg( toolBar->label() ),
@@ -112,14 +114,14 @@ namespace
            m_toolBarActions.append( action );
        }
        KActionCollection *m_actionCollection;
        KMainWindow *m_mainWindow;
-        QPtrList<KToolBar> m_toolBars; 
+        Q3PtrList<KToolBar> m_toolBars; 
-        QPtrList<KAction> m_toolBarActions;
+        Q3PtrList<KAction> m_toolBarActions;
        bool m_needsRebuild : 1;
    };
 }
 using namespace KDEPrivate;
@@ -221,13 +223,13 @@ void ToolBarHandler::init( KMainWindow *mainWindow )
    }
 */    
 }
 void ToolBarHandler::connectToActionContainers()
 {
-    QPtrListIterator<KAction> actionIt( m_actions );
+    Q3PtrListIterator<KAction> actionIt( m_actions );
    for ( ; actionIt.current(); ++actionIt ) 
        connectToActionContainer( actionIt.current() );
 }
 void ToolBarHandler::connectToActionContainer( KAction *action )
 {
@@ -236,13 +238,13 @@ void ToolBarHandler::connectToActionContainer( KAction *action )
        connectToActionContainer( action->container( i ) );
 }
 void ToolBarHandler::connectToActionContainer( QWidget *container )
 {
 //US    QPopupMenu *popupMenu = dynamic_cast<QPopupMenu *>( container );
-    QPopupMenu *popupMenu = (QPopupMenu *)( container );
+    Q3PopupMenu *popupMenu = (Q3PopupMenu *)( container );
    if ( !popupMenu )
        return;
    connect( popupMenu, SIGNAL( aboutToShow() ),
             this, SLOT( setupActions() ) );
 }
diff --git a/microkde/kdeui/ktoolbarhandler.h b/microkde/kdeui/ktoolbarhandler.h
index a1340ae..35f0d18 100644
--- a/microkde/kdeui/ktoolbarhandler.h
+++ b/microkde/kdeui/ktoolbarhandler.h
@@ -17,14 +17,14 @@
 */
 #ifndef KBARHANDLER_H
 #define KBARHANDLER_H
 #include <qobject.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
 class KMainWindow;
 class KToolBar;
@@ -54,15 +54,15 @@ private:
    void connectToActionContainer( KAction *action );
    void connectToActionContainer( QWidget *container );
    struct Data;
    Data *d;
-    QGuardedPtr<KMainWindow> m_mainWindow;
+    QPointer<KMainWindow> m_mainWindow;
-    QPtrList<KAction> m_actions;
+    Q3PtrList<KAction> m_actions;
-    QPtrList<KToolBar> m_toolBars;
+    Q3PtrList<KToolBar> m_toolBars;
 };
 } // namespace KDEPrivate
 #endif // KBARHANDLER_H
diff --git a/microkde/kdeui/kxmlguiclient.cpp b/microkde/kdeui/kxmlguiclient.cpp
index 073e30b..8740bde 100644
--- a/microkde/kdeui/kxmlguiclient.cpp
+++ b/microkde/kdeui/kxmlguiclient.cpp
@@ -36,12 +36,14 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kapplication.h>
 #include <assert.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 class KXMLGUIClientPrivate
 {
 public:
  KXMLGUIClientPrivate()
  {
@@ -60,13 +62,13 @@ public:
 //US  QDomDocument m_doc;
  KActionCollection *m_actionCollection;
 //US  QDomDocument m_buildDocument;
 //US  KXMLGUIFactory *m_factory;
  KXMLGUIClient *m_parent;
  //QPtrList<KXMLGUIClient> m_supers;
-  QPtrList<KXMLGUIClient> m_children;
+  Q3PtrList<KXMLGUIClient> m_children;
 //US  KXMLGUIBuilder *m_builder;
 //US  QString m_xmlFile;
 //US  QString m_localXMLFile;
 };
 KXMLGUIClient::KXMLGUIClient()
@@ -82,13 +84,13 @@ KXMLGUIClient::KXMLGUIClient( KXMLGUIClient *parent )
 KXMLGUIClient::~KXMLGUIClient()
 {
  if ( d->m_parent )
    d->m_parent->removeChildClient( this );
-  QPtrListIterator<KXMLGUIClient> it( d->m_children );
+  Q3PtrListIterator<KXMLGUIClient> it( d->m_children );
  for ( ; it.current(); ++it ) {
      assert( it.current()->d->m_parent == this );
      it.current()->d->m_parent = 0;
  }
  delete d->m_actionCollection;
@@ -96,13 +98,13 @@ KXMLGUIClient::~KXMLGUIClient()
 }
 KAction *KXMLGUIClient::action( const char *name ) const
 {
  KAction* act = actionCollection()->action( name );
  if ( !act ) {
-    QPtrListIterator<KXMLGUIClient> childIt( d->m_children );
+    Q3PtrListIterator<KXMLGUIClient> childIt( d->m_children );
    for (; childIt.current(); ++childIt ) {
      act = childIt.current()->actionCollection()->action( name );
      if ( act )
        break;
    }
  }
@@ -585,13 +587,13 @@ void KXMLGUIClient::removeChildClient( KXMLGUIClient *child )
  if ( d->m_supers.contains( super ) )
    return false;
  d->m_supers.append( super );
  return true;
 }*/
-const QPtrList<KXMLGUIClient> *KXMLGUIClient::childClients()
+const Q3PtrList<KXMLGUIClient> *KXMLGUIClient::childClients()
 {
  return &d->m_children;
 }
 /*US
 void KXMLGUIClient::setClientBuilder( KXMLGUIBuilder *builder )
 {
@@ -603,13 +605,13 @@ void KXMLGUIClient::setClientBuilder( KXMLGUIBuilder *builder )
 KXMLGUIBuilder *KXMLGUIClient::clientBuilder() const
 {
  return d->m_builder;
 }
 */
-void KXMLGUIClient::plugActionList( const QString &name, const QPtrList<KAction> &actionList )
+void KXMLGUIClient::plugActionList( const QString &name, const Q3PtrList<KAction> &actionList )
 {
 /*US  
  if ( !d->m_factory )
    return;
  d->m_factory->plugActionList( this, name, actionList );
diff --git a/microkde/kdeui/kxmlguiclient.h b/microkde/kdeui/kxmlguiclient.h
index cd74c8e..b9d7b09 100644
--- a/microkde/kdeui/kxmlguiclient.h
+++ b/microkde/kdeui/kxmlguiclient.h
@@ -18,13 +18,13 @@
 */
 #ifndef _KXMLGUICLIENT_H
 #define _KXMLGUICLIENT_H
 //US #include <qdom.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qmap.h>
 #include <qstringlist.h>
 class QWidget;
 class KAction;
 class KActionCollection;
@@ -158,13 +158,13 @@ public:
   */
  void removeChildClient( KXMLGUIClient *child );
  /**
   * Retrieves a list of all child clients.
   */
-  const QPtrList<KXMLGUIClient> *childClients();
+  const Q3PtrList<KXMLGUIClient> *childClients();
  /**
   * A client can have an own @ref KXMLGUIBuilder.
   * Use this method to assign your builder instance to the client (so that the
   * @ref KXMLGUIFactory can use it when building the client's GUI)
   *
@@ -225,13 +225,13 @@ public:
   *       function.  In fact, that would remove the newly added
   *       actionlists again...
   * \note Forgetting to call unplugActionList() before
   *       plugActionList() would leave the previous actions in the
   *       menu too..
   */
-  void plugActionList( const QString &name, const QPtrList<KAction> &actionList );
+  void plugActionList( const QString &name, const Q3PtrList<KAction> &actionList );
  /**
   * The complement of \ref plugActionList() ...
   */
  void unplugActionList( const QString &name );