104 files changed, 1617 insertions, 1358 deletions

diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 72c4e60..4172cd0 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -35,57 +35,67 @@
 #ifndef QT_NO_SPLITTER___
 
 #include "qpainter.h"
 #include "qdrawutil.h"
 #include "qbitmap.h" 
 #if QT_VERSION >= 0x030000
-#include "qptrlist.h"
-#include "qmemarray.h"
+#include "q3ptrlist.h"
+#include "q3memarray.h"
 #else
 #include <qlist.h>
 #include <qarray.h>
-#define QPtrList QList
-#define QMemArray QArray
+#define Q3PtrList QList
+#define Q3MemArray QArray
 #endif
 #include "qlayoutengine_p.h"
-#include "qobjectlist.h"
+#include "qobject.h"
 #include "qstyle.h"
 #include "qapplication.h" //sendPostedEvents
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qcursor.h>
-#include <qframe.h>
+#include <q3frame.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPixmap>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QPaintEvent>
 #ifndef KDGANTT_MASTER_CVS
 //#include "KDGanttMinimizeSplitter.moc"
 #endif
 
 
 
 #ifndef DOXYGEN_SKIP_INTERNAL
 
 #if QT_VERSION >= 232
 static int mouseOffset;
 static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky
 
-class KDRubberBand: public QFrame
+class KDRubberBand: public Q3Frame
 {
 public:
-    KDRubberBand(  QWidget *parent, const char * name, WFlags f ) :QFrame ( parent, name, f ) {;}
+    KDRubberBand(  QWidget *parent, const char * name, Qt::WFlags f ) :Q3Frame ( parent, name, f ) {;}
 
 protected:
     virtual void mousePressEvent ( QMouseEvent * )
     {
         close();
     };
 
 };
 
 KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
                                   KDGanttMinimizeSplitter *parent, const char * name )
-    : QWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
+    : _activeButton( 0 ), _collapsed( false )
 {
-
+    setObjectName(name);
+    setParent(parent);
     if ( QApplication::desktop()->width() > 320 &&  QApplication::desktop()->width() < 650 ) {
         mSizeHint = QSize(7,7);
         mUseOffset = true;
     } else {
         mSizeHint = QSize(6,6);
         mUseOffset = false;
@@ -103,24 +113,24 @@ QSize KDGanttSplitterHandle::sizeHint() const
 }
 
 void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
 {
     orient = o;
 #ifndef QT_NO_CURSOR
-    if ( o == KDGanttMinimizeSplitter::Horizontal )
-        setCursor( splitHCursor );
+    if ( o == Qt::Horizontal )
+        setCursor( Qt::splitHCursor );
     else
-        setCursor( splitVCursor );
+        setCursor( Qt::splitVCursor );
 #endif
 }
 
 
 void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
 {
     updateCursor( e->pos() );
-    if ( !(e->state()&LeftButton) )
+    if ( !(e->state()&Qt::LeftButton) )
         return;
 
     if ( _activeButton != 0)
         return;
 
     QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
@@ -134,31 +144,31 @@ void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
     }
     _collapsed = false;
 }
 
 void KDGanttSplitterHandle::mousePressEvent( QMouseEvent *e )
 {
-    if ( e->button() == LeftButton ) {
+    if ( e->button() == Qt::LeftButton ) {
         _activeButton = onButton( e->pos() );
         mouseOffset = s->pick(e->pos());
         mMouseDown = true;
         repaint();
         updateCursor( e->pos() );
     }
 }
 
 void KDGanttSplitterHandle::updateCursor( const QPoint& p)
 {
     if ( onButton( p ) != 0 ) {
-        setCursor( arrowCursor );
+        setCursor( Qt::arrowCursor );
     }
     else {
-        if ( orient == KDGanttMinimizeSplitter::Horizontal )
-            setCursor( splitHCursor );
+        if ( orient == Qt::Horizontal )
+            setCursor( Qt::splitHCursor );
         else
-            setCursor( splitVCursor );
+            setCursor( Qt::splitVCursor );
     }
 }
 void KDGanttSplitterHandle::toggle()
 {
     int pos;
     int min, max;
@@ -192,13 +202,13 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
             toggle();
         }
         _activeButton = 0;
         updateCursor( e->pos() );
     }
     else {
-        if ( !opaque() && e->button() == LeftButton ) {
+        if ( !opaque() && e->button() == Qt::LeftButton ) {
             QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
         }
     }
@@ -208,16 +218,16 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
     }
     repaint();
 }
 
 int KDGanttSplitterHandle::onButton( const QPoint& p )
 {
-    QValueList<QPointArray> list = buttonRegions();
+    Q3ValueList<Q3PointArray> list = buttonRegions();
     int index = 1;
     int add = 12;
-    for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
+    for( Q3ValueList<Q3PointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         QRect rect = (*it).boundingRect();
         rect.setLeft( rect.left()- add );
         rect.setRight( rect.right() + add);
         rect.setTop( rect.top()- add );
         rect.setBottom( rect.bottom() + add);
         if ( rect.contains( p ) ) {
@@ -226,22 +236,22 @@ int KDGanttSplitterHandle::onButton( const QPoint& p )
         index++;
     }
     return 0;
 }
 
 
-QValueList<QPointArray> KDGanttSplitterHandle::buttonRegions()
+Q3ValueList<Q3PointArray> KDGanttSplitterHandle::buttonRegions()
 {
-    QValueList<QPointArray> list;
+    Q3ValueList<Q3PointArray> list;
 
     int sw = 8;
     int yyy = 1;
     int xxx = 1;
     int voffset[] = { (int) -sw*3, (int) sw*3 };
     for ( int i = 0; i < 2; i++ ) {
-        QPointArray arr;
+        Q3PointArray arr;
         if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ||
              _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Left) {
             int mid = height()/2 + voffset[i];
             arr.setPoints( 3,
                            1-xxx, mid - sw + 4,
                            sw-3-xxx, mid,
@@ -308,17 +318,17 @@ void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
             col = colorGroup().background().dark( 150 );
     }
     //QColor col = backgroundColor().dark( 130 );
     p.setBrush( col );
     p.setPen( col  );
 
-    QValueList<QPointArray> list = buttonRegions();
+    Q3ValueList<Q3PointArray> list = buttonRegions();
     int index = 1;
     if ( mUseOffset )
         p.translate( 0, 1 );
-    for ( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
+    for ( Q3ValueList<Q3PointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) { 
            
             /*
             if ( ! _collapsed ) {
             p.save();
             // p.translate( parentWidget()->style().pixelMetric( QStyle::PM_ButtonShiftHorizontal ),
@@ -374,18 +384,18 @@ public:
 
 class QSplitterData
 {
 public:
     QSplitterData() : opaque( FALSE ), firstShow( TRUE ) {}
 
-    QPtrList<QSplitterLayoutStruct> list;
+    Q3PtrList<QSplitterLayoutStruct> list;
     bool opaque;
     bool firstShow;
 };
 
-void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos,
+void kdganttGeomCalc( Q3MemArray<QLayoutStruct> &chain, int start, int count, int pos,
                  int space, int spacer );
 #endif // DOXYGEN_SKIP_INTERNAL
 
 
 /*!
   \class KDGanttMinimizeSplitter KDGanttMinimizeSplitter.h
@@ -458,30 +468,31 @@ static QSize minSizeHint( const QWidget* w )
 
 /*!
   Constructs a horizontal splitter with the \a parent and \a
   name arguments being passed on to the QFrame constructor.
 */
 KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( QWidget *parent, const char *name )
-    :QFrame(parent,name,WPaintUnclipped)
+    :Q3Frame(parent,name)
 {
+    setAttribute(Qt::WA_PaintUnclipped);
     mRubberBand = 0;
     mFirstHandle = 0;
 #if QT_VERSION >= 232
-     orient = Horizontal;
+     orient = Qt::Horizontal;
      init();
 #endif
 }
 
 /*!
   Constructs a splitter with orientation \a o with the \a parent
   and \a name arguments being passed on to the QFrame constructor.
 */
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Orientation o, QWidget *parent, const char *name )
-    :QFrame(parent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, QWidget *parent, const char *name )
+    :Q3Frame(parent,name)
 { 
-    
+    setAttribute(Qt::WA_PaintUnclipped);
     mRubberBand = 0;
     mFirstHandle = 0;
 #if QT_VERSION >= 232
      orient = o;
      init();
 #endif
@@ -502,13 +513,13 @@ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 
 
 #if QT_VERSION >= 232
 void KDGanttMinimizeSplitter::init()
 {
     data = new QSplitterData;
-    if ( orient == Horizontal )
+    if ( orient == Qt::Horizontal )
         setSizePolicy( QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum) );
     else
         setSizePolicy( QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Expanding) );
 #ifndef DESKTOP_VERSION
      setOpaqueResize( false );
 #else
@@ -531,20 +542,20 @@ void KDGanttMinimizeSplitter::toggle()
 /*!
   \brief the orientation of the splitter
 
   By default the orientation is horizontal (the widgets are side by side).
   The possible orientations are Qt:Vertical and Qt::Horizontal (the default).
 */
-void KDGanttMinimizeSplitter::setOrientation( Orientation o )
+void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o )
 {
 #if QT_VERSION >= 232
     if ( orient == o )
         return;
     orient = o;
 
-    if ( orient == Horizontal )
+    if ( orient == Qt::Horizontal )
         setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
     else
         setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
@@ -583,27 +594,27 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
     if ( data->list.count() > 0 ) {
         s = new QSplitterLayoutStruct;
         s->mode = KeepSize;
         QString tmp = "qt_splithandle_";
         tmp += w->name();
         newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() );
-    if ( ! mFirstHandle )
-        mFirstHandle = newHandle;
+        if ( ! mFirstHandle )
+            mFirstHandle = newHandle;
         s->wid = newHandle;
         newHandle->setId(data->list.count());
         s->isSplitter = TRUE;
         s->sizer = pick( newHandle->sizeHint() );
         if ( first )
             data->list.insert( 0, s );
         else
             data->list.append( s );
     }
     s = new QSplitterLayoutStruct;
     s->mode = Stretch;
     s->wid = w;
-    if ( !testWState( WState_Resized ) && w->sizeHint().isValid() )
+    if ( !testAttribute( Qt::WA_Resized ) && w->sizeHint().isValid() )
         s->sizer = pick( w->sizeHint() );
     else
         s->sizer = pick( w->size() );
     s->isSplitter = FALSE;
     if ( first )
         data->list.insert( 0, s );
@@ -618,26 +629,32 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
 /*!
   Tells the splitter that a child widget has been inserted or removed.
   The event is passed in \a c.
 */
 void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
 {
-    if ( c->type() == QEvent::ChildInserted ) {
+    if ( c->type() == QEvent::ChildAdded ) {
         if ( !c->child()->isWidgetType() )
             return;
 
-        if ( ((QWidget*)c->child())->testWFlags( WType_TopLevel ) )
+        QWidget *cw = (QWidget*)c->child();
+
+        if ( (cw->windowFlags())&Qt::Window )
+            return;
+
+        // avoid infinite recursion
+        if(cw->objectName().startsWith("qt_splithandle_"))
             return;
 
         QSplitterLayoutStruct *s = data->list.first();
         while ( s ) {
-            if ( s->wid == c->child() )
+            if ( s->wid == cw )
                 return;
             s = data->list.next();
         }
-        addWidget( (QWidget*)c->child() );
+        addWidget( cw );
         recalc( isVisible() );
 
     } else if ( c->type() == QEvent::ChildRemoved ) {
         QSplitterLayoutStruct *p = 0;
         if ( data->list.count() > 1 )
             p = data->list.at(1); //remove handle _after_ first widget.
@@ -667,23 +684,23 @@ void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
   rubber band is removed.
 */
 void KDGanttMinimizeSplitter::setRubberband( int p )
 {
 #ifdef DESKTOP_VERSION
     QPainter paint( this );
-    paint.setPen( gray );
-    paint.setBrush( gray );
-    paint.setRasterOp( XorROP );
+    paint.setPen( Qt::gray );
+    paint.setBrush( Qt::gray );
+    paint.setCompositionMode( QPainter::CompositionMode_Xor );
     QRect r = contentsRect();
     const int rBord = 3; //Themable????
 #if QT_VERSION >= 0x030000
-    int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
+    int sw = style()->pixelMetric(QStyle::PM_SplitterWidth, 0, this);
 #else
     int sw = style().splitterWidth();
 #endif
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         if ( opaqueOldPos >= 0 )
             paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
                             2*rBord, r.height() );
         if ( p >= 0 )
             paint.drawRect( p  + sw/2 - rBord, r.y(), 2*rBord, r.height() );
     } else {
@@ -693,13 +710,13 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
         if ( p >= 0 )
             paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
     }
     opaqueOldPos = p;
 #else 
     if ( !mRubberBand  ) {
-        mRubberBand = new KDRubberBand( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
+        mRubberBand = new KDRubberBand( 0, "rubber", Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop);
         mRubberBand->setFrameStyle( Box | Raised );
         //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
         mRubberBand->setPalette( QPalette ( colorGroup().background().light(), colorGroup().background().dark() ));
     }
     QRect r = contentsRect();
     static int rBord = 0; //Themable????
@@ -707,13 +724,13 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
         if (QApplication::desktop()->width() <= 320 )
             rBord = 3;
         else
             rBord = 4;
     }
     int sw = style().splitterWidth();
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         if ( p >= 0 ) {
             QPoint geo =  mapToGlobal (QPoint ( p  + sw/2 - rBord, r.y()));
             mRubberBand->setGeometry( geo.x(), geo.y(), 2*rBord, r.height() );
         }
     } else {
         if ( p >= 0 ) {
@@ -729,13 +746,13 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
 }
 
 
 /*! \reimp */
 bool KDGanttMinimizeSplitter::event( QEvent *e )
 {
-    if ( e->type() == QEvent::LayoutHint || ( e->type() == QEvent::Show && data->firstShow ) ) {
+    if ( e->type() == QEvent::LayoutRequest || ( e->type() == QEvent::Show && data->firstShow ) ) {
         recalc( isVisible() );
         if ( e->type() == QEvent::Show )
             data->firstShow = FALSE;
     }
     return QWidget::event( e );
 }
@@ -752,13 +769,13 @@ void KDGanttMinimizeSplitter::drawSplitter( QPainter *p,
                               QCOORD x, QCOORD y, QCOORD w, QCOORD h )
 {
 #if 0
     // LR
     style().drawPrimitive(QStyle::PE_Splitter, p, QRect(x, y, w, h), colorGroup(),
                           (orientation() == Qt::Horizontal ?
-                           QStyle::Style_Horizontal : 0));
+                           QStyle::State_Horizontal : 0));
 #endif
 }
 
 
 /*!
   Returns the id of the splitter to the right of or below the widget \a w,
@@ -793,15 +810,15 @@ int KDGanttMinimizeSplitter::idAfter( QWidget* w ) const
   \sa idAfter()
 */
 void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
 {
     p = adjustPos( p, id );
     QSplitterLayoutStruct *s = data->list.at(id);
-    int oldP = orient == Horizontal ? s->wid->x() : s->wid->y();
+    int oldP = orient == Qt::Horizontal ? s->wid->x() : s->wid->y();
     bool upLeft;
-    if ( false && orient == Horizontal ) {
+    if ( false && orient == Qt::Horizontal ) {
         p += s->wid->width();
         upLeft = p > oldP;
     } else
         upLeft = p < oldP;
 
     moveAfter( p, id, upLeft );
@@ -810,14 +827,14 @@ void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
     storeSizes();
 }
 
 
 void KDGanttMinimizeSplitter::setG( QWidget *w, int p, int s, bool isSplitter )
 {
-    if ( orient == Horizontal ) {
-        if ( false && orient == Horizontal && !isSplitter )
+    if ( orient == Qt::Horizontal ) {
+        if ( false && orient == Qt::Horizontal && !isSplitter )
             p = contentsRect().width() - p - s;
         w->setGeometry( p, contentsRect().y(), s, contentsRect().height() );
     } else
         w->setGeometry( contentsRect().x(), p, contentsRect().width(), s );
 }
 
@@ -837,13 +854,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
     QWidget *w = s->wid;
     if ( w->isHidden() ) {
         moveBefore( pos, id-1, upLeft );
     } else if ( s->isSplitter ) {
         int pos1, pos2;
         int dd = s->sizer;
-        if( false && orient == Horizontal ) {
+        if( false && orient == Qt::Horizontal ) {
             pos1 = pos;
             pos2 = pos + dd;
         } else {
             pos2 = pos - dd;
             pos1 = pos2 + 1;
         }
@@ -853,13 +870,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
         } else {
             moveBefore( pos2, id-1, upLeft );
             setG( w, pos1, dd, TRUE );
         }
     } else {
         int dd, newLeft, nextPos;
-        if( false && orient == Horizontal ) {
+        if( false && orient == Qt::Horizontal ) {
             dd = w->geometry().right() - pos;
             dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
             newLeft = pos+1;
             nextPos = newLeft + dd;
         } else {
             dd = pos - pick( w->pos() ) + 1;
@@ -890,13 +907,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
     } else if ( pick( w->pos() ) == pos ) {
         //No need to do anything if it's already there.
         return;
     } else if ( s->isSplitter ) {
         int dd = s->sizer;
         int pos1, pos2;
-        if( false && orient == Horizontal ) {
+        if( false && orient == Qt::Horizontal ) {
             pos2 = pos - dd;
             pos1 = pos2 + 1;
         } else {
             pos1 = pos;
             pos2 = pos + dd;
         }
@@ -907,13 +924,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
             moveAfter( pos2, id+1, upLeft );
             setG( w, pos1, dd, TRUE );
         }
     } else {
         int left = pick( w->pos() );
         int right, dd,/* newRight,*/ newLeft, nextPos;
-        if ( false && orient == Horizontal ) {
+        if ( false && orient == Qt::Horizontal ) {
             dd = pos - left + 1;
             dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
             newLeft = pos-dd+1;
             nextPos = newLeft - 1;
         } else {
             right = pick( w->geometry().bottomRight() );
@@ -985,15 +1002,15 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
         } else {
             minA += pick( minSize(s->wid) );
             maxA += pick( s->wid->maximumSize() );
         }
     }
     QRect r = contentsRect();
-    if ( orient == Horizontal && false ) {
+    if ( orient == Qt::Horizontal && false ) {
 #if QT_VERSION >= 0x030000
-    int splitterWidth = style().pixelMetric(QStyle::PM_SplitterWidth, this);
+    int splitterWidth = style()->pixelMetric(QStyle::PM_SplitterWidth, 0,this);
 #else
     int splitterWidth = style().splitterWidth();
 #endif
       
         if ( min )
             *min = pick(r.topRight()) - QMIN( maxB, pick(r.size())-minA ) - splitterWidth;
@@ -1027,13 +1044,13 @@ int KDGanttMinimizeSplitter::adjustPos( int p, int id )
 
 void KDGanttMinimizeSplitter::doResize()
 {
     QRect r = contentsRect();
     int i;
     int n = data->list.count();
-    QMemArray<QLayoutStruct> a( n );
+    Q3MemArray<QLayoutStruct> a( n );
     for ( i = 0; i< n; i++ ) {
         a[i].init();
         QSplitterLayoutStruct *s = data->list.at(i);
         if ( s->wid->isHidden() ) {
             a[i].stretch = 0;
             a[i].sizeHint = a[i].minimumSize = 0;
@@ -1129,13 +1146,13 @@ void KDGanttMinimizeSplitter::recalc( bool update )
     } else {
         maxl = QMIN( maxl, QWIDGETSIZE_MAX );
     }
     if ( maxt < mint )
         maxt = mint;
 
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         setMaximumSize( maxl, maxt );
         setMinimumSize( minl, mint );
     } else {
         setMaximumSize( maxt, maxl );
         setMinimumSize( mint, minl );
     }
@@ -1264,60 +1281,54 @@ void KDGanttMinimizeSplitter::recalcId()
 */
 QSize KDGanttMinimizeSplitter::sizeHint() const
 {
     constPolish();
     int l = 0;
     int t = 0;
-    if ( children() ) {
-        const QObjectList * c = children();
-        QObjectListIt it( *c );
-        QObject * o;
-
-        while( (o=it.current()) != 0 ) {
-            ++it;
+    if ( !children().empty() ) {
+        const QObjectList c = children();
+        for(QObjectList::const_iterator i=c.begin();i!=c.end();++i) {
+            QObject * o = *i;
             if ( o->isWidgetType() &&
                  !((QWidget*)o)->isHidden() ) {
                 QSize s = ((QWidget*)o)->sizeHint();
                 if ( s.isValid() ) {
                     l += pick( s );
                     t = QMAX( t, trans( s ) );
                 }
             }
         }
     }
-    return orientation() == Horizontal ? QSize( l, t ) : QSize( t, l );
+    return orientation() == Qt::Horizontal ? QSize( l, t ) : QSize( t, l );
 }
 
 
 /*!
 \reimp
 */
 
 QSize KDGanttMinimizeSplitter::minimumSizeHint() const
 {
     constPolish();
     int l = 0;
     int t = 0;
-    if ( children() ) {
-        const QObjectList * c = children();
-        QObjectListIt it( *c );
-        QObject * o;
-
-        while( (o=it.current()) != 0 ) {
-            ++it;
+    if ( !children().empty() ) {
+        const QObjectList c = children();
+        for(QObjectList::const_iterator i=c.begin();i!=c.end();++i) {
+            QObject * o = *i;
             if ( o->isWidgetType() &&
                  !((QWidget*)o)->isHidden() ) {
                 QSize s = minSizeHint((QWidget*)o);
                 if ( s.isValid() ) {
                     l += pick( s );
                     t = QMAX( t, trans( s ) );
                 }
             }
         }
     }
-    return orientation() == Horizontal ? QSize( l, t ) : QSize( t, l );
+    return orientation() == Qt::Horizontal ? QSize( l, t ) : QSize( t, l );
 }
 
 
 /*
   Calculates stretch parameters from current sizes
 */
@@ -1399,19 +1410,20 @@ bool KDGanttMinimizeSplitter::isHidden( QWidget *w ) const
     }
     \endcode
 
   \sa setSizes()
 */
 
-QValueList<int> KDGanttMinimizeSplitter::sizes() const
+Q3ValueList<int> KDGanttMinimizeSplitter::sizes() const
 {
+    /* TODO: hacker 
     if ( !testWState(WState_Polished) ) {
         QWidget* that = (QWidget*) this;
         that->polish();
-    }
-    QValueList<int> list;
+    } */
+    Q3ValueList<int> list;
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
         if ( !s->isSplitter )
             list.append( s->sizer );
         s = data->list.next();
     }
@@ -1430,16 +1442,16 @@ QValueList<int> KDGanttMinimizeSplitter::sizes() const
   If \a list contains too few values, the result is undefined
   but the program will still be well-behaved.
 
   \sa sizes()
 */
 
-void KDGanttMinimizeSplitter::setSizes( QValueList<int> list )
+void KDGanttMinimizeSplitter::setSizes( Q3ValueList<int> list )
 {
     processChildEvents();
-    QValueList<int>::Iterator it = list.begin();
+    Q3ValueList<int>::Iterator it = list.begin();
     QSplitterLayoutStruct *s = data->list.first();
     while ( s && it != list.end() ) {
         if ( !s->isSplitter ) {
             s->sizer = *it;
             ++it;
         }
@@ -1453,36 +1465,36 @@ void KDGanttMinimizeSplitter::setSizes( QValueList<int> list )
   Gets all posted child events, ensuring that the internal state of
   the splitter is consistent.
 */
 
 void KDGanttMinimizeSplitter::processChildEvents()
 {
-    QApplication::sendPostedEvents( this, QEvent::ChildInserted );
+    QApplication::sendPostedEvents( this, QEvent::ChildAdded );
 }
 
 
 /*!
   \reimp
 */
 
 void KDGanttMinimizeSplitter::styleChange( QStyle& old )
 {
 
 #if QT_VERSION >= 0x030000
-    int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
+    int sw = style()->pixelMetric(QStyle::PM_SplitterWidth, 0, this);
 #else
     int sw = style().splitterWidth();
 #endif
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
         if ( s->isSplitter )
             s->sizer = sw;
         s = data->list.next();
     }
     doResize();
-    QFrame::styleChange( old );
+    Q3Frame::styleChange( old );
 }
 
 #endif
 
 /*!
   Specifies the direction of the minimize buttons.
@@ -1509,13 +1521,13 @@ KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection()
   unfortunately isn't exported.
 */
 static inline int toFixed( int i ) { return i * 256; }
 static inline int fRound( int i ) {
     return ( i % 256 < 128 ) ? i / 256 : 1 + i / 256;
 }
-void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos,
+void kdganttGeomCalc( Q3MemArray<QLayoutStruct> &chain, int start, int count, int pos,
                 int space, int spacer )
 {
     typedef int fixed;
     int cHint = 0;
     int cMin = 0;
     int cMax = 0;
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 3042e0a..338d965 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -1,6 +1,13 @@
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QChildEvent>
+#include <QMouseEvent>
+#include <QEvent>
 /* -*- Mode: C++ -*-
    $Id$
 */
 
 /****************************************************************************
  ** Copyright (C)  2001-2004 Klarälvdalens Datakonsult AB.  All rights reserved.
@@ -32,38 +39,38 @@
  **********************************************************************/
 
 #ifndef KDGANTTMINIMIZESPLITTER_H
 #define KDGANTTMINIMIZESPLITTER_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qvaluelist.h"
+#include "q3frame.h"
+#include "q3valuelist.h"
 #endif // QT_H
 
 #ifndef QT_NO_SPLITTER___
 class QSplitterData;
 class QSplitterLayoutStruct;
 class KDGanttSplitterHandle;
 class KDRubberBand; 
-class KDGanttMinimizeSplitter : public QFrame
+class KDGanttMinimizeSplitter : public Q3Frame
 {
     Q_OBJECT
     //  Q_ENUMS( Direction )
     // Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     // Q_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
 
 public:
     enum ResizeMode { Stretch, KeepSize, FollowSizeHint };
     enum Direction { Left, Right, Up, Down };
 
     KDGanttMinimizeSplitter( QWidget* parent=0, const char* name=0 );
-    KDGanttMinimizeSplitter( Orientation, QWidget* parent=0, const char* name=0 );
+    KDGanttMinimizeSplitter( Qt::Orientation, QWidget* parent=0, const char* name=0 );
     ~KDGanttMinimizeSplitter();
 
-    virtual void setOrientation( Orientation );
-    Orientation orientation() const { return orient; }
+    virtual void setOrientation( Qt::Orientation );
+    Qt::Orientation orientation() const { return orient; }
 
     void setMinimizeDirection( Direction );
     Direction minimizeDirection() const;
 
 #if QT_VERSION >= 232
     virtual void setResizeMode( QWidget *w, ResizeMode );
@@ -74,14 +81,14 @@ public:
     void moveToLast( QWidget * );
 
     void refresh() { recalc( TRUE ); }
     QSize sizeHint() const;
     QSize minimumSizeHint() const;
 
-    QValueList<int> sizes() const;
-    void setSizes( QValueList<int> );
+    Q3ValueList<int> sizes() const;
+    void setSizes( Q3ValueList<int> );
     KDGanttSplitterHandle* firstHandle(){ return mFirstHandle;}
     void expandPos( int id, int* min, int* max );
     KDRubberBand* rubberBand() { return mRubberBand ;}
 public slots:
      void toggle();
 protected:
@@ -111,26 +118,26 @@ private:
     void recalcId();
     void moveBefore( int pos, int id, bool upLeft );
     void moveAfter( int pos, int id, bool upLeft );
     void setG( QWidget *w, int p, int s, bool isSplitter = FALSE );
 
     QCOORD pick( const QPoint &p ) const
-    { return orient == Horizontal ? p.x() : p.y(); }
+    { return orient == Qt::Horizontal ? p.x() : p.y(); }
     QCOORD pick( const QSize &s ) const
-    { return orient == Horizontal ? s.width() : s.height(); }
+    { return orient == Qt::Horizontal ? s.width() : s.height(); }
 
     QCOORD trans( const QPoint &p ) const
-    { return orient == Vertical ? p.x() : p.y(); }
+    { return orient == Qt::Vertical ? p.x() : p.y(); }
     QCOORD trans( const QSize &s ) const
-    { return orient == Vertical ? s.width() : s.height(); }
+    { return orient == Qt::Vertical ? s.width() : s.height(); }
     KDGanttSplitterHandle* mFirstHandle;
     QSplitterData *data;
 #endif
 
 private:
-    Orientation orient;
+    Qt::Orientation orient;
     Direction _direction;
 #ifndef DOXYGEN_SKIP_INTERNAL
     friend class KDGanttSplitterHandle;
 #endif
         private:// Disabled copy constructor and operator=
 #if defined(Q_DISABLE_COPY)
@@ -160,13 +167,13 @@ public:
     void toggle();
 
     int id() const { return myId; } // data->list.at(id())->wid == this
     void setId( int i ) { myId = i; }
 
 protected:
-    QValueList<QPointArray> buttonRegions();
+    Q3ValueList<Q3PointArray> buttonRegions();
     void paintEvent( QPaintEvent * );
     void mouseMoveEvent( QMouseEvent * );
     void mousePressEvent( QMouseEvent * );
     void mouseReleaseEvent( QMouseEvent * );
     int onButton( const QPoint& p );
     void updateCursor( const QPoint& p );
diff --git a/microkde/fncolordialog.h b/microkde/fncolordialog.h
index 615d2ed..52356be 100755
--- a/microkde/fncolordialog.h
+++ b/microkde/fncolordialog.h
@@ -32,18 +32,18 @@
 #include <qslider.h>

 #include <qspinbox.h>

 

 //-----------------------------------------------------------------------------

 // FNPaletteBase

 //-----------------------------------------------------------------------------

-class Q_EXPORT FNPaletteBase : public QWidget

+class /* Q_EXPORT */ FNPaletteBase : public QWidget

 { 

     Q_OBJECT

 public:

         

-    FNPaletteBase(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);

+    FNPaletteBase(QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);

 

         

     virtual ~FNPaletteBase();

 

         

     void setBGColor(QColor c) {

@@ -75,31 +75,31 @@ signals:
 

 

 

 //-----------------------------------------------------------------------------

 // FNColorPalette

 //-----------------------------------------------------------------------------

-class Q_EXPORT FNColorPalette : public FNPaletteBase

+class /* Q_EXPORT */ FNColorPalette : public FNPaletteBase

 { 

     Q_OBJECT

 public:

-    FNColorPalette(QColor c, QWidget* parent = 0, const char* name = 0, WFlags fl = 0);

+    FNColorPalette(QColor c, QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);

     virtual ~FNColorPalette();

 };

 

 

 

 

 //-----------------------------------------------------------------------------

 // FNHSVPalette

 //-----------------------------------------------------------------------------

-class Q_EXPORT FNHSVPalette : public FNPaletteBase

+class /*Q_EXPORT */ FNHSVPalette : public FNPaletteBase

 {

     Q_OBJECT

 public:

-    FNHSVPalette(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);

+    FNHSVPalette(QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);

     virtual ~FNHSVPalette();

 public slots:

     void hueChanged(int v);

 protected:

         virtual void drawImpl(QPainter& pa);

         int _hue;

@@ -108,17 +108,17 @@ protected:
 

 

 

 //-----------------------------------------------------------------------------

 // FNColorDialog

 //-----------------------------------------------------------------------------

-class Q_EXPORT FNColorDialog : public QDialog

+class /*Q_EXPORT */FNColorDialog : public QDialog

 {

         Q_OBJECT

 public:

-        FNColorDialog(QWidget* parent=0, const char* name=0, WFlags f=0);

+        FNColorDialog(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);

         virtual ~FNColorDialog();

         void setColor(QColor c);

         QColor color() const;

 public slots:

         virtual void basePaletteClicked(FNPaletteBase*);

         virtual void hsvPaletteClicked(FNPaletteBase*);

diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index d7c12bb..b058d54 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -3,17 +3,20 @@
 
 #include "kapplication.h"
 #include "ktextedit.h"
 #include <qapplication.h>
 #include <qstring.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qdialog.h>
 #include <qlayout.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qregexp.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 int KApplication::random()
 {
   return rand();
 }
 
@@ -72,54 +75,54 @@ void KApplication::showFile(QString caption, QString fn)
    fileName = getenv("QPEDIR");
    fileName += "/pics/" + fn ;
 #else
    fileName  = qApp->applicationDirPath () + "/" + fn;
 #endif 
     QFile file( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return ;
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     text = ts.read();
     file.close();
     KApplication::showText( caption, text );
   
 }
  
 bool KApplication::convert2latin1(QString fileName)
 {
     QString text;
     QFile file( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return false;
         
     } 
-    QTextStream ts( &file );
-    ts.setEncoding( QTextStream::UnicodeUTF8 );
+    Q3TextStream ts( &file );
+    ts.setEncoding( Q3TextStream::UnicodeUTF8 );
     text = ts.read();
     file.close();  
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return false;
     }
-    QTextStream tsIn( &file );
-    tsIn.setEncoding( QTextStream::Latin1 );
+    Q3TextStream tsIn( &file );
+    tsIn.setEncoding( Q3TextStream::Latin1 );
     tsIn << text.latin1();
     file.close(); 
     return true; 
  
 
 }
 void KApplication::showText(QString caption, QString text)
 {
     QDialog dia( 0, "name", true ); ;
     dia.setCaption( caption );
-    QVBoxLayout* lay = new QVBoxLayout( &dia );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     KTextEdit tb ( &dia );
-    tb.setWordWrap( QMultiLineEdit::WidgetWidth );
+    tb.setWordWrap( Q3MultiLineEdit::WidgetWidth );
     lay->addWidget( &tb ); 
     tb.setText( text );
 #ifdef DESKTOP_VERSION
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
@@ -130,29 +133,29 @@ void KApplication::showText(QString caption, QString text)
 
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qdir.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include "kglobal.h"
 #include "klocale.h"
 
 class KBackupPrefs : public QDialog
 {
   public:
     KBackupPrefs( QString message , QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Backup Failed!") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab  = new QLabel( message, this );
         lay->addWidget( lab ); 
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("Choose action"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("Choose action"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         vcal = new QRadioButton(i18n("Try again now"), format );
         tcal = new QRadioButton(i18n("Try again later"), format );
         ical = new QRadioButton(i18n("Try again tomorrow"), format );
         ocal = new QRadioButton(i18n("Disable backup"), format );
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp
index 197bea2..16618fc 100644
--- a/microkde/kcolorbutton.cpp
+++ b/microkde/kcolorbutton.cpp
@@ -1,14 +1,17 @@
 #include "kcolorbutton.h"
 #include "kcolordialog.h"
 #include "qapplication.h"
+#include <QDesktopWidget>
 
 
 #include "qlayout.h"
 #ifdef DESKTOP_VERSION
 #include <qcolordialog.h>
+//Added by qt3to4:
+#include <QPixmap>
 #endif
 void KColorButton:: edit()
 {
 
 #ifdef DESKTOP_VERSION
     QColor col = QColorDialog::getColor ( mColor ); 
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index 940196e..12063ca 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -1,9 +1,11 @@
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include "kdebug.h"
 
 #include "kurl.h"
 #include "kstandarddirs.h"
 #include "kconfig.h"
@@ -50,17 +52,17 @@ void KConfig::setGroup( const QString &group )
 //US
 QString KConfig::group() const {
   return mGroup;
 }
 
 //US added method
-QValueList<int> KConfig::readIntListEntry( const QString & key)
+Q3ValueList<int> KConfig::readIntListEntry( const QString & key)
 {
 //  qDebug("KConfig::readIntListEntry key=%s:", key.latin1());
   
-  QValueList<int> result;
+  Q3ValueList<int> result;
 
   QMap<QString,QString>::ConstIterator mit = mStringMap.find( mGroup + key );
   
   if ( mit == mStringMap.end() ) {
     return result;
   }
@@ -108,13 +110,13 @@ QString KConfig::readEntry( const QString &key, const QString &def )
   
   return QString::fromUtf8((*it).latin1());
 }
 
 QSize KConfig::readSizeEntry( const QString &key, QSize* def )
 {
-  QValueList<int> intlist = readIntListEntry(key);
+  Q3ValueList<int> intlist = readIntListEntry(key);
 
   if (intlist.count() < 2)
     {
       if (def)
       return *def;
       else
@@ -191,17 +193,17 @@ QDateTime KConfig::readDateTimeEntry( const QString &key, const QDateTime *def )
   }
 
   return *it;
 }
 
 //US added method
-void KConfig::writeEntry( const QString &key, const QValueList<int> &value)
+void KConfig::writeEntry( const QString &key, const Q3ValueList<int> &value)
 {
   QStringList valuesAsStrings;
 
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
   
   for( it = value.begin(); it != value.end(); ++it )
   {
     valuesAsStrings << QString::number(*it);
   }
   
@@ -243,13 +245,13 @@ void KConfig::writeEntry( const QString & e, const QColor & c )
     l.append( QString::number ( c.blue() ) );
     writeEntry(  e.utf8(), l );
 }
 
 void KConfig::writeEntry( const QString & e, const QSize & s )
 {
-  QValueList<int> intlist;
+  Q3ValueList<int> intlist;
   intlist << s.width() << s.height();
   writeEntry(  e, intlist );
 }
 
 void KConfig::writeEntry( const QString & e , const QFont & f )
 {
@@ -268,26 +270,26 @@ void KConfig::writeEntry( const QString &key, const QDateTime &dt )
 
 void KConfig::load()
 {
   
 
   QFile f( mFileName );
-  if ( !f.open( IO_ReadOnly ) ) {
+  if ( !f.open( QIODevice::ReadOnly ) ) {
       //qDebug("KConfig: could not open file %s ",mFileName.latin1() );
       return;
   }
 
   mBoolMap.clear();
   mStringMap.clear();
   
-  QTextStream t( &f );
-  t.setEncoding( QTextStream::Latin1 );
+  Q3TextStream t( &f );
+  t.setEncoding( Q3TextStream::Latin1 );
   QString line = t.readLine();
 
   while ( !line.isNull() ) {
-    QStringList tokens = QStringList::split( ",", line );
+    QStringList tokens = line.split(',');
     if ( tokens[0] == "bool" ) {
       bool value = false;
       if ( tokens[2] == "1" ) value = true;      
       mBoolMap.insert( tokens[1], value );
     } else if ( tokens[0] == "QString" ) {
       QString value = tokens[2];
@@ -320,21 +322,21 @@ void KConfig::sync()
   KURL path;
   path.setPath(mFileName);
   QString dir=path.directory();
   KStandardDirs::makeDir(dir);
   
   QFile f( mFileName );
-  if ( !f.open( IO_WriteOnly ) ) {
+  if ( !f.open( QIODevice::WriteOnly ) ) {
   
     qDebug("KConfig::sync() Can't open file %s ",mFileName.latin1() );
     
     return;
   }
 
-  QTextStream t( &f );
-  t.setEncoding( QTextStream::Latin1 );
+  Q3TextStream t( &f );
+  t.setEncoding( Q3TextStream::Latin1 );
   QMap<QString,bool>::ConstIterator itBool;
   for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) {
     t << "bool," << itBool.key() << "," << ( *itBool ? "1" : "0"  ) << endl;
   }
 
   QMap<QString,QString>::ConstIterator itString;
diff --git a/microkde/kconfig.h b/microkde/kconfig.h
index 1a1038f..7b91e44 100644
--- a/microkde/kconfig.h
+++ b/microkde/kconfig.h
@@ -1,12 +1,12 @@
 #ifndef MINIKDE_KCONFIG_H
 #define MINIKDE_KCONFIG_H
 
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qcolor.h>
 #include <qfont.h>
 #include <qmap.h>
 #include <qdatetime.h>
 
 class KConfig
@@ -54,25 +54,25 @@ class KConfig
   bool hasGroup(const QString &group) const;
     
     
     QString getFileName();
     
 //US added method readIntListEntry    
-    QValueList<int> readIntListEntry( const QString &);
+    Q3ValueList<int> readIntListEntry( const QString &);
     
     int readNumEntry( const QString &, int def=0 );
     QString readEntry( const QString &, const QString &def=QString::null );
     QStringList readListEntry( const QString & );
     bool readBoolEntry( const QString &, bool def=false );
     QColor readColorEntry( const QString &, QColor * );
     QFont readFontEntry( const QString &, QFont * );
     QDateTime readDateTimeEntry( const QString &, const QDateTime *pDefault = 0 );
     QSize readSizeEntry(const QString &, QSize* );
     bool hasKey( const QString &);
         
-    void writeEntry( const QString &, const QValueList<int>& );
+    void writeEntry( const QString &, const Q3ValueList<int>& );
     void writeEntry( const QString &, int );
     void writeEntry( const QString &key , unsigned int value) { writeEntry( key, int( value ) ); }
     void writeEntry( const char *key , unsigned int value) { writeEntry( QString( key ), value ); }
     void writeEntry( const char *key, int value ) { writeEntry( QString( key ), value ); } 
     void writeEntry( const QString &, const QString & );
     void writeEntry( const char *key, const QString &value ) { writeEntry( QString( key ), value ); }
diff --git a/microkde/kdatepickernew.cpp b/microkde/kdatepickernew.cpp
index f60a422..8f8001e 100644
--- a/microkde/kdatepickernew.cpp
+++ b/microkde/kdatepickernew.cpp
@@ -310,13 +310,13 @@ KDatePicker::selectMonthClicked()
 {
   // every year can have different month names (in some calendar systems)
   const KCalendarSystem * calendar = KGlobal::locale()->calendar();
   QDate date = table->getDate();
   int i, month, months = calendar->monthsInYear(date);
 
-  QPopupMenu popup(selectMonth);
+  Q3PopupMenu popup(selectMonth);
 
   for (i = 1; i <= months; i++)
     popup.insertItem(calendar->monthName(i, calendar->year(date)), i);
 
   popup.setActiveItem(calendar->month(date) - 1);
 
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index 353f78d..10dc449 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -41,12 +41,20 @@
 #include "kdatetbl.h"
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qpen.h>
 #include <qpainter.h>
 #include <qdialog.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <Q3Frame>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
 #include <assert.h>
 #include <qapplication.h>
 
 KDateValidator::KDateValidator(QWidget* parent, const char* name)
     : QValidator(parent, name)
 {
@@ -66,37 +74,37 @@ KDateValidator::date(const QString& text, QDate& d) const
     QDate tmp = KGlobal::locale()->readDate(text);
     if (!tmp.isNull())
         {
             d = tmp;
             return Acceptable;
         } else
-        return Valid;
+        return QValidator::Intermediate;
 }
 
 void
 KDateValidator::fixup( QString& ) const
 {
 
 }
 
-KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
-    : QGridView(parent, name, f)
+KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, Qt::WFlags f)
+    : Q3GridView(parent, name, f)
 {
     setFont( KGlobalSettings::generalFont() );
     if(!date_.isValid())
         {
             date_=QDate::currentDate();
         }
-    setFocusPolicy( QWidget::StrongFocus );
+    setFocusPolicy( Qt::StrongFocus );
     setNumRows(7); // 6 weeks max + headline
     setNumCols(7); // 7 days a week
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
     viewport()->setBackgroundColor(QColor(220,245,255));
 #if 0
-    viewport()->setEraseColor(lightGray);
+    viewport()->setEraseColor(Qt::lightGray);
 #endif
     mMarkCurrent = false;
     setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
 }
 
 void
@@ -105,13 +113,13 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
     QRect rect;
     QString text;
     QPen pen;
     int w=cellWidth();
     int h=cellHeight();
     int pos;
-    QBrush brushBlue(blue);
+    QBrush brushBlue(Qt::blue);
     QBrush brushLightblue(QColor(220,245,255));
     QFont _font=font();
     // -----
     if(row==0)
         { // we are drawing the headline
             _font.setBold(true);
@@ -130,24 +138,23 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
             }
             if (!normalday)
                 {
                     painter->setPen(QColor(220,245,255));
                     painter->setBrush(brushLightblue);
                     painter->drawRect(0, 0, w, h);
-                    painter->setPen(blue);
+                    painter->setPen(Qt::blue);
                 } else {
-                painter->setPen(blue);
+                painter->setPen(Qt::blue);
                 painter->setBrush(brushBlue);
                 painter->drawRect(0, 0, w, h);
-                painter->setPen(white);
+                painter->setPen(Qt::white);
             }
-            painter->drawText(0, 0, w, h-1, AlignCenter,
+            painter->drawText(0, 0, w, h-1, Qt::AlignCenter,
                               daystr, -1, &rect);
-            painter->setPen(black);
-            painter->moveTo(0, h-1);
-            painter->lineTo(w-1, h-1);
+            painter->setPen(Qt::black);
+            painter->drawLine(0, h-1, w-1, h-1);
             // ----- draw the weekday:
         } else {
         painter->setFont(_font);
         pos=7*(row-1)+col;
         if (KGlobal::locale()->weekStartsMonday())
             pos++;
@@ -158,47 +165,47 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
                 if(pos<firstday)
                     { // previous month
                         text.setNum(numDaysPrevMonth+pos-firstday+1);
                     } else { // following month
                     text.setNum(pos-firstday-numdays+1);
                 }
-                painter->setPen(gray);
+                painter->setPen(Qt::gray);
             } else { // paint a day of the current month
             text.setNum(pos-firstday+1);
-            painter->setPen(black);
+            painter->setPen(Qt::black);
         }
 
         pen=painter->pen();
         if(firstday+date.day()-1==pos)
             {
                 if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
-                    painter->setPen(green);
+                    painter->setPen(Qt::green);
                 else
-                    painter->setPen(red);
+                    painter->setPen(Qt::red);
                 if(hasFocus())
                     {  
-                        painter->setBrush(darkRed);
-                        pen=white;
+                        painter->setBrush(Qt::darkRed);
+                        pen=QColor(Qt::white);
                     } else {
-                    painter->setBrush(darkGray);
-                    pen=white;
+                    painter->setBrush(Qt::darkGray);
+                    pen=QColor(Qt::white);
                 }
             } else {
             if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
                 {
-                    painter->setPen(green);
-                    painter->setBrush(darkGreen);
-                    pen=white;
+                    painter->setPen(Qt::green);
+                    painter->setBrush(Qt::darkGreen);
+                    pen=QColor(Qt::white);
                 } else {
                 painter->setBrush(QColor(220,245,255));
                 painter->setPen(QColor(220,245,255));
             }
         }
         painter->drawRect(0, 0, w, h);
         painter->setPen(pen);
-        painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect);
+        painter->drawText(0, 0, w, h, Qt::AlignCenter, text, -1, &rect);
     }
     /*
     if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); 
     if(rect.height()>maxCell.height()) {
         maxCell.setHeight(rect.height());
     }
@@ -271,13 +278,13 @@ KDateTable::keyPressEvent( QKeyEvent *e )
  
 }
 
 void
 KDateTable::viewportResizeEvent(QResizeEvent * e)
 {
-    QGridView::viewportResizeEvent(e);
+    Q3GridView::viewportResizeEvent(e);
 
     setCellWidth(viewport()->width()/7);
     setCellHeight(viewport()->height()/7);
 }
 
 void
@@ -406,19 +413,19 @@ KDateTable::getDate() const
     return date;
 }
 
 void KDateTable::focusInEvent( QFocusEvent *e )
 {
     repaintContents(false);
-    QGridView::focusInEvent( e );
+    Q3GridView::focusInEvent( e );
 }
 
 void KDateTable::focusOutEvent( QFocusEvent *e )
 {
     repaintContents(false);
-    QGridView::focusOutEvent( e );
+    Q3GridView::focusOutEvent( e );
 }
 
 QSize
 KDateTable::sizeHint() const
 {
     if(maxCell.height()>0 && maxCell.width()>0)
@@ -429,13 +436,13 @@ KDateTable::sizeHint() const
         return QSize(-1, -1);
     }
 }
 
 KDateInternalMonthPicker::KDateInternalMonthPicker
 (QWidget* parent, const char* name)
-    : QGridView(parent, name),
+    : Q3GridView(parent, name),
       result(0) // invalid
 {
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
@@ -448,19 +455,19 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
     if ( QApplication::desktop()->width() > 640 )
         add += 6;
     font.setPointSize(fontsize+add);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
     setNumRows(4);
     setNumCols(3);
     // enable to find drawing failures:
     // setTableFlags(Tbl_clipCellPainting);
 #if 0
-    viewport()->setEraseColor(lightGray); // for consistency with the datepicker
+    viewport()->setEraseColor(Qt::lightGray); // for consistency with the datepicker
 #endif
     // ----- find the preferred size
     //       (this is slow, possibly, but unfortunatly it is needed here):
     QFontMetrics metrics(font);
     for(int i=1; i <= 12; ++i)
         {
@@ -484,13 +491,13 @@ KDateInternalMonthPicker::getResult() const
     return result;
 }
 
 void
 KDateInternalMonthPicker::setupPainter(QPainter *p)
 {
-    p->setPen(black);
+    p->setPen(Qt::black);
 }
 
 void
 KDateInternalMonthPicker::viewportResizeEvent(QResizeEvent*)
 {
     setCellWidth(width()/3);
@@ -502,21 +509,21 @@ KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
 {
     int index;
     QString text;
     // ----- find the number of the cell:
     index=3*row+col+1;
     text=KGlobal::locale()->monthName(index, false);
-    painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
+    painter->drawText(0, 0, cellWidth(), cellHeight(), Qt::AlignCenter, text);
     if ( activeCol == col && activeRow == row )
         painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 
 void
 KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-    if(!isEnabled() || e->button() != LeftButton)
+    if(!isEnabled() || e->button() != Qt::LeftButton)
         {
             KNotifyClient::beep();
             return;
         }
     // -----
     int row, col;
@@ -537,13 +544,13 @@ KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
     }
 }
 
 void
 KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-    if (e->state() & LeftButton)
+    if (e->state() & Qt::LeftButton)
         {
             int row, col;
             QPoint mouseCoord;
             // -----
             mouseCoord = e->pos();
             row=rowAt(mouseCoord.y());
@@ -611,13 +618,13 @@ KDateInternalYearSelector::KDateInternalYearSelector
     QFont font;
     // -----
     font=KGlobalSettings::generalFont();
     font.setPointSize(fontsize);
     setFont(font);
 #if 0
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
 #endif
     // we have to respect the limits of QDate here, I fear:
     val->setRange(0, 8000);
     setValidator(val);
     connect(this, SIGNAL(returnPressed()), SLOT(yearEnteredSlot()));
 }
@@ -658,24 +665,24 @@ KDateInternalYearSelector::setYear(int year)
     // -----
     temp.setNum(year);
     setText(temp);
 }
 
 KPopupFrame::KPopupFrame(QWidget* parent, const char*  name)
-    : QFrame(parent, name, WType_Popup),
+    : Q3Frame(parent, name, Qt::WType_Popup),
       result(0), // rejected
       main(0)
 {
-    setFrameStyle(QFrame::Box|QFrame::Raised);
+    setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
     setMidLineWidth(2);
 }
 
 void
 KPopupFrame::keyPressEvent(QKeyEvent* e)
 {
-    if(e->key()==Key_Escape)
+    if(e->key()==Qt::Key_Escape)
         {
             result=0; // rejected
             qApp->exit_loop();
         }
 }
 
@@ -753,13 +760,13 @@ void KDateTable::virtual_hook( int, void* )
 
 //#include "kdatetbl.moc"
 
 
 KDateInternalWeekPicker::KDateInternalWeekPicker
 (QWidget* parent, const char* name)
-    : QGridView(parent, name),
+    : Q3GridView(parent, name),
       result(0) // invalid
 {
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
@@ -770,24 +777,24 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
     if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
         add += 6;
     font.setPointSize(fontsize+add);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
     if ( QApplication::desktop()->height() > 240 ) {
         setNumRows(13);
         setNumCols(4);
     } else {
         setNumRows(4);
         setNumCols(13);
     }
     // enable to find drawing failures:
     // setTableFlags(Tbl_clipCellPainting);
 #if 0
-    viewport()->setEraseColor(lightGray); // for consistency with the datepicker
+    viewport()->setEraseColor(Qt::lightGray); // for consistency with the datepicker
 #endif
     // ----- find the preferred size
     //       (this is slow, possibly, but unfortunatly it is needed here):
     QFontMetrics metrics(font);
     for(int i=1; i <= 52; ++i)
         {
@@ -815,13 +822,13 @@ KDateInternalWeekPicker::getResult() const
     return result;
 }
 
 void
 KDateInternalWeekPicker::setupPainter(QPainter *p)
 {
-    p->setPen(black);
+    p->setPen(Qt::black);
 }
 
 void
 KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*)
 {
     setCellWidth(width()/ numCols());
@@ -833,21 +840,21 @@ KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col)
 {
     int index;
     QString text;
     // ----- find the number of the cell:
     index=numCols()*row+col+1;
     text=QString::number( index );
-    painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
+    painter->drawText(0, 0, cellWidth(), cellHeight(), Qt::AlignCenter, text);
     if ( activeCol == col && activeRow == row )
         painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 
 void
 KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-    if(!isEnabled() || e->button() != LeftButton)
+    if(!isEnabled() || e->button() != Qt::LeftButton)
         {
             KNotifyClient::beep();
             return;
         }
     // -----
     int row, col;
@@ -868,13 +875,13 @@ KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e)
     }
 }
 
 void
 KDateInternalWeekPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-    if (e->state() & LeftButton)
+    if (e->state() & Qt::LeftButton)
         {
             int row, col;
             QPoint mouseCoord;
             // -----
             mouseCoord = e->pos();
             row=rowAt(mouseCoord.y());
diff --git a/microkde/kdatetbl.h b/microkde/kdatetbl.h
index 87808df..2d3d2cf 100644
--- a/microkde/kdatetbl.h
+++ b/microkde/kdatetbl.h
@@ -18,23 +18,29 @@
     Boston, MA 02111-1307, USA.
 */
 #ifndef KDATETBL_H
 #define KDATETBL_H
 
 #include <qvalidator.h>
-#include <qgridview.h>
+#include <q3gridview.h>
 #include <qlineedit.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <Q3Frame>
+#include <QKeyEvent>
+#include <QFocusEvent>
 
 /**
 * A table containing month names. It is used to pick a month directly.
 * @internal
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDateInternalMonthPicker : public QGridView
+class KDateInternalMonthPicker : public Q3GridView
 {
   Q_OBJECT
 protected:
   /**
    * Store the month that has been clicked [1..12].
    */
@@ -124,13 +130,13 @@ private:
 
 /**
  * Frame with popup menu behaviour.
  * @author Tim Gilman, Mirko Boehm
  * @version $Id$
  */
-class KPopupFrame : public QFrame
+class KPopupFrame : public Q3Frame
 {
   Q_OBJECT
 protected:
   /**
    * The result. It is returned from exec() when the popup window closes.
    */
@@ -179,13 +185,13 @@ public:
    * Dito.
    */
   int exec(int x, int y);
 
 private:
 
-  virtual bool close(bool alsoDelete) { return QFrame::close(alsoDelete); }
+  virtual bool close(bool alsoDelete) { return Q3Frame::close(alsoDelete); }
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
   class KPopupFramePrivate;
   KPopupFramePrivate *d;
 };
@@ -212,22 +218,22 @@ public:
  * dateSelected(QDate)
  *
  * @internal
  * @version $Id$
  * @author Tim Gilman, Mirko Boehm
  */
-class KDateTable : public QGridView
+class KDateTable : public Q3GridView
 {
     Q_OBJECT
 public:
     /**
      * The constructor.
      */
     KDateTable(QWidget *parent=0,
                QDate date=QDate::currentDate(),
-               const char* name=0, WFlags f=0);
+               const char* name=0, Qt::WFlags f=0);
     /**
      * Returns a recommended size for the widget.
      * To save some time, the size of the largest used cell content is
      * calculated in each paintCell() call, since all calculations have
      * to be done there anyway. The size is stored in maxCell. The
      * sizeHint() simply returns a multiple of maxCell.
@@ -304,13 +310,13 @@ protected:
 private:
     class KDateTablePrivate;
     KDateTablePrivate *d;
 };
 
 #endif // KDATETBL_H
-class KDateInternalWeekPicker : public QGridView
+class KDateInternalWeekPicker : public Q3GridView
 {
   Q_OBJECT
 protected:
   /**
    * Store the month that has been clicked [1..12].
    */
diff --git a/microkde/kdebug.h b/microkde/kdebug.h
index bb9cfe3..534943c 100644
--- a/microkde/kdebug.h
+++ b/microkde/kdebug.h
@@ -1,12 +1,14 @@
 #ifndef MINIKDE_KDEBUG_H
 #define MINIKDE_KDEBUG_H
 
 #include <stdio.h>
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 
 
 class kdbgstream;
 typedef kdbgstream & (*KDBGFUNC)(kdbgstream &); // manipulator function
 
@@ -61,13 +63,13 @@ class kdbgstream {
     kdbgstream &operator<<(const QString&) {
         return *this;
     }
     kdbgstream &operator<<(const char*) {
         return *this;
     }
-    kdbgstream &operator<<(const QCString&) {
+    kdbgstream &operator<<(const Q3CString&) {
       return *this;
     }
     kdbgstream& operator<<(KDBGFUNC f) {
         return (*f)(*this);
     }
     kdbgstream& operator<<(double) {
diff --git a/microkde/kdecore/kcatalogue.cpp b/microkde/kdecore/kcatalogue.cpp
index 97ac326..1600b08 100644
--- a/microkde/kdecore/kcatalogue.cpp
+++ b/microkde/kdecore/kcatalogue.cpp
@@ -17,12 +17,14 @@
    Boston, MA 02111-1307, USA.
 */
 
 //US #include <config.h>
 
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kdebug.h>
 
 #include "kcatalogue.h"
 
 char *k_nl_find_msg(struct kde_loaded_l10nfile *domain_file,
@@ -85,13 +87,13 @@ void KCatalogue::setFileName( const QString & fileName )
 {
   // nothing to do if the file name is already the same
   if ( this->fileName() == fileName ) return;
 
   doUnload();
 
-  QCString newFileName = QFile::encodeName( fileName );
+  Q3CString newFileName = QFile::encodeName( fileName );
 
   if ( !fileName.isEmpty() )
     {
       // set file name
       char *filename = new char[ newFileName.length() + 1 ];
       ::qstrcpy( filename, newFileName );
diff --git a/microkde/kdecore/kconfigbase.h b/microkde/kdecore/kconfigbase.h
index 7e56d11..1ef6a04 100644
--- a/microkde/kdecore/kconfigbase.h
+++ b/microkde/kdecore/kconfigbase.h
@@ -23,12 +23,14 @@
 // $Id$
 
 #ifndef _KCONFIGBASE_H
 #define _KCONFIGBASE_H
 
 #include "kconfig.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 /**
   * Helper class to facilitate working with @ref KConfig / @ref KSimpleConfig
   * groups.
   *
   * Careful programmers always set the group of a
@@ -79,13 +81,13 @@ public:
         { _config->setGroup( group ); }
 
   KConfigGroupSaver( KConfig* config, const char *group )
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
-  KConfigGroupSaver( KConfig* config, const QCString &group )
+  KConfigGroupSaver( KConfig* config, const Q3CString &group )
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
   ~KConfigGroupSaver() { _config->setGroup( _oldgroup ); }
 
     KConfig* config() { return _config; };
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index 6d0475a..0b54eb6 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -17,15 +17,18 @@
    Boston, MA 02111-1307, USA.
 */
 //US #include <config.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtimer.h>
-#include <qobjectdict.h>
-#include <qwidgetlist.h>
+#include <q3objectdict.h>
 #include <qwidget.h>
+#include <qwidget.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 
 #include "kapplication.h"
 #include "klibloader.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
 #include "klocale.h"
@@ -42,13 +45,13 @@
 #include <qtopia/qlibrary.h>
 #else
 #include <qlibrary.h> 
 #endif
 
 
-template class QAsciiDict<KLibrary>;
+template class Q3AsciiDict<KLibrary>;
 
 #include <stdlib.h> //getenv
 
 /*US
 #if HAVE_DLFCN_H
 #  include <dlfcn.h>
@@ -117,13 +120,13 @@ KLibrary::~KLibrary()
     if ( m_timer && m_timer->isActive() )
         m_timer->stop();
 
     // If any object is remaining, delete
     if ( m_objs.count() > 0 )
         {
-            QPtrListIterator<QObject> it( m_objs );
+            Q3PtrListIterator<QObject> it( m_objs );
             for ( ; it.current() ; ++it )
                 {
                     kdDebug(150) << "Factory still has object " << it.current() << " " << it.current()->name () << " Library = " << m_libname << endl;
                     disconnect( it.current(), SIGNAL( destroyed() ),
                                 this, SLOT( slotObjectDestroyed() ) );
                 }
@@ -149,13 +152,13 @@ QString KLibrary::fileName() const
 
 KLibFactory* KLibrary::factory()
 {
     if ( m_factory )
         return m_factory;
 
-        QCString symname;
+        Q3CString symname;
         symname.sprintf("init_%s", name().latin1() );
     
         void* sym = symbol( symname );
         if ( !sym )
         {
             qDebug("KLibrary: The library %s does not offer an %s function", name().latin1(), symname.data());
@@ -302,14 +305,14 @@ KLibWrapPrivate::KLibWrapPrivate(KLibrary *l, QLibrary* h)
     }
 }
 
 class KLibLoaderPrivate
 {
 public:
-    QPtrList<KLibWrapPrivate> loaded_stack;
-    QPtrList<KLibWrapPrivate> pending_close;
+    Q3PtrList<KLibWrapPrivate> loaded_stack;
+    Q3PtrList<KLibWrapPrivate> pending_close;
     enum {UNKNOWN, UNLOAD, DONT_UNLOAD} unload_mode;
 
     QString errorMessage;
 };
 
 KLibLoader* KLibLoader::s_self = 0;
@@ -345,13 +348,13 @@ KLibLoader::KLibLoader( QObject* parent, const char* name )
 }
 
 KLibLoader::~KLibLoader()
 {
 //    kdDebug(150) << "Deleting KLibLoader " << this << "  " << name() << endl;
 
-    QAsciiDictIterator<KLibWrapPrivate> it( m_libs );
+    Q3AsciiDictIterator<KLibWrapPrivate> it( m_libs );
     for (; it.current(); ++it )
     {
       kdDebug(150) << "The KLibLoader contains the library " << it.current()->name
         << " (" << it.current()->lib << ")" << endl;
       d->pending_close.append(it.current());
     }
@@ -361,13 +364,13 @@ KLibLoader::~KLibLoader()
     delete d;
 }
 
 //static
 QString KLibLoader::findLibrary( const char * name/*US , const KInstance * instance*/ )
 {
-    QCString libname( name );
+    Q3CString libname( name );
 
     // only append ".la" if there is no extension
     // this allows to load non-libtool libraries as well
     // (mhk, 20000228)
     int pos = libname.findRev('/');
     if (pos < 0)
@@ -418,13 +421,13 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
 #endif
       }
       if ( libfile.isEmpty() )
       {
 #ifndef NDEBUG
         kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl;
-        self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); 
+        self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(QString(libname)); 
             
         qDebug("KLibLoader::library could not find library: %s", libname.data());
 #endif
             
       }
       else
@@ -466,13 +469,13 @@ KLibrary* KLibLoader::library( const char *name )
       wrap->ref_count++;
       return wrap->lib;
     }
 
     /* Test if this library was loaded at some time, but got
        unloaded meanwhile, whithout being dlclose()'ed.  */
-    QPtrListIterator<KLibWrapPrivate> it(d->loaded_stack);
+    Q3PtrListIterator<KLibWrapPrivate> it(d->loaded_stack);
     for (; it.current(); ++it) {
       if (it.current()->name == name)
         wrap = it.current();
     }
 
     if (wrap) {
@@ -547,13 +550,13 @@ KLibFactory* KLibLoader::factory( const char* name )
 }
 
 void KLibLoader::slotLibraryDestroyed()
 {
   const KLibrary *lib = static_cast<const KLibrary *>( sender() );
 
-  QAsciiDictIterator<KLibWrapPrivate> it( m_libs );
+  Q3AsciiDictIterator<KLibWrapPrivate> it( m_libs );
   for (; it.current(); ++it )
     if ( it.current()->lib == lib )
     {
       KLibWrapPrivate *wrap = it.current();
       wrap->lib = 0;  /* the KLibrary object is already away */
       m_libs.remove( it.currentKey() );
@@ -566,13 +569,13 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 {
   if (wrap && !d->pending_close.containsRef( wrap ))
     d->pending_close.append( wrap );
 
   /* First delete all KLibrary objects in pending_close, but _don't_ unload
      the DSO behind it.  */
-  QPtrListIterator<KLibWrapPrivate> it(d->pending_close);
+  Q3PtrListIterator<KLibWrapPrivate> it(d->pending_close);
   for (; it.current(); ++it) {
     wrap = it.current();
     if (wrap->lib) {
       disconnect( wrap->lib, SIGNAL( destroyed() ),
                   this, SLOT( slotLibraryDestroyed() ) );
       delete wrap->lib;
diff --git a/microkde/kdecore/klibloader.h b/microkde/kdecore/klibloader.h
index ed57109..53d146e 100644
--- a/microkde/kdecore/klibloader.h
+++ b/microkde/kdecore/klibloader.h
@@ -18,14 +18,14 @@
 #ifndef KLIBLOADER_H
 #define KLIBLOADER_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qasciidict.h>
-#include <qptrlist.h>
+#include <q3asciidict.h>
+#include <q3ptrlist.h>
 #include <kglobal.h>
 
 #include <stdlib.h> // For backwards compatibility
 
 class KInstance;
 class QTimer;
@@ -49,13 +49,13 @@ class QLibrary;
  * @see KLibLoader
  * @author Torben Weis <weis@kde.org>
  */
 class KLibrary : public QObject
 {
     friend class KLibLoader;
-    friend class QAsciiDict<KLibrary>;
+    friend class Q3AsciiDict<KLibrary>;
 
     Q_OBJECT
 public:
     /**
      * @internal
      * Don't create KLibrary objects on your own. Instead use @ref KLibLoader.
@@ -124,13 +124,13 @@ private:
 
     QString m_libname;
     QString m_filename;
     KLibFactory* m_factory;
 //US    void * m_handle;
     QLibrary* m_handle;
-    QPtrList<QObject> m_objs;
+    Q3PtrList<QObject> m_objs;
     QTimer *m_timer;
     KLibraryPrivate *d;
 };
 
 class KLibWrapPrivate;
 
@@ -284,13 +284,13 @@ protected:
     KLibLoader( QObject* parent = 0, const char* name = 0 );
 
 private slots:
     void slotLibraryDestroyed();
 private:
     void close_pending( KLibWrapPrivate * );
-    QAsciiDict<KLibWrapPrivate> m_libs;
+    Q3AsciiDict<KLibWrapPrivate> m_libs;
 
     static KLibLoader* s_self;
 
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 1d8ae9f..dd310fa 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -1,21 +1,22 @@
 #include <qregexp.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 #include "kdebug.h"
 #include "kcalendarsystemgregorian.h"
 
 #include "klocale.h"
 
 #include <qstringlist.h>
 
 //#define COLLECT_TRANSLATION
 
 
-QDict<QString> *mLocaleDict = 0;
-void setLocaleDict( QDict<QString> * dict )
+Q3Dict<QString> *mLocaleDict = 0;
+void setLocaleDict( Q3Dict<QString> * dict )
 {
     mLocaleDict = dict;
 
 }
 
 #ifdef COLLECT_TRANSLATION 
@@ -42,24 +43,24 @@ void addExist(const char *text,QString trans )
 
     }
 
 }
 
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #endif
 void dumpMissing()
 {
 #ifdef COLLECT_TRANSLATION 
     QString fileName = "/tmp/usernewtrans.txt";
     QFile file( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return ;
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
 
     int i;
     for ( i = 0; i< missingTrans.count(); ++i ) {
 
         QString text = missingTrans[i].replace( QRegExp("\n"),"\\n" );
@@ -67,16 +68,16 @@ void dumpMissing()
 
     }
     file.close();
     {
     QString fileName = "/tmp/usertrans.txt";
     QFile file( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return ;
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
 
     int i;
     for ( i = 0; i< existingTrans1.count(); ++i ) {
 
         QString text = existingTrans1[i].replace( QRegExp("\n"),"\\n" );
@@ -464,13 +465,13 @@ QString KLocale::formatDateTime(const QDateTime &pDateTime,
   QString format("%1 %2");
 
   if ( intIntDateFormat == Default )
     format = "%1 %2";
   else if ( intIntDateFormat == Format1 )
     format = "%1 %2";
-  else  if ( intIntDateFormat == ISODate )
+  else  if ( intIntDateFormat == Qt::ISODate )
     format = "%1T%2";
 
   QString res = format.arg(formatDate( pDateTime.date(), shortFormat, intIntDateFormat ))
                .arg(formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ));
 
   //qDebug("KLocale::formatDateTime transformed %s, into %s", pDateTime.toString().latin1(), res.latin1() );
@@ -524,13 +525,13 @@ QDate KLocale::readDate(const QString &intstr, const QString &fmt, bool* ok) con
 
       // remove space at the begining
       if (str.length() > strpos && str.at(strpos).isSpace())
         strpos++;
 
       c = fmt.at(fmtpos++);
-      switch (c)
+      switch (c.unicode())
       {
         case 'a':
         case 'A':
           // this will just be ignored
           { // Cristian Tache: porting to Win: Block added because of "j" redefinition
             for (int j = 1; j < 8; j++) {
@@ -635,13 +636,13 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
 
       // remove space at the begining
       if (str.length() > strpos && str.at(strpos).isSpace())
         strpos++;
 
       c = Format.at(Formatpos++);
-      switch (c)
+      switch (c.unicode())
         {
         case 'p':
           {
             QString s;
             s = i18n("pm").lower();
             int len = s.length();
@@ -731,13 +732,13 @@ QDateTime KLocale::readDateTime(const QString &intstr,
   QString time = intstr.mid(pos+1);
 
   QString dformat = dateFormat(intIntDateFormat);
   QString tformat = timeFormat(intIntDateFormat);
 
   QDate m_date = readDate(date, dformat, &ok1);
-  QTime m_time = readTime(time, tformat, &ok2);
+  QTime m_time = readTime(time, !tformat.isEmpty(), &ok2);
 
   QDateTime m_dt;
 
   if (ok)
     {
       if ((ok1 == false) || (ok2 == false))
diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h
index 58e0b39..840fc9d 100644
--- a/microkde/kdecore/klocale.h
+++ b/microkde/kdecore/klocale.h
@@ -1,20 +1,20 @@
 #ifndef MINIKDE_KLOCALE_H
 #define MINIKDE_KLOCALE_H
 
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qdatetime.h>
-#include <qdict.h>
+#include <q3dict.h>
 
 #ifndef I18N_NOOP
 #define I18N_NOOP(x) (x)
 #endif
 
 class KCalendarSystem;
-void setLocaleDict( QDict<QString> * dict );
+void setLocaleDict( Q3Dict<QString> * dict );
 QString i18n(const char *text);
 QString i18n(const char *hint, const char *text);
 QString i18n(const char *text1, const char *textn, int num);
 
 // Qt3's uic generates i18n( "msg", "comment" ) calls which conflict
 // with our i18n method. we use uic -tr tr2i18n to redirect
diff --git a/microkde/kdecore/kmdcodec.cpp b/microkde/kdecore/kmdcodec.cpp
index bc03569..db11e52 100644
--- a/microkde/kdecore/kmdcodec.cpp
+++ b/microkde/kdecore/kmdcodec.cpp
@@ -36,12 +36,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include <kdebug.h>
 #include "kmdcodec.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 #define KMD5_S11 7
 #define KMD5_S12 12
 #define KMD5_S13 17
 #define KMD5_S14 22
 #define KMD5_S21 5
@@ -144,20 +146,20 @@ static int rikFindChar(register const char * _s, const char c)
     if ((0 == *s) || (c == *s)) break; ++s;
   }
 
   return s - _s;
 }
 
-QCString KCodecs::quotedPrintableEncode(const QByteArray& in, bool useCRLF)
+Q3CString KCodecs::quotedPrintableEncode(const QByteArray& in, bool useCRLF)
 {
   QByteArray out;
   quotedPrintableEncode (in, out, useCRLF);
-  return QCString (out.data(), out.size()+1);
+  return Q3CString (out.data(), out.size()+1);
 }
 
-QCString KCodecs::quotedPrintableEncode(const QCString& str, bool useCRLF)
+Q3CString KCodecs::quotedPrintableEncode(const Q3CString& str, bool useCRLF)
 {
   if (str.isEmpty())
     return "";
 
   QByteArray in (str.length());
   memcpy (in.data(), str.data(), str.length());
@@ -277,20 +279,20 @@ void KCodecs::quotedPrintableEncode(const QByteArray& in, QByteArray& out, bool
     }
   }
 
   out.truncate(cursor - out.data());
 }
 
-QCString KCodecs::quotedPrintableDecode(const QByteArray & in)
+Q3CString KCodecs::quotedPrintableDecode(const QByteArray & in)
 {
   QByteArray out;
   quotedPrintableDecode (in, out);
-  return QCString (out.data(), out.size()+1);
+  return Q3CString (out.data(), out.size()+1);
 }
 
-QCString KCodecs::quotedPrintableDecode(const QCString & str)
+Q3CString KCodecs::quotedPrintableDecode(const Q3CString & str)
 {
   if (str.isEmpty())
     return "";
 
   QByteArray in (str.length());
   memcpy (in.data(), str.data(), str.length());
@@ -352,27 +354,27 @@ void KCodecs::quotedPrintableDecode(const QByteArray& in, QByteArray& out)
     }
   }
 
   out.truncate(cursor - out.data());
 }
 
-QCString KCodecs::base64Encode( const QCString& str, bool insertLFs )
+Q3CString KCodecs::base64Encode( const Q3CString& str, bool insertLFs )
 {
     if ( str.isEmpty() )
         return "";
 
     QByteArray in (str.length());
     memcpy( in.data(), str.data(), str.length() );
     return base64Encode( in, insertLFs );
 }
 
-QCString KCodecs::base64Encode( const QByteArray& in, bool insertLFs )
+Q3CString KCodecs::base64Encode( const QByteArray& in, bool insertLFs )
 {
     QByteArray out;
     base64Encode( in, out, insertLFs );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
 
 void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
                             bool insertLFs )
 {
     // clear out the output buffer
@@ -402,66 +404,63 @@ void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
     {
         while (sidx < len-2)
         {
             if ( insertLFs )
             {
                 if ( count && (count%76) == 0 )
-                    out.at(didx++) = '\n';
+                    out[didx++] = '\n';
                 count += 4;
             }
-            out.at(didx++) = Base64EncMap[(data[sidx] >> 2) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = Base64EncMap[(data[sidx] >> 2) & 077];
+            out[didx++] = Base64EncMap[(data[sidx+1] >> 4) & 017 |
                                        (data[sidx] << 4) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+2] >> 6) & 003 |
+            out[didx++] = Base64EncMap[(data[sidx+2] >> 6) & 003 |
                                        (data[sidx+1] << 2) & 077];
-            out.at(didx++) = Base64EncMap[data[sidx+2] & 077];
+            out[didx++] = Base64EncMap[data[sidx+2] & 077];
             sidx += 3;
         }
     }
 
     if (sidx < len)
     {
         if ( insertLFs && (count > 0) && (count%76) == 0 )
-           out.at(didx++) = '\n';
+           out[didx++] = '\n';
 
-        out.at(didx++) = Base64EncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = Base64EncMap[(data[sidx] >> 2) & 077];
         if (sidx < len-1)
         {
-            out.at(didx++) = Base64EncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = Base64EncMap[(data[sidx+1] >> 4) & 017 |
                                        (data[sidx] << 4) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+1] << 2) & 077];
+            out[didx++] = Base64EncMap[(data[sidx+1] << 2) & 077];
         }
         else
         {
-            out.at(didx++) = Base64EncMap[(data[sidx] << 4) & 077];
+            out[didx++] = Base64EncMap[(data[sidx] << 4) & 077];
         }
     }
 
     // Add padding
     while (didx < out.size())
-    {
-        out.at(didx) = '=';
-        didx++;
-    }
+        out[didx++] = '=';
 }
 
-QCString KCodecs::base64Decode( const QCString& str )
+Q3CString KCodecs::base64Decode( const Q3CString& str )
 {
     if ( str.isEmpty() )
         return "";
 
     QByteArray in( str.length() );
     memcpy( in.data(), str.data(), str.length() );
     return base64Decode( in );
 }
 
-QCString KCodecs::base64Decode( const QByteArray& in )
+Q3CString KCodecs::base64Decode( const QByteArray& in )
 {
     QByteArray out;
     base64Decode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
 
 void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
 {
     out.resize(0);
     if ( in.isEmpty() )
@@ -502,13 +501,13 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
         // Adhere to RFC 2045 and ignore characters
         // that are not part of the encoding table.
         unsigned char ch = data[idx];
         if ((ch > 47 && ch < 58) || (ch > 64 && ch < 91) ||
             (ch > 96 && ch < 123) || ch == '+' || ch == '/' || ch == '=')
         {
-            out.at(outIdx++) = Base64DecMap[ch];
+            out[outIdx++] = Base64DecMap[ch];
         }
         else
         {
             len--;
             tail--;
         }
@@ -520,47 +519,47 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
     len = (tail>(len/4)) ? tail-(len/4) : 0;
     unsigned int sidx = 0, didx = 0;
     if ( len > 1 )
     {
       while (didx < len-2)
       {
-          out.at(didx) = (((out.at(sidx) << 2) & 255) | ((out.at(sidx+1) >> 4) & 003));
-          out.at(didx+1) = (((out.at(sidx+1) << 4) & 255) | ((out.at(sidx+2) >> 2) & 017));
-          out.at(didx+2) = (((out.at(sidx+2) << 6) & 255) | (out.at(sidx+3) & 077));
+          out[didx] = (((out[sidx] << 2) & 255) | ((out[sidx+1] >> 4) & 003));
+          out[didx+1] = (((out[sidx+1] << 4) & 255) | ((out[sidx+2] >> 2) & 017));
+          out[didx+2] = (((out[sidx+2] << 6) & 255) | (out[sidx+3] & 077));
           sidx += 4;
           didx += 3;
       }
     }
 
     if (didx < len)
-        out.at(didx) = (((out.at(sidx) << 2) & 255) | ((out.at(sidx+1) >> 4) & 003));
+        out[didx] = (((out[sidx] << 2) & 255) | ((out[sidx+1] >> 4) & 003));
 
     if (++didx < len )
-        out.at(didx) = (((out.at(sidx+1) << 4) & 255) | ((out.at(sidx+2) >> 2) & 017));
+        out[didx] = (((out[sidx+1] << 4) & 255) | ((out[sidx+2] >> 2) & 017));
 
     // Resize the output buffer
     if ( len == 0 || len < out.size() )
       out.resize(len);
 }
 
-QCString KCodecs::uuencode( const QCString& str )
+Q3CString KCodecs::uuencode( const Q3CString& str )
 {
     if ( str.isEmpty() )
         return "";
 
     QByteArray in;
     in.resize( str.length() );
     memcpy( in.data(), str.data(), str.length() );
     return uuencode( in );
 }
 
-QCString KCodecs::uuencode( const QByteArray& in )
+Q3CString KCodecs::uuencode( const QByteArray& in )
 {
     QByteArray out;
     uuencode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
 
 void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
 {
     out.resize( 0 );
     if( in.isEmpty() )
@@ -577,87 +576,87 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
 
     out.resize( (len+2)/3*4 + ((len+line_len-1)/line_len)*(nl_len+1) );
     // split into lines, adding line-length and line terminator
     while (sidx+line_len < len)
     {
         // line length
-        out.at(didx++) = UUEncMap[line_len];
+        out[didx++] = UUEncMap[line_len];
 
         // 3-byte to 4-byte conversion + 0-63 to ascii printable conversion
         for (unsigned int end = sidx+line_len; sidx < end; sidx += 3)
         {
-            out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-            out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+            out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                    (data[sidx] << 4) & 077];
-            out.at(didx++) = UUEncMap[(data[sidx+2] >> 6) & 003 |
+            out[didx++] = UUEncMap[(data[sidx+2] >> 6) & 003 |
                                 (data[sidx+1] << 2) & 077];
-            out.at(didx++) = UUEncMap[data[sidx+2] & 077];
+            out[didx++] = UUEncMap[data[sidx+2] & 077];
         }
 
         // line terminator
         //for (unsigned int idx=0; idx < nl_len; idx++)
-        //out.at(didx++) = nl[idx];
+        //out[didx++] = nl[idx];
         memcpy(out.data()+didx, nl, nl_len);
         didx += nl_len;
     }
 
     // line length
-    out.at(didx++) = UUEncMap[len-sidx];
+    out[didx++] = UUEncMap[len-sidx];
     // 3-byte to 4-byte conversion + 0-63 to ascii printable conversion
     while (sidx+2 < len)
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                (data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+2] >> 6) & 003 |
+        out[didx++] = UUEncMap[(data[sidx+2] >> 6) & 003 |
                                (data[sidx+1] << 2) & 077];
-        out.at(didx++) = UUEncMap[data[sidx+2] & 077];
+        out[didx++] = UUEncMap[data[sidx+2] & 077];
         sidx += 3;
     }
 
     if (sidx < len-1)
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                (data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] << 2) & 077];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[(data[sidx+1] << 2) & 077];
+        out[didx++] = UUEncMap[0];
     }
     else if (sidx < len)
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[0];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx] << 4) & 077];
+        out[didx++] = UUEncMap[0];
+        out[didx++] = UUEncMap[0];
     }
 
     // line terminator
     memcpy(out.data()+didx, nl, nl_len);
     didx += nl_len;
 
     // sanity check
     if ( didx != out.size() )
         out.resize( 0 );
 }
 
-QCString KCodecs::uudecode( const QCString& str )
+Q3CString KCodecs::uudecode( const Q3CString& str )
 {
     if ( str.isEmpty() )
         return "";
 
     QByteArray in;
     in.resize( str.length() );
     memcpy( in.data(), str.data(), str.length() );
     return uudecode( in );
 }
 
-QCString KCodecs::uudecode( const QByteArray& in )
+Q3CString KCodecs::uudecode( const QByteArray& in )
 {
     QByteArray out;
     uudecode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
 
 void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
 {
     out.resize( 0 );
     if( in.isEmpty() )
@@ -702,31 +701,31 @@ void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
           while (didx < end-2)
           {
              A = UUDecMap[(unsigned char) data[sidx]];
              B = UUDecMap[(unsigned char) data[sidx+1]];
              C = UUDecMap[(unsigned char) data[sidx+2]];
              D = UUDecMap[(unsigned char) data[sidx+3]];
-             out.at(didx++) = ( ((A << 2) & 255) | ((B >> 4) & 003) );
-             out.at(didx++) = ( ((B << 4) & 255) | ((C >> 2) & 017) );
-             out.at(didx++) = ( ((C << 6) & 255) | (D & 077) );
+             out[didx++] = ( ((A << 2) & 255) | ((B >> 4) & 003) );
+             out[didx++] = ( ((B << 4) & 255) | ((C >> 2) & 017) );
+             out[didx++] = ( ((C << 6) & 255) | (D & 077) );
              sidx += 4;
           }
         }
 
         if (didx < end)
         {
             A = UUDecMap[(unsigned char) data[sidx]];
             B = UUDecMap[(unsigned char) data[sidx+1]];
-            out.at(didx++) = ( ((A << 2) & 255) | ((B >> 4) & 003) );
+            out[didx++] = ( ((A << 2) & 255) | ((B >> 4) & 003) );
         }
 
         if (didx < end)
         {
             B = UUDecMap[(unsigned char) data[sidx+1]];
             C = UUDecMap[(unsigned char) data[sidx+2]];
-            out.at(didx++) = ( ((B << 4) & 255) | ((C >> 2) & 017) );
+            out[didx++] = ( ((B << 4) & 255) | ((C >> 2) & 017) );
         }
 
         // skip padding
         while (sidx < len  && data[sidx] != '\n' && data[sidx] != '\r')
             sidx++;
 
@@ -758,24 +757,24 @@ KMD5::KMD5(const char *in, int len)
 KMD5::KMD5(const QByteArray& in)
 {
     init();
     update( in );
 }
 
-KMD5::KMD5(const QCString& in)
+KMD5::KMD5(const Q3CString& in)
 {
     init();
     update( in );
 }
 
 void KMD5::update(const QByteArray& in)
 {
     update(in.data(), int(in.size()));
 }
 
-void KMD5::update(const QCString& in)
+void KMD5::update(const Q3CString& in)
 {
     update(in.data(), int(in.length()));
 }
 
 void KMD5::update(const unsigned char* in, int len)
 {
@@ -870,13 +869,13 @@ void KMD5::finalize ()
 bool KMD5::verify( const KMD5::Digest& digest)
 {
     finalize();
     return (0 == memcmp(rawDigest(), digest, sizeof(KMD5::Digest)));
 }
 
-bool KMD5::verify( const QCString& hexdigest)
+bool KMD5::verify( const Q3CString& hexdigest)
 {
     finalize();
     return (0 == strcmp(hexDigest().data(), hexdigest));
 }
 
 const KMD5::Digest& KMD5::rawDigest()
@@ -889,36 +888,36 @@ void KMD5::rawDigest( KMD5::Digest& bin )
 {
     finalize();
     memcpy( bin, m_digest, 16 );
 }
 
 
-QCString KMD5::hexDigest()
+Q3CString KMD5::hexDigest()
 {
-    QCString s(33);
+    Q3CString s(33);
 
     finalize();
     sprintf(s.data(), "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
             m_digest[0], m_digest[1], m_digest[2], m_digest[3], m_digest[4], m_digest[5],
             m_digest[6], m_digest[7], m_digest[8], m_digest[9], m_digest[10], m_digest[11],
             m_digest[12], m_digest[13], m_digest[14], m_digest[15]);
 
     return s;
 }
 
-void KMD5::hexDigest(QCString& s)
+void KMD5::hexDigest(Q3CString& s)
 {
     finalize();
     s.resize(33);
     sprintf(s.data(), "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
             m_digest[0], m_digest[1], m_digest[2], m_digest[3], m_digest[4], m_digest[5],
             m_digest[6], m_digest[7], m_digest[8], m_digest[9], m_digest[10], m_digest[11],
             m_digest[12], m_digest[13], m_digest[14], m_digest[15]);
 }
 
-QCString KMD5::base64Digest()
+Q3CString KMD5::base64Digest()
 {
     QByteArray ba(16);
 
     finalize();
     memcpy(ba.data(), m_digest, 16);
     return KCodecs::base64Encode(ba);
@@ -953,13 +952,13 @@ void KMD5::transform( const unsigned char block[64] )
     Q_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16];
 
     decode (x, block, 64);
     //memcpy( x, block, 64 );
 
 //US    Q_ASSERT(!m_finalized);  // not just a user error, since the method is private
-    ASSERT(!m_finalized);  // not just a user error, since the method is private
+    Q_ASSERT(!m_finalized);  // not just a user error, since the method is private
 
     /* Round 1 */
     FF (a, b, c, d, x[ 0], KMD5_S11, 0xd76aa478); /* 1 */
     FF (d, a, b, c, x[ 1], KMD5_S12, 0xe8c7b756); /* 2 */
     FF (c, d, a, b, x[ 2], KMD5_S13, 0x242070db); /* 3 */
     FF (b, c, d, a, x[ 3], KMD5_S14, 0xc1bdceee); /* 4 */
diff --git a/microkde/kdecore/kmdcodec.h b/microkde/kdecore/kmdcodec.h
index 2c4d611..616b683 100644
--- a/microkde/kdecore/kmdcodec.h
+++ b/microkde/kdecore/kmdcodec.h
@@ -36,12 +36,14 @@
 
 #define KBase64 KCodecs
 
 #include <qglobal.h>
 #include <qstring.h>
 #include <qiodevice.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 /**
  * A wrapper class for the most commonly used encoding and
  * decoding algorithms.  Currently there is support for encoding
  * and decoding input using base64, uu and the quoted-printable
  * specifications.
@@ -78,13 +80,13 @@ public:
    * @param in      data to be encoded.
    * @param useCRLF if true the input data is expected to have
    *                CRLF line breaks and the output will have CRLF line
    *                breaks, too.
    * @return        quoted-printable encoded data.
    */
-  static QCString quotedPrintableEncode(const QByteArray & in,
+  static Q3CString quotedPrintableEncode(const QByteArray & in,
                                         bool useCRLF = true);
 
   /**
    * @overload
    *
    * Same as above except it accepts a null terminated
@@ -93,13 +95,13 @@ public:
    * @param str     data to be encoded.
    * @param useCRLF if true the input data is expected to have
    *                CRLF line breaks and the output will have CRLF line
    *                breaks, too.
    * @return        quoted-printable encoded data.
    */
-  static QCString quotedPrintableEncode(const QCString & str,
+  static Q3CString quotedPrintableEncode(const Q3CString & str,
                                         bool useCRLF = true);
 
   /**
    * Encodes the given data using the quoted-printable algorithm.
    *
    * Use this function if you want the result of the encoding
@@ -126,24 +128,24 @@ public:
    *
    * Accepts data with CRLF or standard unix line breaks.
    *
    * @param in  the data to be decoded.
    * @return    decoded data.
    */
-  static QCString quotedPrintableDecode(const QByteArray & in);
+  static Q3CString quotedPrintableDecode(const QByteArray & in);
 
   /**
    * @overload
    *
    * Same as above except it accepts a null terminated
    * string instead an array.
    *
    * @param str  the data to be decoded.
    * @return     decoded data.
    */
-  static QCString quotedPrintableDecode(const QCString & str);
+  static Q3CString quotedPrintableDecode(const Q3CString & str);
 
   /**
    * Decodes a quoted-printable encoded data.
    *
    * Accepts data with CRLF or standard unix line breaks.
    * Use this function if you want the result of the decoding
@@ -172,24 +174,24 @@ public:
    * line is longer than 45 octets (60 characters), excluding the
    * line terminator.
    *
    * @param in   the data to be uuencoded
    * @return     a uuencoded data.
    */
-  static QCString uuencode( const QByteArray& in );
+  static Q3CString uuencode( const QByteArray& in );
 
   /**
    * @overload
    *
    * Same as the above functions except it accepts
    * a null terminated string instead an array.
    *
    * @param str   the string to be uuencoded.
    * @return      the encoded string.
    */
-  static QCString uuencode( const QCString& str );
+  static Q3CString uuencode( const Q3CString& str );
 
   /**
    * Encodes the given data using the uuencode algorithm.
    *
    * Use this function if you want the result of the encoding
    * to be placed in another array and cut down the number of
@@ -212,24 +214,24 @@ public:
    * the utilities in unix and unix-like OS will be
    * automatically ignored.
    *
    * @param in   the data uuencoded data to be decoded.
    * @return     a decoded string.
    */
-  static QCString uudecode( const QByteArray& in );
+  static Q3CString uudecode( const QByteArray& in );
 
   /**
    * @overload
    *
    * Same as the above functions except it accepts
    * a null terminated string instead an array.
    *
    * @param str   the string to be decoded.
    * @return      a uudecoded string.
    */
-  static QCString uudecode( const QCString& str );
+  static Q3CString uudecode( const Q3CString& str );
 
   /**
    * Decodes the given data using the uudecode algorithm.
    *
    * Use this function if you want the result of the decoding
    * to be placed in another array which cuts down the number
@@ -260,25 +262,25 @@ public:
    *
    * @param in         the data to be encoded.
    * @param insertLFs  limit the number of characters per line.
    *
    * @return           a base64 encoded string.
    */
-  static QCString base64Encode( const QByteArray& in, bool insertLFs = false);
+  static Q3CString base64Encode( const QByteArray& in, bool insertLFs = false);
 
   /**
    * @overload
    *
    * Same as the above functions except it accepts
    * a null terminated string instead an array.
    *
    * @param str       the string to be encoded.
    * @param insertLFs limit the number of characters per line.
    * @return          the decoded string.
    */
-  static QCString base64Encode( const QCString& str, bool insertLFs = false );
+  static Q3CString base64Encode( const Q3CString& str, bool insertLFs = false );
 
   /**
    * Encodes the given data using the base64 algorithm.
    *
    * Use this function if you want the result of the encoding
    * to be placed in another array which cuts down the number
@@ -305,24 +307,24 @@ public:
    * Decodes the given data that was encoded using the
    * base64 algorithm.
    *
    * @param in   the base64-encoded data to be decoded.
    * @return     the decoded data.
    */
-  static QCString base64Decode( const QByteArray& in );
+  static Q3CString base64Decode( const QByteArray& in );
 
   /**
    * @overload
    *
    * Same as the above functions except it accepts
    * a null terminated string instead an array.
    *
    * @param str  the base64-encoded string.
    * @return     the decoded string.
    */
-  static QCString base64Decode( const QCString& str );
+  static Q3CString base64Decode( const Q3CString& str );
 
   /**
    * Decodes the given data that was encoded with the base64
    * algorithm.
    *
    * Use this function if you want the result of the decoding
@@ -428,13 +430,13 @@ public:
 
   /**
    * @overload
    *
    * Same as above except it accepts a QByteArray as its argument.
    */
-  KMD5(const QCString& a );
+  KMD5(const Q3CString& a );
 
   /**
    * Updates the message to be digested. Be sure to add all data
    * before you read the digest. After reading the digest, you
    * can <b>not</b> add more data!
    *
@@ -457,13 +459,13 @@ public:
 
   /**
    * @overload
    *
    * @param in     message to be added to the digest (QByteArray).
    */
-  void update(const QCString& in );
+  void update(const Q3CString& in );
 
   /**
    * @overload
    *
    * reads the data from an I/O device, i.e. from a file (QFile).
    *
@@ -499,35 +501,35 @@ public:
   void rawDigest( KMD5::Digest& bin );
 
   /**
    * Returns the value of the calculated message digest in
    * a hexadecimal representation.
    */
-  QCString hexDigest ();
+  Q3CString hexDigest ();
 
   /**
    * @overload
    */
-  void hexDigest(QCString&);
+  void hexDigest(Q3CString&);
 
   /**
    * Returns the value of the calculated message digest in
    * a base64-encoded representation.
    */
-  QCString base64Digest ();
+  Q3CString base64Digest ();
 
   /**
    * returns true if the calculated digest for the given
    * message matches the given one.
    */
   bool verify( const KMD5::Digest& digest);
 
   /**
    * @overload
    */
-  bool verify(const QCString&);
+  bool verify(const Q3CString&);
 
 protected:
   /**
    *  Performs the real update work.  Note
    *  that length is implied to be 64.
    */
diff --git a/microkde/kdecore/kprefs.cpp b/microkde/kdecore/kprefs.cpp
index 0220a34..d4010fa 100644
--- a/microkde/kdecore/kprefs.cpp
+++ b/microkde/kdecore/kprefs.cpp
@@ -18,12 +18,14 @@
     Boston, MA 02111-1307, USA.
 */
 
 // $Id$
 
 #include <qcolor.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
@@ -137,23 +139,23 @@ class KPrefsItemStringList : public KPrefsItem {
     QStringList mDefault;
 };
 
 
 class KPrefsItemIntList : public KPrefsItem {
   public:
-    KPrefsItemIntList(const QString &group,const QString &name,QValueList<int> *,
-                      const QValueList<int> &defaultValue=QValueList<int>());
+    KPrefsItemIntList(const QString &group,const QString &name,Q3ValueList<int> *,
+                      const Q3ValueList<int> &defaultValue=Q3ValueList<int>());
     virtual ~KPrefsItemIntList() {}
     
     void setDefault();
     void readConfig(KConfig *);
     void writeConfig(KConfig *);    
 
   private:
-    QValueList<int> *mReference;
-    QValueList<int> mDefault;
+    Q3ValueList<int> *mReference;
+    Q3ValueList<int> mDefault;
 };
 
 
 KPrefsItemBool::KPrefsItemBool(const QString &group,const QString &name,
                                bool *reference,bool defaultValue) :
   KPrefsItem(group,name)
@@ -361,13 +363,13 @@ void KPrefsItemStringList::readConfig(KConfig *config)
   config->setGroup(mGroup);
   *mReference = config->readListEntry(mName);
 }
 
 
 KPrefsItemIntList::KPrefsItemIntList(const QString &group,const QString &name,
-                                     QValueList<int> *reference,const QValueList<int> &defaultValue) :
+                                     Q3ValueList<int> *reference,const Q3ValueList<int> &defaultValue) :
   KPrefsItem(group,name)
 {
   mReference = reference;
   mDefault = defaultValue;
 }
 
@@ -502,11 +504,11 @@ void KPrefs::addItemPassword(const QString &key,QString *reference,const QString
 void KPrefs::addItemStringList(const QString &key,QStringList *reference,
                                const QStringList &defaultValue)
 {
   addItem(new KPrefsItemStringList(*mCurrentGroup,key,reference,defaultValue));
 }
 
-void KPrefs::addItemIntList(const QString &key,QValueList<int> *reference,
-                            const QValueList<int> &defaultValue)
+void KPrefs::addItemIntList(const QString &key,Q3ValueList<int> *reference,
+                            const Q3ValueList<int> &defaultValue)
 {
   addItem(new KPrefsItemIntList(*mCurrentGroup,key,reference,defaultValue));
 }
diff --git a/microkde/kdecore/kprefs.h b/microkde/kdecore/kprefs.h
index 95d2724..d9d1572 100644
--- a/microkde/kdecore/kprefs.h
+++ b/microkde/kdecore/kprefs.h
@@ -18,17 +18,19 @@
     Boston, MA 02111-1307, USA.
 */
 #ifndef _KPREFS_H
 #define _KPREFS_H
 // $Id$
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qcolor.h>
 #include <qfont.h>
 #include <qsize.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 class KConfig;
 
 /**
   @short Class for storing a preferences setting
   @author Cornelius Schumacher
@@ -280,14 +282,14 @@ class KPrefs {
       @param reference Pointer to the variable, which is set by readConfig()
                        and setDefaults() calls and read by writeConfig() calls.
       @param defaultValue Default value, which is used by setDefaults() and
                           when the config file does not yet contain the key of
                           this item.
     */
-    void addItemIntList(const QString &key,QValueList<int> *reference,
-                        const QValueList<int> &defaultValue=QValueList<int>());
+    void addItemIntList(const QString &key,Q3ValueList<int> *reference,
+                        const Q3ValueList<int> &defaultValue=Q3ValueList<int>());
 
   protected:
     /**
       Implemented by subclasses that use special defaults.
     */
     virtual void usrSetDefaults() {};
@@ -307,10 +309,10 @@ class KPrefs {
 
   private:
     static QString *mCurrentGroup;
 
     KConfig *mConfig;  // pointer to KConfig object
 
-    QPtrList<KPrefsItem> mItems;
+    Q3PtrList<KPrefsItem> mItems;
 };
 
 #endif
diff --git a/microkde/kdecore/kshortcut.h b/microkde/kdecore/kshortcut.h
index 4813734..244d590 100644
--- a/microkde/kdecore/kshortcut.h
+++ b/microkde/kdecore/kshortcut.h
@@ -560,13 +560,13 @@ class KShortcut
         /**
          * Creates a new shortcut with the given Qt key code
          * as the only key sequence.
          * @param keyQt the qt keycode
          * @see Qt::Key
          */
-        KShortcut( int keyQt ) {}
+        KShortcut( int /*keyQt */) {}
 
         /**
          * Creates a new shortcut that contains only the given qt key
          * sequence.
          * @param keySeq the qt key sequence to add
          */
@@ -596,22 +596,22 @@ class KShortcut
          * Creates a new key sequence that contains the given key sequence.
          * The description consists of semicolon-separated keys as
          * used in @ref KKeySequence::KKeySequence(const QString&).
          * @param shortcut the description of the key
          * @see KKeySequence::KKeySequence(const QString&)
          */
-        KShortcut( const char* shortcut ) {}
+        KShortcut( const char* /*shortcut */) {}
 
         /**
          * Creates a new key sequence that contains the given key sequence.
          * The description consists of semicolon-separated keys as
          * used in @ref KKeySequence::KKeySequence(const QString&).
          * @param shortcut the description of the key
          * @see KKeySequence::KKeySequence(const QString&)
          */
-        KShortcut( const QString& shortcut ) {}
+        KShortcut( const QString& /*shortcut */) {}
         ~KShortcut() {}
 
         /**
          * Clears the shortcut. The shortcut is null after calling this 
          * function.
          * @see isNull()
@@ -813,13 +813,13 @@ class KShortcut
          */
         //USQString toString() const;
 
         /**
          * @internal
          */
-  QString toStringInternal( const KShortcut* pcutDefault = 0 ) const
+  QString toStringInternal( const KShortcut* /*pcutDefault*/ = 0 ) const
   {
     return "EMPTY IMPL.";
   }
 
         /**
          * Returns a null shortcut.
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index d5bfefd..f10934b 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -34,21 +34,23 @@
 //US #endif
 //US#include <sys/types.h>
 //US#include <dirent.h>
 //US#include <pwd.h>
 
 #include <qregexp.h>
-#include <qasciidict.h>
-#include <qdict.h>
+#include <q3asciidict.h>
+#include <q3dict.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qstring.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "kstandarddirs.h"
 #include "kconfig.h"
 #include "kdebug.h"
 //US #include "kinstance.h"
 #include "kshell.h"
@@ -56,21 +58,21 @@
 //US#include <unistd.h>
 
 //US
 QString KStandardDirs::mAppDir = QString::null;
 
 
-template class QDict<QStringList>;
+template class Q3Dict<QStringList>;
 
 #if 0
-#include <qtextedit.h>
+#include <q3textedit.h>
 void ddd( QString op )
 {
-  static QTextEdit * dot = 0;
+  static Q3TextEdit * dot = 0;
   if ( ! dot )
-  dot = new QTextEdit();
+  dot = new Q3TextEdit();
 
   dot->show();
 
   dot->append( op );
 
 }
@@ -82,13 +84,13 @@ public:
     : restrictionsActive(false),
       dataRestrictionActive(false)
    { }
 
    bool restrictionsActive;
    bool dataRestrictionActive;
-   QAsciiDict<bool> restrictions;
+   Q3AsciiDict<bool> restrictions;
    QStringList xdgdata_prefixes;
    QStringList xdgconf_prefixes;
 };
 
 static const char* const types[] = {"html", "icon", "apps", "sound",
                               "data", "locale", "services", "mime",
@@ -442,13 +444,13 @@ static void lookupDirectory(const QString& path, const QString &relPart,
 
 /*US
       if (!recursive && !regexp.exactMatch(fn))
         continue; // No match
 */
 //US this should do the same:
-      int pos = regexp.match(fn);
+      int pos = regexp.exactMatch(fn);
       if (!recursive && !pos == 0)
         continue; // No match
 
       QString pathfn = path + fn;
 /*US
       if ( stat( QFile::encodeName(pathfn), &buff ) != 0 ) {
@@ -479,13 +481,13 @@ static void lookupDirectory(const QString& path, const QString &relPart,
 
 /*US
         if (!regexp.exactMatch(fn))
           continue; // No match
 */
 //US this should do the same:
-        pos = regexp.match(fn);
+        pos = regexp.exactMatch(fn);
         if (!pos == 0)
           continue; // No match
       }
 
 //US      if ( S_ISREG( buff.st_mode))
       if ( pathfnInfo.isFile())
@@ -1105,13 +1107,13 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
 
     while( i < len )
     {
 //US        struct stat st;
         int pos = target.find('/', i);
         base += target.mid(i - 1, pos - i + 1);
-        QCString baseEncoded = QFile::encodeName(base);
+        Q3CString baseEncoded = QFile::encodeName(base);
         // bail out if we encountered a problem
 //US        if (stat(baseEncoded, &st) != 0)
         QFileInfo baseEncodedInfo(baseEncoded);
         if (!baseEncodedInfo.exists())
         {
           // Directory does not exist....
@@ -1205,13 +1207,13 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
 
 QString readEnvPath(const char *env)
 {
   //#ifdef _WIN32_
   //    return "";
   //#else
-  QCString c_path;
+  Q3CString c_path;
   if ( getenv(env) != NULL )
     c_path = QString ( getenv(env) );
   if (c_path.isEmpty())
     return QString::null;
   return QFile::decodeName(c_path);
    //#endif
diff --git a/microkde/kdecore/kstandarddirs.h b/microkde/kdecore/kstandarddirs.h
index 901384e..f0e28fc 100644
--- a/microkde/kdecore/kstandarddirs.h
+++ b/microkde/kdecore/kstandarddirs.h
@@ -21,13 +21,13 @@
 */
 
 #ifndef SSK_KSTDDIRS_H
 #define SSK_KSTDDIRS_H
 
 #include <qstring.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstringlist.h>
 #include <kglobal.h>
 
 class KConfig;
 class KStandardDirsPrivate;
 
@@ -571,17 +571,17 @@ public:
          
  private:
 
         QStringList prefixes;
 
         // Directory dictionaries
-        QDict<QStringList> absolutes;
-        QDict<QStringList> relatives;
+        Q3Dict<QStringList> absolutes;
+        Q3Dict<QStringList> relatives;
 
-        mutable QDict<QStringList> dircache;
-        mutable QDict<QString> savelocations;
+        mutable Q3Dict<QStringList> dircache;
+        mutable Q3Dict<QString> savelocations;
 
         // Disallow assignment and copy-construction
         KStandardDirs( const KStandardDirs& );
         KStandardDirs& operator= ( const KStandardDirs& );
 
         bool addedCustoms;
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 <qpopupmenu.h>
-#include <qiconset.h>
+#include <q3toolbar.h>
+#include <q3popupmenu.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" ) ) {
-    QPopupMenu* menu = static_cast<QPopupMenu*>(w);
+  if ( w->inherits( "Q3PopupMenu" ) ) {
+    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") )
-      static_cast<QPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
+    if ( w->inherits("Q3PopupMenu") )
+      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() );
-    updateShortcut( static_cast<QPopupMenu*>(w), id );
+    static_cast<Q3PopupMenu*>(w)->changeItem( id, d->text() );
+    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() );
-    updateShortcut( static_cast<QPopupMenu*>(w), itemId_ );
+    static_cast<Q3PopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() );
+    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() );
-    updateShortcut( static_cast<QPopupMenu*>(w), itemId_ );
+    static_cast<Q3PopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() );
+    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 <qguardedptr.h>
+#include <q3valuelist.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 <qtoolbar.h>
+#include <q3mainwindow.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();
-    if ( list ) {
-      QObjectListIt it( *list );
-      for( ; it.current(); ++it ) {
-        if ( it.current()->inherits( "KToggleAction" ) && it.current() != this &&
-            static_cast<KToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) {
-          KToggleAction *a = static_cast<KToggleAction*>(it.current());
+    const QObjectList list = parent()->children();
+    if ( !list.empty() ) {
+      for(QObjectList::const_iterator it=list.begin();it!=list.end();++it) {
+        if ( (*it)->inherits( "KToggleAction" ) && (*it) != this &&
+            static_cast<KToggleAction*>((*it))->exclusiveGroup() == exclusiveGroup() ) {
+          KToggleAction *a = static_cast<KToggleAction*>(*it);
           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" ) )
-    static_cast<QPopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
+  if ( w->inherits( "Q3PopupMenu" ) )
+    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;
-    QGuardedPtr<KToolBar>  m_toolBar;
+    Q3CString               m_toolBarName;
+    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 <qptrlist.h>
+#include <q3asciidict.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;
-  QPtrDict< QPtrList<KAction> > m_dctHighlightContainers;
+  Q3AsciiDict<KAction> m_actionDict;
+  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();
-  QValueList<KAction *>::ConstIterator it = actions.begin();
-  QValueList<KAction *>::ConstIterator end = actions.end();
+  Q3ValueList<KAction *> actions = c.actions();
+  Q3ValueList<KAction *>::ConstIterator it = actions.begin();
+  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 <qhbox.h>
-#include <qvbox.h>
-#include <qgrid.h>
+#include <q3listview.h>
+#include <q3hbox.h>
+#include <q3vbox.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 width( const QListBox *lb ) const;
+    virtual int height( const Q3ListBox *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
-  for( uint i=0; i < l->count(); i++ )
+  QObjectList l = mSwallowPage->children(); // silence please
+  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 QVBox;
-class QHBox;
+class Q3ListViewItem;
+class Q3VBox;
+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<QListBoxItem *, QWidget *> mIconListToPageStack;
+    QMap<Q3ListViewItem *, QWidget *> mTreeListToPageStack;
+    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 )
-    : QListBox( parent, name, f )
+KListBox::KListBox( QWidget *parent, const char *name, Qt::WFlags f )
+    : Q3ListBox( parent, name, f )
 {
     connect( this, SIGNAL( onViewport() ),
              this, SLOT( slotOnViewport() ) );
-    connect( this, SIGNAL( onItem( QListBoxItem * ) ),
-             this, SLOT( slotOnItem( QListBoxItem * ) ) );
+    connect( this, SIGNAL( onItem( Q3ListBoxItem * ) ),
+             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;
-  QListViewItem *parentItemDrop;
+  Q3ListViewItem *afterItemDrop;
+  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 * ) ),
-                   this, SLOT( slotOnItem( QListViewItem * ) ) );
+  connect( this, SIGNAL( onItem( Q3ListViewItem * ) ),
+                   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)),
-                           this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int)));
+          connect (this, SIGNAL (rightButtonPressed (Q3ListViewItem*, const QPoint&, int)),
+                           this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int)));
         }
   else
         {
-          connect (this, SIGNAL (rightButtonClicked (QListViewItem*, const QPoint&, int)),
-                           this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int)));
+          connect (this, SIGNAL (rightButtonClicked (Q3ListViewItem*, const QPoint&, int)),
+                           this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int)));
         }
 
-  connect (this, SIGNAL (menuShortCutPressed (KListView*, QListViewItem*)),
-                   this, SLOT (emitContextMenu (KListView*, QListViewItem*)));
+  connect (this, SIGNAL (menuShortCutPressed (KListView*, Q3ListViewItem*)),
+                   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)),
-               this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int)));
+    disconnect(this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)),
+               this, SLOT (slotMouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)));
 
     if( d->bUseSingle )
-      connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
-               this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int)));
+      connect (this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, 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 );
-  emit QListView::doubleClicked( item ); // we do it now
+  Q3ListViewItem *item = itemAt( vp );
+  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;
-  QListViewItem *current=currentItem();
+  Q3PtrList<Q3ListViewItem> items, afterFirsts, afterNows;
+  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();
-      QListViewItem * last = above;
+      Q3ListViewItem * betterAbove = above->parent();
+      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;
-  for (QListViewItem *i=firstChild(); i!=0; i=i->itemBelow())
+  Q3PtrList<Q3ListViewItem> list;
+  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,
-                                    QListViewItem *after)
+QRect KListView::drawDropVisualizer(QPainter *p, Q3ListViewItem *parent,
+                                    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)
-        && (e->key()!=Key_Meta) && (e->key()!=Key_Alt))
+    if ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control)
+        && (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;
-    QListViewItem* repaintItem2 = 0L;
-    QListViewItem* visItem = 0L;
+    Q3ListViewItem* repaintItem1 = item;
+    Q3ListViewItem* repaintItem2 = 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->key()==Key_Down)
-        || (e->key()==Key_Up)
-        || (e->key()==Key_Next)
-        || (e->key()==Key_Prior)
-        || (e->key()==Key_Home)
-        || (e->key()==Key_End)))
+        && (e_state==Qt::NoButton)
+        && ((e->key()==Qt::Key_Down)
+        || (e->key()==Qt::Key_Up)
+        || (e->key()==Qt::Key_Next)
+        || (e->key()==Qt::Key_Prior)
+        || (e->key()==Qt::Key_Home)
+        || (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)
-                        && (e->key()!=Key_Meta) && (e->key()!=Key_Alt));
+       bool realKey = ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control)
+                        && (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();
-       setSelectionMode (QListView::Multi);
-       QListView::keyPressEvent (e);
+       Q3ListView::SelectionMode oldSelectionMode = selectionMode();
+       setSelectionMode (Q3ListView::Multi);
+       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)
-  : QListViewItem(parent)
+KListViewItem::KListViewItem(Q3ListView *parent)
+  : Q3ListViewItem(parent)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListViewItem *parent)
-  : QListViewItem(parent)
+KListViewItem::KListViewItem(Q3ListViewItem *parent)
+  : Q3ListViewItem(parent)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListView *parent, QListViewItem *after)
-  : QListViewItem(parent, after)
+KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after)
+  : Q3ListViewItem(parent, after)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after)
-  : QListViewItem(parent, after)
+KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *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 <qptrlist.h>
+#include <q3listview.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,
-        Multi = QListView::Multi,
-        Extended = QListView::Extended,
-        NoSelection = QListView::NoSelection,
+        Single = Q3ListView::Single,
+        Multi = Q3ListView::Multi,
+        Extended = Q3ListView::Extended,
+        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 contextRequest( QListViewItem *item, const QPoint &pos, int c );
+  void doubleClicked( Q3ListViewItem *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 doneEditing(QListViewItem *item, int row);
+  void slotMouseButtonClicked( int btn, Q3ListViewItem *item, const QPoint &pos, int c );
+  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(QListViewItem *parent);
-  KListViewItem(QListView *parent, QListViewItem *after);
-  KListViewItem(QListViewItem *parent, QListViewItem *after);
+  KListViewItem(Q3ListView *parent);
+  KListViewItem(Q3ListViewItem *parent);
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *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;
-    for ( int i = (int)QMainWindow::Unmanaged; i <= (int)Minimized; ++i ) {
-        lst = toolBars( (ToolBarDock)i );
-        for ( QToolBar *tb = lst.first(); tb; tb = lst.next() ) {
+    QList<Q3ToolBar*> lst;
+    for ( int i = (int)Qt::Unmanaged; i <= (int)Qt::Minimized; ++i ) {
+        lst = toolBars( (Qt::ToolBarDock)i );
+        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 (entry==QString::fromLatin1("Disabled"))
-        {
-            mb->hide(); 
-        } else
-        {
-            mb->show();
-        }
+        if(!entryList.empty()) {
+            entry = entryList.first();
+            if (entry==QString::fromLatin1("Disabled"))
+            {
+                mb->hide(); 
+            } else
+            {
+                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 );
-    if ( !l || !l->first() ) {
-        delete l;
-        return 0;
-    }
-
-//US    KMenuBar *m = (KMenuBar*)l->first();
-    QMenuBar *m = (QMenuBar*)l->first();
-    delete l;
-    return m;
+    QObjectList l = queryList( "QMenuBar", 0, false, false );
+    if(l.empty())
+        return 0;
+    return (QMenuBar*)l.front();
 }
 
 //US KStatusBar *KMainWindow::internalStatusBar()
 QStatusBar *KMainWindow::internalStatusBar()
 {
 //US    QObjectList *l = queryList( "KStatusBar", 0, false, false );
-    QObjectList *l = queryList( "QStatusBar", 0, false, false );
-    if ( !l || !l->first() ) {
-        delete l;
-        return 0;
-    }
-
-//US    KStatusBar *s = (KStatusBar*)l->first();
-    QStatusBar *s = (QStatusBar*)l->first();
-    delete l;
-    return s;
+    QObjectList l = queryList( "QStatusBar", 0, false, false );
+    if(l.empty())
+        return 0;
+    return (QStatusBar*)l.front();
 }
 
 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 <qptrlist.h>
+#include <q3mainwindow.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)))
-                              | AlignVCenter);
+        m_label->setAlignment((a & (~(Qt::AlignTop|Qt::AlignBottom|Qt::AlignVCenter)))
+                              | Qt::AlignVCenter);
         // if no vertical alignment set, use Top alignment
-        if(!(a & (AlignTop|AlignBottom|AlignVCenter)))
-           a |= AlignTop;
+        if(!(a & (Qt::AlignTop|Qt::AlignBottom|Qt::AlignVCenter)))
+           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)
-   : QFrame(parent, name, f)
+KSeparator::KSeparator(QWidget* parent, const char* name, Qt::WFlags f)
+   : Q3Frame(parent, name, f)
 {
    setLineWidth(1);
    setMidLineWidth(0);
    setOrientation( HLine );
 }
 
 
 
-KSeparator::KSeparator(int orientation, QWidget* parent, const char* name, WFlags f)
-   : QFrame(parent, name, f)
+KSeparator::KSeparator(int orientation, QWidget* parent, const char* name, Qt::WFlags 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 <qmainwindow.h>
+#include <q3popupmenu.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)),
-             this, SLOT(setOrientation(Orientation)) );
+    connect( parent, SIGNAL(orientationChanged(Qt::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 ),
-      parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
+    : Q3ToolBar( QString::fromLatin1( name ),
+      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 * ) ),
-                 this, SLOT( toolBarPosChanged( QToolBar * ) ) );
+        connect( mainWindow(), SIGNAL( toolBarPositionChanged( Q3ToolBar * ) ),
+                 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();
-  QValueList<int>::ConstIterator iEnd = d->iconSizes.end();
+  Q3ValueList<int>::ConstIterator iIt = d->iconSizes.begin();
+  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 <qframe.h>
-#include <qiconset.h>
+#include <qpointer.h>
+#include <q3frame.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;
-    QPtrList<QWidget> widgets;
+    Q3PopupMenu *context;
+    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();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Active );
+  QIcon set = iconSet();
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Active );
   QToolButton::setIconSet( set );
 }
 
 void KToolBarButton::setDefaultPixmap( const QPixmap &pixmap )
 {
-  QIconSet set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Normal );
+  QIcon set = iconSet();
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Normal );
   QToolButton::setIconSet( set );
 }
 
 void KToolBarButton::setDisabledPixmap( const QPixmap &pixmap )
 {
-  QIconSet set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Disabled );
+  QIcon set = iconSet();
+  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::SCFlags active = QStyle::SC_None;
+  QStyle::State flags   = QStyle::State_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 (isOn())   flags |= QStyle::Style_On;
-          if (isEnabled() && d->m_isRaised)flags |= QStyle::Style_Raised;
-          if (hasFocus())flags |= QStyle::Style_HasFocus;
+          if (isEnabled()) flags |= QStyle::State_Enabled;
+          if (isOn())   flags |= QStyle::State_On;
+          if (isEnabled() && d->m_isRaised)flags |= QStyle::State_Raised;
+          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(),
-        colorGroup(), flags, QStyle::SC_ToolButton, active, QStyleOption());
+  style()->drawComplexControl(QStyle::CC_ToolButton, &qsotb, _painter, this);
 
 #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,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
-                    QIconSet::Disabled);
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
+                    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,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
-                    QIconSet::Disabled);
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
+                    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,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
-                    QIconSet::Disabled);
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
+                    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;
-            if (isEnabled()) arrowFlags |= QStyle::Style_Enabled;
+    QStyleOption qso;
+    qso.initFrom(this);
+    qso.state = arrowFlags;
+    qso.rect = QRect(width()-7, height()-7, 7, 7);
+    qso.palette = palette();
 
-      style().drawPrimitive(QStyle::PE_ArrowDown, _painter,
-          QRect(width()-7, height()-7, 7, 7), colorGroup(),
-          arrowFlags, QStyleOption() );
+      style()->drawPrimitive(QStyle::PE_IndicatorArrowDown, &qso, _painter);
 #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; 
-        QPtrList<KAction> m_toolBarActions;
+        Q3PtrList<KToolBar> m_toolBars; 
+        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 <qptrlist.h>
+#include <qpointer.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;
-    QPtrList<KAction> m_actions;
-    QPtrList<KToolBar> m_toolBars;
+    QPointer<KMainWindow> m_mainWindow;
+    Q3PtrList<KAction> m_actions;
+    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 );
 
diff --git a/microkde/kdialog.cpp b/microkde/kdialog.cpp
index 8398956..57e7ea6 100644
--- a/microkde/kdialog.cpp
+++ b/microkde/kdialog.cpp
@@ -1,13 +1,15 @@
 
 #include <kdialog.h>
-#include <qapp.h>
+#include <qapplication.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <klocale.h>
     
 KDialog::KDialog( QWidget *parent, const char *name, bool modal ) :
       QDialog( parent, name, modal ) 
 {
     ;
@@ -27,15 +29,15 @@ int KDialog::marginHint() { return 3; }
 int KDialog::spacingHintSmall() { return 1; }
 int KDialog::marginHintSmall() { return 1; }
 #endif
 KProgressDialog::KProgressDialog( QWidget *parent, const char *name, bool modal ) :
       QDialog( parent, name, modal ) 
 {
-    QVBoxLayout* lay= new QVBoxLayout ( this ); 
+    Q3VBoxLayout* lay= new Q3VBoxLayout ( this ); 
     mLabel = new QLabel ( "abc",this );
-    mBar = new QProgressBar ( this );
+    mBar = new Q3ProgressBar ( this );
     mButton = new QPushButton ( i18n("Cancel"),this );
     lay->addWidget ( mLabel );
     lay->addWidget ( mBar );
     lay->addWidget ( mButton  );
     connect ( mButton , SIGNAL ( clicked () ), this, SIGNAL ( cancelled () ));
     resize ( 220, sizeHint().height() +mLabel->sizeHint().height());
diff --git a/microkde/kdialog.h b/microkde/kdialog.h
index bc80689..5f9bf0e 100644
--- a/microkde/kdialog.h
+++ b/microkde/kdialog.h
@@ -1,12 +1,14 @@
 #ifndef MINIKDE_KDIALOG_H
 #define MINIKDE_KDIALOG_H
 
 #include <qdialog.h>
+//Added by qt3to4:
+#include <QLabel>
 class QLabel;
-class QProgressBar;
+class Q3ProgressBar;
 class QPushButton ;
 
 class KDialog : public QDialog
 { 
     Q_OBJECT
   public:
@@ -26,13 +28,13 @@ class KProgressDialog : public QDialog
     void setTotalSteps ( int totalSteps );
     void setProgress ( int progress );
     void accept();
     void reject();
  private:
     QLabel * mLabel;
-    QProgressBar *mBar;
+    Q3ProgressBar *mBar;
     QPushButton *mButton;
  signals:
     void cancelled (); 
 };
 
 #endif
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index d5c7e61..a40bad6 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -1,10 +1,14 @@
 #include <qtabwidget.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qframe.h>
+#include <q3frame.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 
 #include "klocale.h"
 #include "kdebug.h"
 
 #include "kdialogbase.h"
@@ -132,19 +136,19 @@ void KDialogBase::hideButtons()
 
 }
 void KDialogBase::initLayout()
 {
 
   delete mTopLayout;
-  mTopLayout = new QVBoxLayout( this );
+  mTopLayout = new Q3VBoxLayout( this );
   mTopLayout->setMargin( marginHintSmall() );
   mTopLayout->setSpacing( spacingHintSmall() );
 
   mTopLayout->addWidget( mMainWidget );
 
-  QBoxLayout *buttonLayout = new QHBoxLayout;
+  Q3BoxLayout *buttonLayout = new Q3HBoxLayout;
   mTopLayout->addLayout( buttonLayout );
 
   if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
   if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
   if ( mOkButton ) buttonLayout->addWidget( mOkButton );
   if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
@@ -152,21 +156,21 @@ void KDialogBase::initLayout()
   if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
   if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
   buttonLayout->setMargin( marginHintSmall()  );
   buttonLayout->setSpacing( spacingHintSmall() );
 }
 
-QFrame *KDialogBase::addPage( const QString &name )
+Q3Frame *KDialogBase::addPage( const QString &name )
 {
 //  kdDebug() << "KDialogBase::addPage(): " << name << endl;
-  QFrame *frame = new QFrame( tabWidget() );
+  Q3Frame *frame = new Q3Frame( tabWidget() );
   tabWidget()->addTab( frame, name );
   return frame;
 }
 
-QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
+Q3Frame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
 {
   return addPage( name );
 }
 
 
 void KDialogBase::setMainWidget( QWidget *widget )
@@ -251,16 +255,16 @@ int KDialogBase::pageIndex( QWidget *widget ) const
 
 bool KDialogBase::showPage( int index )
 {
     tabWidget()->setCurrentPage( index );return false;
 }
 
-QFrame *KDialogBase::plainPage()
+Q3Frame *KDialogBase::plainPage()
 {
   if ( !mPlainPage ) {
-    mPlainPage = new QFrame( this );
+    mPlainPage = new Q3Frame( this );
     setMainWidget( mPlainPage );
   }
   return mPlainPage;
 }
 
 void KDialogBase::slotOk()
diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h
index 17c186b..64cbd17 100644
--- a/microkde/kdialogbase.h
+++ b/microkde/kdialogbase.h
@@ -1,17 +1,19 @@
 #ifndef MINIKDE_KDIALOGBASE_H
 #define MINIKDE_KDIALOGBASE_H
 
-#include <qframe.h>
+#include <q3frame.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 #include "kdialog.h"
 
 class QPushButton;
 class QLayout;
 class QTabWidget;
-class QBoxLayout;
+class Q3BoxLayout;
 
 class KDialogBase : public KDialog
 {
     Q_OBJECT
   public:
     enum ButtonCode
@@ -56,14 +58,14 @@ class KDialogBase : public KDialog
                  bool separator=false,
                  const QString &user1=QString::null,
                  const QString &user2=QString::null,
                  const QString &user3=QString::null);
     virtual ~KDialogBase();
     
-    QFrame *addPage( const QString & );
-    QFrame *addPage( const QString &, int, const QPixmap & );
+    Q3Frame *addPage( const QString & );
+    Q3Frame *addPage( const QString &, int, const QPixmap & );
 
     void setMainWidget( QWidget *widget );
 
     void setButtonText( ButtonCode id, const QString &text );
 
     void enableButton( ButtonCode id, bool state );
@@ -74,13 +76,13 @@ class KDialogBase : public KDialog
 
     int pageIndex( QWidget *widget ) const;
 
     bool showPage( int index );
     void hideButtons();
 
-    QFrame *plainPage();
+    Q3Frame *plainPage();
 
   signals:
     void user1Clicked();
     void user2Clicked();
  /**
      * The Apply button was pressed. This signal is only emitted if
@@ -125,14 +127,14 @@ class KDialogBase : public KDialog
     void init( const QString &caption, int buttonMask,
                const QString &user1=QString::null, const QString &user2=QString::null );
     void initLayout();
 
     QWidget *mMainWidget;
     QTabWidget *mTabWidget;
-    QFrame *mPlainPage;
-    QBoxLayout *mTopLayout;
+    Q3Frame *mPlainPage;
+    Q3BoxLayout *mTopLayout;
     
     QPushButton *mUser1Button;
     QPushButton *mUser2Button;
     QPushButton *mCloseButton;
     QPushButton *mOkButton;
     QPushButton *mApplyButton;
diff --git a/microkde/keditlistbox.cpp b/microkde/keditlistbox.cpp
index 55b7784..257a44a 100644
--- a/microkde/keditlistbox.cpp
+++ b/microkde/keditlistbox.cpp
@@ -18,16 +18,19 @@
    Boston, MA 02111-1307, USA.
 */
 
 #include <qstringlist.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qgroupbox.h>
-#include <qlistbox.h>
-#include <qwhatsthis.h>
+#include <q3groupbox.h>
+#include <q3listbox.h>
+#include <q3whatsthis.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3StrList>
 
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -44,28 +47,28 @@ public:
     bool m_checkAtEntering;
     int buttons;
 };
 
 KEditListBox::KEditListBox(QWidget *parent, const char *name,
                            bool checkAtEntering, int buttons )
-    :QGroupBox(parent, name )
+    :Q3GroupBox(parent, name )
 {
     init( checkAtEntering, buttons );
 }
 
 KEditListBox::KEditListBox(const QString& title, QWidget *parent,
                            const char *name, bool checkAtEntering, int buttons)
-    :QGroupBox(title, parent, name )
+    :Q3GroupBox(title, parent, name )
 {
     init( checkAtEntering, buttons );
 }
 
 KEditListBox::KEditListBox(const QString& title, const CustomEditor& custom,
                            QWidget *parent, const char *name,
                            bool checkAtEntering, int buttons)
-    :QGroupBox(title, parent, name )
+    :Q3GroupBox(title, parent, name )
 {
     m_lineEdit = custom.lineEdit();
     init( checkAtEntering, buttons, custom.representationWidget() );
 }
 
 KEditListBox::~KEditListBox()
@@ -92,13 +95,13 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
 
     servNewButton = servRemoveButton = servUpButton = servDownButton = 0L;
     setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
                               QSizePolicy::MinimumExpanding));
 
     QWidget * gb = this;
-    QGridLayout * grid = new QGridLayout(gb, 7 - lostButtons, 2,
+    Q3GridLayout * grid = new Q3GridLayout(gb, 7 - lostButtons, 2,
                                          KDialog::marginHint(),
                                          KDialog::spacingHint());
     grid->addRowSpacing(0, fontMetrics().lineSpacing());
     for ( int i = 1; i < 7 - lostButtons; i++ )
         grid->setRowStretch(i, 1);
 
@@ -106,13 +109,13 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
 
     if ( representationWidget )
         representationWidget->reparent( gb, QPoint(0,0) );
     else
         m_lineEdit=new KLineEdit(gb);
 
-    m_listBox = new QListBox(gb);
+    m_listBox = new Q3ListBox(gb);
 
     QWidget *editingWidget = representationWidget ?
                              representationWidget : m_lineEdit;
     grid->addMultiCellWidget(editingWidget,1,1,0,1);
     grid->addMultiCellWidget(m_listBox, 2, 6 - lostButtons, 0, 0);
     int row = 2;
@@ -201,13 +204,13 @@ void KEditListBox::moveItemUp()
     if (selIndex == 0)
     {
         KNotifyClient::beep();
         return;
     }
 
-    QListBoxItem *selItem = m_listBox->item(selIndex);
+    Q3ListBoxItem *selItem = m_listBox->item(selIndex);
     m_listBox->takeItem(selItem);
     m_listBox->insertItem(selItem, selIndex-1);
     m_listBox->setCurrentItem(selIndex - 1);
 
     emit changed();
 }
@@ -224,13 +227,13 @@ void KEditListBox::moveItemDown()
     if (selIndex == m_listBox->count() - 1)
     {
         KNotifyClient::beep();
         return;
     }
 
-    QListBoxItem *selItem = m_listBox->item(selIndex);
+    Q3ListBoxItem *selItem = m_listBox->item(selIndex);
     m_listBox->takeItem(selItem);
     m_listBox->insertItem(selItem, selIndex+1);
     m_listBox->setCurrentItem(selIndex + 1);
 
     emit changed();
 }
@@ -346,20 +349,22 @@ void KEditListBox::clear()
 
 void KEditListBox::insertStringList(const QStringList& list, int index)
 {
     m_listBox->insertStringList(list,index);
 }
 
-void KEditListBox::insertStrList(const QStrList* list, int index)
+void KEditListBox::insertStrList(const Q3StrList* list, int index)
 {
-    m_listBox->insertStrList(list,index);
+    for(Q3StrList::const_iterator i=list->begin();i!=list->end();++i)
+        m_listBox->insertItem(*i,index++);
 }
 
-void KEditListBox::insertStrList(const QStrList& list, int index)
+void KEditListBox::insertStrList(const Q3StrList& list, int index)
 {
-    m_listBox->insertStrList(list,index);
+    for(Q3StrList::const_iterator i=list.begin();i!=list.end();++i)
+        m_listBox->insertItem(*i,index++);
 }
 
 void KEditListBox::insertStrList(const char ** list, int numStrings, int index)
 {
     m_listBox->insertStrList(list,numStrings,index);
 }
diff --git a/microkde/keditlistbox.h b/microkde/keditlistbox.h
index 130d933..e43d958 100644
--- a/microkde/keditlistbox.h
+++ b/microkde/keditlistbox.h
@@ -17,14 +17,16 @@
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KEDITLISTBOX_H
 #define KEDITLISTBOX_H
 
-#include <qgroupbox.h>
-#include <qlistbox.h>
+#include <q3groupbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <Q3StrList>
 
 class KLineEdit;
 class KComboBox;
 class QPushButton;
 
 class KEditListBoxPrivate;
@@ -33,13 +35,13 @@ class KEditListBoxPrivate;
  *
  * This class provides a editable listbox ;-), this means
  * a listbox which is accompanied by a line edit to enter new
  * items into the listbox and pushbuttons to add and remove
  * items from the listbox and two buttons to move items up and down.
  */
-class KEditListBox : public QGroupBox
+class KEditListBox : public Q3GroupBox
 {
    Q_OBJECT
 
 public:
     /// @since 3.1
     class CustomEditor
@@ -123,13 +125,13 @@ public:
 
       virtual ~KEditListBox();
 
       /**
        * Return a pointer to the embedded QListBox.
        */
-      QListBox* listBox() const     { return m_listBox; }
+      Q3ListBox* listBox() const     { return m_listBox; }
       /**
        * Return a pointer to the embedded QLineEdit.
        */
       KLineEdit* lineEdit() const     { return m_lineEdit; }
       /**
        * Return a pointer to the Add button
@@ -156,17 +158,17 @@ public:
        * See @ref QListBox::insertStringList()
        */
       void insertStringList(const QStringList& list, int index=-1);
       /**
        * See @ref QListBox::insertStringList()
        */
-      void insertStrList(const QStrList* list, int index=-1);
+      void insertStrList(const Q3StrList* list, int index=-1);
       /**
        * See @ref QListBox::insertStrList()
        */
-      void insertStrList(const QStrList& list, int index=-1);
+      void insertStrList(const Q3StrList& list, int index=-1);
       /**
        * See @ref QListBox::insertStrList()
        */
       void insertStrList(const char ** list, int numStrings=-1, int index=-1);
       /**
        * See @ref QListBox::insertItem()
@@ -204,13 +206,13 @@ public:
       void addItem();
       void removeItem();
       void enableMoveButtons(int index);
       void typedSomething(const QString& text);
 
    private:
-      QListBox *m_listBox;
+      Q3ListBox *m_listBox;
       QPushButton *servUpButton, *servDownButton;
       QPushButton *servNewButton, *servRemoveButton;
       KLineEdit *m_lineEdit;
 
       //this is called in both ctors, to avoid code duplication
       void init( bool checkAtEntering, int buttons,
diff --git a/microkde/kfiledialog.cpp b/microkde/kfiledialog.cpp
index 383e711..c1bfdef 100644
--- a/microkde/kfiledialog.cpp
+++ b/microkde/kfiledialog.cpp
@@ -1,22 +1,24 @@
 #include <kfiledialog.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #ifndef DESKTOP_VERSION
 //US orig#include <ofileselector.h>
 #include <ofileselector_p.h>
 QString KFileDialog::getSaveFileName( const QString & fn,
                                              const QString & cap , QWidget * par )
 {
     QString retfile = "";
     QDialog dia ( par, "input-dialog", true ); 
-    QVBoxLayout lay( &dia );
+    Q3VBoxLayout lay( &dia );
     lay.setMargin(7); 
     lay.setSpacing(7); 
     QString file = fn;
     if ( file.isEmpty() )
         file = QDir::homeDirPath()+"/*";
     QFileInfo fi ( file );
@@ -39,13 +41,13 @@ QString KFileDialog::getSaveFileName( const QString & fn,
 QString KFileDialog::getOpenFileName( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
    QString retfile = "";
     QDialog dia ( par, "input-dialog", true ); 
     // QLineEdit lab ( &dia ); 
-    QVBoxLayout lay( &dia );
+    Q3VBoxLayout lay( &dia );
     lay.setMargin(7); 
     lay.setSpacing(7);
     QString file = fn;
     if ( file.isEmpty() )
         file = QDir::homeDirPath()+"/*";;
     QFileInfo fi ( file );
@@ -63,26 +65,26 @@ QString KFileDialog::getExistingDirectory( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
     return KFileDialog::getSaveFileName( fn, cap, par );
 }
 #else
 
-#include <qfiledialog.h> 
+#include <q3filedialog.h> 
 
 QString KFileDialog::getSaveFileName( const QString & fn,
                                              const QString & cap , QWidget * par )
 {
-    return QFileDialog::getSaveFileName( fn, QString::null, par, "openfile", cap );
+    return Q3FileDialog::getSaveFileName( fn, QString::null, par, "openfile", cap );
 }
 QString KFileDialog::getOpenFileName( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
 
-    return QFileDialog::getOpenFileName( fn, QString::null, par, "openfile", cap );
+    return Q3FileDialog::getOpenFileName( fn, QString::null, par, "openfile", cap );
 }
 QString KFileDialog::getExistingDirectory( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
-    return QFileDialog::getExistingDirectory( fn, par, "exidtingdir", cap );
+    return Q3FileDialog::getExistingDirectory( fn, par, "exidtingdir", cap );
 }
 #endif
 
diff --git a/microkde/kfontdialog.cpp b/microkde/kfontdialog.cpp
index 174123c..f83c2a8 100644
--- a/microkde/kfontdialog.cpp
+++ b/microkde/kfontdialog.cpp
@@ -4,18 +4,20 @@
 #else
 #include <qfontdialog.h>
 #endif
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 QFont KFontDialog::getFont( const QFont & f, bool & ok )
 {
 #ifndef DESKTOP_VERSION
     QDialog d( 0, "fd", true );;
     OFontSelector s ( true,  &d, "fontsel");
-    QVBoxLayout l ( &d );
+    Q3VBoxLayout l ( &d );
     l.addWidget( &s );
     s.setSelectedFont (  f );
     QPushButton b ( "OK",  &d );
     l.addWidget( &b );
     qDebug("size %d ", f.bold());
     QObject::connect( &b, SIGNAL( clicked () ), &d, SLOT ( accept () ) );
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp
index 53edd08..9cc5835 100644
--- a/microkde/kglobal.cpp
+++ b/microkde/kglobal.cpp
@@ -1,22 +1,23 @@
 #include "kglobal.h"
 #include "kstandarddirs.h"
-#include <qkeycode.h>
+#include <qnamespace.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 KLocale *KGlobal::mLocale = 0;
 KConfig *KGlobal::mConfig = 0;
 KIconLoader *KGlobal::mIconLoader = 0;
 KStandardDirs *KGlobal::mDirs = 0;
 
 QString KGlobal::mAppName = "godot";
 
 KLocale *KGlobal::locale()
 {
   if ( !mLocale ) {
-    ASSERT(mAppName);
+    Q_ASSERT(!mAppName.isEmpty());
 
     mLocale = new KLocale();//mAppName);
   }
 
   return mLocale;
 }
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 2e483e9..1f08255 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -1,12 +1,13 @@
 #include "kglobalsettings.h"
 #include "kconfig.h"
 #include "kglobal.h"
 #include "kconfigbase.h"
 
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 #ifdef DESKTOP_VERSION
   QColor KGlobalSettings::mAlternate = QColor( 235, 235, 235 );
 #else
   QColor KGlobalSettings::mAlternate =  QColor( 210, 210, 210 );
 #endif 
diff --git a/microkde/kiconloader.cpp b/microkde/kiconloader.cpp
index 4842d71..e7f657d 100644
--- a/microkde/kiconloader.cpp
+++ b/microkde/kiconloader.cpp
@@ -1,30 +1,32 @@
 
 #include "kiconloader.h"
 #include "kglobal.h"
 
 #ifndef DESKTOP_VERSION_OEGEL
 #include <qdir.h>
+//Added by qt3to4:
+#include <QPixmap>
 QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
                                int, QString *, bool ) const
 {
     QPixmap pix; 
     QString file;
     file = iconPath() + name+".png";
     pix.load (  file );
     // qDebug("KIconLoader::loadIcon %s -----------",  file.latin1());
     return pix;
 }
-QIconSet KIconLoader::loadIconSet( const QString& name) const
+QIcon KIconLoader::loadIconSet( const QString& name) const
 {
     QPixmap pixmapLoader; 
     QString file;
     file = iconPath() + name+".png";
     pixmapLoader.load( file ); 
     //qDebug("KIconLoader::loadIconSet: %s ************", file.latin1() );
-    QIconSet is ( pixmapLoader );
+    QIcon is ( pixmapLoader );
   return is;
 }
 
 QPixmap BarIcon( const QString &name )
 { 
     QPixmap pix;
@@ -74,18 +76,18 @@ QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
   if (pPtr == 0)
     qDebug("KIconLoader::loadIcon: %s not found", px.latin1());
   
   return p;
 }
 
-QIconSet KIconLoader::loadIconSet( const QString& name) const
+QIcon KIconLoader::loadIconSet( const QString& name) const
 {
   QString px = this->iconPath() + "/" + name;
   
-  QIconSet is ;//= Resource::loadIconSet( px );
-  QIconSet* isPtr = 0;//LR&is;
+  QIcon is ;//= Resource::loadIconSet( px );
+  QIcon* isPtr = 0;//LR&is;
   if (isPtr == 0)
     qDebug("KIconLoader::loadIconSet: %s not foun", px.latin1());
   
   return is;
 }
 
diff --git a/microkde/kiconloader.h b/microkde/kiconloader.h
index 68fec4e..2abb667 100644
--- a/microkde/kiconloader.h
+++ b/microkde/kiconloader.h
@@ -1,13 +1,13 @@
 #ifndef MINIKDE_KICONLOADER_H
 #define MINIKDE_KICONLOADER_H
 
 #include <qpixmap.h>
 #include <qstring.h>
 //US
-#include <qiconset.h>
+#include <qicon.h>
 
 class KIcon
 {
   public:
     enum Group { NoGroup=-1, Desktop=0, Toolbar, MainToolbar, Small,
                  Panel, LastGroup, User };
@@ -31,13 +31,13 @@ class KIconLoader
                      bool canReturnNull=false) const;
 
 //US    
     QString setIconPath( const QString &);
     QString iconPath( /*US const QString &, int */) const;
     QString iconPath( const QString &, int ) const;
-    QIconSet loadIconSet( const QString &name) const; 
+    QIcon loadIconSet( const QString &name) const; 
     
 //US to make this class usable for different applications, we have to add a iconpathvariable
   private:
     QString mIconpath;
 };
 
diff --git a/microkde/kio/kfile/kurlrequester.cpp b/microkde/kio/kfile/kurlrequester.cpp
index ca94570..ce62da7 100644
--- a/microkde/kio/kfile/kurlrequester.cpp
+++ b/microkde/kio/kfile/kurlrequester.cpp
@@ -24,12 +24,14 @@
 #include <unistd.h>
 #endif
 #include <qstring.h>
 //US #include <qtooltip.h>
 
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 //US #include <kaccel.h>
 //US #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kfiledialog.h>
@@ -179,22 +181,22 @@ KURLRequester::KURLRequester( QWidget *editWidget, QWidget *parent,
 
     init();
 }
 */
 
 KURLRequester::KURLRequester( QWidget *parent, const char *name )
-  : QHBox( parent, name )
+  : Q3HBox( parent, name )
 {
     d = new KURLRequesterPrivate;
     init();
 }
 
 
 KURLRequester::KURLRequester( const QString& url, QWidget *parent,
                               const char *name )
-  : QHBox( parent, name )
+  : Q3HBox( parent, name )
 {
     d = new KURLRequesterPrivate;
     init();
     setURL( url );
 }
 
@@ -213,14 +215,14 @@ void KURLRequester::init()
     myShowLocalProt = false;
     mPathIsDir = false;
     if (/*US !d->combo && */ !d->edit )
         d->edit = new KLineEdit( this, "KURLRequester::KLineEdit" );
 
     myButton = new KURLDragPushButton( this, "kfile button");
-    QIconSet iconSet = SmallIconSet("fileopen");
-    QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal );
+    QIcon iconSet = SmallIconSet("fileopen");
+    QPixmap pixMap = iconSet.pixmap( QIcon::Small, QIcon::Normal );
     myButton->setIconSet( iconSet );
     myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
 //US    QToolTip::add(myButton, i18n("Open file dialog"));
 
     connect( myButton, SIGNAL( pressed() ), SLOT( slotUpdateURL() ));
 
diff --git a/microkde/kio/kfile/kurlrequester.h b/microkde/kio/kfile/kurlrequester.h
index faa3326..5d4fa11 100644
--- a/microkde/kio/kfile/kurlrequester.h
+++ b/microkde/kio/kfile/kurlrequester.h
@@ -17,13 +17,13 @@
 */
 
 
 #ifndef KURLREQUESTER_H
 #define KURLREQUESTER_H
 
-#include <qhbox.h>
+#include <q3hbox.h>
 
 #include <keditlistbox.h>
 //US #include <kfile.h>
 //US #include <kpushbutton.h>
 #include <kurl.h>
 
@@ -50,13 +50,13 @@ class QTimer;
  *
  * You can change this behavior by using @ref setMode() or @ref setFilter().
  *
  * @short A widget to request a filename/url from the user
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KURLRequester : public QHBox
+class KURLRequester : public Q3HBox
 {
     Q_OBJECT
     Q_PROPERTY( QString url READ url WRITE setURL )
 
 public:
     /**
diff --git a/microkde/kio/kio/kdirwatch.cpp b/microkde/kio/kio/kdirwatch.cpp
index 1596d1f..5f07c54 100644
--- a/microkde/kio/kio/kdirwatch.cpp
+++ b/microkde/kio/kio/kdirwatch.cpp
@@ -49,17 +49,19 @@ $Id$
 #endif
 
 #include <sys/stat.h>
 #include <assert.h>
 #include <qdir.h>
 #include <qfile.h>
-#include <qintdict.h>
-#include <qptrlist.h>
+#include <q3intdict.h>
+#include <q3ptrlist.h>
 #include <qsocketnotifier.h>
 #include <qstringlist.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kconfigbase.h>
 #include <kglobal.h>
@@ -181,13 +183,13 @@ KDirWatchPrivate::KDirWatchPrivate()
   m_ref = 0;
 
 //US  KConfigGroup config(KGlobal::config(), QCString("DirWatch"));
 //US  m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000);
 //US  m_PollInterval = config.readNumEntry("PollInterval", 500);
   KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver( config, QCString("DirWatch") );
+  KConfigGroupSaver saver( config, Q3CString("DirWatch") );
   
   m_nfsPollInterval = config->readNumEntry("NFSPollInterval", 5000);
   m_PollInterval = config->readNumEntry("PollInterval", 500);
   
 
   QString available("Stat");
@@ -728,13 +730,13 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance,
 
 /* Called from KDirWatch destructor:
  * remove <instance> as client from all entries
  */
 void KDirWatchPrivate::removeEntries( KDirWatch* instance )
 {
-  QPtrList<Entry> list;
+  Q3PtrList<Entry> list;
   int minfreq = 3600000;
 
   // put all entries where instance is a client in list
   EntryMap::Iterator it = m_mapEntries.begin();
   for( ; it != m_mapEntries.end(); ++it ) {
     Client* c = (*it).m_clients.first();
@@ -1004,13 +1006,13 @@ void KDirWatchPrivate::slotRescan()
 
   // We delay deletions of entries this way.
   // removeDir(), when called in slotDirty(), can cause a crash otherwise
   delayRemove = true;
 
 #ifdef HAVE_DNOTIFY
-  QPtrList<Entry> dList, cList;
+  Q3PtrList<Entry> dList, cList;
 
   // for DNotify method,
   if (rescan_all)
   {
     // mark all as dirty
     it = m_mapEntries.begin();
diff --git a/microkde/kio/kio/kdirwatch_p.h b/microkde/kio/kio/kdirwatch_p.h
index 0ab482f..be74f2a 100644
--- a/microkde/kio/kio/kdirwatch_p.h
+++ b/microkde/kio/kio/kdirwatch_p.h
@@ -15,13 +15,13 @@ $Id$
 #define _KDIRWATCH_P_H
 
 #ifdef HAVE_FAM
 #include <fam.h>
 #endif
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kdirwatch.h>
 
 #include <ctime>
 
 #define invalid_ctime ((time_t)-1)
@@ -55,15 +55,15 @@ public:
     // the last observed link count
     int m_nlink; 
     entryStatus m_status;
     entryMode m_mode;
     bool isDir;
     // instances interested in events
-    QPtrList<Client> m_clients;
+    Q3PtrList<Client> m_clients;
     // nonexistent entries of this directory
-    QPtrList<Entry> m_entries;
+    Q3PtrList<Entry> m_entries;
     QString path;
 
     int msecLeft, freq;
 
     void addClient(KDirWatch*);
     void removeClient(KDirWatch*);
@@ -121,13 +121,13 @@ private:
   int statEntries;
   int m_nfsPollInterval, m_PollInterval;
   int m_ref;
   bool useStat(Entry*);
 
   bool delayRemove;
-  QPtrList<Entry> removeList;
+  Q3PtrList<Entry> removeList;
 
 #ifdef HAVE_FAM
   QSocketNotifier *sn;
   FAMConnection fc;
   bool use_fam;
 
@@ -138,13 +138,13 @@ private:
 #ifdef HAVE_DNOTIFY
   bool supports_dnotify;
   bool rescan_all;
   int mPipe[2];
   QTimer mTimer;
   QSocketNotifier *mSn;
-  QIntDict<Entry> fd_Entry;
+  Q3IntDict<Entry> fd_Entry;
 
   static void dnotify_handler(int, siginfo_t *si, void *);
   static void dnotify_sigio_handler(int, siginfo_t *si, void *);
   bool useDNotify(Entry*);
 #endif
 };
diff --git a/microkde/klineedit.h b/microkde/klineedit.h
index 70c72d1..9eb749d 100644
--- a/microkde/klineedit.h
+++ b/microkde/klineedit.h
@@ -1,10 +1,12 @@
 #ifndef MINIKDE_KLINEEDIT_H
 #define MINIKDE_KLINEEDIT_H
 
 #include <qlineedit.h>
+//Added by qt3to4:
+#include <QKeyEvent>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 
 
diff --git a/microkde/klineeditdlg.h b/microkde/klineeditdlg.h
index 68e9252..d0004cd 100644
--- a/microkde/klineeditdlg.h
+++ b/microkde/klineeditdlg.h
@@ -4,21 +4,23 @@
 #include "kdialogbase.h"
 #include <klineedit.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 class KLineEditDlg : public QDialog
 {
   public:
     KLineEditDlg( const QString & text, const QString & editText, QWidget *parent ) :
       QDialog( parent,"lineedit", true ) {
         QLabel* lab = new QLabel( text, this );
         mEdit = new KLineEdit( this );
-        QVBoxLayout* vl = new QVBoxLayout( this );
+        Q3VBoxLayout* vl = new Q3VBoxLayout( this );
         vl->setSpacing(5);
         vl->setMargin(7);
         vl->addWidget( lab );
         vl->addWidget( mEdit );
         mEdit->setText( editText );
         QPushButton * p = new QPushButton (" OK ", this );
diff --git a/microkde/kresources/configdialog.cpp b/microkde/kresources/configdialog.cpp
index 55253c0..4820faf 100644
--- a/microkde/kresources/configdialog.cpp
+++ b/microkde/kresources/configdialog.cpp
@@ -22,20 +22,23 @@
 */
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 
 #include <qcheckbox.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
 
 #include <kbuttonbox.h>
 #include <kdialog.h>
 #include <klineedit.h>
 
 #include "factory.h"
@@ -52,20 +55,20 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
 
   Factory *factory = Factory::self( resourceFamily );
 
 //US  resize( 250, 240 );
   resize( KMIN(KGlobal::getDesktopWidth(), 250), KMIN(KGlobal::getDesktopHeight(), 240));
 
-  QFrame *main;
+  Q3Frame *main;
 
   main = plainPage();
 
-  QVBoxLayout *mainLayout = new QVBoxLayout( main, 0, spacingHint() );
+  Q3VBoxLayout *mainLayout = new Q3VBoxLayout( main, 0, spacingHint() );
 
 
-  QGroupBox *generalGroupBox = new QGroupBox( 2, Qt::Horizontal, main );
+  Q3GroupBox *generalGroupBox = new Q3GroupBox( 2, Qt::Horizontal, main );
   generalGroupBox->layout()->setSpacing( spacingHint() );
   generalGroupBox->setTitle( i18n( "General Settings" ) );
 
   new QLabel( i18n( "Name:" ), generalGroupBox );
 
   mName = new KLineEdit( generalGroupBox );
@@ -79,13 +82,13 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
   mIncludeInSync->setChecked( mResource->includeInSync() );
 
   mName->setText( mResource->resourceName() );
 
   mainLayout->addWidget( generalGroupBox );
 
-  QGroupBox *resourceGroupBox = new QGroupBox( 2, Qt::Horizontal,  main );
+  Q3GroupBox *resourceGroupBox = new Q3GroupBox( 2, Qt::Horizontal,  main );
   resourceGroupBox->layout()->setSpacing( spacingHint());
   resourceGroupBox->setTitle( i18n( "%1 Resource Settings" )
                               .arg( factory->typeName( resource->type() ) ) );
   mainLayout->addWidget( resourceGroupBox );
 
   mainLayout->addStretch();
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index fc7a42e..1a9d063 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -25,21 +25,25 @@
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 
 #ifdef DESKTOP_VERSION
 #include <qinputdialog.h>
 #else
 #include <qtcompat/qinputdialog.h>
 #endif
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
@@ -58,17 +62,17 @@ $Id$
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <kglobal.h>
 
 using namespace KRES;
 
-class ConfigViewItem : public QCheckListItem
+class ConfigViewItem : public Q3CheckListItem
 {
   public:
-    ConfigViewItem( QListView *parent, Resource* resource ) :
-      QCheckListItem( parent, resource->resourceName(), CheckBox ),
+    ConfigViewItem( Q3ListView *parent, Resource* resource ) :
+      Q3CheckListItem( parent, resource->resourceName(), CheckBox ),
       mResource( resource ),
       mIsStandard( false )
     {
       setText( 1, mResource->type() );
       setOn( mResource->isActive() );
     }
@@ -94,19 +98,19 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
   : QWidget( parent, name ),
     mCurrentManager( 0 ),
     mCurrentConfig( 0 )
 {
   setCaption( i18n( "Resource Configuration" ) );
 
-  QVBoxLayout *mainLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *mainLayout = new Q3VBoxLayout( this );
 
-  QGroupBox *groupBox = new QGroupBox( i18n( "Resources" ), this );
+  Q3GroupBox *groupBox = new Q3GroupBox( i18n( "Resources" ), this );
   groupBox->setColumnLayout(0, Qt::Vertical );
   groupBox->layout()->setSpacing( 3 );
   groupBox->layout()->setMargin( 5 );
-  QGridLayout *groupBoxLayout = new QGridLayout( groupBox->layout(), 4, 2 );
+  Q3GridLayout *groupBoxLayout = new Q3GridLayout( groupBox->layout(), 4, 2 );
 
 //US  mFamilyCombo = new KComboBox( false, groupBox );
   mFamilyCombo = new KComboBox( groupBox );
   groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 );
 
   mListView = new KListView( groupBox );
@@ -142,27 +146,27 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
   mainLayout->addWidget( groupBox );
 
   connect( mFamilyCombo, SIGNAL( activated( int ) ),
            SLOT( slotFamilyChanged( int ) ) );
   connect( mListView, SIGNAL( selectionChanged() ),
            SLOT( slotSelectionChanged() ) );
-  connect( mListView, SIGNAL( clicked( QListViewItem * ) ),
-           SLOT( slotItemClicked( QListViewItem * ) ) );
+  connect( mListView, SIGNAL( clicked( Q3ListViewItem * ) ),
+           SLOT( slotItemClicked( Q3ListViewItem * ) ) );
 
   mLastItem = 0;
 
 //US  mConfig = new KConfig( "kcmkresourcesrc" );
   mConfig = new KConfig( locateLocal( "config", "kcmkresourcesrc")   );
   mConfig->setGroup( "General" );
 
   load();
 }
 
 ConfigPage::~ConfigPage()
 {
-  QValueList<ResourcePageInfo>::Iterator it;
+  Q3ValueList<ResourcePageInfo>::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) {
     (*it).mManager->removeListener( this );
     delete (*it).mManager;
     delete (*it).mConfig;
   }
 
@@ -227,13 +231,13 @@ void ConfigPage::load()
 }
 
 void ConfigPage::save()
 {
   saveResourceSettings();
 
-  QValueList<ResourcePageInfo>::Iterator it;
+  Q3ValueList<ResourcePageInfo>::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it )
     (*it).mManager->writeConfig( (*it).mConfig );
 
   emit changed( false );
 }
 
@@ -338,13 +342,13 @@ void ConfigPage::slotAdd()
     mLastItem = item;
 
     // if there are only read-only resources we'll set this resource
     // as standard resource
     if ( !resource->readOnly() ) {
       bool onlyReadOnly = true;
-      QListViewItem *it = mListView->firstChild();
+      Q3ListViewItem *it = mListView->firstChild();
       while ( it != 0 ) {
         ConfigViewItem *confIt = static_cast<ConfigViewItem*>( it );
         if ( !confIt->readOnly() && confIt != item )
           onlyReadOnly = false;
 
         it = it->itemBelow();
@@ -363,13 +367,13 @@ void ConfigPage::slotAdd()
 
 void ConfigPage::slotRemove()
 {
   if ( !mCurrentManager )
     return;
 
-  QListViewItem *item = mListView->currentItem();
+  Q3ListViewItem *item = mListView->currentItem();
   ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item );
 
   if ( !confItem )
     return;
 
   if ( confItem->standard() ) {
@@ -390,13 +394,13 @@ void ConfigPage::slotRemove()
 
 void ConfigPage::slotEdit()
 {
   if ( !mCurrentManager )
     return;
 
-  QListViewItem *item = mListView->currentItem();
+  Q3ListViewItem *item = mListView->currentItem();
   ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
   if ( !configItem )
     return;
 
   Resource *resource = configItem->resource();
 
@@ -432,13 +436,13 @@ void ConfigPage::slotStandard()
 
   if ( !item->isOn() ) {
     KMessageBox::sorry( this, i18n( "You cannot use an inactive<br>resource as standard!" ) );
     return;
   }
 
-  QListViewItem *it = mListView->firstChild();
+  Q3ListViewItem *it = mListView->firstChild();
   while ( it != 0 ) {
     ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it );
     if ( configItem->standard() )
       configItem->setStandard( false );
     it = it->itemBelow();
   }
@@ -479,13 +483,13 @@ void ConfigPage::resourceModified( Resource* resource )
 
 void ConfigPage::resourceDeleted( Resource* resource )
 {
   qDebug("ConfigPage::resourceDeleted  : %s", resource->resourceName().latin1());
 }
 
-void ConfigPage::slotItemClicked( QListViewItem *item )
+void ConfigPage::slotItemClicked( Q3ListViewItem *item )
 {
   ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item );
   if ( !configItem ) return;
 
   if ( configItem->standard() && !configItem->isOn() ) {
     KMessageBox::sorry( this, i18n( "You cannot deactivate the<br>standard resource. Choose<br>another standard resource first." ) );
@@ -501,13 +505,13 @@ void ConfigPage::slotItemClicked( QListViewItem *item )
 void ConfigPage::saveResourceSettings()
 {
     //qDebug("ConfigPage::saveResourceSettings() begin");
 
   if ( mCurrentManager ) {
 
-    QListViewItem *item = mListView->firstChild();
+    Q3ListViewItem *item = mListView->firstChild();
     while ( item ) {
       ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
 
       // check if standard resource
       if ( configItem->standard() && !configItem->readOnly() &&
            configItem->isOn() ) {
diff --git a/microkde/kresources/configpage.h b/microkde/kresources/configpage.h
index be9239e..dc1aa50 100644
--- a/microkde/kresources/configpage.h
+++ b/microkde/kresources/configpage.h
@@ -22,19 +22,21 @@
 
 #ifndef KRESOURCES_CONFIGPAGE_H
 #define KRESOURCES_CONFIGPAGE_H
 
 #include <qstringlist.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include "manager.h"
 
 class KComboBox;
 class KListView;
 
-class QListViewItem;
+class Q3ListViewItem;
 class QPushButton;
 
 
 namespace KRES {
 
 class ResourcePageInfo
@@ -70,35 +72,35 @@ class ConfigPage : public QWidget, public ManagerListener<Resource>
   public:
     virtual void resourceAdded( Resource* resource );
     virtual void resourceModified( Resource* resource );
     virtual void resourceDeleted( Resource* resource );
 
   protected slots:
-    void slotItemClicked( QListViewItem * );
+    void slotItemClicked( Q3ListViewItem * );
 
   signals:
     void changed( bool );
 
   private:
     void saveResourceSettings();
 
     Manager<Resource>* mCurrentManager;
     KConfig* mCurrentConfig;
     KConfig* mConfig;
     QString mFamily;
     QStringList mFamilyMap;
-    QValueList<ResourcePageInfo> mInfoMap;
+    Q3ValueList<ResourcePageInfo> mInfoMap;
 
     KComboBox* mFamilyCombo;
     KListView* mListView;
     QPushButton* mAddButton;
     QPushButton* mRemoveButton;
     QPushButton* mEditButton;
     QPushButton* mStandardButton;
 
-    QListViewItem* mLastItem;
+    Q3ListViewItem* mLastItem;
     static const QString syncfamily;
 };
 
 }
 
 #endif
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 86b22b2..4f286d1 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -38,23 +38,23 @@
 #include <file/resourcefile.h>
 #include <dir/resourcedir.h>
 #include <qtopia/resourceqtopia.h>
 #endif 
 using namespace KRES;
 
-QDict<Factory> *Factory::mSelves = 0;
-static KStaticDeleter< QDict<Factory> > staticDeleter;
+Q3Dict<Factory> *Factory::mSelves = 0;
+static KStaticDeleter< Q3Dict<Factory> > staticDeleter;
 
 Factory *Factory::self( const QString& resourceFamily)
 {
 
 
   Factory *factory = 0;
   if ( !mSelves )
   {
-    mSelves = staticDeleter.setObject( new QDict<Factory> );
+    mSelves = staticDeleter.setObject( new Q3Dict<Factory> );
   }
 
   factory = mSelves->find( resourceFamily );
 
   if ( !factory ) {
     factory = new Factory( resourceFamily);
diff --git a/microkde/kresources/factory.h b/microkde/kresources/factory.h
index ea01b23..709fde0 100644
--- a/microkde/kresources/factory.h
+++ b/microkde/kresources/factory.h
@@ -21,13 +21,13 @@
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KRESOURCES_FACTORY_H
 #define KRESOURCES_FACTORY_H
 
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 
 #include <kconfig.h>
 
 
 #include "resource.h"
@@ -111,13 +111,13 @@ class Factory
     QString typeDescription( const QString &type ) const;
 
   protected:
     Factory( const QString& resourceFamily);
 
   private:
-    static QDict<Factory> *mSelves;
+    static Q3Dict<Factory> *mSelves;
 
     QString mResourceFamily;
 //US    QMap<QString, KService::Ptr> mTypeMap;
 //US lets store the pluginfo struct as value instead of a KService
     QMap<QString, PluginInfo*> mTypeMap;
 };
diff --git a/microkde/kresources/kcmkresources.cpp b/microkde/kresources/kcmkresources.cpp
index d600a31..f5eb826 100644
--- a/microkde/kresources/kcmkresources.cpp
+++ b/microkde/kresources/kcmkresources.cpp
@@ -17,12 +17,15 @@
     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 <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
 
 //US #include <kaboutdata.h>
 //US #include <kgenericfactory.h>
 #include <klocale.h>
 
 #include "configpage.h"
@@ -37,15 +40,15 @@ using namespace KRES;
 //US KCMKResources::KCMKResources( QWidget *parent, const char *name, const QStringList& )
 //US  : KCModule( ResourcesFactory::instance(), parent, name )
 KCMKResources::KCMKResources( QWidget *parent, const char *name, const QStringList& )
   : KDialogBase( parent, name, true, i18n( "Configure Resources" ),
     Ok|Cancel, Ok, true )
 {
-  QFrame *main = plainPage();
+  Q3Frame *main = plainPage();
 
-  QVBoxLayout *layout = new QVBoxLayout( main );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( main );
   mConfigPage = new KRES::ConfigPage( main );
   layout->addWidget( mConfigPage );
 
 
   connect( mConfigPage, SIGNAL( changed( bool ) ), SLOT( changed( bool ) ) );
 #ifndef DESKTOP_VERSION
diff --git a/microkde/kresources/manager.h b/microkde/kresources/manager.h
index 69062da..88705d4 100644
--- a/microkde/kresources/manager.h
+++ b/microkde/kresources/manager.h
@@ -29,14 +29,16 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KRESOURCES_MANAGER_H
 #define KRESOURCES_MANAGER_H
 
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include "factory.h"
 #include "managerimpl.h"
 
 namespace KRES {
 
@@ -172,13 +174,13 @@ class Manager : private ManagerImplListener
       mFactory = Factory::self( family );
       // The managerimpl will use the same Factory object as the manager
       // because of the Factory::self() pattern
       mImpl = new ManagerImpl( family );
       mImpl->setListener( this );
 
-      mListeners = new QPtrList<ManagerListener<T> >;
+      mListeners = new Q3PtrList<ManagerListener<T> >;
     }
 
     virtual ~Manager()
     {
       mImpl->setListener( 0 );
       delete mListeners;
@@ -327,12 +329,12 @@ class Manager : private ManagerImplListener
       }
     }
 
   private:
     ManagerImpl *mImpl;
     Factory *mFactory;
-    QPtrList<ManagerListener<T> > *mListeners;
+    Q3PtrList<ManagerListener<T> > *mListeners;
 };
 
 }
 
 #endif
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index a6d2007..4c0751c 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -32,12 +32,14 @@ $Id$
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include "resource.h"
 #include "factory.h"
 #include "managerimpl.h"
 
 
@@ -229,26 +231,26 @@ QStringList ManagerImpl::resourceNames()
 
 Resource::List *ManagerImpl::resourceList()
 {
   return &mResources;
 }
 
-QPtrList<Resource> ManagerImpl::resources()
+Q3PtrList<Resource> ManagerImpl::resources()
 {
-  QPtrList<Resource> result;
+  Q3PtrList<Resource> result;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     result.append( *it );
   }
   return result;
 }
 
-QPtrList<Resource> ManagerImpl::resources( bool active )
+Q3PtrList<Resource> ManagerImpl::resources( bool active )
 {
-  QPtrList<Resource> result;
+  Q3PtrList<Resource> result;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     if ( (*it)->isActive() == active ) {
       result.append( *it );
     }
diff --git a/microkde/kresources/managerimpl.h b/microkde/kresources/managerimpl.h
index 56a2db6..1f728e5 100644
--- a/microkde/kresources/managerimpl.h
+++ b/microkde/kresources/managerimpl.h
@@ -29,14 +29,14 @@ $Id$
 */
 
 #ifndef KRESOURCES_MANAGERIMPL_H
 #define KRESOURCES_MANAGERIMPL_H
 
 #include <qstring.h>
-#include <qptrlist.h>
-#include <qdict.h>
+#include <q3ptrlist.h>
+#include <q3dict.h>
 //US
 #include <qobject.h>
 
 #include "resource.h"
 
 
@@ -78,16 +78,16 @@ class ManagerImpl : public QObject
     void setStandardResource( Resource *resource );
 
     void setActive( Resource *resource, bool active );
 
     Resource::List *resourceList();
 
-    QPtrList<Resource> resources();
+    Q3PtrList<Resource> resources();
 
     // Get only active or passive resources
-    QPtrList<Resource> resources( bool active );
+    Q3PtrList<Resource> resources( bool active );
 
     QStringList resourceNames();
 
     void setListener( ManagerImplListener *listener );
 
   public slots:
diff --git a/microkde/kresources/resource.h b/microkde/kresources/resource.h
index ed5af96..1f9527c 100644
--- a/microkde/kresources/resource.h
+++ b/microkde/kresources/resource.h
@@ -25,13 +25,13 @@
 
 //US
 #ifdef QT_THREAD_SUPPORT
 #include <qmutex.h>
 #endif //QT_THREAD_SUPPORT
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qwidget.h>
 
 #include <qobject.h>
 
 #include <klibloader.h>
 
@@ -236,13 +236,13 @@ k * @ref writeConfig method.
    */
 class Resource : public QObject
 {
   Q_OBJECT
 
   public:
-    typedef QValueList<Resource *> List;
+    typedef Q3ValueList<Resource *> List;
 
     /**
      * Constructor. Construct resource from config.
      * @param config Configuration to read persistence information from.
      *               If config==0, create object using default settings.
      */
diff --git a/microkde/kresources/selectdialog.cpp b/microkde/kresources/selectdialog.cpp
index fba8648..d5b83e9 100644
--- a/microkde/kresources/selectdialog.cpp
+++ b/microkde/kresources/selectdialog.cpp
@@ -31,52 +31,56 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
 //US
 #include <kglobal.h>
 
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qlayout.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3PtrList>
 
 #include "resource.h"
 
 #include "selectdialog.h"
 
 using namespace KRES;
 
 //US I am using KBaseDialog instead of KDialog
 //US  : KDialog( parent, name, true )
-SelectDialog::SelectDialog( QPtrList<Resource> list, QWidget *parent,
+SelectDialog::SelectDialog( Q3PtrList<Resource> list, QWidget *parent,
                             const char *name )
   : KDialogBase( parent, name, true, i18n( "Resource Selection" ), Help | Ok | Cancel,
                  Ok, true)
 
 {
 //US  setCaption( i18n( "Resource Selection" ) );
 //US  resize( 300, 200 );
   resize( KMIN(KGlobal::getDesktopWidth(), 300), KMIN(KGlobal::getDesktopHeight(), 200) );
 
 //US  
-  QFrame *main = plainPage();
+  Q3Frame *main = plainPage();
 /*US
   QVBoxLayout *layout = new QVBoxLayout( main );
   mConfigPage = new KRES::ConfigPage( main );
   layout->addWidget( mConfigPage );
 */
 
 //US  QVBoxLayout *mainLayout = new QVBoxLayout( this );
-  QVBoxLayout *mainLayout = new QVBoxLayout( main );
+  Q3VBoxLayout *mainLayout = new Q3VBoxLayout( main );
   mainLayout->setMargin( marginHint() );
     
 //US  QGroupBox *groupBox = new QGroupBox( 2, Qt::Horizontal,  this );
-  QGroupBox *groupBox = new QGroupBox( 2, Qt::Horizontal,  main );
+  Q3GroupBox *groupBox = new Q3GroupBox( 2, Qt::Horizontal,  main );
   groupBox->setTitle( i18n( "Resources" ) );
 
 //US  mResourceId = new KListBox( groupBox );
-  mResourceId = new QListBox( groupBox );
+  mResourceId = new Q3ListBox( groupBox );
 
   mainLayout->addWidget( groupBox );
 
   mainLayout->addSpacing( 40 );
 
 /*US 
@@ -98,25 +102,25 @@ SelectDialog::SelectDialog( QPtrList<Resource> list, QWidget *parent,
       mResourceId->insertItem( resource->resourceName() );
       counter++;
     }
   }
 
   mResourceId->setCurrentItem( 0 );
-  connect( mResourceId, SIGNAL(returnPressed(QListBoxItem*)), 
+  connect( mResourceId, SIGNAL(returnPressed(Q3ListBoxItem*)), 
            SLOT(accept()) );
 }
 
 Resource *SelectDialog::resource()
 {
   if ( mResourceId->currentItem() != -1 )
     return mResourceMap[ mResourceId->currentItem() ];
   else
     return 0;
 }
 
-Resource *SelectDialog::getResource( QPtrList<Resource> list, QWidget *parent )
+Resource *SelectDialog::getResource( Q3PtrList<Resource> list, QWidget *parent )
 {
   if ( list.count() == 0 ) {
     KMessageBox::error( parent, i18n( "There is no resource available!" ) );
     return 0;
   }
 
diff --git a/microkde/kresources/selectdialog.h b/microkde/kresources/selectdialog.h
index 7026212..be5152b 100644
--- a/microkde/kresources/selectdialog.h
+++ b/microkde/kresources/selectdialog.h
@@ -22,19 +22,19 @@
 */
 
 #ifndef KRESOURCES_SELECTDIALOG_H
 #define KRESOURCES_SELECTDIALOG_H
 
 #include <qobject.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qmap.h>
 
 #include <kdialogbase.h>
 
 //US class KListBox;
-class QListBox;
+class Q3ListBox;
 
 namespace KRES {
 
 class Resource;
 
 /**
@@ -59,13 +59,13 @@ class SelectDialog : KDialogBase
     /**
      * Constructor.
      * @param ab     The address book you want to select the resource from
      * @param parent The parent widget
      * @param name   The name of the dialog
      */
-    SelectDialog( QPtrList<Resource> list, QWidget *parent = 0,
+    SelectDialog( Q3PtrList<Resource> list, QWidget *parent = 0,
         const char *name = 0);
 
   //  ~SelectDialog();
 
     /**
      * Return selected resource.
@@ -73,17 +73,17 @@ class SelectDialog : KDialogBase
     Resource *resource();
 
     /**
      * Open a dialog showing the available resources and return the resource the
      * user has selected. Returns 0, if the dialog was canceled.
      */
-    static Resource *getResource( QPtrList<Resource> list, QWidget *parent = 0 );
+    static Resource *getResource( Q3PtrList<Resource> list, QWidget *parent = 0 );
 
   private:
 //US    KListBox *mResourceId;
-    QListBox *mResourceId;
+    Q3ListBox *mResourceId;
 
     QMap<int, Resource*> mResourceMap;
 };
 
 
 
diff --git a/microkde/ksystemtray.cpp b/microkde/ksystemtray.cpp
index 4f81d02..0d0045f 100644
--- a/microkde/ksystemtray.cpp
+++ b/microkde/ksystemtray.cpp
@@ -1,7 +1,10 @@
 #include "ksystemtray.h"
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QLabel>
 
 void KSystemTray::mousePressEvent( QMouseEvent *)
 {
    ; //qDebug("hallo");
 }
 
diff --git a/microkde/ksystemtray.h b/microkde/ksystemtray.h
index f3e4f6a..6708c86 100644
--- a/microkde/ksystemtray.h
+++ b/microkde/ksystemtray.h
@@ -1,10 +1,12 @@
 #ifndef MICROKDE_KSYSTEMTRAY_H
 #define MICROKDE_KSYSTEMTRAY_H
 
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QMouseEvent>
 
 class KSystemTray : public QLabel
 { 
     Q_OBJECT
   public:
     KSystemTray( QWidget *parent = 0 );
diff --git a/microkde/ktempfile.cpp b/microkde/ktempfile.cpp
index b9166bd..d61d22e 100644
--- a/microkde/ktempfile.cpp
+++ b/microkde/ktempfile.cpp
@@ -1,7 +1,7 @@
-#include <qtextstream.h>
+#include <q3textstream.h>
 
 #include "ktempfile.h"
 
 KTempFile::KTempFile()
 {
 }
@@ -16,10 +16,10 @@ void KTempFile::setAutoDelete( bool )
 
 QString KTempFile::name()
 {
   return QString::null;
 }
 
-QTextStream *KTempFile::textStream()
+Q3TextStream *KTempFile::textStream()
 {
   return 0;
 }
diff --git a/microkde/ktempfile.h b/microkde/ktempfile.h
index 20dfa82..1ac7258 100644
--- a/microkde/ktempfile.h
+++ b/microkde/ktempfile.h
@@ -1,20 +1,20 @@
 #ifndef MINIKDE_KTEMPFILE_H
 #define MINIKDE_KTEMPFILE_H
 
 #include <qstring.h>
 
-class QTextStream;
+class Q3TextStream;
 
 class KTempFile
 {
   public:
     KTempFile();
     KTempFile( const QString &filename, const QString &extension );
   
     void setAutoDelete( bool );
     QString name();
     
-    QTextStream *textStream();
+    Q3TextStream *textStream();
 };
 
 #endif
diff --git a/microkde/ktextedit.cpp b/microkde/ktextedit.cpp
index 4dd6875..d74706b 100644
--- a/microkde/ktextedit.cpp
+++ b/microkde/ktextedit.cpp
@@ -1,53 +1,55 @@
 
 #include <ktextedit.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
+//Added by qt3to4:
+#include <QMouseEvent>
 #endif
 
 
-KTextEdit::KTextEdit ( QWidget *parent ) : QMultiLineEdit( parent ) 
+KTextEdit::KTextEdit ( QWidget *parent ) : Q3MultiLineEdit( parent ) 
 {
     mAllowPopupMenu = false; 
     mMouseDown = false; 
     mIgnoreMark = false; 
 #ifndef DESKTOP_VERSION 
     QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 #endif 
 }
 
 void KTextEdit::mousePressEvent(QMouseEvent *e)
 {
-    if (  e->button() == LeftButton ) {
+    if (  e->button() == Qt::LeftButton ) {
         mAllowPopupMenu = true;
         mYMousePos = mapToGlobal( (e->pos())).y();
         mXMousePos = mapToGlobal( (e->pos())).x();
     }
-     if (  e->button() == RightButton &&  !mAllowPopupMenu   )
+     if (  e->button() == Qt::RightButton &&  !mAllowPopupMenu   )
       return;
-    if (  e->button() == LeftButton ) {
+    if (  e->button() == Qt::LeftButton ) {
         if ( hasMarkedText () )
             mIgnoreMark = !mIgnoreMark;
         if ( mIgnoreMark && hasMarkedText () ) {
             mMouseDown = false;
             return ;
         }
     }
-    QMultiLineEdit::mousePressEvent( e );
+    Q3MultiLineEdit::mousePressEvent( e );
 }
 
 void KTextEdit::mouseReleaseEvent(QMouseEvent *e)
 {
-    QMultiLineEdit::mouseReleaseEvent(e);
+    Q3MultiLineEdit::mouseReleaseEvent(e);
 }
 
 void KTextEdit::mouseMoveEvent(QMouseEvent *e)
 {
     int diff = mYMousePos - mapToGlobal( (e->pos())).y();
     if ( diff < 0 ) diff = -diff;
     int diff2 = mXMousePos - mapToGlobal( (e->pos())).x();
     if ( diff2 < 0 ) diff2 = -diff2;
     if ( diff+ diff2 > 20 )
         mAllowPopupMenu = false;
-    QMultiLineEdit::mouseMoveEvent(e);
+    Q3MultiLineEdit::mouseMoveEvent(e);
 }
 
diff --git a/microkde/ktextedit.h b/microkde/ktextedit.h
index 87c0602..b7c8924 100644
--- a/microkde/ktextedit.h
+++ b/microkde/ktextedit.h
@@ -1,12 +1,14 @@
 #ifndef MICROKDE_KTEXTEDIT_H
 #define MICROKDE_KTEXTEDIT_H
 
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
+//Added by qt3to4:
+#include <QMouseEvent>
 
-class KTextEdit : public QMultiLineEdit
+class KTextEdit : public Q3MultiLineEdit
 {
   public:
     KTextEdit( QWidget *parent )  ;
     void setIgnoreMark( bool b ) { mIgnoreMark = b; }
 
  private:
diff --git a/microkde/kurl.cpp b/microkde/kurl.cpp
index 2574e25..122ad71 100644
--- a/microkde/kurl.cpp
+++ b/microkde/kurl.cpp
@@ -31,19 +31,21 @@
 #include <stdlib.h>
 #ifdef _WIN32_
 
 #else
 #include <unistd.h>
 #endif
-#include <qurl.h>
+#include <q3url.h>
 #include <qdir.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 //US#include <qstylesheet.h>
 #include <qmap.h>
 #include <qtextcodec.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 static const QString fileProt = "file";
 
 static QTextCodec * codecForHint( int encoding_hint /* not 0 ! */ )
 {
     return QTextCodec::codecForMib( encoding_hint );
@@ -54,13 +56,13 @@ static QString encode( const QString& segment, bool encode_slash, int encoding_h
   const char *encode_string;
   if (encode_slash)
     encode_string = "<>#@\"&%?={}|^~[]\'`\\:+/";
   else
     encode_string = "<>#@\"&%?={}|^~[]\'`\\:+";
 
-  QCString local;
+  Q3CString local;
   if (encoding_hint==0)
     local = segment.local8Bit();
   else
   {
       QTextCodec * textCodec = codecForHint( encoding_hint );
       if (!textCodec)
@@ -97,13 +99,13 @@ static QString encode( const QString& segment, bool encode_slash, int encoding_h
       c = character % 16;
       c += (c > 9) ? ('A' - 10) : '0';
       new_segment[ new_length++ ] = c;
 
     }
     else
-      new_segment[ new_length++ ] = local[i];
+      new_segment[ new_length++ ] = character;
   }
 
   QString result = QString(new_segment, new_length);
   delete [] new_segment;
   return result;
 }
@@ -202,13 +204,13 @@ static void decode( const QString& segment, QString &decoded, QString &encoded,
   if (encoding_hint)
       textCodec = codecForHint( encoding_hint );
 
   if (!textCodec)
       textCodec = QTextCodec::codecForLocale();
 
-  QCString csegment = textCodec->fromUnicode(segment);
+  Q3CString csegment = textCodec->fromUnicode(segment);
   // Check if everything went ok
   if (textCodec->toUnicode(csegment) != segment)
   {
       // Uh oh
       textCodec = codecForHint( 106 ); // Fall back to utf-8
       csegment = textCodec->fromUnicode(segment);
@@ -275,13 +277,13 @@ static void decode( const QString& segment, QString &decoded, QString &encoded,
   if (updateDecoded)
   {
      QByteArray array;
      array.setRawData(new_segment, new_length);
      decoded = textCodec->toUnicode( array, new_length );
      array.resetRawData(new_segment, new_length);
-     QCString validate = textCodec->fromUnicode(decoded);
+     Q3CString validate = textCodec->fromUnicode(decoded);
 
      if (strcmp(validate.data(), new_segment) != 0)
      {
         decoded = QString::fromLocal8Bit(new_segment, new_length);
      }
   }
@@ -416,13 +418,13 @@ KURL::KURL( const QString &url, int encoding_hint )
 KURL::KURL( const char * url, int encoding_hint )
 {
   reset();
   parse( QString::fromLatin1(url), encoding_hint );
 }
 
-KURL::KURL( const QCString& url, int encoding_hint )
+KURL::KURL( const Q3CString& url, int encoding_hint )
 {
   reset();
   parse( QString::fromLatin1(url), encoding_hint );
 }
 
 KURL::KURL( const KURL& _u )
@@ -457,13 +459,13 @@ QDataStream & operator>> (QDataStream & s, KURL & a)
       a.m_strQuery_encoded = QueryFromWire.mid(1);
 
     return s;
 }
 
 #ifndef QT_NO_NETWORKPROTOCOL
-KURL::KURL( const QUrl &u )
+KURL::KURL( const Q3Url &u )
 {
   *this = u;
 }
 #endif
 
 KURL::KURL( const KURL& _u, const QString& _rel_url, int encoding_hint )
@@ -586,19 +588,19 @@ void KURL::parse( const QString& _url, int encoding_hint )
   uint pos = 0;
 
   // Node 1: Accept alpha or slash
   QChar x = buf[pos++];
   if ( x == '/' )
     goto Node9;
-  if ( !isalpha( (int)x ) )
+  if ( !x.isLetter() )
     goto NodeErr;
 
   // Node 2: Accept any amount of (alpha|digit|'+'|'-')
   // '.' is not currently accepted, because current KURL may be confused.
   // Proceed with :// :/ or :
-  while( pos < len && (isalpha((int)buf[pos]) || isdigit((int)buf[pos]) ||
+  while( pos < len && ( buf[pos].isLetter() || buf[pos].isDigit() ||
           buf[pos] == '+' || buf[pos] == '-')) pos++;
 
   if ( pos+2 < len && buf[pos] == ':' && buf[pos+1] == '/' && buf[pos+2] == '/' )
     {
       m_strProtocol = QString( orig, pos ).lower();
       pos += 3;
@@ -766,17 +768,17 @@ void KURL::parse( const QString& _url, int encoding_hint )
   pos++;
 
   // Node 8a: Accept at least one digit
   if ( pos == len )
     goto NodeErr;
   start = pos;
-  if ( !isdigit( buf[pos++] ) )
+  if ( !buf[pos++].isDigit() )
     goto NodeErr;
 
   // Node 8b: Accept any amount of digits
-  while( pos < len && isdigit( buf[pos] ) ) pos++;
+  while( pos < len && buf[pos].isDigit() ) pos++;
   port = QString( buf + start, pos - start );
   m_iPort = port.toUShort();
   if ( pos == len )
     goto NodeOk;
   start = pos++;
 
@@ -845,13 +847,13 @@ KURL& KURL::operator=( const char * _url )
   parse( QString::fromLatin1(_url) );
 
   return *this;
 }
 
 #ifndef QT_NO_NETWORKPROTOCOL
-KURL& KURL::operator=( const QUrl & u )
+KURL& KURL::operator=( const Q3Url & u )
 {
   m_strProtocol = u.protocol();
   m_strUser = u.user();
   m_strPass = u.password();
   m_strHost = u.host();
   m_strPath = u.path( FALSE );
@@ -1371,13 +1373,13 @@ KURL KURL::join( const KURL::List & lst )
   KURL::List::ConstIterator first = lst.fromLast();
   for( KURL::List::ConstIterator it = first; it != lst.end(); --it )
   {
      KURL u(*it);
      if (it != first)
      {
-        if (!u.m_strRef_encoded) u.m_strRef_encoded = tmp.url();
+        if (u.m_strRef_encoded.isEmpty()) u.m_strRef_encoded = tmp.url();
         else u.m_strRef_encoded += "#" + tmp.url(); // Support more than one suburl thingy
      }
      tmp = u;
   }
 
   return tmp;
@@ -1415,13 +1417,13 @@ QString KURL::fileName( bool _strip_trailing_slash ) const
   {
      // This is hairy, we need the last unencoded slash.
      // Count in the encoded string how many encoded slashes follow the last
      // unencoded one.
      int i = m_strPath_encoded.findRev( '/', len - 1 );
      QString fileName_encoded = m_strPath_encoded.mid(i+1);
-     n += fileName_encoded.contains("%2f", false);
+     n += fileName_encoded.count("%2f", Qt::CaseInsensitive);
   }
   int i = len;
   do {
     i = path.findRev( '/', i - 1 );
   }
   while (--n && (i > 0));
diff --git a/microkde/kurl.h b/microkde/kurl.h
index cd65a1c..016eb24 100644
--- a/microkde/kurl.h
+++ b/microkde/kurl.h
@@ -18,15 +18,17 @@
  **/
 
 #ifndef __kurl_h__
 #define __kurl_h__ "$Id$"
 
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
-class QUrl;
+class Q3Url;
 class QStringList;
 template <typename K, typename V> class QMap;
 
 class KURLPrivate;
 /**
  * Represents and parses a URL.
@@ -61,13 +63,13 @@ public:
   /**
    * KURL::List is a QValueList that contains KURLs with a few
    * convenience methods.
    * @see KURL
    * @see QValueList
    */
-  class List : public QValueList<KURL>
+  class List : public Q3ValueList<KURL>
   {
   public:
     /**
      * Creates an empty List.
      */
       List() { }
@@ -132,23 +134,23 @@ public:
    * then URL, in its encoded form, is strictly ascii.
    * @param url A encoded URL. If the URL does not have a protocol part,
    *            "file:" is assumed.
    * @param encoding_hint MIB of original encoding of URL.
    * @see QTextCodec::mibEnum()
    */
-  KURL( const QCString& url, int encoding_hint = 0 );
+  KURL( const Q3CString& url, int encoding_hint = 0 );
   /**
    * Copy constructor.
    * @param u the KURL to copy
    */
   KURL( const KURL& u );
   /**
    * Converts from a @ref QUrl.
    * @param u the QUrl
    */
-  KURL( const QUrl &u );
+  KURL( const Q3Url &u );
   /**
    * Constructor allowing relative URLs.
    *
    * @param _baseurl The base url.
    * @param _rel_url A relative or absolute URL.
    * If this is an absolute URL then @p _baseurl will be ignored.
@@ -655,13 +657,13 @@ public:
    */
   KURL upURL( ) const;
 
   KURL& operator=( const KURL& _u );
   KURL& operator=( const QString& _url );
   KURL& operator=( const char * _url );
-  KURL& operator=( const QUrl & u );
+  KURL& operator=( const Q3Url & u );
 
   bool operator==( const KURL& _u ) const;
   bool operator==( const QString& _u ) const;
   bool operator!=( const KURL& _u ) const { return !( *this == _u ); }
   bool operator!=( const QString& _u ) const { return !( *this == _u ); }
 
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index 9c87682..88f17e5 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -16,16 +16,18 @@
    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 <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qcursor.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -70,13 +72,13 @@ KCMultiDialog::~KCMultiDialog()
 
 void KCMultiDialog::slotDefault()
 {
 
     int curPageIndex = activePageIndex();
 
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
     {
        if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
        {
           (*it)->defaults();
           clientChanged(true);
@@ -88,13 +90,13 @@ void KCMultiDialog::slotDefault()
 void KCMultiDialog::accept()
 {
     slotOk();
 }
 void KCMultiDialog::slotApply()
 {
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
       (*it)->save();
     clientChanged(false);
 
     emit applyClicked();
 
@@ -102,13 +104,13 @@ void KCMultiDialog::slotApply()
 
 
 void KCMultiDialog::slotOk()
 {
 qDebug("KCMultiDialog::slotOk clicked");
 
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
       (*it)->save();
     QDialog::accept();
 
     emit okClicked();
 }
@@ -150,15 +152,15 @@ void KCMultiDialog::addModule(const QString& path, bool withfallback)
     }
     moduleDict.insert(page, new LoadInfo(path, withfallback));
     if (modules.isEmpty())
        slotAboutToShow(page);
 }
 */
-QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename )
+Q3VBox * KCMultiDialog::getNewVBoxPage( const QString & modulename )
 {
-    QVBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() );
+    Q3VBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() );
     return page;
 
 }
 //US special method for microkde. We dop noty want to load everything dynamically.
 void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname)
 {
diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h
index 66412ac..78f8a00 100644
--- a/microkde/kutils/kcmultidialog.h
+++ b/microkde/kutils/kcmultidialog.h
@@ -19,14 +19,14 @@
 
 */
 
 #ifndef KCMULTIDIALOG_H
 #define KCMULTIDIALOG_H
 
-#include <qptrlist.h>
-#include <qptrdict.h>
+#include <q3ptrlist.h>
+#include <q3ptrdict.h>
 
 #include <kdialogbase.h>
 #include <kjanuswidget.h>
 #include <kcmodule.h>
 
 /**
@@ -72,13 +72,13 @@ public:
      **/
 //US    void addModule(const QString& module, bool withfallback=true);
 
 
 //US special method for microkde. We do not want to load everything dynamically.
    void addModule(KCModule* module );//, const QString& modulename, const QString& iconname);
-    QVBox* getNewVBoxPage(const QString & modulename) ;
+    Q3VBox* getNewVBoxPage(const QString & modulename) ;
 
 
     bool showPage( int index );
     int activePageIndex() const;
     int pageIndex( QWidget *widget ) const;
 
@@ -130,13 +130,13 @@ private:
          : path(_path), withfallback(_withfallback)
          { }
       QString path;
       bool withfallback;
     };
 */
-    QPtrList<KCModule> modules;
+    Q3PtrList<KCModule> modules;
 /*
     QPtrDict<LoadInfo> moduleDict;
     QString _docPath;
 */
     QString _baseGroup;
 
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 7120bdd..4ff06a3 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -3,13 +3,13 @@ CONFIG		+= qt warn_on
 include( ../variables.pri )
 #INCLUDEPATH     += $(QTDIR)/include .
 #DEPENDPATH      += $(QTDIR)/include
 INCLUDEPATH     += .  ../  ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
 #LIBS            += -lqtcompat
 
-        TARGET  = microkde
+        TARGET  = xmicrokde
 DESTDIR= ../bin
 DEFINES += DESKTOP_VERSION KDE_QT_ONLY
 unix : {
 staticlib: {
 INCLUDEPATH += ../kabc/plugins
 DEFINES += STATIC_RESOURCES
@@ -175,6 +175,8 @@ KDGanttMinimizeSplitter.cpp \
  kdeui/ktoolbarhandler.cpp \
  kdeui/kstdaction.cpp \
  kdeui/kxmlguiclient.cpp \
  kdecore/kprefs.cpp \
  kdecore/klibloader.cpp \
  kidmanager.cpp 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 8fe2bd5..514e7b3 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -4,13 +4,13 @@ INCLUDEPATH     += . .. $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui ki
 
 DEPENDPATH      += $(QPEDIR)/include
 LIBS            += -lmicroqtcompat -L$(QPEDIR)/lib
 
 DEFINES += KDE_QT_ONLY
 
-        TARGET  = microkde
+        TARGET  = xmicrokde
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/lib
 
 
 INTERFACES = \
diff --git a/microkde/ofileselector_p.cpp b/microkde/ofileselector_p.cpp
index f4f112e..0f95c84 100644
--- a/microkde/ofileselector_p.cpp
+++ b/microkde/ofileselector_p.cpp
@@ -262,13 +262,13 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
             selector(), SIGNAL(closeMe() ) );
 
     btn = new QToolButton( box );
     btn->setIconSet( Resource::loadPixmap("cardmon/pcmcia") );
 
     /* let's fill device parts */
-    QPopupMenu* pop = new QPopupMenu(this);
+    Q3PopupMenu* pop = new Q3PopupMenu(this);
     connect(pop, SIGNAL( activated(int) ),
             this, SLOT(slotFSActivated(int) ) );
 
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it(fs);
diff --git a/microkde/ofileselector_p.h b/microkde/ofileselector_p.h
index 834fd70..a7d97fe 100644
--- a/microkde/ofileselector_p.h
+++ b/microkde/ofileselector_p.h
@@ -134,13 +134,13 @@ protected:
     OFileSelector* selector();
 
 private:
     QMap<QString, QString> m_dev;
     bool m_all : 1;
     OFileSelector* m_sel;
-    QPopupMenu* m_fsPop;
+    Q3PopupMenu* m_fsPop;
     bool compliesMime( const QString& );
     QStringList m_mimes; // used in compy mime
     QString m_currentDir;
     QToolButton *m_btnNew, *m_btnClose;
     void connectSlots();
     void addFile( QFileInfo* info, bool symlink = FALSE );
diff --git a/microkde/qlayoutengine_p.h b/microkde/qlayoutengine_p.h
index 2d6a556..e782703 100644
--- a/microkde/qlayoutengine_p.h
+++ b/microkde/qlayoutengine_p.h
@@ -1,6 +1,8 @@
+//Added by qt3to4:
+#include <Q3MemArray>
 // THIS IS A COPY OF THE FILE FOUND IN $QTDIR/src/kernel. Needed to modify qsplitter
 
 /****************************************************************************
 ** $Id$
 **
 ** Internal header file.
@@ -52,16 +54,12 @@
 //
 // We mean it.
 //
 //
 
 
-#ifndef QT_H
-#include "qabstractlayout.h"
-#endif // QT_H
-
 #ifndef QT_NO_LAYOUT
 struct QLayoutStruct
 {
     void initParameters() { minimumSize = sizeHint = 0;
     maximumSize = QWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
     void init() { stretch = 0; initParameters(); }
@@ -78,13 +76,13 @@ struct QLayoutStruct
     //result:
     int pos;
     int size;
 };
 
 
-void qGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos,
+void qGeomCalc( Q3MemArray<QLayoutStruct> &chain, int start, int count, int pos,
                       int space, int spacer );
 
 
 
 /*
   Modify total maximum (max) and total expansion (exp)