initial public commit of qt4 portp1

author: Michael Krelin <hacker@klever.net> 2007-07-04 11:23:42 (UTC)
committer: Michael Krelin <hacker@klever.net> 2007-07-04 11:23:42 (UTC)
commit: a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff)
tree: 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /microkde
parent: 11edc920afe4f274c0964436633aa632c8288a40 (diff)
download: kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip
kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz
kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2
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
@@ -38,21 +38,30 @@
 #include "qdrawutil.h"
 #include "qbitmap.h" 
 #if QT_VERSION >= 0x030000
-#include "qptrlist.h"
+#include "q3ptrlist.h"
-#include "qmemarray.h"
+#include "q3memarray.h"
 #else
 #include <qlist.h>
 #include <qarray.h>
-#define QPtrList QList
+#define Q3PtrList QList
-#define QMemArray QArray
+#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
@@ -65,10 +74,10 @@
 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 * )
@@ -80,9 +89,10 @@ protected:
 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;
@@ -106,10 +116,10 @@ void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
 {
    orient = o;
 #ifndef QT_NO_CURSOR
-    if ( o == KDGanttMinimizeSplitter::Horizontal )
+    if ( o == Qt::Horizontal )
-        setCursor( splitHCursor );
+        setCursor( Qt::splitHCursor );
    else
-        setCursor( splitVCursor );
+        setCursor( Qt::splitVCursor );
 #endif
 }
@@ -117,7 +127,7 @@ void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
 void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
 {
    updateCursor( e->pos() );
-    if ( !(e->state()&LeftButton) )
+    if ( !(e->state()&Qt::LeftButton) )
        return;
    if ( _activeButton != 0)
@@ -137,7 +147,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
 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;
@@ -149,13 +159,13 @@ void KDGanttSplitterHandle::mousePressEvent( QMouseEvent *e )
 void KDGanttSplitterHandle::updateCursor( const QPoint& p)
 {
    if ( onButton( p ) != 0 ) {
-        setCursor( arrowCursor );
+        setCursor( Qt::arrowCursor );
    }
    else {
-        if ( orient == KDGanttMinimizeSplitter::Horizontal )
+        if ( orient == Qt::Horizontal )
-            setCursor( splitHCursor );
+            setCursor( Qt::splitHCursor );
        else
-            setCursor( splitVCursor );
+            setCursor( Qt::splitVCursor );
    }
 }
 void KDGanttSplitterHandle::toggle()
@@ -195,7 +205,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
        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 );
@@ -211,10 +221,10 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
 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);
@@ -229,16 +239,16 @@ int KDGanttSplitterHandle::onButton( const QPoint& p )
 }
-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];
@@ -311,11 +321,11 @@ void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
    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 ) { 
           
            /*
@@ -377,12 +387,12 @@ 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
@@ -461,12 +471,13 @@ static QSize minSizeHint( const QWidget* w )
  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
 }
@@ -475,10 +486,10 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( QWidget *parent, const char *n
  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 )
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, QWidget *parent, const char *name )
-    :QFrame(parent,name,WPaintUnclipped)
+    :Q3Frame(parent,name)
 { 
-    
+    setAttribute(Qt::WA_PaintUnclipped);
    mRubberBand = 0;
    mFirstHandle = 0;
 #if QT_VERSION >= 232
@@ -505,7 +516,7 @@ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 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) );
@@ -534,14 +545,14 @@ void KDGanttMinimizeSplitter::toggle()
  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 ) );
@@ -586,8 +597,8 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
        QString tmp = "qt_splithandle_";
        tmp += w->name();
        newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() );
-    if ( ! mFirstHandle )
+        if ( ! mFirstHandle )
-        mFirstHandle = newHandle;
+            mFirstHandle = newHandle;
        s->wid = newHandle;
        newHandle->setId(data->list.count());
        s->isSplitter = TRUE;
@@ -600,7 +611,7 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
    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() );
@@ -621,20 +632,26 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
 */
 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 ) {
@@ -670,17 +687,17 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
 {
 #ifdef DESKTOP_VERSION
    QPainter paint( this );
-    paint.setPen( gray );
+    paint.setPen( Qt::gray );
-    paint.setBrush( gray );
+    paint.setBrush( Qt::gray );
-    paint.setRasterOp( XorROP );
+    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() );
@@ -696,7 +713,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
    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() ));
@@ -710,7 +727,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
            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() );
@@ -732,7 +749,7 @@ 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;
@@ -755,7 +772,7 @@ void KDGanttMinimizeSplitter::drawSplitter( QPainter *p,
    // 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
 }
@@ -796,9 +813,9 @@ 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
@@ -813,8 +830,8 @@ void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
 void KDGanttMinimizeSplitter::setG( QWidget *w, int p, int s, bool isSplitter )
 {
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
-        if ( false && orient == Horizontal && !isSplitter )
+        if ( false && orient == Qt::Horizontal && !isSplitter )
            p = contentsRect().width() - p - s;
        w->setGeometry( p, contentsRect().y(), s, contentsRect().height() );
    } else
@@ -840,7 +857,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool 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 {
@@ -856,7 +873,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
        }
    } 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;
@@ -893,7 +910,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
    } 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 {
@@ -910,7 +927,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
    } 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;
@@ -988,9 +1005,9 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
        }
    }
    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
@@ -1030,7 +1047,7 @@ 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);
@@ -1132,7 +1149,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
    if ( maxt < mint )
        maxt = mint;
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
        setMaximumSize( maxl, maxt );
        setMinimumSize( minl, mint );
    } else {
@@ -1267,13 +1284,10 @@ QSize KDGanttMinimizeSplitter::sizeHint() const
    constPolish();
    int l = 0;
    int t = 0;
-    if ( children() ) {
+    if ( !children().empty() ) {
-        const QObjectList * c = children();
+        const QObjectList c = children();
-        QObjectListIt it( *c );
+        for(QObjectList::const_iterator i=c.begin();i!=c.end();++i) {
-        QObject * o;
+            QObject * o = *i;
-        while( (o=it.current()) != 0 ) {
-            ++it;
            if ( o->isWidgetType() &&
                 !((QWidget*)o)->isHidden() ) {
                QSize s = ((QWidget*)o)->sizeHint();
@@ -1284,7 +1298,7 @@ QSize KDGanttMinimizeSplitter::sizeHint() const
            }
        }
    }
-    return orientation() == Horizontal ? QSize( l, t ) : QSize( t, l );
+    return orientation() == Qt::Horizontal ? QSize( l, t ) : QSize( t, l );
 }
@@ -1297,13 +1311,10 @@ QSize KDGanttMinimizeSplitter::minimumSizeHint() const
    constPolish();
    int l = 0;
    int t = 0;
-    if ( children() ) {
+    if ( !children().empty() ) {
-        const QObjectList * c = children();
+        const QObjectList c = children();
-        QObjectListIt it( *c );
+        for(QObjectList::const_iterator i=c.begin();i!=c.end();++i) {
-        QObject * o;
+            QObject * o = *i;
-        while( (o=it.current()) != 0 ) {
-            ++it;
            if ( o->isWidgetType() &&
                 !((QWidget*)o)->isHidden() ) {
                QSize s = minSizeHint((QWidget*)o);
@@ -1314,7 +1325,7 @@ QSize KDGanttMinimizeSplitter::minimumSizeHint() const
            }
        }
    }
-    return orientation() == Horizontal ? QSize( l, t ) : QSize( t, l );
+    return orientation() == Qt::Horizontal ? QSize( l, t ) : QSize( t, l );
 }
@@ -1402,13 +1413,14 @@ bool KDGanttMinimizeSplitter::isHidden( QWidget *w ) const
  \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 )
@@ -1433,10 +1445,10 @@ QValueList<int> KDGanttMinimizeSplitter::sizes() const
  \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 ) {
@@ -1456,7 +1468,7 @@ void KDGanttMinimizeSplitter::setSizes( QValueList<int> list )
 void KDGanttMinimizeSplitter::processChildEvents()
 {
-    QApplication::sendPostedEvents( this, QEvent::ChildInserted );
+    QApplication::sendPostedEvents( this, QEvent::ChildAdded );
 }
@@ -1468,7 +1480,7 @@ 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
@@ -1479,7 +1491,7 @@ void KDGanttMinimizeSplitter::styleChange( QStyle& old )
        s = data->list.next();
    }
    doResize();
-    QFrame::styleChange( old );
+    Q3Frame::styleChange( old );
 }
 #endif
@@ -1512,7 +1524,7 @@ 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;
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 3042e0a..338d965 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -1,3 +1,10 @@
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QChildEvent>
+#include <QMouseEvent>
+#include <QEvent>
 /* -*- Mode: C++ -*-
   $Id$
 */
@@ -35,8 +42,8 @@
 #define KDGANTTMINIMIZESPLITTER_H
 #ifndef QT_H
-#include "qframe.h"
+#include "q3frame.h"
-#include "qvaluelist.h"
+#include "q3valuelist.h"
 #endif // QT_H
 #ifndef QT_NO_SPLITTER___
@@ -44,7 +51,7 @@ class QSplitterData;
 class QSplitterLayoutStruct;
 class KDGanttSplitterHandle;
 class KDRubberBand; 
-class KDGanttMinimizeSplitter : public QFrame
+class KDGanttMinimizeSplitter : public Q3Frame
 {
    Q_OBJECT
    //  Q_ENUMS( Direction )
@@ -56,11 +63,11 @@ public:
    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 );
+    virtual void setOrientation( Qt::Orientation );
-    Orientation orientation() const { return orient; }
+    Qt::Orientation orientation() const { return orient; }
    void setMinimizeDirection( Direction );
    Direction minimizeDirection() const;
@@ -77,8 +84,8 @@ public:
    QSize sizeHint() const;
    QSize minimumSizeHint() const;
-    QValueList<int> sizes() const;
+    Q3ValueList<int> sizes() const;
-    void setSizes( QValueList<int> );
+    void setSizes( Q3ValueList<int> );
    KDGanttSplitterHandle* firstHandle(){ return mFirstHandle;}
    void expandPos( int id, int* min, int* max );
    KDRubberBand* rubberBand() { return mRubberBand ;}
@@ -114,20 +121,20 @@ private:
    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;
@@ -163,7 +170,7 @@ public:
    void setId( int i ) { myId = i; }
 protected:
-    QValueList<QPointArray> buttonRegions();
+    Q3ValueList<Q3PointArray> buttonRegions();
    void paintEvent( QPaintEvent * );
    void mouseMoveEvent( QMouseEvent * );
    void mousePressEvent( QMouseEvent * );
diff --git a/microkde/fncolordialog.h b/microkde/fncolordialog.h
index 615d2ed..52356be 100755
--- a/microkde/fncolordialog.h
+++ b/microkde/fncolordialog.h
@@ -35,12 +35,12 @@
 //-----------------------------------------------------------------------------
 // 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();
@@ -78,11 +78,11 @@ 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();
 };
@@ -92,11 +92,11 @@ public:
 //-----------------------------------------------------------------------------
 // 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);
@@ -111,11 +111,11 @@ 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;
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index d7c12bb..b058d54 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -6,11 +6,14 @@
 #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()
 {
@@ -75,10 +78,10 @@ void KApplication::showFile(QString caption, QString fn)
   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 );
@@ -89,19 +92,19 @@ 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 );
+    Q3TextStream ts( &file );
-    ts.setEncoding( QTextStream::UnicodeUTF8 );
+    ts.setEncoding( Q3TextStream::UnicodeUTF8 );
    text = ts.read();
    file.close();  
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
        return false;
    }
-    QTextStream tsIn( &file );
+    Q3TextStream tsIn( &file );
-    tsIn.setEncoding( QTextStream::Latin1 );
+    tsIn.setEncoding( Q3TextStream::Latin1 );
    tsIn << text.latin1();
    file.close(); 
    return true; 
@@ -112,11 +115,11 @@ 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
@@ -133,7 +136,7 @@ void KApplication::showText(QString caption, QString text)
 #include <qlayout.h>
 #include <qdir.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include "kglobal.h"
 #include "klocale.h"
@@ -144,12 +147,12 @@ class KBackupPrefs : public QDialog
      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 );
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp
index 197bea2..16618fc 100644
--- a/microkde/kcolorbutton.cpp
+++ b/microkde/kcolorbutton.cpp
@@ -1,11 +1,14 @@
 #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()
 {
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index 940196e..12063ca 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -1,6 +1,8 @@
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "kdebug.h"
@@ -53,11 +55,11 @@ QString KConfig::group() const {
 }
 //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 );
  
@@ -111,7 +113,7 @@ QString KConfig::readEntry( const QString &key, const QString &def )
 QSize KConfig::readSizeEntry( const QString &key, QSize* def )
 {
-  QValueList<int> intlist = readIntListEntry(key);
+  Q3ValueList<int> intlist = readIntListEntry(key);
  if (intlist.count() < 2)
    {
@@ -194,11 +196,11 @@ QDateTime KConfig::readDateTimeEntry( const QString &key, const QDateTime *def )
 }
 //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 )
  {
@@ -246,7 +248,7 @@ void KConfig::writeEntry( const QString & e, const QColor & c )
 void KConfig::writeEntry( const QString & e, const QSize & s )
 {
-  QValueList<int> intlist;
+  Q3ValueList<int> intlist;
  intlist << s.width() << s.height();
  writeEntry(  e, intlist );
 }
@@ -271,7 +273,7 @@ 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;
  }
@@ -279,12 +281,12 @@ void KConfig::load()
  mBoolMap.clear();
  mStringMap.clear();
  
-  QTextStream t( &f );
+  Q3TextStream t( &f );
-  t.setEncoding( QTextStream::Latin1 );
+  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;      
@@ -323,15 +325,15 @@ void KConfig::sync()
  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 );
+  Q3TextStream t( &f );
-  t.setEncoding( QTextStream::Latin1 );
+  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;
diff --git a/microkde/kconfig.h b/microkde/kconfig.h
index 1a1038f..7b91e44 100644
--- a/microkde/kconfig.h
+++ b/microkde/kconfig.h
@@ -3,7 +3,7 @@
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qcolor.h>
 #include <qfont.h>
 #include <qmap.h>
@@ -57,7 +57,7 @@ class KConfig
    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 );
@@ -69,7 +69,7 @@ class KConfig
    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 ); }
diff --git a/microkde/kdatepickernew.cpp b/microkde/kdatepickernew.cpp
index f60a422..8f8001e 100644
--- a/microkde/kdatepickernew.cpp
+++ b/microkde/kdatepickernew.cpp
@@ -313,7 +313,7 @@ KDatePicker::selectMonthClicked()
  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);
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index 353f78d..10dc449 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -44,6 +44,14 @@
 #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>
@@ -69,7 +77,7 @@ KDateValidator::date(const QString& text, QDate& d) const
            d = tmp;
            return Acceptable;
        } else
-        return Valid;
+        return QValidator::Intermediate;
 }
 void
@@ -78,22 +86,22 @@ KDateValidator::fixup( QString& ) const
 }
-KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
+KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, Qt::WFlags f)
-    : QGridView(parent, name, 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
@@ -108,7 +116,7 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
    int w=cellWidth();
    int h=cellHeight();
    int pos;
-    QBrush brushBlue(blue);
+    QBrush brushBlue(Qt::blue);
    QBrush brushLightblue(QColor(220,245,255));
    QFont _font=font();
    // -----
@@ -133,18 +141,17 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
                    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->setPen(Qt::black);
-            painter->moveTo(0, h-1);
+            painter->drawLine(0, h-1, w-1, h-1);
-            painter->lineTo(w-1, h-1);
            // ----- draw the weekday:
        } else {
        painter->setFont(_font);
@@ -161,33 +168,33 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
                    } 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);
+                        painter->setBrush(Qt::darkRed);
-                        pen=white;
+                        pen=QColor(Qt::white);
                    } else {
-                    painter->setBrush(darkGray);
+                    painter->setBrush(Qt::darkGray);
-                    pen=white;
+                    pen=QColor(Qt::white);
                }
            } else {
            if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
                {
-                    painter->setPen(green);
+                    painter->setPen(Qt::green);
-                    painter->setBrush(darkGreen);
+                    painter->setBrush(Qt::darkGreen);
-                    pen=white;
+                    pen=QColor(Qt::white);
                } else {
                painter->setBrush(QColor(220,245,255));
                painter->setPen(QColor(220,245,255));
@@ -195,7 +202,7 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
        }
        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()); 
@@ -274,7 +281,7 @@ KDateTable::keyPressEvent( QKeyEvent *e )
 void
 KDateTable::viewportResizeEvent(QResizeEvent * e)
 {
-    QGridView::viewportResizeEvent(e);
+    Q3GridView::viewportResizeEvent(e);
    setCellWidth(viewport()->width()/7);
    setCellHeight(viewport()->height()/7);
@@ -409,13 +416,13 @@ KDateTable::getDate() const
 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
@@ -432,7 +439,7 @@ KDateTable::sizeHint() const
 KDateInternalMonthPicker::KDateInternalMonthPicker
 (QWidget* parent, const char* name)
-    : QGridView(parent, name),
+    : Q3GridView(parent, name),
      result(0) // invalid
 {
    QRect rect;
@@ -451,13 +458,13 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
    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):
@@ -487,7 +494,7 @@ KDateInternalMonthPicker::getResult() const
 void
 KDateInternalMonthPicker::setupPainter(QPainter *p)
 {
-    p->setPen(black);
+    p->setPen(Qt::black);
 }
 void
@@ -505,7 +512,7 @@ KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
    // ----- 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() );
 }
@@ -513,7 +520,7 @@ KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
 void
 KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-    if(!isEnabled() || e->button() != LeftButton)
+    if(!isEnabled() || e->button() != Qt::LeftButton)
        {
            KNotifyClient::beep();
            return;
@@ -540,7 +547,7 @@ KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 void
 KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-    if (e->state() & LeftButton)
+    if (e->state() & Qt::LeftButton)
        {
            int row, col;
            QPoint mouseCoord;
@@ -614,7 +621,7 @@ KDateInternalYearSelector::KDateInternalYearSelector
    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);
@@ -661,18 +668,18 @@ KDateInternalYearSelector::setYear(int year)
 }
 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();
@@ -756,7 +763,7 @@ void KDateTable::virtual_hook( int, void* )
 KDateInternalWeekPicker::KDateInternalWeekPicker
 (QWidget* parent, const char* name)
-    : QGridView(parent, name),
+    : Q3GridView(parent, name),
      result(0) // invalid
 {
    QRect rect;
@@ -773,7 +780,7 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
    setFont(font);
    setHScrollBarMode(AlwaysOff);
    setVScrollBarMode(AlwaysOff);
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
    if ( QApplication::desktop()->height() > 240 ) {
        setNumRows(13);
        setNumCols(4);
@@ -784,7 +791,7 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
    // 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):
@@ -818,7 +825,7 @@ KDateInternalWeekPicker::getResult() const
 void
 KDateInternalWeekPicker::setupPainter(QPainter *p)
 {
-    p->setPen(black);
+    p->setPen(Qt::black);
 }
 void
@@ -836,7 +843,7 @@ KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col)
    // ----- 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() );
 }
@@ -844,7 +851,7 @@ KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col)
 void
 KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-    if(!isEnabled() || e->button() != LeftButton)
+    if(!isEnabled() || e->button() != Qt::LeftButton)
        {
            KNotifyClient::beep();
            return;
@@ -871,7 +878,7 @@ KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e)
 void
 KDateInternalWeekPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-    if (e->state() & LeftButton)
+    if (e->state() & Qt::LeftButton)
        {
            int row, col;
            QPoint mouseCoord;
diff --git a/microkde/kdatetbl.h b/microkde/kdatetbl.h
index 87808df..2d3d2cf 100644
--- a/microkde/kdatetbl.h
+++ b/microkde/kdatetbl.h
@@ -21,9 +21,15 @@
 #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.
@@ -31,7 +37,7 @@
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDateInternalMonthPicker : public QGridView
+class KDateInternalMonthPicker : public Q3GridView
 {
  Q_OBJECT
 protected:
@@ -127,7 +133,7 @@ private:
 * @author Tim Gilman, Mirko Boehm
 * @version $Id$
 */
-class KPopupFrame : public QFrame
+class KPopupFrame : public Q3Frame
 {
  Q_OBJECT
 protected:
@@ -182,7 +188,7 @@ public:
 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:
@@ -215,7 +221,7 @@ public:
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDateTable : public QGridView
+class KDateTable : public Q3GridView
 {
    Q_OBJECT
 public:
@@ -224,7 +230,7 @@ public:
     */
    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
@@ -307,7 +313,7 @@ private:
 };
 #endif // KDATETBL_H
-class KDateInternalWeekPicker : public QGridView
+class KDateInternalWeekPicker : public Q3GridView
 {
  Q_OBJECT
 protected:
diff --git a/microkde/kdebug.h b/microkde/kdebug.h
index bb9cfe3..534943c 100644
--- a/microkde/kdebug.h
+++ b/microkde/kdebug.h
@@ -4,6 +4,8 @@
 #include <stdio.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3CString>
@@ -64,7 +66,7 @@ class kdbgstream {
    kdbgstream &operator<<(const char*) {
        return *this;
    }
-    kdbgstream &operator<<(const QCString&) {
+    kdbgstream &operator<<(const Q3CString&) {
      return *this;
    }
    kdbgstream& operator<<(KDBGFUNC f) {
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
@@ -20,6 +20,8 @@
 //US #include <config.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <kdebug.h>
@@ -88,7 +90,7 @@ void KCatalogue::setFileName( const QString & fileName )
  doUnload();
-  QCString newFileName = QFile::encodeName( fileName );
+  Q3CString newFileName = QFile::encodeName( fileName );
  if ( !fileName.isEmpty() )
    {
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
@@ -26,6 +26,8 @@
 #define _KCONFIGBASE_H
 #include "kconfig.h"
+//Added by qt3to4:
+#include <Q3CString>
 /**
  * Helper class to facilitate working with @ref KConfig / @ref KSimpleConfig
@@ -82,7 +84,7 @@ public:
      : _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 ); }
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
@@ -20,9 +20,12 @@
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtimer.h>
-#include <qobjectdict.h>
+#include <q3objectdict.h>
-#include <qwidgetlist.h>
 #include <qwidget.h>
+#include <qwidget.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 #include "kapplication.h"
 #include "klibloader.h"
@@ -45,7 +48,7 @@
 #endif
-template class QAsciiDict<KLibrary>;
+template class Q3AsciiDict<KLibrary>;
 #include <stdlib.h> //getenv
@@ -120,7 +123,7 @@ KLibrary::~KLibrary()
    // 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;
@@ -152,7 +155,7 @@ KLibFactory* KLibrary::factory()
    if ( m_factory )
        return m_factory;
-        QCString symname;
+        Q3CString symname;
        symname.sprintf("init_%s", name().latin1() );
    
        void* sym = symbol( symname );
@@ -305,8 +308,8 @@ KLibWrapPrivate::KLibWrapPrivate(KLibrary *l, QLibrary* h)
 class KLibLoaderPrivate
 {
 public:
-    QPtrList<KLibWrapPrivate> loaded_stack;
+    Q3PtrList<KLibWrapPrivate> loaded_stack;
-    QPtrList<KLibWrapPrivate> pending_close;
+    Q3PtrList<KLibWrapPrivate> pending_close;
    enum {UNKNOWN, UNLOAD, DONT_UNLOAD} unload_mode;
    QString errorMessage;
@@ -348,7 +351,7 @@ 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
@@ -364,7 +367,7 @@ KLibLoader::~KLibLoader()
 //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
@@ -421,7 +424,7 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
      {
 #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
@@ -469,7 +472,7 @@ KLibrary* KLibLoader::library( const char *name )
    /* 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();
@@ -550,7 +553,7 @@ 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 )
    {
@@ -569,7 +572,7 @@ void KLibLoader::close_pending(KLibWrapPrivate *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) {
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
@@ -21,8 +21,8 @@
 #include <qobject.h>
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qasciidict.h>
+#include <q3asciidict.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <kglobal.h>
 #include <stdlib.h> // For backwards compatibility
@@ -52,7 +52,7 @@ class QLibrary;
 class KLibrary : public QObject
 {
    friend class KLibLoader;
-    friend class QAsciiDict<KLibrary>;
+    friend class Q3AsciiDict<KLibrary>;
    Q_OBJECT
 public:
@@ -127,7 +127,7 @@ private:
    KLibFactory* m_factory;
 //US    void * m_handle;
    QLibrary* m_handle;
-    QPtrList<QObject> m_objs;
+    Q3PtrList<QObject> m_objs;
    QTimer *m_timer;
    KLibraryPrivate *d;
 };
@@ -287,7 +287,7 @@ private slots:
    void slotLibraryDestroyed();
 private:
    void close_pending( KLibWrapPrivate * );
-    QAsciiDict<KLibWrapPrivate> m_libs;
+    Q3AsciiDict<KLibWrapPrivate> m_libs;
    static KLibLoader* s_self;
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,5 +1,6 @@
 #include <qregexp.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include "kdebug.h"
 #include "kcalendarsystemgregorian.h"
@@ -11,8 +12,8 @@
 //#define COLLECT_TRANSLATION
-QDict<QString> *mLocaleDict = 0;
+Q3Dict<QString> *mLocaleDict = 0;
-void setLocaleDict( QDict<QString> * dict )
+void setLocaleDict( Q3Dict<QString> * dict )
 {
    mLocaleDict = dict;
@@ -45,7 +46,7 @@ void addExist(const char *text,QString trans )
 }
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #endif
 void dumpMissing()
@@ -53,10 +54,10 @@ 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;
@@ -70,10 +71,10 @@ void dumpMissing()
    {
    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;
@@ -467,7 +468,7 @@ QString KLocale::formatDateTime(const QDateTime &pDateTime,
    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 ))
@@ -527,7 +528,7 @@ QDate KLocale::readDate(const QString &intstr, const QString &fmt, bool* ok) con
        strpos++;
      c = fmt.at(fmtpos++);
-      switch (c)
+      switch (c.unicode())
      {
        case 'a':
        case 'A':
@@ -638,7 +639,7 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
        strpos++;
      c = Format.at(Formatpos++);
-      switch (c)
+      switch (c.unicode())
        {
        case 'p':
          {
@@ -734,7 +735,7 @@ QDateTime KLocale::readDateTime(const QString &intstr,
  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;
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
@@ -4,14 +4,14 @@
 #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);
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
@@ -39,6 +39,8 @@
 #include <kdebug.h>
 #include "kmdcodec.h"
+//Added by qt3to4:
+#include <Q3CString>
 #define KMD5_S11 7
 #define KMD5_S12 12
@@ -147,14 +149,14 @@ static int rikFindChar(register const char * _s, const char c)
  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 "";
@@ -280,14 +282,14 @@ 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 "";
@@ -355,7 +357,7 @@ 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 "";
@@ -365,11 +367,11 @@ QCString KCodecs::base64Encode( const QCString& str, bool insertLFs )
    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,
@@ -405,15 +407,15 @@ void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
            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[didx++] = Base64EncMap[(data[sidx] >> 2) & 077];
-            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+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;
        }
    }
@@ -421,30 +423,27 @@ void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
    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[didx++] = '=';
-        out.at(didx) = '=';
-        didx++;
-    }
 }
-QCString KCodecs::base64Decode( const QCString& str )
+Q3CString KCodecs::base64Decode( const Q3CString& str )
 {
    if ( str.isEmpty() )
        return "";
@@ -454,11 +453,11 @@ QCString KCodecs::base64Decode( const QCString& str )
    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 )
@@ -505,7 +504,7 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
        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
        {
@@ -523,26 +522,26 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
    {
      while (didx < len-2)
      {
-          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));
-          out.at(didx+1) = (((out.at(sidx+1) << 4) & 255) | ((out.at(sidx+2) >> 2) & 017));
+          out[didx+1] = (((out[sidx+1] << 4) & 255) | ((out[sidx+2] >> 2) & 017));
-          out.at(didx+2) = (((out.at(sidx+2) << 6) & 255) | (out.at(sidx+3) & 077));
+          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 "";
@@ -553,11 +552,11 @@ QCString KCodecs::uuencode( const QCString& str )
    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 )
@@ -580,54 +579,54 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
    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[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
-            out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+            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[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+        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[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+        out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                               (data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] << 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx+1] << 2) & 077];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[0];
    }
    else if (sidx < len)
    {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx] << 4) & 077];
+        out[didx++] = UUEncMap[(data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[0];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[0];
    }
    // line terminator
@@ -639,7 +638,7 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
        out.resize( 0 );
 }
-QCString KCodecs::uudecode( const QCString& str )
+Q3CString KCodecs::uudecode( const Q3CString& str )
 {
    if ( str.isEmpty() )
        return "";
@@ -650,11 +649,11 @@ QCString KCodecs::uudecode( const QCString& str )
    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 )
@@ -705,9 +704,9 @@ void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
             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[didx++] = ( ((A << 2) & 255) | ((B >> 4) & 003) );
-             out.at(didx++) = ( ((B << 4) & 255) | ((C >> 2) & 017) );
+             out[didx++] = ( ((B << 4) & 255) | ((C >> 2) & 017) );
-             out.at(didx++) = ( ((C << 6) & 255) | (D & 077) );
+             out[didx++] = ( ((C << 6) & 255) | (D & 077) );
             sidx += 4;
          }
        }
@@ -716,14 +715,14 @@ void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
        {
            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
@@ -761,7 +760,7 @@ KMD5::KMD5(const QByteArray& in)
    update( in );
 }
-KMD5::KMD5(const QCString& in)
+KMD5::KMD5(const Q3CString& in)
 {
    init();
    update( in );
@@ -772,7 +771,7 @@ 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()));
 }
@@ -873,7 +872,7 @@ bool KMD5::verify( const KMD5::Digest& digest)
    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));
@@ -892,9 +891,9 @@ void KMD5::rawDigest( KMD5::Digest& bin )
 }
-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",
@@ -905,7 +904,7 @@ QCString KMD5::hexDigest()
    return s;
 }
-void KMD5::hexDigest(QCString& s)
+void KMD5::hexDigest(Q3CString& s)
 {
    finalize();
    s.resize(33);
@@ -915,7 +914,7 @@ void KMD5::hexDigest(QCString& s)
            m_digest[12], m_digest[13], m_digest[14], m_digest[15]);
 }
-QCString KMD5::base64Digest()
+Q3CString KMD5::base64Digest()
 {
    QByteArray ba(16);
@@ -956,7 +955,7 @@ void KMD5::transform( const unsigned char 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 */
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
@@ -39,6 +39,8 @@
 #include <qglobal.h>
 #include <qstring.h>
 #include <qiodevice.h>
+//Added by qt3to4:
+#include <Q3CString>
 /**
 * A wrapper class for the most commonly used encoding and
@@ -81,7 +83,7 @@ public:
   *                breaks, too.
   * @return        quoted-printable encoded data.
   */
-  static QCString quotedPrintableEncode(const QByteArray & in,
+  static Q3CString quotedPrintableEncode(const QByteArray & in,
                                        bool useCRLF = true);
  /**
@@ -96,7 +98,7 @@ public:
   *                breaks, too.
   * @return        quoted-printable encoded data.
   */
-  static QCString quotedPrintableEncode(const QCString & str,
+  static Q3CString quotedPrintableEncode(const Q3CString & str,
                                        bool useCRLF = true);
  /**
@@ -129,7 +131,7 @@ public:
   * @param in  the data to be decoded.
   * @return    decoded data.
   */
-  static QCString quotedPrintableDecode(const QByteArray & in);
+  static Q3CString quotedPrintableDecode(const QByteArray & in);
  /**
   * @overload
@@ -140,7 +142,7 @@ public:
   * @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.
@@ -175,7 +177,7 @@ public:
   * @param in   the data to be uuencoded
   * @return     a uuencoded data.
   */
-  static QCString uuencode( const QByteArray& in );
+  static Q3CString uuencode( const QByteArray& in );
  /**
   * @overload
@@ -186,7 +188,7 @@ public:
   * @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.
@@ -215,7 +217,7 @@ public:
   * @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
@@ -226,7 +228,7 @@ public:
   * @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.
@@ -263,7 +265,7 @@ public:
   *
   * @return           a base64 encoded string.
   */
-  static QCString base64Encode( const QByteArray& in, bool insertLFs = false);
+  static Q3CString base64Encode( const QByteArray& in, bool insertLFs = false);
  /**
   * @overload
@@ -275,7 +277,7 @@ public:
   * @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.
@@ -308,7 +310,7 @@ public:
   * @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
@@ -319,7 +321,7 @@ public:
   * @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
@@ -431,7 +433,7 @@ public:
   *
   * 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
@@ -460,7 +462,7 @@ public:
   *
   * @param in     message to be added to the digest (QByteArray).
   */
-  void update(const QCString& in );
+  void update(const Q3CString& in );
  /**
   * @overload
@@ -502,18 +504,18 @@ public:
   * 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
@@ -524,7 +526,7 @@ public:
  /**
   * @overload
   */
-  bool verify(const QCString&);
+  bool verify(const Q3CString&);
 protected:
  /**
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
@@ -21,6 +21,8 @@
 // $Id$
 #include <qcolor.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kconfig.h>
 #include <kstandarddirs.h>
@@ -140,8 +142,8 @@ class KPrefsItemStringList : public KPrefsItem {
 class KPrefsItemIntList : public KPrefsItem {
  public:
-    KPrefsItemIntList(const QString &group,const QString &name,QValueList<int> *,
+    KPrefsItemIntList(const QString &group,const QString &name,Q3ValueList<int> *,
-                      const QValueList<int> &defaultValue=QValueList<int>());
+                      const Q3ValueList<int> &defaultValue=Q3ValueList<int>());
    virtual ~KPrefsItemIntList() {}
    
    void setDefault();
@@ -149,8 +151,8 @@ class KPrefsItemIntList : public KPrefsItem {
    void writeConfig(KConfig *);    
  private:
-    QValueList<int> *mReference;
+    Q3ValueList<int> *mReference;
-    QValueList<int> mDefault;
+    Q3ValueList<int> mDefault;
 };
@@ -364,7 +366,7 @@ void KPrefsItemStringList::readConfig(KConfig *config)
 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;
@@ -505,8 +507,8 @@ void KPrefs::addItemStringList(const QString &key,QStringList *reference,
  addItem(new KPrefsItemStringList(*mCurrentGroup,key,reference,defaultValue));
 }
-void KPrefs::addItemIntList(const QString &key,QValueList<int> *reference,
+void KPrefs::addItemIntList(const QString &key,Q3ValueList<int> *reference,
-                            const QValueList<int> &defaultValue)
+                            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
@@ -21,11 +21,13 @@
 #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;
@@ -283,8 +285,8 @@ class KPrefs {
                          when the config file does not yet contain the key of
                          this item.
    */
-    void addItemIntList(const QString &key,QValueList<int> *reference,
+    void addItemIntList(const QString &key,Q3ValueList<int> *reference,
-                        const QValueList<int> &defaultValue=QValueList<int>());
+                        const Q3ValueList<int> &defaultValue=Q3ValueList<int>());
  protected:
    /**
@@ -310,7 +312,7 @@ class KPrefs {
    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
@@ -563,7 +563,7 @@ class KShortcut
         * @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
@@ -599,7 +599,7 @@ class KShortcut
         * @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.
@@ -608,7 +608,7 @@ class KShortcut
         * @param shortcut the description of the key
         * @see KKeySequence::KKeySequence(const QString&)
         */
-        KShortcut( const QString& shortcut ) {}
+        KShortcut( const QString& /*shortcut */) {}
        ~KShortcut() {}
        /**
@@ -816,7 +816,7 @@ class KShortcut
        /**
         * @internal
         */
-  QString toStringInternal( const KShortcut* pcutDefault = 0 ) const
+  QString toStringInternal( const KShortcut* /*pcutDefault*/ = 0 ) const
  {
    return "EMPTY IMPL.";
  }
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
@@ -37,8 +37,8 @@
 //US#include <pwd.h>
 #include <qregexp.h>
-#include <qasciidict.h>
+#include <q3asciidict.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qstring.h>
@@ -46,6 +46,8 @@
 #include <qapplication.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include "kstandarddirs.h"
 #include "kconfig.h"
@@ -59,15 +61,15 @@
 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();
@@ -85,7 +87,7 @@ public:
   bool restrictionsActive;
   bool dataRestrictionActive;
-   QAsciiDict<bool> restrictions;
+   Q3AsciiDict<bool> restrictions;
   QStringList xdgdata_prefixes;
   QStringList xdgconf_prefixes;
 };
@@ -445,7 +447,7 @@ static void lookupDirectory(const QString& path, const QString &relPart,
        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
@@ -482,7 +484,7 @@ static void lookupDirectory(const QString& path, const QString &relPart,
          continue; // No match
 */
 //US this should do the same:
-        pos = regexp.match(fn);
+        pos = regexp.exactMatch(fn);
        if (!pos == 0)
          continue; // No match
      }
@@ -1108,7 +1110,7 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
 //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);
@@ -1208,7 +1210,7 @@ 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())
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
@@ -24,7 +24,7 @@
 #define SSK_KSTDDIRS_H
 #include <qstring.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstringlist.h>
 #include <kglobal.h>
@@ -574,11 +574,11 @@ public:
        QStringList prefixes;
        // Directory dictionaries
-        QDict<QStringList> absolutes;
+        Q3Dict<QStringList> absolutes;
-        QDict<QStringList> relatives;
+        Q3Dict<QStringList> relatives;
-        mutable QDict<QStringList> dircache;
+        mutable Q3Dict<QStringList> dircache;
-        mutable QDict<QString> savelocations;
+        mutable Q3Dict<QString> savelocations;
        // Disallow assignment and copy-construction
        KStandardDirs( const KStandardDirs& );
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
@@ -28,6 +28,9 @@
 #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>
@@ -42,9 +45,9 @@
 //US added this includefiles
 #include <qmenubar.h>
-#include <qtoolbar.h>
+#include <q3toolbar.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
-#include <qiconset.h>
+#include <qicon.h>
 /**
 * How it works.
@@ -87,7 +90,7 @@ public:
  }
  KAccel *m_kaccel;
-  QValueList<KAccel*> m_kaccelList;
+  Q3ValueList<KAccel*> m_kaccelList;
  QString m_groupText;
  QString m_group;
@@ -107,7 +110,7 @@ public:
    QWidget* m_representative;
  };
-  QValueList<Container> m_containers;
+  Q3ValueList<Container> m_containers;
 };
 //---------------------------------------------------------------------
@@ -130,7 +133,7 @@ KAction::KAction( const QString& text, const QString& sIconName, const KShortcut
  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 )
@@ -164,7 +167,7 @@ KAction::KAction( const QString& text, const KShortcut& cut,
 {
    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 )
@@ -182,7 +185,7 @@ KAction::KAction( const QString& text, const QString& pix,
    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 )
@@ -506,8 +509,8 @@ void KAction::updateShortcut( int i )
  int id = itemId( i );
  QWidget* w = container( i );
-  if ( w->inherits( "QPopupMenu" ) ) {
+  if ( w->inherits( "Q3PopupMenu" ) ) {
-    QPopupMenu* menu = static_cast<QPopupMenu*>(w);
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>(w);
    updateShortcut( menu, id );
  }
  else if ( w->inherits( "QMenuBar" ) )
@@ -518,7 +521,7 @@ void KAction::updateShortcut( int i )
 }
-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;
@@ -621,7 +624,7 @@ void KAction::updateToolTip( int 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() );
 }
@@ -646,9 +649,9 @@ int KAction::plug( QWidget *w, int index )
  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.  ");
@@ -721,7 +724,7 @@ int KAction::plug( QWidget *w, int index )
                           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() );
@@ -749,9 +752,9 @@ void KAction::unplug( QWidget *w )
    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" ) )
@@ -862,8 +865,8 @@ void KAction::updateEnabled( int i )
 {
    QWidget *w = container( i );
-    if ( w->inherits("QPopupMenu") )
+    if ( w->inherits("Q3PopupMenu") )
-      static_cast<QPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
+      static_cast<Q3PopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
    else if ( w->inherits("QMenuBar") )
      static_cast<QMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
    else if ( w->inherits( "KToolBar" ) )
@@ -906,10 +909,10 @@ void KAction::updateText( int i )
 {
  QWidget *w = container( i );
-  if ( w->inherits( "QPopupMenu" ) ) {
+  if ( w->inherits( "Q3PopupMenu" ) ) {
    int id = itemId( i );
-    static_cast<QPopupMenu*>(w)->changeItem( id, d->text() );
+    static_cast<Q3PopupMenu*>(w)->changeItem( id, d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), id );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), id );
  }
  else if ( w->inherits( "QMenuBar" ) )
    static_cast<QMenuBar*>(w)->changeItem( itemId( i ), d->text() );
@@ -947,16 +950,16 @@ void KAction::updateIcon( int id )
 {
  QWidget* w = container( id );
-  if ( w->inherits( "QPopupMenu" ) ) {
+  if ( w->inherits( "Q3PopupMenu" ) ) {
    int itemId_ = itemId( id );
-    static_cast<QPopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() );
+    static_cast<Q3PopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), itemId_ );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), itemId_ );
  }
  else if ( w->inherits( "QMenuBar" ) )
    static_cast<QMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( KIcon::Small ), d->text() );
  else if ( w->inherits( "KToolBar" ) )
    static_cast<KToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
-  else if ( w->inherits( "QToolBar" ) )
+  else if ( w->inherits( "Q3ToolBar" ) )
  {
    qDebug("KAction::updateIcon has top be fixed");
 //US    static_cast<QToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
@@ -968,7 +971,7 @@ QString KAction::icon() const
  return d->iconName( );
 }
-void KAction::setIconSet( const QIconSet &iconset )
+void KAction::setIconSet( const QIcon &iconset )
 {
  d->setIconSet( iconset );
@@ -982,11 +985,11 @@ void KAction::updateIconSet( int id )
 {
  QWidget *w = container( id );
-  if ( w->inherits( "QPopupMenu" ) )
+  if ( w->inherits( "Q3PopupMenu" ) )
  {
    int itemId_ = itemId( id );
-    static_cast<QPopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() );
+    static_cast<Q3PopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), itemId_ );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), itemId_ );
  }
  else if ( w->inherits( "QMenuBar" ) )
    static_cast<QMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() );
@@ -999,7 +1002,7 @@ void KAction::updateIconSet( int id )
  }
 }
-QIconSet KAction::iconSet( KIcon::Group group, int size ) const
+QIcon KAction::iconSet( KIcon::Group group, int size ) const
 {
  return d->iconSet( group, size );
 }
@@ -1022,7 +1025,7 @@ void KAction::setWhatsThis( const QString& text )
 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() );
@@ -1064,10 +1067,10 @@ KToolBar* KAction::toolBar( int index ) const
  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
@@ -1155,7 +1158,7 @@ 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 )
@@ -1170,7 +1173,7 @@ int KAction::findContainer( const QWidget* widget ) const
 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 )
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
@@ -29,8 +29,10 @@
 //US #include <qkeysequence.h>
 #include <qobject.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
 #include <kguiitem.h>
 #include <kshortcut.h>
 #include <kstdaction.h>
@@ -40,10 +42,10 @@
 #include <kiconloader.h>
 class QMenuBar;
-class QPopupMenu;
+class Q3PopupMenu;
 //USclass QComboBox;
 //USclass QPoint;
-class QIconSet;
+class QIcon;
 class QString;
 class KToolBar;
@@ -259,7 +261,7 @@ public:
     * @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 );
@@ -308,7 +310,7 @@ public:
        /**
         * @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
@@ -318,7 +320,7 @@ public:
        /**
         * @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
@@ -461,10 +463,10 @@ public:
     * 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 );
    }
@@ -518,7 +520,7 @@ public slots:
     * 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 );
@@ -546,7 +548,7 @@ protected slots:
 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 );
@@ -555,7 +557,7 @@ protected:
    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);
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
@@ -28,9 +28,11 @@
 #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>
@@ -48,13 +50,13 @@
 //US added the following includefiles
 #include <kconfigbase.h>
 #include <qwidget.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmenubar.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #include <qcombobox.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
+#include <qcoreapplication.h>
 static QFontDatabase *fontDataBase = 0;
@@ -83,7 +85,7 @@ static void get_fonts( QStringList &lst )
    lst.sort();
 }
-static QValueList<int> get_standard_font_sizes()
+static Q3ValueList<int> get_standard_font_sizes()
 {
    if ( !fontDataBase ) {
        fontDataBase = new QFontDatabase();
@@ -120,7 +122,7 @@ KToggleAction::KToggleAction( const QString& text, const KShortcut& cut,
  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 )
@@ -136,7 +138,7 @@ KToggleAction::KToggleAction( const QString& text, const QString& pix,
  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,
@@ -169,7 +171,7 @@ KToggleAction::~KToggleAction()
 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;
@@ -184,11 +186,11 @@ int KToggleAction::plug( QWidget* widget, int 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 );
@@ -214,13 +216,12 @@ void KToggleAction::setChecked( bool c )
    updateChecked( i );
  if ( c && parent() && !exclusiveGroup().isEmpty() ) {
-    const QObjectList *list = parent()->children();
+    const QObjectList list = parent()->children();
-    if ( list ) {
+    if ( !list.empty() ) {
-      QObjectListIt it( *list );
+      for(QObjectList::const_iterator it=list.begin();it!=list.end();++it) {
-      for( ; it.current(); ++it ) {
+        if ( (*it)->inherits( "KToggleAction" ) && (*it) != this &&
-        if ( it.current()->inherits( "KToggleAction" ) && it.current() != this &&
+            static_cast<KToggleAction*>((*it))->exclusiveGroup() == exclusiveGroup() ) {
-            static_cast<KToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) {
+          KToggleAction *a = static_cast<KToggleAction*>(*it);
-          KToggleAction *a = static_cast<KToggleAction*>(it.current());
          if( a->isChecked() ) {
            a->setChecked( false );
            emit a->toggled( false );
@@ -235,8 +236,8 @@ void KToggleAction::updateChecked( int id )
 {
  QWidget *w = container( id );
-  if ( w->inherits( "QPopupMenu" ) )
+  if ( w->inherits( "Q3PopupMenu" ) )
-    static_cast<QPopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
+    static_cast<Q3PopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
  else if ( w->inherits( "QMenuBar" ) )
    static_cast<QMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked );
  else if ( w->inherits( "KToolBar" ) )
@@ -283,7 +284,7 @@ KRadioAction::KRadioAction( const QString& text, const KShortcut& cut,
 {
 }
-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 )
@@ -297,7 +298,7 @@ KRadioAction::KRadioAction( const QString& text, const QString& pix,
 {
 }
-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 )
@@ -349,7 +350,7 @@ public:
  }
  bool m_edit;
  bool m_menuAccelsEnabled;
-  QPopupMenu *m_menu;
+  Q3PopupMenu *m_menu;
  int m_current;
  int m_comboWidth;
  QStringList m_list;
@@ -387,7 +388,7 @@ KSelectAction::KSelectAction( const QString& text, const KShortcut& cut,
  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 )
@@ -403,7 +404,7 @@ KSelectAction::KSelectAction( const QString& text, const QString& pix,
  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,
@@ -439,7 +440,7 @@ KSelectAction::~KSelectAction()
 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;
    }
@@ -479,13 +480,13 @@ void KSelectAction::setComboWidth( int width )
    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 );
@@ -643,12 +644,12 @@ int KSelectAction::plug( QWidget *widget, int index )
 //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() )
@@ -682,7 +683,7 @@ int KSelectAction::plug( QWidget *widget, int index )
    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 )
      {
@@ -852,7 +853,7 @@ KListAction::KListAction( const QString& text, const KShortcut& cut,
    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 )
@@ -868,7 +869,7 @@ KListAction::KListAction( const QString& text, const QString& pix,
  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 )
@@ -965,7 +966,7 @@ KRecentFilesAction::KRecentFilesAction( const QString& text,
 }
 KRecentFilesAction::KRecentFilesAction( const QString& text,
-                                        const QIconSet& pix,
+                                        const QIcon& pix,
                                        const KShortcut& cut,
                                        QObject* parent, const char* name,
                                        uint maxItems )
@@ -991,7 +992,7 @@ KRecentFilesAction::KRecentFilesAction( const QString& text,
 }
 KRecentFilesAction::KRecentFilesAction( const QString& text,
-                                        const QIconSet& pix,
+                                        const QIcon& pix,
                                        const KShortcut& cut,
                                        const QObject* receiver,
                                        const char* slot,
@@ -1201,7 +1202,7 @@ KFontAction::KFontAction( const QString& text, const KShortcut& cut,
    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 )
@@ -1223,7 +1224,7 @@ KFontAction::KFontAction( const QString& text, const QString& pix,
    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 )
@@ -1361,7 +1362,7 @@ KFontSizeAction::KFontSizeAction( const QString& text,
  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 )
@@ -1377,7 +1378,7 @@ KFontSizeAction::KFontSizeAction( const QString& text, const QString& pix,
  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,
@@ -1414,9 +1415,9 @@ 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 );
@@ -1437,7 +1438,7 @@ void KFontSizeAction::setFontSize( int size )
    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)
@@ -1450,7 +1451,7 @@ qDebug("KFontSizeAction::setFontSize heapsort not found.");
 //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
@@ -1492,7 +1493,7 @@ 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;
  }
@@ -1502,7 +1503,7 @@ public:
  }
  
 //US  KPopupMenu *m_popup;
-  QPopupMenu *m_popup;
+  Q3PopupMenu *m_popup;
  bool m_delayed;
  bool m_stickyMenu;
 };
@@ -1522,7 +1523,7 @@ KActionMenu::KActionMenu( const QString& text, QObject* parent,
  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 )
 {
@@ -1552,7 +1553,7 @@ void KActionMenu::popup( const QPoint& global )
 //US KPopupMenu* KActionMenu::popupMenu() const
-QPopupMenu* KActionMenu::popupMenu() const
+Q3PopupMenu* KActionMenu::popupMenu() const
 {
  return d->m_popup;
 }
@@ -1592,9 +1593,9 @@ int KActionMenu::plug( QWidget* widget, int index )
    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 );
@@ -1781,12 +1782,12 @@ int KToolBarPopupAction::plug( QWidget *widget, int 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;
 }
@@ -1953,7 +1954,7 @@ 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;
@@ -1974,9 +1975,9 @@ 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 );
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
@@ -34,11 +34,14 @@
 //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;
@@ -54,7 +57,7 @@ class KURL;
 //US class KToolBar needs to be replaced
-class KToolBar;
+#include "ktoolbar.h"
 class KActionCollection;
 //US class KPopupMenu needs to be replaced
@@ -105,7 +108,7 @@ public:
     *  @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 );
    /**
@@ -127,7 +130,7 @@ public:
     *  @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 );
    /**
@@ -246,7 +249,7 @@ public:
     *  @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 );
    /**
@@ -268,7 +271,7 @@ public:
     *  @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 );
    /**
@@ -352,7 +355,7 @@ public:
     *  @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 );
    /**
@@ -374,7 +377,7 @@ public:
     *  @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 );
    /**
@@ -438,7 +441,7 @@ public:
     */
    virtual int comboWidth() const;
-    QPopupMenu* popupMenu() const;
+    Q3PopupMenu* popupMenu() const;
    /**
     * Deprecated. See @ref setMenuAccelsEnabled .
@@ -567,7 +570,7 @@ public:
     *  @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 );
    /**
@@ -589,7 +592,7 @@ public:
     *  @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 );
@@ -685,7 +688,7 @@ public:
   *  @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 );
@@ -712,7 +715,7 @@ public:
   *  @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 );
@@ -834,11 +837,11 @@ public:
    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,
@@ -873,11 +876,11 @@ public:
                     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,
@@ -931,7 +934,7 @@ class KActionMenu : public KAction
 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 );
@@ -942,7 +945,7 @@ public:
    virtual void remove( KAction* );
 //US    KPopupMenu* popupMenu() const;
-    QPopupMenu* popupMenu() const;
+    Q3PopupMenu* popupMenu() const;
    void popup( const QPoint& global );
    /**
@@ -1067,7 +1070,7 @@ public:
     * 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
@@ -1098,7 +1101,7 @@ public:
 private:
 //US    KPopupMenu *m_popup;
-    QPopupMenu *m_popup;
+    Q3PopupMenu *m_popup;
    bool m_delayed:1;
    bool m_stickyMenu:1;
 protected:
@@ -1147,8 +1150,8 @@ public slots:
    virtual void setChecked( bool );
 private:
-    QCString               m_toolBarName;
+    Q3CString               m_toolBarName;
-    QGuardedPtr<KToolBar>  m_toolBar;
+    QPointer<KToolBar>  m_toolBar;
 protected:
    virtual void virtual_hook( int id, void* data );
 private:
@@ -1195,7 +1198,7 @@ public:
 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 );
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
@@ -26,7 +26,9 @@
 #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>
@@ -36,8 +38,8 @@
 //US#include <kxmlguifactory.h>
 //US I included the following files
-#include <qasciidict.h>
+#include <q3asciidict.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include "kaction.h"
 #include <kglobal.h>
 #include <qobject.h>
@@ -67,13 +69,13 @@ public:
  //int m_iWidgetCurrent;
  //QValueList<QWidget*> m_widgetList;
  //QValueList<KAccel*> m_kaccelList;
-  QValueList<KActionCollection*> m_docList;
+  Q3ValueList<KActionCollection*> m_docList;
  QWidget *m_widget;
  KAccel *m_kaccel;
  KAccel *m_builderKAccel;
-  QAsciiDict<KAction> m_actionDict;
+  Q3AsciiDict<KAction> m_actionDict;
-  QPtrDict< QPtrList<KAction> > m_dctHighlightContainers;
+  Q3PtrDict< Q3PtrList<KAction> > m_dctHighlightContainers;
  bool m_highlight;
  KAction *m_currentHighlightAction;
  bool m_statusCleared;
@@ -133,7 +135,7 @@ KActionCollection::KActionCollection( const KActionCollection &copy )
 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;
@@ -365,7 +367,7 @@ KAction* KActionCollection::_take( KAction* action )
 void KActionCollection::_clear()
 {
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
  while ( it.current() )
    _remove( it.current() );
 }
@@ -386,7 +388,7 @@ KAction* KActionCollection::action( const char* name, const char* classname ) co
    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 ) &&
@@ -407,7 +409,7 @@ KAction* KActionCollection::action( const char* name, const char* classname ) co
 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 );
@@ -432,7 +434,7 @@ 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() );
@@ -444,7 +446,7 @@ 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() );
@@ -458,7 +460,7 @@ 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() );
@@ -508,13 +510,13 @@ 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 ) ) );
@@ -522,7 +524,7 @@ void KActionCollection::connectHighlight( QWidget *container, KAction *action )
               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 ) ) );
@@ -542,7 +544,7 @@ 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;
@@ -625,12 +627,12 @@ void KActionCollection::slotDestroyed()
 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();
@@ -644,9 +646,9 @@ KActionCollection KActionCollection::operator+(const KActionCollection &c ) cons
  kdWarning(129) << "KActionCollection::operator+(): function is severely deprecated." << endl;
  KActionCollection ret( *this );
-  QValueList<KAction *> actions = c.actions();
+  Q3ValueList<KAction *> actions = c.actions();
-  QValueList<KAction *>::ConstIterator it = actions.begin();
+  Q3ValueList<KAction *>::ConstIterator it = actions.begin();
-  QValueList<KAction *>::ConstIterator end = actions.end();
+  Q3ValueList<KAction *>::ConstIterator end = actions.end();
  for (; it != end; ++it )
    ret.insert( *it );
@@ -670,7 +672,7 @@ KActionCollection &KActionCollection::operator=( const KActionCollection &copy )
 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() );
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
@@ -30,6 +30,8 @@
 //US #include <qkeysequence.h>
 #include <qobject.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //US#include <qvaluelist.h>
 //US#include <qguardedptr.h>
 //US #include <kguiitem.h>
@@ -60,7 +62,7 @@
 class QWidget;
-typedef QValueList<KAction *> KActionPtrList;
+typedef Q3ValueList<KAction *> KActionPtrList;
 /**
 * A managed set of KAction objects.
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
@@ -49,7 +49,9 @@
 
 #include <kbuttonbox.h>
 #include <qpushbutton.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 #include <assert.h>
 #define minButtonWidth 50
@@ -62,7 +64,7 @@ public:
  unsigned short actual_size;
 };
-template class QPtrList<KButtonBox::Item>;
+template class Q3PtrList<KButtonBox::Item>;
 class KButtonBoxPrivate {
 public:
@@ -70,10 +72,10 @@ public:
  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)
 {
@@ -149,7 +151,7 @@ void KButtonBox::layout() {
 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;
@@ -251,7 +253,7 @@ QSize KButtonBox::sizeHint() const {
        else
          s = bs;
-        if(data->orientation == Horizontal)
+        if(data->orientation == Qt::Horizontal)
          dw += s.width();
        else
          dw += s.height();
@@ -261,7 +263,7 @@ QSize KButtonBox::sizeHint() const {
      }
    }
-    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);
@@ -270,7 +272,7 @@ QSize KButtonBox::sizeHint() const {
 QSizePolicy KButtonBox::sizePolicy() const
 {
-    return data->orientation == Horizontal?
+    return data->orientation == Qt::Horizontal?
        QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ) :
        QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum );
 }
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
@@ -21,6 +21,8 @@
 #define __KBUTTONBOX__H__
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 class QPushButton;
 class KButtonBoxPrivate;
@@ -48,7 +50,7 @@ public:
    * @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);
  /**
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
@@ -20,7 +20,7 @@
 #include <qregexp.h>
 #include <qstring.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qpixmap.h>
 #include <assert.h>
@@ -62,7 +62,7 @@ public:
    QString m_whatsThis;
    QString m_statusText;
    QString m_iconName;
-    QIconSet m_iconSet;
+    QIcon m_iconSet;
    bool m_hasIcon : 1;
    bool m_enabled : 1;
 };
@@ -82,7 +82,7 @@ KGuiItem::KGuiItem( const QString &text,    const QString &iconName,
    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;
@@ -124,7 +124,7 @@ QString KGuiItem::plainText() const {
  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 )
    {
@@ -148,7 +148,7 @@ QIconSet KGuiItem::iconSet( KIcon::Group group, int size /*US, KInstance* instan
        }
    }
    else
-        return QIconSet();
+        return QIcon();
 }
 QString KGuiItem::iconName() const
@@ -177,7 +177,7 @@ 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;
@@ -187,7 +187,7 @@ void KGuiItem::setIconSet( const QIconSet &iconset )
 void KGuiItem::setIconName( const QString &iconName )
 {
    d->m_iconName = iconName;
-    d->m_iconSet = QIconSet();
+    d->m_iconSet = QIcon();
    d->m_hasIcon = !iconName.isEmpty();
 }
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
@@ -23,9 +23,9 @@
 #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>
@@ -42,7 +42,7 @@ public:
              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 );
@@ -53,10 +53,10 @@ public:
    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;
@@ -69,7 +69,7 @@ public:
 #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 );
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
@@ -22,15 +22,23 @@
 #include <qbitmap.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qtabwidget.h>
-#include <qlistview.h>
+#include <q3listview.h>
-#include <qhbox.h>
+#include <q3hbox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qgrid.h>
+#include <q3grid.h>
 #include <qpainter.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3Frame>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 /*US 
 #include <qbitmap.h>
 #include <qgrid.h>
@@ -65,13 +73,13 @@
 #include "kjanuswidget.h"
-class KJanusWidget::IconListItem : public QListBoxItem
+class KJanusWidget::IconListItem : public Q3ListBoxItem
 {
  public:
-    IconListItem( QListBox *listbox, const QPixmap &pixmap,
+    IconListItem( Q3ListBox *listbox, const QPixmap &pixmap,
                   const QString &text );
-    virtual int height( const QListBox *lb ) const;
+    virtual int height( const Q3ListBox *lb ) const;
-    virtual int width( const QListBox *lb ) const;
+    virtual int width( const Q3ListBox *lb ) const;
    int expandMinimumWidth( int width );
  protected:
@@ -98,7 +106,7 @@ public:
  QMap<int, QString> mIntToTitle;
 };
-template class QPtrList<QListViewItem>;
+template class Q3PtrList<Q3ListViewItem>;
 KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
@@ -107,12 +115,12 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
    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
@@ -145,7 +153,7 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
    }
    else
    {
-      QHBoxLayout *hbox = new QHBoxLayout( topLayout );
+      Q3HBoxLayout *hbox = new Q3HBoxLayout( topLayout );
      mIconList = new IconListBox( this );
      QFont listFont( mIconList->font() );
@@ -156,7 +164,7 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
      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 );
    }
@@ -165,7 +173,7 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
    // 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 );
@@ -175,10 +183,10 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
    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 );
@@ -199,7 +207,7 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
  else
  {
    mFace = Plain;
-    mPlainPage = new QFrame( this );
+    mPlainPage = new Q3Frame( this );
    topLayout->addWidget( mPlainPage, 10 );
  }
 /*US
@@ -245,7 +253,7 @@ bool KJanusWidget::isValid() const
 }
-QFrame *KJanusWidget::plainPage()
+Q3Frame *KJanusWidget::plainPage()
 {
  return( mPlainPage );
 }
@@ -266,7 +274,7 @@ QWidget *KJanusWidget::FindParent()
  }
 }
-QFrame *KJanusWidget::addPage( const QStringList &items, const QString &header,
+Q3Frame *KJanusWidget::addPage( const QStringList &items, const QString &header,
                               const QPixmap &pixmap )
 {
  if( mValid == false )
@@ -275,7 +283,7 @@ QFrame *KJanusWidget::addPage( const QStringList &items, const QString &header,
    return( 0 );
  }
-  QFrame *page = new QFrame( FindParent(), "page" );
+  Q3Frame *page = new Q3Frame( FindParent(), "page" );
  addPageWidget( page, items, header, pixmap );
  return page;
@@ -287,13 +295,13 @@ void KJanusWidget::pageGone( QObject *obj )
  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 )
 {
@@ -304,7 +312,7 @@ QFrame *KJanusWidget::addPage( const QString &itemName, const QString &header,
-QVBox *KJanusWidget::addVBoxPage( const QStringList &items,
+Q3VBox *KJanusWidget::addVBoxPage( const QStringList &items,
                                  const QString &header,
                                  const QPixmap &pixmap )
 {
@@ -315,14 +323,14 @@ QVBox *KJanusWidget::addVBoxPage( const QStringList &items,
    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 )
 {
@@ -331,7 +339,7 @@ QVBox *KJanusWidget::addVBoxPage( const QString &itemName,
  return addVBoxPage(items, header, pixmap);
 }
-QHBox *KJanusWidget::addHBoxPage( const QStringList &items,
+Q3HBox *KJanusWidget::addHBoxPage( const QStringList &items,
                                  const QString &header,
                                  const QPixmap &pixmap )
 {
@@ -340,14 +348,14 @@ QHBox *KJanusWidget::addHBoxPage( const QStringList &items,
    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 )
 {
@@ -356,7 +364,7 @@ QHBox *KJanusWidget::addHBoxPage( const QString &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 )
@@ -367,7 +375,7 @@ QGrid *KJanusWidget::addGridPage( int n, QGrid::Direction dir,
    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 );
@@ -375,7 +383,7 @@ QGrid *KJanusWidget::addGridPage( int n, QGrid::Direction dir,
 }
-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 )
@@ -385,10 +393,10 @@ QGrid *KJanusWidget::addGridPage( int n, QGrid::Direction dir,
  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;
@@ -412,9 +420,9 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
      // 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) {
@@ -431,9 +439,9 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
    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
@@ -459,7 +467,7 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
  }
 }
-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. 
@@ -550,15 +558,15 @@ bool KJanusWidget::setSwallowedWidget( QWidget *widget )
  {
    delete mSwallowPage->layout();
  }
-  QGridLayout *gbox = new QGridLayout( mSwallowPage, 1, 1, 0 );
+  Q3GridLayout *gbox = new Q3GridLayout( mSwallowPage, 1, 1, 0 );
  //
  // Hide old children
  //
-  QObjectList *l = (QObjectList*)mSwallowPage->children(); // silence please
+  QObjectList l = mSwallowPage->children(); // silence please
-  for( uint i=0; i < l->count(); i++ )
+  for( uint i=0; i < l.count(); i++ )
  {
-    QObject *o = l->at(i);
+    QObject *o = l.at(i);
    if( o->isWidgetType() )
    {
      ((QWidget*)o)->hide();
@@ -597,7 +605,7 @@ bool KJanusWidget::slotShowPage()
  if( mFace == TreeList )
  {
-    QListViewItem *node = mTreeList->selectedItem();
+    Q3ListViewItem *node = mTreeList->selectedItem();
    if( node == 0 ) { return( false ); }
    QWidget *stackItem = mTreeListToPageStack[node];
@@ -606,7 +614,7 @@ bool KJanusWidget::slotShowPage()
  }
  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)
@@ -646,9 +654,9 @@ bool KJanusWidget::showPage( QWidget *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 );
@@ -658,9 +666,9 @@ bool KJanusWidget::showPage( QWidget *w )
    }
    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 );
@@ -686,13 +694,13 @@ 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];
@@ -761,7 +769,7 @@ void KJanusWidget::slotFontChanged()
 */
 // 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());
@@ -895,11 +903,11 @@ 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 );
  }
 }
@@ -953,7 +961,7 @@ bool KJanusWidget::eventFilter( QObject *o, QEvent *e )
 KJanusWidget::IconListBox::IconListBox( QWidget *parent, const char *name,
-                                        WFlags f )
+                                        Qt::WFlags f )
  :KListBox( parent, name, f ), mShowAll(false), mHeightValid(false),
   mWidthValid(false)
 {
@@ -965,7 +973,7 @@ 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 );
    }
@@ -980,13 +988,13 @@ 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 );
    }
@@ -1022,9 +1030,9 @@ void KJanusWidget::IconListBox::setShowAll( bool showAll )
-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 )
@@ -1083,7 +1091,7 @@ void KJanusWidget::IconListItem::paint( QPainter *painter )
  }
 }
-int KJanusWidget::IconListItem::height( const QListBox *lb ) const
+int KJanusWidget::IconListItem::height( const Q3ListBox *lb ) const
 {
  if( text().isEmpty() == true )
  {
@@ -1096,7 +1104,7 @@ int KJanusWidget::IconListItem::height( const QListBox *lb ) const
 }
-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;
@@ -1122,7 +1130,7 @@ void KJanusWidget::removePage( QWidget *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)
      {
@@ -1137,7 +1145,7 @@ void KJanusWidget::removePage( QWidget *page )
  }
  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)
      {
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
@@ -20,10 +20,16 @@
 #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
@@ -38,12 +44,12 @@
 class KSeparator;
 class KListView;
-class QWidgetStack;
+class Q3WidgetStack;
 class QLabel;
 class QTabWidget;
-class QListViewItem;
+class Q3ListViewItem;
-class QVBox;
+class Q3VBox;
-class QHBox;
+class Q3HBox;
 /**
 * Provides a number of ready to use layouts (faces). It is used
@@ -102,7 +108,7 @@ class KJanusWidget : public QWidget
    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();
@@ -193,7 +199,7 @@ class KJanusWidget : public QWidget
     *
     * @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
@@ -214,7 +220,7 @@ class KJanusWidget : public QWidget
     * @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() );
    /**
@@ -231,7 +237,7 @@ 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.
     **/
-     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() );
    /**
@@ -253,7 +259,7 @@ class KJanusWidget : public QWidget
     *
     * @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() );
@@ -269,7 +275,7 @@ 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.
     **/
-    virtual QVBox *addVBoxPage( const QStringList &items,
+    virtual Q3VBox *addVBoxPage( const QStringList &items,
                        const QString &header=QString::null,
                        const QPixmap &pixmap=QPixmap() );
@@ -293,7 +299,7 @@ class KJanusWidget : public QWidget
     * @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() );
@@ -309,7 +315,7 @@ 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.
     **/
-    virtual QHBox *addHBoxPage( const QStringList &items,
+    virtual Q3HBox *addHBoxPage( const QStringList &items,
                        const QString &header=QString::null,
                        const QPixmap &pixmap=QPixmap() );
@@ -337,7 +343,7 @@ class KJanusWidget : public QWidget
     *         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() );
@@ -355,7 +361,7 @@ class KJanusWidget : public QWidget
     * 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() );
@@ -517,38 +523,38 @@ class KJanusWidget : public QWidget
  private slots:
    bool slotShowPage();
 //US not yet implemented    void slotFontChanged();
-    void slotItemClicked(QListViewItem *it);
+    void slotItemClicked(Q3ListViewItem *it);
    void pageGone( QObject *obj); // signal from the added page's "destroyed" signal
-    void slotReopen(QListViewItem *item);
+    void slotReopen(Q3ListViewItem *item);
  protected:
    bool showPage( QWidget *w );
-    void addPageWidget( QFrame *page, const QStringList &items,
+    void addPageWidget( Q3Frame *page, const QStringList &items,
                        const QString &header, const QPixmap &pixmap );
-    void InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, QFrame *page);
+    void InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, Q3Frame *page);
    QWidget *FindParent();
  private:
    bool mValid;
    // Obsolete members. Remove in KDE 4.
-    QPtrList<QWidget> *mPageList;
+    Q3PtrList<QWidget> *mPageList;
    QStringList *mTitleList;
    int          mFace;
    KListView    *mTreeList;
    IconListBox  *mIconList;
-    QWidgetStack *mPageStack;
+    Q3WidgetStack *mPageStack;
    QLabel       *mTitleLabel;
    QTabWidget   *mTabControl;
-    QFrame       *mPlainPage;
+    Q3Frame       *mPlainPage;
    QWidget      *mSwallowPage;
    QWidget      *mActivePageWidget;
    KSeparator   *mTitleSep;
 //US    QSplitter::ResizeMode mTreeListResizeMode;
    bool         mShowIconsInTreeList;
-    QMap<QListViewItem *, QWidget *> mTreeListToPageStack;
+    QMap<Q3ListViewItem *, QWidget *> mTreeListToPageStack;
-    QMap<QListBoxItem *, QWidget *> mIconListToPageStack;
+    QMap<Q3ListBoxItem *, QWidget *> mIconListToPageStack;
    QMap<QString, QPixmap> mFolderIconMap;
    QMap<QString, QStringList> mChildrenNames;
    QMap<QString, QWidget *> mChildPages;
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
@@ -16,6 +16,11 @@
   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>
@@ -26,22 +31,23 @@
 #include "klistbox.h"
 #ifdef Q_WS_X11
+#include <QX11Info>
 #include <X11/Xlib.h>
 #endif
 #ifdef _WIN32_
 #define Q_WS_QWS
 #endif
-KListBox::KListBox( QWidget *parent, const char *name, WFlags f )
+KListBox::KListBox( QWidget *parent, const char *name, Qt::WFlags f )
-    : QListBox( parent, name, f )
+    : Q3ListBox( parent, name, f )
 {
    connect( this, SIGNAL( onViewport() ),
             this, SLOT( slotOnViewport() ) );
-    connect( this, SIGNAL( onItem( QListBoxItem * ) ),
+    connect( this, SIGNAL( onItem( Q3ListBoxItem * ) ),
-             this, SLOT( slotOnItem( QListBoxItem * ) ) );
+             this, SLOT( slotOnItem( Q3ListBoxItem * ) ) );
-    connect( this, SIGNAL( mouseButtonClicked( int, QListBoxItem *, 
+    connect( this, SIGNAL( mouseButtonClicked( int, Q3ListBoxItem *, 
        const QPoint & ) ),
-              this, SLOT( slotMouseButtonClicked( int, QListBoxItem *,
+              this, SLOT( slotMouseButtonClicked( int, Q3ListBoxItem *,
        const QPoint & ) ) );
 /*US    
@@ -60,7 +66,7 @@ KListBox::KListBox( QWidget *parent, const char *name, WFlags f )
      this, SLOT( slotAutoSelect() ) );
 }
-void KListBox::slotOnItem( QListBoxItem *item )
+void KListBox::slotOnItem( Q3ListBoxItem *item )
 {
 /*US
    if ( item && m_bChangeCursorOverItem && m_bUseSingle )
@@ -139,11 +145,11 @@ void KListBox::slotAutoSelect()
  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 ) {
@@ -167,7 +173,7 @@ void KListBox::slotAutoSelect()
      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 );
@@ -186,7 +192,7 @@ void KListBox::slotAutoSelect()
      emit selectionChanged();
-      if( selectionMode() == QListBox::Single )
+      if( selectionMode() == Q3ListBox::Single )
        emit selectionChanged( m_pCurrentItem );
    }
 #ifndef Q_WS_QWS //FIXME
@@ -213,14 +219,14 @@ void KListBox::slotAutoSelect()
 #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
    
@@ -246,17 +252,17 @@ void KListBox::emitExecute( QListBoxItem *item, const QPoint &pos )
 //
 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);
  }
 }
@@ -264,19 +270,19 @@ 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 );
@@ -285,26 +291,26 @@ void KListBox::contentsMousePressEvent( QMouseEvent *e )
    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 );
 }
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
@@ -18,7 +18,12 @@
 #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
@@ -35,12 +40,12 @@
 * 
 * @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:
@@ -54,7 +59,7 @@ signals:
   * 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. 
@@ -67,7 +72,7 @@ signals:
   * 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 
@@ -83,10 +88,10 @@ signals:
   * 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);
@@ -97,7 +102,7 @@ protected slots:
  void slotAutoSelect();
 protected:
-  void emitExecute( QListBoxItem *item, const QPoint &pos );
+  void emitExecute( Q3ListBoxItem *item, const QPoint &pos );
  /**
   * @reimplemented
@@ -123,13 +128,13 @@ protected:
  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 );
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
@@ -18,13 +18,27 @@
   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>
@@ -38,7 +52,7 @@
 #endif
 #ifndef _WIN32_
 #define private public
-#include <qlistview.h>
+#include <q3listview.h>
 #undef private
 #endif
 #include "klistview.h"
@@ -46,9 +60,10 @@
 #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);
@@ -67,7 +82,7 @@ private:
 };
 KListView::Tooltip::Tooltip (KListView* parent, QToolTipGroup* group)
-  : QToolTip (parent, group),
+  : /* XXX:hacker:XXX: QToolTip (parent, group), */
        mParent (parent)
 {
 }
@@ -123,20 +138,20 @@ public:
 //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;
@@ -170,8 +185,8 @@ public:
  QRect mOldDropVisualizer;
  int mDropVisualizerWidth;
  QRect mOldDropHighlighter;
-  QListViewItem *afterItemDrop;
+  Q3ListViewItem *afterItemDrop;
-  QListViewItem *parentItemDrop;
+  Q3ListViewItem *parentItemDrop;
  QColor alternateBackground;
 };
@@ -226,7 +241,7 @@ void KListViewLineEdit::load(QListViewItem *i, int c)
         *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)
        {
@@ -239,9 +254,9 @@ static int nextCol (KListView *pl, QListViewItem *pi, int start, int dir)
        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.
@@ -252,7 +267,7 @@ static QListViewItem *prevItem (QListViewItem *pi)
        return NULL;
 }
-static QListViewItem *lastQChild (QListViewItem *pi)
+static Q3ListViewItem *lastQChild (Q3ListViewItem *pi)
 {
        if (pi)
        {
@@ -260,7 +275,7 @@ static QListViewItem *lastQChild (QListViewItem *pi)
                         *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;
        }
@@ -328,10 +343,10 @@ bool KListViewLineEdit::event (QEvent *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;
            }
        }
@@ -406,7 +421,7 @@ void KListViewLineEdit::slotSelectionChanged()
 */
 KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse  )
-  : QListView( parent, name ),
+  : Q3ListView( parent, name ),
        d (new KListViewPrivate (this))
 {
 #ifndef DESKTOP_VERSION
@@ -417,8 +432,8 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse
  connect( this, SIGNAL( onViewport() ),
                   this, SLOT( slotOnViewport() ) );
-  connect( this, SIGNAL( onItem( QListViewItem * ) ),
+  connect( this, SIGNAL( onItem( Q3ListViewItem * ) ),
-                   this, SLOT( slotOnItem( QListViewItem * ) ) );
+                   this, SLOT( slotOnItem( Q3ListViewItem * ) ) );
  connect (this, SIGNAL(contentsMoving(int,int)),
                   this, SLOT(cleanDropVisualizer()));
@@ -445,17 +460,17 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse
  // context menu handling
  if (d->showContextMenusOnPress)
        {
-          connect (this, SIGNAL (rightButtonPressed (QListViewItem*, const QPoint&, int)),
+          connect (this, SIGNAL (rightButtonPressed (Q3ListViewItem*, const QPoint&, int)),
-                           this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int)));
+                           this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int)));
        }
  else
        {
-          connect (this, SIGNAL (rightButtonClicked (QListViewItem*, const QPoint&, int)),
+          connect (this, SIGNAL (rightButtonClicked (Q3ListViewItem*, const QPoint&, int)),
-                           this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int)));
+                           this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int)));
        }
-  connect (this, SIGNAL (menuShortCutPressed (KListView*, QListViewItem*)),
+  connect (this, SIGNAL (menuShortCutPressed (KListView*, Q3ListViewItem*)),
-                   this, SLOT (emitContextMenu (KListView*, QListViewItem*)));
+                   this, SLOT (emitContextMenu (KListView*, Q3ListViewItem*)));
  
 
  //qDebug("KListView::KListView make alternate color configurable");  
@@ -480,7 +495,7 @@ QSize KListView::sizeHint() const
 {
    //qDebug("KListView::QSize sizeHint() ");
 #ifdef DESKTOP_VERSION
-    return QListView::sizeHint();
+    return Q3ListView::sizeHint();
 #else
    return QSize ( 40, 40 );
 #endif
@@ -503,7 +518,7 @@ bool KListView::isExecuteArea( int x )
  }
 }
-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 ) {
@@ -534,12 +549,12 @@ void KListView::slotSettingsChanged(int category)
    //US set explicitly d->bUseSingle = KGlobalSettings::singleClick();
    //    qDebug("KListView::slotSettingsChanged: single%i", d->bUseSingle);
-    disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
+    disconnect(this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)),
-               this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int)));
+               this, SLOT (slotMouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)));
    if( d->bUseSingle )
-      connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
+      connect (this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)),
-               this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int)));
+               this, SLOT (slotMouseButtonClicked( int, Q3ListViewItem*, const QPoint &, int)));
    //US d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon();
    //US d->autoSelectDelay = KGlobalSettings::autoSelectDelay();
@@ -611,7 +626,7 @@ void KListView::slotAutoSelect()
  if( !hasFocus() )
    setFocus();
-  QListViewItem* previousItem = currentItem();
+  Q3ListViewItem* previousItem = currentItem();
  setCurrentItem( d->pCurrentItem );
 #if 0
@@ -632,7 +647,7 @@ void KListView::slotAutoSelect()
      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 );
@@ -651,7 +666,7 @@ void KListView::slotAutoSelect()
      emit selectionChanged();
-      if( selectionMode() == QListView::Single )
+      if( selectionMode() == Q3ListView::Single )
                emit selectionChanged( d->pCurrentItem );
    }
    else if( (keybstate & ControlMask) )
@@ -684,7 +699,7 @@ void KListView::slotHeaderChanged()
  }
 }
-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) ) ) {
@@ -701,7 +716,7 @@ void KListView::emitExecute( int buttonstate, QListViewItem *item, const QPoint
            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 );
@@ -714,7 +729,7 @@ void KListView::emitExecute( int buttonstate, QListViewItem *item, const QPoint
 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)
@@ -747,14 +762,14 @@ void KListView::focusOutEvent( QFocusEvent *fe )
      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 )
@@ -765,13 +780,13 @@ bool KListView::event( QEvent *e )
  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 );
@@ -793,7 +808,7 @@ void KListView::contentsMousePressEvent( QMouseEvent *e )
  };
  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
@@ -801,7 +816,7 @@ void KListView::contentsMousePressEvent( QMouseEvent *e )
                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();
@@ -813,18 +828,18 @@ void KListView::contentsMousePressEvent( QMouseEvent *e )
    }
  }
-  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 )
@@ -853,7 +868,7 @@ void KListView::contentsMouseMoveEvent( QMouseEvent *e )
       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;
@@ -862,13 +877,13 @@ void KListView::contentsMouseMoveEvent( QMouseEvent *e )
 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)
@@ -890,7 +905,7 @@ void KListView::contentsMouseReleaseEvent( QMouseEvent *e )
    d->validDrag = false;
    d->startDragPos = QPoint();
  }
-  QListView::contentsMouseReleaseEvent( e );
+  Q3ListView::contentsMouseReleaseEvent( e );
 }
 void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e )
@@ -901,8 +916,8 @@ void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e )
  //QListView::contentsMouseDoubleClickEvent( e );
  QPoint vp = contentsToViewport(e->pos());
-  QListViewItem *item = itemAt( vp );
+  Q3ListViewItem *item = itemAt( vp );
-  emit QListView::doubleClicked( item ); // we do it now
+  emit Q3ListView::doubleClicked( item ); // we do it now
  int col = item ? header()->mapToLogical( header()->cellAt( vp.x() ) ) : -1;
@@ -911,7 +926,7 @@ void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e )
    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);
@@ -919,11 +934,11 @@ void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e )
  }
 }
-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);
@@ -961,12 +976,12 @@ qDebug("KListView::contentsDropEvent drag&drop not supported yet");
  
 }
-void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme)
+void KListView::movableDropEvent (Q3ListViewItem* parent, Q3ListViewItem* afterme)
 {
-  QPtrList<QListViewItem> items, afterFirsts, afterNows;
+  Q3PtrList<Q3ListViewItem> items, afterFirsts, afterNows;
-  QListViewItem *current=currentItem();
+  Q3ListViewItem *current=currentItem();
  bool hasMoved=false;
-  for (QListViewItem *i = firstChild(), *iNext=0; i != 0; i = iNext)
+  for (Q3ListViewItem *i = firstChild(), *iNext=0; i != 0; i = iNext)
  {
    iNext=i->itemBelow();
    if (!i->isSelected())
@@ -979,7 +994,7 @@ void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme)
    i->setSelected(false);
-    QListViewItem *afterFirst = i->itemAbove();
+    Q3ListViewItem *afterFirst = i->itemAbove();
        if (!hasMoved)
        {
@@ -1000,7 +1015,7 @@ void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* 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);
@@ -1086,14 +1101,14 @@ 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
@@ -1123,8 +1138,8 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte
      // Ok, there's one more level of complexity. We may want to become a new
      // sibling, but of an upper-level group, rather than the "above" item
-      QListViewItem * betterAbove = above->parent();
+      Q3ListViewItem * betterAbove = above->parent();
-      QListViewItem * last = above;
+      Q3ListViewItem * last = above;
      while ( betterAbove )
      {
          // We are allowed to become a sibling of "betterAbove" only if we are
@@ -1146,9 +1161,9 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte
  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());
@@ -1156,11 +1171,11 @@ QListViewItem* KListView::lastChild () const
  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;
@@ -1187,12 +1202,12 @@ qDebug("KListView::startDrag drag&drop not supported yet.");
 */    
 }
-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)
@@ -1246,19 +1261,19 @@ void KListView::setDropVisualizer(bool b)
  d->dropVisualizer=b;
 }
-QPtrList<QListViewItem> KListView::selectedItems() const
+Q3PtrList<Q3ListViewItem> KListView::selectedItems() const
 {
-  QPtrList<QListViewItem> list;
+  Q3PtrList<Q3ListViewItem> list;
-  for (QListViewItem *i=firstChild(); i!=0; i=i->itemBelow())
+  for (Q3ListViewItem *i=firstChild(); i!=0; i=i->itemBelow())
        if (i->isSelected()) list.append(i);
  return list;
 }
-void KListView::moveItem(QListViewItem *item, QListViewItem *parent, QListViewItem *after)
+void KListView::moveItem(Q3ListViewItem *item, Q3ListViewItem *parent, Q3ListViewItem *after)
 {
  // sanity check - don't move a item into it's own child structure
-  QListViewItem *i = parent;
+  Q3ListViewItem *i = parent;
  while(i)
    {
      if(i == item)
@@ -1296,8 +1311,8 @@ void KListView::setDropVisualizerWidth (int w)
  d->mDropVisualizerWidth = w > 0 ? w : 1;
 }
-QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent,
+QRect KListView::drawDropVisualizer(QPainter *p, Q3ListViewItem *parent,
-                                    QListViewItem *after)
+                                    Q3ListViewItem *after)
 {
    QRect insertmarker;
@@ -1308,7 +1323,7 @@ QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent,
        int level = 0;
        if (after)
        {
-            QListViewItem* it = 0L;
+            Q3ListViewItem* it = 0L;
            if (after->isOpen())
            {
                // Look for the last child (recursively)
@@ -1338,12 +1353,12 @@ QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent,
    // 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;
@@ -1376,7 +1391,7 @@ void KListView::cleanItemHighlighter ()
  }
 }
-void KListView::rename(QListViewItem *item, int c)
+void KListView::rename(Q3ListViewItem *item, int c)
 {
  if (d->renameable.contains(c))
  {
@@ -1403,7 +1418,7 @@ void KListView::setRenameable (int col, bool yesno)
    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);
@@ -1447,12 +1462,12 @@ 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);
 }
@@ -1482,7 +1497,7 @@ void KListView::keyPressEvent (QKeyEvent* e)
        }
  if (d->selectionMode != FileManager)
-        QListView::keyPressEvent (e);
+        Q3ListView::keyPressEvent (e);
  else
        fileManagerKeyPressEvent (e);
 }
@@ -1513,45 +1528,45 @@ bool KListView::automaticSelection() const
 void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
 {
   //don't care whether it's on the keypad or not
-    int e_state=(e->state() & ~Keypad);
+    int e_state=(e->state() & ~Qt::Keypad);
    int oldSelectionDirection(d->selectionDirection);
-    if ((e->key()!=Key_Shift) && (e->key()!=Key_Control)
+    if ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control)
-        && (e->key()!=Key_Meta) && (e->key()!=Key_Alt))
+        && (e->key()!=Qt::Key_Meta) && (e->key()!=Qt::Key_Alt))
    {
-       if ((e_state==ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove))
+       if ((e_state==Qt::ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove))
          selectAll(FALSE);
       d->selectionDirection=0;
-       d->wasShiftEvent = (e_state == ShiftButton);
+       d->wasShiftEvent = (e_state == Qt::ShiftButton);
    };
-    //d->wasShiftEvent = (e_state == ShiftButton);
+    //d->wasShiftEvent = (e_state == Qt::ShiftButton);
-    QListViewItem* item = currentItem();
+    Q3ListViewItem* item = currentItem();
    if (item==0) return;
-    QListViewItem* repaintItem1 = item;
+    Q3ListViewItem* repaintItem1 = item;
-    QListViewItem* repaintItem2 = 0L;
+    Q3ListViewItem* repaintItem2 = 0L;
-    QListViewItem* visItem = 0L;
+    Q3ListViewItem* visItem = 0L;
-    QListViewItem* nextItem = 0L;
+    Q3ListViewItem* nextItem = 0L;
    int items = 0;
-    bool shiftOrCtrl((e_state==ControlButton) || (e_state==ShiftButton));
+    bool shiftOrCtrl((e_state==Qt::ControlButton) || (e_state==Qt::ShiftButton));
    int selectedItems(0);
-    for (QListViewItem *tmpItem=firstChild(); tmpItem!=0; tmpItem=tmpItem->nextSibling())
+    for (Q3ListViewItem *tmpItem=firstChild(); tmpItem!=0; tmpItem=tmpItem->nextSibling())
       if (tmpItem->isSelected()) selectedItems++;
    if (((selectedItems==0) || ((selectedItems==1) && (d->selectedUsingMouse)))
-        && (e_state==NoButton)
+        && (e_state==Qt::NoButton)
-        && ((e->key()==Key_Down)
+        && ((e->key()==Qt::Key_Down)
-        || (e->key()==Key_Up)
+        || (e->key()==Qt::Key_Up)
-        || (e->key()==Key_Next)
+        || (e->key()==Qt::Key_Next)
-        || (e->key()==Key_Prior)
+        || (e->key()==Qt::Key_Prior)
-        || (e->key()==Key_Home)
+        || (e->key()==Qt::Key_Home)
-        || (e->key()==Key_End)))
+        || (e->key()==Qt::Key_End)))
    {
       d->selectedBySimpleMove=true;
       d->selectedUsingMouse=false;
@@ -1563,12 +1578,12 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
    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;
@@ -1576,7 +1591,7 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
       emitSelectionChanged=TRUE;
       break;
-    case Key_Insert:
+      case Qt::Key_Insert:
       //toggle selection of current item and move to the next item
       if (d->selectedBySimpleMove)
       {
@@ -1600,7 +1615,7 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
       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)
@@ -1633,7 +1648,7 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
       };
       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
@@ -1668,7 +1683,7 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
       };
       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)
@@ -1693,7 +1708,7 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
       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;
@@ -1715,7 +1730,7 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
       emitSelectionChanged=TRUE;
       break;
-    case Key_Next:
+      case Qt::Key_Next:
       items=visibleHeight()/item->height();
       nextItem=item;
       if (d->selectedBySimpleMove)
@@ -1751,7 +1766,7 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
       }
       break;
-    case Key_Prior:
+      case Qt::Key_Prior:
       items=visibleHeight()/item->height();
       nextItem=item;
       if (d->selectedBySimpleMove)
@@ -1785,25 +1800,25 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
       }
       break;
-    case Key_Minus:
+      case Qt::Key_Minus:
       if ( item->isOpen() )
          setOpen( item, FALSE );
       break;
-    case Key_Plus:
+      case Qt::Key_Plus:
       if (  !item->isOpen() && (item->isExpandable() || item->childCount()) )
          setOpen( item, TRUE );
       break;
    default:
-       bool realKey = ((e->key()!=Key_Shift) && (e->key()!=Key_Control)
+       bool realKey = ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control)
-                        && (e->key()!=Key_Meta) && (e->key()!=Key_Alt));
+                        && (e->key()!=Qt::Key_Meta) && (e->key()!=Qt::Key_Alt));
       bool selectCurrentItem = (d->selectedBySimpleMove) && (item->isSelected());
       if (realKey && selectCurrentItem)
          item->setSelected(false);
       //this is mainly for the "goto filename beginning with pressed char" feature (aleXXX)
-       QListView::SelectionMode oldSelectionMode = selectionMode();
+       Q3ListView::SelectionMode oldSelectionMode = selectionMode();
-       setSelectionMode (QListView::Multi);
+       setSelectionMode (Q3ListView::Multi);
-       QListView::keyPressEvent (e);
+       Q3ListView::keyPressEvent (e);
       setSelectionMode (oldSelectionMode);
       if (realKey && selectCurrentItem)
       {
@@ -1850,11 +1865,11 @@ void KListView::setSelectionModeExt (SelectionModeExt mode)
    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:
@@ -1868,7 +1883,7 @@ 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;
@@ -1876,7 +1891,7 @@ int KListView::itemIndex( const QListViewItem *item ) const
    if ( item == firstChild() )
        return 0;
    else {
-        QListViewItemIterator it(firstChild());
+        Q3ListViewItemIterator it(firstChild());
        uint j = 0;
        for (; it.current() && it.current() != item; ++it, ++j );
@@ -1887,13 +1902,13 @@ int KListView::itemIndex( const QListViewItem *item ) const
    }
 }
-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();
@@ -1903,7 +1918,7 @@ QListViewItem* KListView::itemAtIndex(int index)
 }
-void KListView::emitContextMenu (KListView*, QListViewItem* i)
+void KListView::emitContextMenu (KListView*, Q3ListViewItem* i)
 {
  QPoint p;
  //    qDebug("KListView::emitContextMenu ");
@@ -1916,9 +1931,9 @@ void KListView::emitContextMenu (KListView*, QListViewItem* i)
  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");
@@ -1933,7 +1948,7 @@ void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col)
 void KListView::setAcceptDrops (bool val)
 {
-  QListView::setAcceptDrops (val);
+  Q3ListView::setAcceptDrops (val);
  viewport()->setAcceptDrops (val);
 }
@@ -1945,14 +1960,14 @@ int KListView::dropVisualizerWidth () const
 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))
    {
@@ -1988,7 +2003,7 @@ bool KListView::fullWidth() const
 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);
@@ -1996,9 +2011,9 @@ int KListView::addColumn(const QString& label, int width)
  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);
@@ -2008,13 +2023,13 @@ int KListView::addColumn(const QIconSet& iconset, const QString& label, int widt
 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
@@ -2070,7 +2085,7 @@ 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
@@ -2083,58 +2098,58 @@ bool KListView::ascendingSort(void) const
  return d->sortAscending;
 }
-KListViewItem::KListViewItem(QListView *parent)
+KListViewItem::KListViewItem(Q3ListView *parent)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
  init();
 }
-KListViewItem::KListViewItem(QListViewItem *parent)
+KListViewItem::KListViewItem(Q3ListViewItem *parent)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
  init();
 }
-KListViewItem::KListViewItem(QListView *parent, QListViewItem *after)
+KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after)
-  : QListViewItem(parent, after)
+  : Q3ListViewItem(parent, after)
 {
  init();
 }
-KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after)
+KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after)
-  : QListViewItem(parent, after)
+  : Q3ListViewItem(parent, after)
 {
  init();
 }
-KListViewItem::KListViewItem(QListView *parent,
+KListViewItem::KListViewItem(Q3ListView *parent,
    QString label1, QString label2, QString label3, QString label4,
    QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
  init();
 }
-KListViewItem::KListViewItem(QListViewItem *parent,
+KListViewItem::KListViewItem(Q3ListViewItem *parent,
    QString label1, QString label2, QString label3, QString label4,
    QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
  init();
 }
-KListViewItem::KListViewItem(QListView *parent, QListViewItem *after,
+KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after,
    QString label1, QString label2, QString label3, QString label4,
    QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
  init();
 }
-KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after,
+KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after,
    QString label1, QString label2, QString label3, QString label4,
    QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
  init();
 }
@@ -2212,12 +2227,12 @@ void KListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, in
  }
  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
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
@@ -20,9 +20,20 @@
 #ifndef KLISTVIEW_H
 #define KLISTVIEW_H
-#include <qlistview.h>
+#include <q3listview.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QDragEnterEvent>
 //US 
 class QDropEvent;
@@ -30,7 +41,7 @@ class QDragLeaveEvent;
 class QDragMoveEvent;
 class QDragEnterEvent;
-class QDragObject;
+class Q3DragObject;
 class KConfig;
 class KLineEdit;
 /**
@@ -57,7 +68,7 @@ class KLineEdit;
 *
 * @version $Id$
 */
-class KListView : public QListView
+class KListView : public Q3ListView
 {
  Q_OBJECT
  Q_ENUMS( SelectionModeExt )
@@ -106,15 +117,15 @@ public:
   *   This way e.g. SHIFT+up/PgUp then SHIFT+down/PgDn leaves no item selected
   */
  enum SelectionModeExt {
-        Single = QListView::Single,
+        Single = Q3ListView::Single,
-        Multi = QListView::Multi,
+        Multi = Q3ListView::Multi,
-        Extended = QListView::Extended,
+        Extended = Q3ListView::Extended,
-        NoSelection = QListView::NoSelection,
+        NoSelection = Q3ListView::NoSelection,
        FileManager
  };
  void repaintContents( bool erase = true )
        {
-            QScrollView::repaintContents( contentsX(), contentsY(),
+            Q3ScrollView::repaintContents( contentsX(), contentsY(),
                                          visibleWidth(), visibleHeight(), erase );
        };
  /**
@@ -161,26 +172,26 @@ public:
  /**
   * @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.
@@ -276,14 +287,14 @@ public:
   * @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
@@ -314,7 +325,7 @@ public:
  /**
   * 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
   *
@@ -388,7 +399,7 @@ signals:
   * 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.
@@ -401,7 +412,7 @@ signals:
   * 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
@@ -417,8 +428,8 @@ signals:
   * You should normally not need to use this. In most cases its better
   * to use @ref #executed() instead.
   */
-  void doubleClicked( QListViewItem *item, const QPoint &pos, int c );
+  void doubleClicked( Q3ListViewItem *item, const QPoint &pos, int c );
-  void contextRequest( QListViewItem *item, const QPoint &pos, int c );
+  void contextRequest( Q3ListViewItem *item, const QPoint &pos, int c );
  /**
   * This signal gets emitted whenever something acceptable is
@@ -430,7 +441,7 @@ signals:
   *
   * @see #acceptDrop()
   */
-  void dropped (QDropEvent * e, QListViewItem *after);
+  void dropped (QDropEvent * e, Q3ListViewItem *after);
  /**
   * This signal gets emitted whenever something acceptable is
@@ -444,7 +455,7 @@ signals:
   * @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
@@ -458,7 +469,7 @@ signals:
   * @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
@@ -471,7 +482,7 @@ signals:
   * @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
@@ -502,7 +513,7 @@ signals:
   * @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);
  /**
@@ -510,7 +521,7 @@ signals:
   * 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.
@@ -519,12 +530,12 @@ signals:
   * @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();
  /**
@@ -537,7 +548,7 @@ signals:
   * @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.
@@ -547,13 +558,13 @@ signals:
   * @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),
@@ -673,7 +684,7 @@ protected:
   * @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));
  }
@@ -689,7 +700,7 @@ protected:
   * @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.
@@ -721,12 +732,12 @@ protected:
  /**
   * @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.
@@ -805,7 +816,7 @@ protected:
   *
   * @see setDragEnabled()
   */
-  virtual QDragObject *dragObject();
+  virtual Q3DragObject *dragObject();
  /**
   * @return true if the @p event provides some acceptable
@@ -821,7 +832,7 @@ protected:
   *
   * @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 :)
@@ -829,7 +840,7 @@ protected:
   *
   * @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.
@@ -886,8 +897,8 @@ protected slots:
   */
  void slotSettingsChanged(int);
-  void slotMouseButtonClicked( int btn, QListViewItem *item, const QPoint &pos, int c );
+  void slotMouseButtonClicked( int btn, Q3ListViewItem *item, const QPoint &pos, int c );
-  void doneEditing(QListViewItem *item, int row);
+  void doneEditing(Q3ListViewItem *item, int row);
  /**
   * Repaint the rect where I was drawing the drop line.
@@ -902,18 +913,18 @@ protected slots:
  /**
   * 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
@@ -939,7 +950,7 @@ 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?
@@ -947,7 +958,7 @@ protected:
   * 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).
@@ -974,7 +985,7 @@ private:
 *
 * @short listview item with alternate background colour support
 */
-class KListViewItem : public QListViewItem
+class KListViewItem : public Q3ListViewItem
 {
 public:
  /**
@@ -983,30 +994,30 @@ public:
   * don't mix KListViewItem (or subclasses) with QListViewItem
   * (or subclasses).
   */
-  KListViewItem(QListView *parent);
+  KListViewItem(Q3ListView *parent);
-  KListViewItem(QListViewItem *parent);
+  KListViewItem(Q3ListViewItem *parent);
-  KListViewItem(QListView *parent, QListViewItem *after);
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *after);
-  KListViewItem(QListViewItem *parent, QListViewItem *after);
+  KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after);
-  KListViewItem(QListView *parent,
+  KListViewItem(Q3ListView *parent,
    QString, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null);
-  KListViewItem(QListViewItem *parent,
+  KListViewItem(Q3ListViewItem *parent,
    QString, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null);
-  KListViewItem(QListView *parent, QListViewItem *after,
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *after,
    QString, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null);
-  KListViewItem(QListViewItem *parent, QListViewItem *after,
+  KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after,
    QString, QString = QString::null,
    QString = QString::null, QString = QString::null,
    QString = QString::null, QString = QString::null,
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
@@ -21,12 +21,18 @@
     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"
@@ -54,7 +60,7 @@ public:
 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);
@@ -276,7 +282,7 @@ void KMainWindow::setCaption( const QString &caption, bool 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 );
@@ -421,10 +427,10 @@ void KMainWindow::createStandardStatusBarAction(){
  }
 }
-QToolBar *KMainWindow::tBar(  )
+Q3ToolBar *KMainWindow::tBar(  )
 {
    if  ( ! mQToolBar )
-      mQToolBar =   new QToolBar( this );
+      mQToolBar =   new Q3ToolBar( this );
    return mQToolBar;
 }
@@ -443,22 +449,23 @@ KToolBar *KMainWindow::toolBar( const char * name )
        return new KToolBar(this, name, honor_mode); // XMLGUI constructor
    else
 */    
-      return new KToolBar(this, Top, false, name, honor_mode ); // non-XMLGUI
+      return new KToolBar(this, Qt::Top, false, name, honor_mode ); // non-XMLGUI
 }
-QPtrListIterator<KToolBar> KMainWindow::toolBarIterator()
+Q3PtrListIterator<KToolBar> KMainWindow::toolBarIterator()
 {
    toolbarList.clear();
-    QPtrList<QToolBar> lst;
+    QList<Q3ToolBar*> lst;
-    for ( int i = (int)QMainWindow::Unmanaged; i <= (int)Minimized; ++i ) {
+    for ( int i = (int)Qt::Unmanaged; i <= (int)Qt::Minimized; ++i ) {
-        lst = toolBars( (ToolBarDock)i );
+        lst = toolBars( (Qt::ToolBarDock)i );
-        for ( QToolBar *tb = lst.first(); tb; tb = lst.next() ) {
+        for(QList<Q3ToolBar*>::iterator i=lst.begin();i!=lst.end();++i) {
+            Q3ToolBar *tb = *i;
            if ( !tb->inherits( "KToolBar" ) )
                continue;
            toolbarList.append( (KToolBar*)tb );
        }
    }
-    return QPtrListIterator<KToolBar>( toolbarList );
+    return Q3PtrListIterator<KToolBar>( toolbarList );
 }
 void KMainWindow::setAutoSaveSettings( const QString & groupName, bool saveWindowSize )
@@ -469,7 +476,7 @@ void KMainWindow::setAutoSaveSettings( const QString & groupName, bool saveWindo
    // 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() ) );
             
@@ -503,7 +510,7 @@ QString KMainWindow::autoSaveGroup() const
 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();
@@ -639,7 +646,7 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const QString &configG
    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;
@@ -714,19 +721,21 @@ void KMainWindow::applyMainWindowSettings(KConfig *config, const QString &config
        entryList.clear();
 //US        i = config->readListEntry (QString::fromLatin1("MenuBar"), entryList, ';');
        entryList = config->readListEntry (QString::fromLatin1("MenuBar"));
-        entry = entryList.first();
+        if(!entryList.empty()) {
-        if (entry==QString::fromLatin1("Disabled"))
+            entry = entryList.first();
-        {
+            if (entry==QString::fromLatin1("Disabled"))
-            mb->hide(); 
+            {
-        } else
+                mb->hide(); 
-        {
+            } else
-            mb->show();
+            {
-        }
+                mb->show();
+            }
+        }
    }
        int n = 1; // Toolbar counter. toolbars are counted from 1,
        KToolBar *toolbar;
-        QPtrListIterator<KToolBar> it( toolBarIterator() ); // must use own iterator
+        Q3PtrListIterator<KToolBar> it( toolBarIterator() ); // must use own iterator
        for ( ; it.current(); ++it) {
            toolbar= it.current();
@@ -756,7 +765,7 @@ void KMainWindow::finalizeGUI( bool force )
    // 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 );
@@ -851,7 +860,7 @@ void KMainWindow::resizeEvent( QResizeEvent * e)
 {
    if ( d->autoSaveWindowSize )
        setSettingsDirty(); 
-    QMainWindow::resizeEvent( e ); 
+    Q3MainWindow::resizeEvent( e ); 
 }
 bool KMainWindow::hasMenuBar()
@@ -869,7 +878,7 @@ QMenuBar *KMainWindow::menuBar()
        mb = new QMenuBar( this );
        // trigger a re-layout and trigger a call to the private
        // setMenuBar method.
-        QMainWindow::menuBar();
+        Q3MainWindow::menuBar();
    }
    return mb;
 }
@@ -884,7 +893,7 @@ QStatusBar *KMainWindow::statusBar()
        sb = new QStatusBar( this );
        // trigger a re-layout and trigger a call to the private
        // setStatusBar method.
-        QMainWindow::statusBar();
+        Q3MainWindow::statusBar();
    }
    return sb;
 }
@@ -908,42 +917,30 @@ void KMainWindow::shuttingDown()
 QMenuBar *KMainWindow::internalMenuBar()
 {
 //US    QObjectList *l = queryList( "KMenuBar", 0, false, false );
-    QObjectList *l = queryList( "QMenuBar", 0, false, false );
+    QObjectList l = queryList( "QMenuBar", 0, false, false );
-    if ( !l || !l->first() ) {
+    if(l.empty())
-        delete l;
+        return 0;
-        return 0;
+    return (QMenuBar*)l.front();
-    }
-//US    KMenuBar *m = (KMenuBar*)l->first();
-    QMenuBar *m = (QMenuBar*)l->first();
-    delete l;
-    return m;
 }
 //US KStatusBar *KMainWindow::internalStatusBar()
 QStatusBar *KMainWindow::internalStatusBar()
 {
 //US    QObjectList *l = queryList( "KStatusBar", 0, false, false );
-    QObjectList *l = queryList( "QStatusBar", 0, false, false );
+    QObjectList l = queryList( "QStatusBar", 0, false, false );
-    if ( !l || !l->first() ) {
+    if(l.empty())
-        delete l;
+        return 0;
-        return 0;
+    return (QStatusBar*)l.front();
-    }
-//US    KStatusBar *s = (KStatusBar*)l->first();
-    QStatusBar *s = (QStatusBar*)l->first();
-    delete l;
-    return s;
 }
 void KMainWindow::childEvent( QChildEvent* e)
 {
-    QMainWindow::childEvent( e );
+    Q3MainWindow::childEvent( e );
 }
 void KMainWindow::paintEvent( QPaintEvent * e)
 {
-    QMainWindow::paintEvent( e );
+    Q3MainWindow::paintEvent( e );
 }
 QSize KMainWindow::sizeForCentralWidgetSize(QSize size)
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,3 +1,8 @@
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QChildEvent>
+#include <QCloseEvent>
+#include <QPaintEvent>
 /*
    This file is part of the KDE libraries
@@ -50,12 +55,12 @@ class KAction;
 #include <ktoolbar.h>
 #include <ktoolbarhandler.h>
 #include <kxmlguiclient.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 class KActionCollection;
-class KMainWindow : public QMainWindow, virtual public KXMLGUIClient
+class KMainWindow : public Q3MainWindow, virtual public KXMLGUIClient
 {
  Q_OBJECT
@@ -320,12 +325,12 @@ public:
     **/
    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
@@ -758,7 +763,7 @@ private slots:
    void saveAutoSaveSettings();
            
 private:
-    QToolBar * mQToolBar;
+    Q3ToolBar * mQToolBar;
 //US    KMenuBar *internalMenuBar();
    QMenuBar *internalMenuBar();
 //US    KStatusBar *internalStatusBar();
@@ -767,7 +772,7 @@ private:
    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
@@ -42,6 +42,9 @@
 #include <qslider.h>
 #include <qspinbox.h>
 #include <qstyle.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QEvent>
 #include <kglobal.h>
 #include <klocale.h>
@@ -106,11 +109,11 @@ void KNumInput::setLabel(const QString & label, int a)
    else {
        if (m_label) m_label->setText(label);
        else m_label = new QLabel(label, this, "KNumInput::QLabel");
-        m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter)))
+        m_label->setAlignment((a & (~(Qt::AlignTop|Qt::AlignBottom|Qt::AlignVCenter)))
-                              | AlignVCenter);
+                              | Qt::AlignVCenter);
        // if no vertical alignment set, use Top alignment
-        if(!(a & (AlignTop|AlignBottom|AlignVCenter)))
+        if(!(a & (Qt::AlignTop|Qt::AlignBottom|Qt::AlignVCenter)))
-           a |= AlignTop;
+           a |= Qt::AlignTop;
        m_alignment = a;
    }
@@ -131,7 +134,7 @@ void KNumInput::layout(bool deep)
    // 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;
@@ -202,7 +205,7 @@ 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);
 }
@@ -215,7 +218,7 @@ 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);
 }
@@ -243,9 +246,9 @@ int KIntSpinBox::mapTextToValue(bool* ok)
 void KIntSpinBox::setEditFocus(bool mark)
 {
-    editor()->setFocus();
+    setFocus();
    if(mark)
-        editor()->selectAll();
+        selectAll();
 }
@@ -325,14 +328,14 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
    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)));
@@ -358,7 +361,7 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
 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
@@ -368,7 +371,7 @@ int KIntNumInput::minValue() const
 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
@@ -415,7 +418,7 @@ QSize KIntNumInput::minimumSizeHint() const
    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
@@ -424,7 +427,7 @@ QSize KIntNumInput::minimumSizeHint() const
    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);
@@ -444,12 +447,12 @@ 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());
@@ -460,7 +463,7 @@ void KIntNumInput::resizeEvent(QResizeEvent* e)
    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());
 }
@@ -646,7 +649,7 @@ QSize KDoubleNumInput::minimumSizeHint() const
    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
@@ -655,7 +658,7 @@ QSize KDoubleNumInput::minimumSizeHint() const
    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);
@@ -666,12 +669,12 @@ 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
@@ -683,7 +686,7 @@ void KDoubleNumInput::resizeEvent(QResizeEvent* e)
    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());
 }
@@ -730,14 +733,14 @@ void KDoubleNumInput::setRange(double lower, double upper, double step,
        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)),
@@ -912,7 +915,7 @@ public:
 KDoubleSpinBox::KDoubleSpinBox( QWidget * parent, const char * name )
  : QSpinBox( parent, name )
 {
-  editor()->setAlignment( Qt::AlignRight );
+  setAlignment( Qt::AlignRight );
  d = new Private();
  updateValidator();
 }
@@ -922,7 +925,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step,
                                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 );
@@ -1027,7 +1030,7 @@ void KDoubleSpinBox::setMaxValue( double value ) {
 }
 double KDoubleSpinBox::lineStep() const {
-  return d->mapToDouble( base::lineStep() );
+  return d->mapToDouble( base::singleStep() );
 }
 void KDoubleSpinBox::setLineStep( double step ) {
@@ -1072,7 +1075,7 @@ 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() );
 }
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
@@ -29,6 +29,11 @@
 #include <qwidget.h>
 #include <qspinbox.h>
+#include <QLineEdit>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
+#include <QEvent>
 class QLabel;
 class QSlider;
@@ -81,7 +86,7 @@ public:
     *     @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.
@@ -302,7 +307,7 @@ public:
    /**
     * @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
@@ -588,7 +593,7 @@ public:
    /**
     * @reimplemented
     */
-    virtual void setLabel(const QString & label, int a = AlignLeft | AlignTop);
+    virtual void setLabel(const QString & label, int a = Qt::AlignLeft | Qt::AlignTop);
    /**
     * @reimplemented
     */
@@ -758,6 +763,10 @@ public:
     */
    void setEditFocus(bool mark);
+    void setValidator(const QValidator *v) {
+        lineEdit()->setValidator(v);
+    }
 protected:
    /**
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,10 +1,13 @@
 #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 ) {;}
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,7 +1,9 @@
 #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
@@ -9,7 +11,7 @@
 #include <qpe/qpemenubar.h>
 #endif
-class KPopupMenu : public QPopupMenu
+class KPopupMenu : public Q3PopupMenu
 {
 Q_OBJECT
    public:
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
@@ -18,6 +18,8 @@
 */
 #include <qstyle.h>
+//Added by qt3to4:
+#include <Q3Frame>
 #include <kdebug.h>
 //US #include <kapplication.h>
@@ -26,8 +28,8 @@
 #include "kseparator.h"
-KSeparator::KSeparator(QWidget* parent, const char* name, WFlags f)
+KSeparator::KSeparator(QWidget* parent, const char* name, Qt::WFlags f)
-   : QFrame(parent, name, f)
+   : Q3Frame(parent, name, f)
 {
   setLineWidth(1);
   setMidLineWidth(0);
@@ -36,8 +38,8 @@ KSeparator::KSeparator(QWidget* parent, const char* name, WFlags f)
-KSeparator::KSeparator(int orientation, QWidget* parent, const char* name, WFlags f)
+KSeparator::KSeparator(int orientation, QWidget* parent, const char* name, Qt::WFlags f)
-   : QFrame(parent, name, f)
+   : Q3Frame(parent, name, f)
 {
   setLineWidth(1);
   setMidLineWidth(0);
@@ -50,18 +52,18 @@ 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
@@ -20,7 +20,7 @@
 #ifndef __KSEPARATOR_H__
 #define __KSEPARATOR_H__
-#include <qframe.h>
+#include <q3frame.h>
 /**
 * Standard horizontal or vertical separator.
@@ -28,7 +28,7 @@
 * @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 )
@@ -36,7 +36,7 @@ class KSeparator : public QFrame
  /**
   * 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.
   *
@@ -44,7 +44,7 @@ class KSeparator : public QFrame
   * 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.
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
@@ -18,6 +18,9 @@
 #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 ) {
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
@@ -20,6 +20,8 @@
 #define KSQUEEZEDTEXTLABEL_H
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 /**
 * A label class that squeezes its text into the label
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
@@ -19,7 +19,7 @@
 #include "kstdaction.h"
 #include <qtoolbutton.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 //US #include <kaboutdata.h>
 #include <kaction.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
@@ -25,9 +25,20 @@
 #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"
@@ -40,7 +51,7 @@
 #include <qdrawutil.h>
 #include <qstring.h>
 #include <qrect.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qtimer.h>
 #include <qstyle.h>
 #include <qapplication.h>
@@ -69,8 +80,8 @@
 //US 
 #include "kconfigbase.h"
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 enum {
    CONTEXT_TOP = 0,
@@ -102,7 +113,7 @@ public:
        m_configurePlugged = false;
 //US        oldPos = Qt::DockUnmanaged;
-        oldPos = QMainWindow::Unmanaged;
+        oldPos = Qt::Unmanaged;
        modified = m_isHorizontal = positioned = FALSE;
@@ -129,24 +140,24 @@ public:
    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.
@@ -158,25 +169,25 @@ public:
  int OffsetDefault;
  QString PositionDefault;
-   QPtrList<QWidget> idleButtons;
+   Q3PtrList<QWidget> idleButtons;
 };
-KToolBarSeparator::KToolBarSeparator(Orientation o , bool l, QToolBar *parent,
+KToolBarSeparator::KToolBarSeparator(Qt::Orientation o , bool l, Q3ToolBar *parent,
                                     const char* name )
-    :QFrame( parent, name ), line( l )
+    :Q3Frame( parent, name ), line( l )
 {
-    connect( parent, SIGNAL(orientationChanged(Orientation)),
+    connect( parent, SIGNAL(orientationChanged(Qt::Orientation)),
-             this, SLOT(setOrientation(Orientation)) );
+             this, SLOT(setOrientation(Qt::Orientation)) );
    setOrientation( o );
    setBackgroundMode( parent->backgroundMode() );
    setBackgroundOrigin( ParentOrigin );
 }
-void KToolBarSeparator::setOrientation( Orientation o )
+void KToolBarSeparator::setOrientation( Qt::Orientation o )
 {
    orient = o;
    if ( line ) {
-        if ( orientation() == Vertical )
+        if ( orientation() == Qt::Vertical )
            setFrameStyle( HLine + Sunken );
        else
            setFrameStyle( VLine + Sunken );
@@ -192,7 +203,7 @@ void KToolBarSeparator::styleChange( QStyle& )
 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
@@ -202,12 +213,12 @@ QSizePolicy KToolBarSeparator::sizePolicy() const
 KToolBar::KToolBar( QWidget *parent, const char *name, bool honorStyle, bool readConfig )
 #ifdef DESKTOP_VERSION
-    : QToolBar( QString::fromLatin1( name ),
+    : Q3ToolBar( QString::fromLatin1( name ),
-      parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
+      parent && parent->inherits( "Q3MainWindow" ) ? static_cast<Q3MainWindow*>(parent) : 0,
      parent, FALSE,
      name ? name : "mainToolBar")
 #else
-  : QPEToolBar( parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
+  : QPEToolBar( parent && parent->inherits( "Q3MainWindow" ) ? static_cast<Q3MainWindow*>(parent) : 0,
                QString::fromLatin1( name ))
@@ -216,9 +227,9 @@ KToolBar::KToolBar( QWidget *parent, const char *name, bool honorStyle, bool rea
    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
@@ -231,9 +242,9 @@ KToolBar::KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock, bo
    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
@@ -280,8 +291,8 @@ void KToolBar::init( bool readConfig, bool honorStyle )
        slotReadConfig();
    if ( mainWindow() )
-        connect( mainWindow(), SIGNAL( toolBarPositionChanged( QToolBar * ) ),
+        connect( mainWindow(), SIGNAL( toolBarPositionChanged( Q3ToolBar * ) ),
-                 this, SLOT( toolBarPosChanged( QToolBar * ) ) );
+                 this, SLOT( toolBarPosChanged( Q3ToolBar * ) ) );
    // Hack to make sure we recalculate our size when we dock.
 //US    connect( this, SIGNAL(placeChanged(QDockWindow::Place)), SLOT(rebuildLayout()) );
@@ -341,7 +352,7 @@ int KToolBar::insertButton(const QPixmap& pixmap, int id, const char *signal,
 }
-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 );
@@ -353,7 +364,7 @@ int KToolBar::insertButton(const QString& icon, int id, QPopupMenu *popup,
 }
-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 );
@@ -540,7 +551,7 @@ void KToolBar::setButtonIcon( int id, const QString& _icon )
        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() )
@@ -552,7 +563,7 @@ void KToolBar::setButtonIconSet( int id, const QIconSet& 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() )
@@ -787,7 +798,7 @@ void KToolBar::setItemAutoSized (int id, bool yes )
 void KToolBar::clear ()
 {
-    QToolBar::clear();
+    Q3ToolBar::clear();
    widget2id.clear();
    id2widget.clear();
 }
@@ -876,21 +887,21 @@ 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;
@@ -967,7 +978,7 @@ void KToolBar::setIconText(IconText icontext, bool update)
    // 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() );
@@ -1004,7 +1015,7 @@ void KToolBar::setIconSize(int size, bool update)
    // 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() );
@@ -1062,10 +1073,10 @@ void KToolBar::setFlat (bool flag)
        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" ) )
@@ -1249,34 +1260,34 @@ 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 );
@@ -1332,7 +1343,7 @@ void KToolBar::rebuildLayout()
            w->hide();
            continue;
        }
-        if ( w->inherits( "QPopupMenu" ) )
+        if ( w->inherits( "Q3PopupMenu" ) )
            continue;
        l->addWidget( w );
        w->show();
@@ -1364,7 +1375,7 @@ 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
@@ -1375,10 +1386,10 @@ void KToolBar::childEvent( QChildEvent *e )
                    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();
@@ -1390,9 +1401,9 @@ void KToolBar::childEvent( QChildEvent *e )
               it.deleteCurrent();
            }
            layoutTimer->start( 50, TRUE );
-        }
+        } */
    }
-    QToolBar::childEvent( e );
+    Q3ToolBar::childEvent( e );
 }
 void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id )
@@ -1416,25 +1427,25 @@ void KToolBar::insertWidgetInternal( QWidget *w, int &index, int 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 );
@@ -1442,7 +1453,7 @@ QSizePolicy KToolBar::sizePolicy() const
 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 );
@@ -1508,7 +1519,7 @@ QSize KToolBar::sizeHint() const
       break;
     default:
-       minSize = QToolBar::sizeHint();
+       minSize = Q3ToolBar::sizeHint();
       break;
    }
    return minSize;
@@ -1532,19 +1543,19 @@ bool KToolBar::highlight() const
 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 );
 }
@@ -1726,7 +1737,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGr
        doUpdate = true;
    }
-    QMainWindow *mw = mainWindow();
+    Q3MainWindow *mw = mainWindow();
    // ...and if we should highlight
    if ( highlight != d->m_highlight ) {
@@ -1805,19 +1816,19 @@ void KToolBar::applySettings(KConfig *config, const QString &_configGroup)
        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)
@@ -1827,7 +1838,7 @@ void KToolBar::applySettings(KConfig *config, const QString &_configGroup)
        if ( mainWindow() )
        {
-            QMainWindow *mw = mainWindow();
+            Q3MainWindow *mw = mainWindow();
            //kdDebug(220) << "KToolBar::applySettings updating ToolbarInfo" << endl;
            d->toolBarInfo = KToolBarPrivate::ToolBarInfo( pos, index, newLine, offset );
@@ -1862,7 +1873,7 @@ bool KToolBar::event( QEvent *e )
       return true;
    }
-    return QToolBar::event( e );
+    return Q3ToolBar::event( e );
 }
 void KToolBar::slotRepaint()
@@ -1880,14 +1891,14 @@ void KToolBar::slotRepaint()
    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();
@@ -2031,7 +2042,7 @@ void KToolBar::getAttributes( QString &position, QString &icontext, int &index )
    }
    if ( mainWindow() ) {
-        QMainWindow::ToolBarDock dock;
+        Qt::ToolBarDock dock;
        bool newLine;
        int offset;
        mainWindow()->getLocation( this, dock, index, newLine, offset );
@@ -2100,7 +2111,7 @@ void KToolBar::positionYourself( bool force )
 }
 //US KPopupMenu *KToolBar::contextMenu()
-QPopupMenu *KToolBar::contextMenu()
+Q3PopupMenu *KToolBar::contextMenu()
 {
  if ( context )
    return context;
@@ -2108,11 +2119,11 @@ QPopupMenu *KToolBar::contextMenu()
  // 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 );
@@ -2122,17 +2133,17 @@ QPopupMenu *KToolBar::contextMenu()
  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"))
@@ -2145,7 +2156,7 @@ QPopupMenu *KToolBar::contextMenu()
  
  d->iconSizes = avSizes;
-  QValueList<int>::Iterator it;
+  Q3ValueList<int>::Iterator it;
  for (it=avSizes.begin(); it!=avSizes.end(); it++) {
      QString text;
      if ( *it < 19 )
@@ -2218,8 +2229,8 @@ void KToolBar::slotContextAboutToShow()
            break;
  }
-  QValueList<int>::ConstIterator iIt = d->iconSizes.begin();
+  Q3ValueList<int>::ConstIterator iIt = d->iconSizes.begin();
-  QValueList<int>::ConstIterator iEnd = d->iconSizes.end();
+  Q3ValueList<int>::ConstIterator iEnd = d->iconSizes.end();
  for (; iIt != iEnd; ++iIt )
      context->setItemChecked( CONTEXT_ICONSIZES + *iIt, false );
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
@@ -26,27 +26,35 @@
 #ifndef DESKTOP_VERSION
 #define private public
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #undef private
 #include <qpe/qpetoolbar.h>
 #else
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #endif
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 #include <qcombobox.h>
 #include <qmap.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QResizeEvent>
+#include <Q3PopupMenu>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QShowEvent>
 #include <kglobal.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
-#include <qframe.h>
+#include <q3frame.h>
-#include <qiconset.h>
+#include <qicon.h>
 class QDomElement;
 class QSize;
 class QPixmap;
-class QPopupMenu;
+class Q3PopupMenu;
 class QStringList;
 class QDomDocument;
 class QTimer;
@@ -63,22 +71,22 @@ 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;
 };
@@ -111,10 +119,10 @@ private:
 // 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
@@ -127,7 +135,7 @@ private:
    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};
@@ -175,7 +183,7 @@ public:
   * @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 );
  /**
@@ -193,7 +201,7 @@ public:
   * @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();
@@ -303,7 +311,7 @@ public:
   * 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);
  /**
@@ -318,7 +326,7 @@ public:
   * 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);
  /**
@@ -359,7 +367,7 @@ public:
                     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.
@@ -375,7 +383,7 @@ public:
                     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.
@@ -465,7 +473,7 @@ public:
   *
   * 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.
@@ -491,7 +499,7 @@ public:
   * 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.
@@ -1060,7 +1068,7 @@ public:
 public slots:
    virtual void setIconText( const QString &txt )
-    { QToolBar::setIconText( txt ); }
+    { Q3ToolBar::setIconText( txt ); }
    void slotRepaint();
 protected:
@@ -1077,7 +1085,7 @@ private slots:
    void slotReadConfig ();
    void slotAppearanceChanged();
    void slotIconChanged(int);
-    void toolBarPosChanged( QToolBar *tb );
+    void toolBarPosChanged( Q3ToolBar *tb );
    void slotContextAboutToShow();
    void widgetDestroyed();
@@ -1090,16 +1098,16 @@ private:
    void removeWidgetInternal( QWidget *w );
    void getAttributes( QString &position, QString &icontext, int &index );
 //US    KPopupMenu *contextMenu();
-    QPopupMenu *contextMenu();
+    Q3PopupMenu *contextMenu();
    QMap<QWidget*, int > widget2id;
    typedef QMap<int, QWidget* > Id2WidgetMap;
    Id2WidgetMap id2widget;
 //US    KPopupMenu *context;
-    QPopupMenu *context;
+    Q3PopupMenu *context;
-    QPtrList<QWidget> widgets;
+    Q3PtrList<QWidget> widgets;
    QTimer *layoutTimer;
-    QGuardedPtr<QWidget> stretchableWidget, rightAligned;
+    QPointer<QWidget> stretchableWidget, rightAligned;
 protected:
    virtual void virtual_hook( int id, void* data );
 private:
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
@@ -33,10 +33,14 @@
 #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>
@@ -48,7 +52,7 @@
 // needed to get our instance
 #include <kmainwindow.h>
-template class QIntDict<KToolBarButton>;
+template class Q3IntDict<KToolBarButton>;
 class KToolBarButtonPrivate
 {
@@ -115,7 +119,7 @@ KToolBarButton::KToolBarButton( const QString& _icon, int _id,
  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() ),
@@ -146,7 +150,7 @@ KToolBarButton::KToolBarButton( const QPixmap& pixmap, int _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()),
@@ -161,7 +165,7 @@ KToolBarButton::KToolBarButton( const QPixmap& pixmap, int _id,
  installEventFilter(this);
  // set our pixmap and do our initial setup
-  setIconSet( QIconSet( pixmap ));
+  setIconSet( QIcon( pixmap ));
  modeChange();
 }
@@ -292,7 +296,7 @@ void KToolBarButton::setIcon( const QString &icon )
    QToolButton::setIconSet(KGlobal::iconLoader()->loadIconSet(d->m_iconName));
 }
-void KToolBarButton::setIconSet( const QIconSet &iconset )
+void KToolBarButton::setIconSet( const QIcon &iconset )
 {
  QToolButton::setIconSet( iconset );
 }
@@ -305,28 +309,28 @@ void KToolBarButton::setPixmap( const QPixmap &pixmap )
    QToolButton::setPixmap( pixmap );
    return;
  }
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Active );
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Active );
  QToolButton::setIconSet( set );
 }
 void KToolBarButton::setDefaultPixmap( const QPixmap &pixmap )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Normal );
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Normal );
  QToolButton::setIconSet( set );
 }
 void KToolBarButton::setDisabledPixmap( const QPixmap &pixmap )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Disabled );
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Disabled );
  QToolButton::setIconSet( set );
 }
 void KToolBarButton::setDefaultIcon( const QString& icon )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
  QPixmap pm;
  if (!strcmp(d->m_parent->name(), "mainToolBar"))
    pm = /*US d->m_instance->iconLoader()*/KGlobal::iconLoader()->loadIcon( icon, KIcon::MainToolbar,
@@ -334,13 +338,13 @@ void KToolBarButton::setDefaultIcon( const QString& icon )
  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,
@@ -348,25 +352,25 @@ void KToolBarButton::setDisabledIcon( const QString& icon )
  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());
@@ -451,21 +455,27 @@ bool KToolBarButton::eventFilter(QObject *o, QEvent *ev)
 void KToolBarButton::drawButton( QPainter *_painter )
 {
 #ifdef DESKTOP_VERSION
-  QStyle::SFlags flags   = QStyle::Style_Default;
+  QStyle::State flags   = QStyle::State_None;
-  QStyle::SCFlags active = QStyle::SC_None;
+  QStyle::SubControls active = QStyle::SC_None;
  if (isDown()) {
-    flags  |= QStyle::Style_Down;
+    flags  |= QStyle::State_DownArrow;
    active |= QStyle::SC_ToolButton;
  }
-          if (isEnabled()) flags |= QStyle::Style_Enabled;
+          if (isEnabled()) flags |= QStyle::State_Enabled;
-          if (isOn())   flags |= QStyle::Style_On;
+          if (isOn())   flags |= QStyle::State_On;
-          if (isEnabled() && d->m_isRaised)flags |= QStyle::Style_Raised;
+          if (isEnabled() && d->m_isRaised)flags |= QStyle::State_Raised;
-          if (hasFocus())flags |= QStyle::Style_HasFocus;
+          if (hasFocus())flags |= QStyle::State_HasFocus;
+  QStyleOptionToolButton qsotb;
+  qsotb.initFrom(this);
+  qsotb.state = flags;
+  qsotb.activeSubControls = active;
+  qsotb.rect = rect();
+  qsotb.palette = palette();
  // Draw a styled toolbutton
-  style().drawComplexControl(QStyle::CC_ToolButton, _painter, this, rect(),
+  style()->drawComplexControl(QStyle::CC_ToolButton, &qsotb, _painter, this);
-        colorGroup(), flags, QStyle::SC_ToolButton, active, QStyleOption());
 #else
  style().drawToolButton(_painter, rect().x(), rect().y(), rect().width(), rect().height(), colorGroup());
@@ -484,9 +494,9 @@ void KToolBarButton::drawButton( QPainter *_painter )
                    QIconSet::Disabled,
        isOn() ? QIconSet::On : QIconSet::Off );
 */        
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
-                    QIconSet::Disabled);
+                    QIcon::Disabled);
    
    if( !pixmap.isNull())
    {
@@ -508,9 +518,9 @@ void KToolBarButton::drawButton( QPainter *_painter )
                    QIconSet::Disabled,
        isOn() ? QIconSet::On : QIconSet::Off );
 */        
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
-                    QIconSet::Disabled);
+                    QIcon::Disabled);
    
    if( !pixmap.isNull())
    {
@@ -526,7 +536,7 @@ void KToolBarButton::drawButton( QPainter *_painter )
    if (!textLabel().isNull())
    {
-      textFlags = AlignVCenter|AlignLeft;
+      textFlags = Qt::AlignVCenter|Qt::AlignLeft;
      if (!pixmap.isNull())
        dx = 4 + pixmap.width() + 2;
      else
@@ -544,7 +554,7 @@ void KToolBarButton::drawButton( QPainter *_painter )
  {
    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*/ )
@@ -563,9 +573,9 @@ void KToolBarButton::drawButton( QPainter *_painter )
                    QIconSet::Disabled,
        isOn() ? QIconSet::On : QIconSet::Off );
 */    
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
-                    QIconSet::Disabled);
+                    QIcon::Disabled);
    
    if( !pixmap.isNull())
    {
@@ -581,7 +591,7 @@ void KToolBarButton::drawButton( QPainter *_painter )
    if (!textLabel().isNull())
    {
-      textFlags = AlignBottom|AlignHCenter;
+      textFlags = Qt::AlignBottom|Qt::AlignHCenter;
      dx = (width() - fm.width(textLabel())) / 2;
      dy = height() - fm.lineSpacing() - 4;
@@ -610,14 +620,18 @@ void KToolBarButton::drawButton( QPainter *_painter )
  if (QToolButton::popup())
  {
 #ifdef DESKTOP_VERSION
-    QStyle::SFlags arrowFlags = QStyle::Style_Default;
+    QStyle::State arrowFlags = QStyle::State_None;
+            if (isDown())arrowFlags |= QStyle::State_DownArrow;
+            if (isEnabled()) arrowFlags |= QStyle::State_Enabled;
-            if (isDown())arrowFlags |= QStyle::Style_Down;
+    QStyleOption qso;
-            if (isEnabled()) arrowFlags |= QStyle::Style_Enabled;
+    qso.initFrom(this);
+    qso.state = arrowFlags;
+    qso.rect = QRect(width()-7, height()-7, 7, 7);
+    qso.palette = palette();
-      style().drawPrimitive(QStyle::PE_ArrowDown, _painter,
+      style()->drawPrimitive(QStyle::PE_IndicatorArrowDown, &qso, _painter);
-          QRect(width()-7, height()-7, 7, 7), colorGroup(),
-          arrowFlags, QStyleOption() );
 #else  
      style().drawArrow(_painter, Qt::DownArrow, isDown(),
          width()-7, height()-7, 7, 7, colorGroup(), isEnabled() );
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
@@ -26,15 +26,18 @@
 #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;
 /**
@@ -150,7 +153,7 @@ public:
   * 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
  /**
@@ -209,7 +212,7 @@ public:
  /**
   * Return a pointer to this button's popup menu (if it exists)
   */
-  QPopupMenu *popup();
+  QMenu *popup();
  /**
   * Returns the button's id.
@@ -224,7 +227,7 @@ public:
   *
   * @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.
@@ -235,7 +238,7 @@ public:
   *
   * @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
@@ -303,7 +306,7 @@ private:
 * @internal
 * @version $Id$
 */
-class KToolBarButtonList : public QIntDict<KToolBarButton>
+class KToolBarButtonList : public Q3IntDict<KToolBarButton>
 {
 public:
   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
@@ -18,7 +18,9 @@
 #include "ktoolbarhandler.h"
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #include <kapplication.h>
 #include <ktoolbar.h>
 #include <kmainwindow.h>
@@ -44,7 +46,7 @@ namespace
    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        
@@ -70,16 +72,16 @@ namespace
        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;
@@ -91,7 +93,7 @@ namespace
            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() );
@@ -99,7 +101,7 @@ namespace
            return actions;
        }
-        const QPtrList<KToolBar> &toolBars() const { return m_toolBars; }
+        const Q3PtrList<KToolBar> &toolBars() const { return m_toolBars; }
    private:
        void handleToolBar( KToolBar *toolBar )
@@ -115,8 +117,8 @@ namespace
        KActionCollection *m_actionCollection;
        KMainWindow *m_mainWindow;
-        QPtrList<KToolBar> m_toolBars; 
+        Q3PtrList<KToolBar> m_toolBars; 
-        QPtrList<KAction> m_toolBarActions;
+        Q3PtrList<KAction> m_toolBarActions;
        bool m_needsRebuild : 1;
    };
@@ -224,7 +226,7 @@ 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() );
 }
@@ -239,7 +241,7 @@ void ToolBarHandler::connectToActionContainer( KAction *action )
 void ToolBarHandler::connectToActionContainer( QWidget *container )
 {
 //US    QPopupMenu *popupMenu = dynamic_cast<QPopupMenu *>( container );
-    QPopupMenu *popupMenu = (QPopupMenu *)( container );
+    Q3PopupMenu *popupMenu = (Q3PopupMenu *)( container );
    if ( !popupMenu )
        return;
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
@@ -20,8 +20,8 @@
 #define KBARHANDLER_H
 #include <qobject.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
@@ -57,9 +57,9 @@ private:
    struct Data;
    Data *d;
-    QGuardedPtr<KMainWindow> m_mainWindow;
+    QPointer<KMainWindow> m_mainWindow;
-    QPtrList<KAction> m_actions;
+    Q3PtrList<KAction> m_actions;
-    QPtrList<KToolBar> m_toolBars;
+    Q3PtrList<KToolBar> m_toolBars;
 };
 } // namespace KDEPrivate
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
@@ -39,6 +39,8 @@
 #include <kapplication.h>
 #include <assert.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 class KXMLGUIClientPrivate
 {
@@ -63,7 +65,7 @@ public:
 //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;
@@ -85,7 +87,7 @@ 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;
@@ -99,7 +101,7 @@ 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 )
@@ -588,7 +590,7 @@ void KXMLGUIClient::removeChildClient( KXMLGUIClient *child )
  return true;
 }*/
-const QPtrList<KXMLGUIClient> *KXMLGUIClient::childClients()
+const Q3PtrList<KXMLGUIClient> *KXMLGUIClient::childClients()
 {
  return &d->m_children;
 }
@@ -606,7 +608,7 @@ KXMLGUIBuilder *KXMLGUIClient::clientBuilder() const
 }
 */
-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 )
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
@@ -21,7 +21,7 @@
 //US #include <qdom.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qmap.h>
 #include <qstringlist.h>
@@ -161,7 +161,7 @@ public:
  /**
   * Retrieves a list of all child clients.
   */
-  const QPtrList<KXMLGUIClient> *childClients();
+  const Q3PtrList<KXMLGUIClient> *childClients();
  /**
   * A client can have an own @ref KXMLGUIBuilder.
@@ -228,7 +228,7 @@ public:
   *       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() ...
diff --git a/microkde/kdialog.cpp b/microkde/kdialog.cpp
index 8398956..57e7ea6 100644
--- a/microkde/kdialog.cpp
+++ b/microkde/kdialog.cpp
@@ -1,10 +1,12 @@
 #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 ) :
@@ -30,9 +32,9 @@ int KDialog::marginHintSmall() { return 1; }
 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 );
diff --git a/microkde/kdialog.h b/microkde/kdialog.h
index bc80689..5f9bf0e 100644
--- a/microkde/kdialog.h
+++ b/microkde/kdialog.h
@@ -2,8 +2,10 @@
 #define MINIKDE_KDIALOG_H
 #include <qdialog.h>
+//Added by qt3to4:
+#include <QLabel>
 class QLabel;
-class QProgressBar;
+class Q3ProgressBar;
 class QPushButton ;
 class KDialog : public QDialog
@@ -29,7 +31,7 @@ class KProgressDialog : public QDialog
    void reject();
 private:
    QLabel * mLabel;
-    QProgressBar *mBar;
+    Q3ProgressBar *mBar;
    QPushButton *mButton;
 signals:
    void cancelled (); 
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index d5c7e61..a40bad6 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -1,7 +1,11 @@
 #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"
@@ -135,13 +139,13 @@ 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 );
@@ -155,15 +159,15 @@ void KDialogBase::initLayout()
  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 );
 }
@@ -254,10 +258,10 @@ 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;
diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h
index 17c186b..64cbd17 100644
--- a/microkde/kdialogbase.h
+++ b/microkde/kdialogbase.h
@@ -1,14 +1,16 @@
 #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
 {
@@ -59,8 +61,8 @@ class KDialogBase : public KDialog
                 const QString &user3=QString::null);
    virtual ~KDialogBase();
    
-    QFrame *addPage( const QString & );
+    Q3Frame *addPage( const QString & );
-    QFrame *addPage( const QString &, int, const QPixmap & );
+    Q3Frame *addPage( const QString &, int, const QPixmap & );
    void setMainWidget( QWidget *widget );
@@ -77,7 +79,7 @@ class KDialogBase : public KDialog
    bool showPage( int index );
    void hideButtons();
-    QFrame *plainPage();
+    Q3Frame *plainPage();
  signals:
    void user1Clicked();
@@ -128,8 +130,8 @@ class KDialogBase : public KDialog
    QWidget *mMainWidget;
    QTabWidget *mTabWidget;
-    QFrame *mPlainPage;
+    Q3Frame *mPlainPage;
-    QBoxLayout *mTopLayout;
+    Q3BoxLayout *mTopLayout;
    
    QPushButton *mUser1Button;
    QPushButton *mUser2Button;
diff --git a/microkde/keditlistbox.cpp b/microkde/keditlistbox.cpp
index 55b7784..257a44a 100644
--- a/microkde/keditlistbox.cpp
+++ b/microkde/keditlistbox.cpp
@@ -21,10 +21,13 @@
 #include <qstringlist.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3StrList>
 #include <kcombobox.h>
 #include <kdebug.h>
@@ -47,14 +50,14 @@ public:
 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 );
 }
@@ -62,7 +65,7 @@ KEditListBox::KEditListBox(const QString& title, QWidget *parent,
 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() );
@@ -95,7 +98,7 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
                              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());
@@ -109,7 +112,7 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
    else
        m_lineEdit=new KLineEdit(gb);
-    m_listBox = new QListBox(gb);
+    m_listBox = new Q3ListBox(gb);
    QWidget *editingWidget = representationWidget ?
                             representationWidget : m_lineEdit;
@@ -204,7 +207,7 @@ void KEditListBox::moveItemUp()
        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);
@@ -227,7 +230,7 @@ void KEditListBox::moveItemDown()
        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);
@@ -349,14 +352,16 @@ 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)
diff --git a/microkde/keditlistbox.h b/microkde/keditlistbox.h
index 130d933..e43d958 100644
--- a/microkde/keditlistbox.h
+++ b/microkde/keditlistbox.h
@@ -20,8 +20,10 @@
 #ifndef KEDITLISTBOX_H
 #define KEDITLISTBOX_H
-#include <qgroupbox.h>
+#include <q3groupbox.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <Q3StrList>
 class KLineEdit;
 class KComboBox;
@@ -36,7 +38,7 @@ class KEditListBoxPrivate;
 * 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
@@ -126,7 +128,7 @@ public:
      /**
       * 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.
       */
@@ -159,11 +161,11 @@ public:
      /**
       * 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()
       */
@@ -207,7 +209,7 @@ public:
      void typedSomething(const QString& text);
   private:
-      QListBox *m_listBox;
+      Q3ListBox *m_listBox;
      QPushButton *servUpButton, *servDownButton;
      QPushButton *servNewButton, *servRemoveButton;
      KLineEdit *m_lineEdit;
diff --git a/microkde/kfiledialog.cpp b/microkde/kfiledialog.cpp
index 383e711..c1bfdef 100644
--- a/microkde/kfiledialog.cpp
+++ b/microkde/kfiledialog.cpp
@@ -4,6 +4,8 @@
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #ifndef DESKTOP_VERSION
 //US orig#include <ofileselector.h>
@@ -13,7 +15,7 @@ QString KFileDialog::getSaveFileName( const QString & fn,
 {
    QString retfile = "";
    QDialog dia ( par, "input-dialog", true ); 
-    QVBoxLayout lay( &dia );
+    Q3VBoxLayout lay( &dia );
    lay.setMargin(7); 
    lay.setSpacing(7); 
    QString file = fn;
@@ -42,7 +44,7 @@ QString KFileDialog::getOpenFileName( const QString & fn,
   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;
@@ -66,23 +68,23 @@ QString KFileDialog::getExistingDirectory( const QString & fn,
 }
 #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
@@ -7,12 +7,14 @@
 #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 );
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp
index 53edd08..9cc5835 100644
--- a/microkde/kglobal.cpp
+++ b/microkde/kglobal.cpp
@@ -1,7 +1,8 @@
 #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;
@@ -13,7 +14,7 @@ QString KGlobal::mAppName = "godot";
 KLocale *KGlobal::locale()
 {
  if ( !mLocale ) {
-    ASSERT(mAppName);
+    Q_ASSERT(!mAppName.isEmpty());
    mLocale = new KLocale();//mAppName);
  }
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 2e483e9..1f08255 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -4,6 +4,7 @@
 #include "kconfigbase.h"
 #include <qapplication.h>
+#include <QDesktopWidget>
 #ifdef DESKTOP_VERSION
  QColor KGlobalSettings::mAlternate = QColor( 235, 235, 235 );
diff --git a/microkde/kiconloader.cpp b/microkde/kiconloader.cpp
index 4842d71..e7f657d 100644
--- a/microkde/kiconloader.cpp
+++ b/microkde/kiconloader.cpp
@@ -4,6 +4,8 @@
 #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
 {
@@ -14,14 +16,14 @@ QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
    // 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;
 }
@@ -77,12 +79,12 @@ QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
  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 );
+  QIcon is ;//= Resource::loadIconSet( px );
-  QIconSet* isPtr = 0;//LR&is;
+  QIcon* isPtr = 0;//LR&is;
  if (isPtr == 0)
    qDebug("KIconLoader::loadIconSet: %s not foun", px.latin1());
  
diff --git a/microkde/kiconloader.h b/microkde/kiconloader.h
index 68fec4e..2abb667 100644
--- a/microkde/kiconloader.h
+++ b/microkde/kiconloader.h
@@ -4,7 +4,7 @@
 #include <qpixmap.h>
 #include <qstring.h>
 //US
-#include <qiconset.h>
+#include <qicon.h>
 class KIcon
 {
@@ -34,7 +34,7 @@ class KIconLoader
    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:
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
@@ -27,6 +27,8 @@
 //US #include <qtooltip.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <QPixmap>
 //US #include <kaccel.h>
 //US #include <kcombobox.h>
@@ -182,7 +184,7 @@ KURLRequester::KURLRequester( QWidget *editWidget, QWidget *parent,
 */
 KURLRequester::KURLRequester( QWidget *parent, const char *name )
-  : QHBox( parent, name )
+  : Q3HBox( parent, name )
 {
    d = new KURLRequesterPrivate;
    init();
@@ -191,7 +193,7 @@ KURLRequester::KURLRequester( QWidget *parent, const char *name )
 KURLRequester::KURLRequester( const QString& url, QWidget *parent,
                              const char *name )
-  : QHBox( parent, name )
+  : Q3HBox( parent, name )
 {
    d = new KURLRequesterPrivate;
    init();
@@ -216,8 +218,8 @@ void KURLRequester::init()
        d->edit = new KLineEdit( this, "KURLRequester::KLineEdit" );
    myButton = new KURLDragPushButton( this, "kfile button");
-    QIconSet iconSet = SmallIconSet("fileopen");
+    QIcon iconSet = SmallIconSet("fileopen");
-    QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal );
+    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"));
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
@@ -20,7 +20,7 @@
 #ifndef KURLREQUESTER_H
 #define KURLREQUESTER_H
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <keditlistbox.h>
 //US #include <kfile.h>
@@ -53,7 +53,7 @@ class QTimer;
 * @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 )
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
@@ -52,11 +52,13 @@ $Id$
 #include <assert.h>
 #include <qdir.h>
 #include <qfile.h>
-#include <qintdict.h>
+#include <q3intdict.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qsocketnotifier.h>
 #include <qstringlist.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <kapplication.h>
 #include <kdebug.h>
@@ -184,7 +186,7 @@ KDirWatchPrivate::KDirWatchPrivate()
 //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);
@@ -731,7 +733,7 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance,
 */
 void KDirWatchPrivate::removeEntries( KDirWatch* instance )
 {
-  QPtrList<Entry> list;
+  Q3PtrList<Entry> list;
  int minfreq = 3600000;
  // put all entries where instance is a client in list
@@ -1007,7 +1009,7 @@ void KDirWatchPrivate::slotRescan()
  delayRemove = true;
 #ifdef HAVE_DNOTIFY
-  QPtrList<Entry> dList, cList;
+  Q3PtrList<Entry> dList, cList;
  // for DNotify method,
  if (rescan_all)
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
@@ -18,7 +18,7 @@ $Id$
 #include <fam.h>
 #endif
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <kdirwatch.h>
@@ -58,9 +58,9 @@ public:
    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;
@@ -124,7 +124,7 @@ private:
  bool useStat(Entry*);
  bool delayRemove;
-  QPtrList<Entry> removeList;
+  Q3PtrList<Entry> removeList;
 #ifdef HAVE_FAM
  QSocketNotifier *sn;
@@ -141,7 +141,7 @@ private:
  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 *);
diff --git a/microkde/klineedit.h b/microkde/klineedit.h
index 70c72d1..9eb749d 100644
--- a/microkde/klineedit.h
+++ b/microkde/klineedit.h
@@ -2,6 +2,8 @@
 #define MINIKDE_KLINEEDIT_H
 #include <qlineedit.h>
+//Added by qt3to4:
+#include <QKeyEvent>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
diff --git a/microkde/klineeditdlg.h b/microkde/klineeditdlg.h
index 68e9252..d0004cd 100644
--- a/microkde/klineeditdlg.h
+++ b/microkde/klineeditdlg.h
@@ -7,6 +7,8 @@
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 class KLineEditDlg : public QDialog
 {
@@ -15,7 +17,7 @@ class KLineEditDlg : public QDialog
      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 );
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
@@ -25,14 +25,17 @@
 #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>
@@ -55,14 +58,14 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& 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" ) );
@@ -82,7 +85,7 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
  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() ) ) );
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
@@ -28,7 +28,7 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #ifdef DESKTOP_VERSION
 #include <qinputdialog.h>
@@ -37,6 +37,10 @@ $Id$
 #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>
@@ -61,11 +65,11 @@ $Id$
 using namespace KRES;
-class ConfigViewItem : public QCheckListItem
+class ConfigViewItem : public Q3CheckListItem
 {
  public:
-    ConfigViewItem( QListView *parent, Resource* resource ) :
+    ConfigViewItem( Q3ListView *parent, Resource* resource ) :
-      QCheckListItem( parent, resource->resourceName(), CheckBox ),
+      Q3CheckListItem( parent, resource->resourceName(), CheckBox ),
      mResource( resource ),
      mIsStandard( false )
    {
@@ -97,13 +101,13 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
 {
  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 );
@@ -145,8 +149,8 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
           SLOT( slotFamilyChanged( int ) ) );
  connect( mListView, SIGNAL( selectionChanged() ),
           SLOT( slotSelectionChanged() ) );
-  connect( mListView, SIGNAL( clicked( QListViewItem * ) ),
+  connect( mListView, SIGNAL( clicked( Q3ListViewItem * ) ),
-           SLOT( slotItemClicked( QListViewItem * ) ) );
+           SLOT( slotItemClicked( Q3ListViewItem * ) ) );
  mLastItem = 0;
@@ -159,7 +163,7 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
 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;
@@ -230,7 +234,7 @@ 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 );
@@ -341,7 +345,7 @@ void ConfigPage::slotAdd()
    // 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 )
@@ -366,7 +370,7 @@ void ConfigPage::slotRemove()
  if ( !mCurrentManager )
    return;
-  QListViewItem *item = mListView->currentItem();
+  Q3ListViewItem *item = mListView->currentItem();
  ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item );
  if ( !confItem )
@@ -393,7 +397,7 @@ void ConfigPage::slotEdit()
  if ( !mCurrentManager )
    return;
-  QListViewItem *item = mListView->currentItem();
+  Q3ListViewItem *item = mListView->currentItem();
  ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
  if ( !configItem )
    return;
@@ -435,7 +439,7 @@ void ConfigPage::slotStandard()
    return;
  }
-  QListViewItem *it = mListView->firstChild();
+  Q3ListViewItem *it = mListView->firstChild();
  while ( it != 0 ) {
    ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it );
    if ( configItem->standard() )
@@ -482,7 +486,7 @@ 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;
@@ -504,7 +508,7 @@ void ConfigPage::saveResourceSettings()
  if ( mCurrentManager ) {
-    QListViewItem *item = mListView->firstChild();
+    Q3ListViewItem *item = mListView->firstChild();
    while ( item ) {
      ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
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
@@ -25,13 +25,15 @@
 #include <qstringlist.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "manager.h"
 class KComboBox;
 class KListView;
-class QListViewItem;
+class Q3ListViewItem;
 class QPushButton;
@@ -73,7 +75,7 @@ class ConfigPage : public QWidget, public ManagerListener<Resource>
    virtual void resourceDeleted( Resource* resource );
  protected slots:
-    void slotItemClicked( QListViewItem * );
+    void slotItemClicked( Q3ListViewItem * );
  signals:
    void changed( bool );
@@ -86,7 +88,7 @@ class ConfigPage : public QWidget, public ManagerListener<Resource>
    KConfig* mConfig;
    QString mFamily;
    QStringList mFamilyMap;
-    QValueList<ResourcePageInfo> mInfoMap;
+    Q3ValueList<ResourcePageInfo> mInfoMap;
    KComboBox* mFamilyCombo;
    KListView* mListView;
@@ -95,7 +97,7 @@ class ConfigPage : public QWidget, public ManagerListener<Resource>
    QPushButton* mEditButton;
    QPushButton* mStandardButton;
-    QListViewItem* mLastItem;
+    Q3ListViewItem* mLastItem;
    static const QString syncfamily;
 };
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
@@ -41,8 +41,8 @@
 #endif 
 using namespace KRES;
-QDict<Factory> *Factory::mSelves = 0;
+Q3Dict<Factory> *Factory::mSelves = 0;
-static KStaticDeleter< QDict<Factory> > staticDeleter;
+static KStaticDeleter< Q3Dict<Factory> > staticDeleter;
 Factory *Factory::self( const QString& resourceFamily)
 {
@@ -51,7 +51,7 @@ 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 );
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
@@ -24,7 +24,7 @@
 #ifndef KRESOURCES_FACTORY_H
 #define KRESOURCES_FACTORY_H
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 #include <kconfig.h>
@@ -114,7 +114,7 @@ class Factory
    Factory( const QString& resourceFamily);
  private:
-    static QDict<Factory> *mSelves;
+    static Q3Dict<Factory> *mSelves;
    QString mResourceFamily;
 //US    QMap<QString, KService::Ptr> 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
@@ -20,6 +20,9 @@
 */
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
 //US #include <kaboutdata.h>
 //US #include <kgenericfactory.h>
@@ -40,9 +43,9 @@ KCMKResources::KCMKResources( QWidget *parent, const char *name, const QStringLi
  : 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 );
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
@@ -32,8 +32,10 @@ $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"
@@ -175,7 +177,7 @@ class Manager : private ManagerImplListener
      mImpl = new ManagerImpl( family );
      mImpl->setListener( this );
-      mListeners = new QPtrList<ManagerListener<T> >;
+      mListeners = new Q3PtrList<ManagerListener<T> >;
    }
    virtual ~Manager()
@@ -330,7 +332,7 @@ class Manager : private ManagerImplListener
  private:
    ManagerImpl *mImpl;
    Factory *mFactory;
-    QPtrList<ManagerListener<T> > *mListeners;
+    Q3PtrList<ManagerListener<T> > *mListeners;
 };
 }
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
@@ -35,6 +35,8 @@ $Id$
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #include "resource.h"
 #include "factory.h"
@@ -232,9 +234,9 @@ 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 ) {
@@ -243,9 +245,9 @@ QPtrList<Resource> ManagerImpl::resources()
  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 ) {
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
@@ -32,8 +32,8 @@ $Id$
 #define KRESOURCES_MANAGERIMPL_H
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-#include <qdict.h>
+#include <q3dict.h>
 //US
 #include <qobject.h>
@@ -81,10 +81,10 @@ class ManagerImpl : public QObject
    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();
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
@@ -28,7 +28,7 @@
 #include <qmutex.h>
 #endif //QT_THREAD_SUPPORT
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qwidget.h>
 #include <qobject.h>
@@ -239,7 +239,7 @@ class Resource : public QObject
  Q_OBJECT
  public:
-    typedef QValueList<Resource *> List;
+    typedef Q3ValueList<Resource *> List;
    /**
     * Constructor. Construct resource from config.
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
@@ -34,9 +34,13 @@
 //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"
@@ -46,7 +50,7 @@ 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)
@@ -57,7 +61,7 @@ SelectDialog::SelectDialog( QPtrList<Resource> list, QWidget *parent,
  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 );
@@ -65,15 +69,15 @@ SelectDialog::SelectDialog( QPtrList<Resource> list, QWidget *parent,
 */
 //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 );
@@ -101,7 +105,7 @@ SelectDialog::SelectDialog( QPtrList<Resource> list, QWidget *parent,
  }
  mResourceId->setCurrentItem( 0 );
-  connect( mResourceId, SIGNAL(returnPressed(QListBoxItem*)), 
+  connect( mResourceId, SIGNAL(returnPressed(Q3ListBoxItem*)), 
           SLOT(accept()) );
 }
@@ -113,7 +117,7 @@ Resource *SelectDialog::resource()
    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!" ) );
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
@@ -25,13 +25,13 @@
 #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 {
@@ -62,7 +62,7 @@ class SelectDialog : KDialogBase
     * @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();
@@ -76,11 +76,11 @@ class SelectDialog : KDialogBase
     * 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,4 +1,7 @@
 #include "ksystemtray.h"
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QLabel>
 void KSystemTray::mousePressEvent( QMouseEvent *)
 {
diff --git a/microkde/ksystemtray.h b/microkde/ksystemtray.h
index f3e4f6a..6708c86 100644
--- a/microkde/ksystemtray.h
+++ b/microkde/ksystemtray.h
@@ -2,6 +2,8 @@
 #define MICROKDE_KSYSTEMTRAY_H
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QMouseEvent>
 class KSystemTray : public QLabel
 { 
diff --git a/microkde/ktempfile.cpp b/microkde/ktempfile.cpp
index b9166bd..d61d22e 100644
--- a/microkde/ktempfile.cpp
+++ b/microkde/ktempfile.cpp
@@ -1,4 +1,4 @@
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include "ktempfile.h"
@@ -19,7 +19,7 @@ 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
@@ -3,7 +3,7 @@
 #include <qstring.h>
-class QTextStream;
+class Q3TextStream;
 class KTempFile
 {
@@ -14,7 +14,7 @@ class KTempFile
    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
@@ -2,10 +2,12 @@
 #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; 
@@ -17,14 +19,14 @@ KTextEdit::KTextEdit ( QWidget *parent ) : QMultiLineEdit( parent )
 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 () ) {
@@ -32,12 +34,12 @@ void KTextEdit::mousePressEvent(QMouseEvent *e)
            return ;
        }
    }
-    QMultiLineEdit::mousePressEvent( e );
+    Q3MultiLineEdit::mousePressEvent( e );
 }
 void KTextEdit::mouseReleaseEvent(QMouseEvent *e)
 {
-    QMultiLineEdit::mouseReleaseEvent(e);
+    Q3MultiLineEdit::mouseReleaseEvent(e);
 }
 void KTextEdit::mouseMoveEvent(QMouseEvent *e)
@@ -48,6 +50,6 @@ void KTextEdit::mouseMoveEvent(QMouseEvent *e)
    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,9 +1,11 @@
 #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 )  ;
diff --git a/microkde/kurl.cpp b/microkde/kurl.cpp
index 2574e25..122ad71 100644
--- a/microkde/kurl.cpp
+++ b/microkde/kurl.cpp
@@ -34,13 +34,15 @@
 #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";
@@ -57,7 +59,7 @@ static QString encode( const QString& segment, bool encode_slash, int encoding_h
  else
    encode_string = "<>#@\"&%?={}|^~[]\'`\\:+";
-  QCString local;
+  Q3CString local;
  if (encoding_hint==0)
    local = segment.local8Bit();
  else
@@ -100,7 +102,7 @@ static QString encode( const QString& segment, bool encode_slash, int encoding_h
    }
    else
-      new_segment[ new_length++ ] = local[i];
+      new_segment[ new_length++ ] = character;
  }
  QString result = QString(new_segment, new_length);
@@ -205,7 +207,7 @@ static void decode( const QString& segment, QString &decoded, QString &encoded,
  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)
  {
@@ -278,7 +280,7 @@ static void decode( const QString& segment, QString &decoded, QString &encoded,
     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)
     {
@@ -419,7 +421,7 @@ KURL::KURL( const char * url, int encoding_hint )
  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 );
@@ -460,7 +462,7 @@ QDataStream & operator>> (QDataStream & s, KURL & a)
 }
 #ifndef QT_NO_NETWORKPROTOCOL
-KURL::KURL( const QUrl &u )
+KURL::KURL( const Q3Url &u )
 {
  *this = u;
 }
@@ -589,13 +591,13 @@ void KURL::parse( const QString& _url, int encoding_hint )
  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] == '/' )
@@ -769,11 +771,11 @@ void KURL::parse( const QString& _url, int encoding_hint )
  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 )
@@ -848,7 +850,7 @@ KURL& KURL::operator=( const char * _url )
 }
 #ifndef QT_NO_NETWORKPROTOCOL
-KURL& KURL::operator=( const QUrl & u )
+KURL& KURL::operator=( const Q3Url & u )
 {
  m_strProtocol = u.protocol();
  m_strUser = u.user();
@@ -1374,7 +1376,7 @@ KURL KURL::join( const KURL::List & lst )
     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;
@@ -1418,7 +1420,7 @@ QString KURL::fileName( bool _strip_trailing_slash ) const
     // 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 {
diff --git a/microkde/kurl.h b/microkde/kurl.h
index cd65a1c..016eb24 100644
--- a/microkde/kurl.h
+++ b/microkde/kurl.h
@@ -21,9 +21,11 @@
 #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;
@@ -64,7 +66,7 @@ public:
   * @see KURL
   * @see QValueList
   */
-  class List : public QValueList<KURL>
+  class List : public Q3ValueList<KURL>
  {
  public:
    /**
@@ -135,7 +137,7 @@ public:
   * @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
@@ -145,7 +147,7 @@ public:
   * Converts from a @ref QUrl.
   * @param u the QUrl
   */
-  KURL( const QUrl &u );
+  KURL( const Q3Url &u );
  /**
   * Constructor allowing relative URLs.
   *
@@ -658,7 +660,7 @@ public:
  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;
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
@@ -19,10 +19,12 @@
 */
-#include <qhbox.h>
+#include <q3hbox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qcursor.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QPixmap>
 #include <klocale.h>
 #include <kglobal.h>
@@ -73,7 +75,7 @@ void KCMultiDialog::slotDefault()
    int curPageIndex = activePageIndex();
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
    for (; it.current(); ++it)
    {
       if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
@@ -91,7 +93,7 @@ void KCMultiDialog::accept()
 }
 void KCMultiDialog::slotApply()
 {
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
    for (; it.current(); ++it)
      (*it)->save();
    clientChanged(false);
@@ -105,7 +107,7 @@ void KCMultiDialog::slotOk()
 {
 qDebug("KCMultiDialog::slotOk clicked");
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
    for (; it.current(); ++it)
      (*it)->save();
    QDialog::accept();
@@ -153,9 +155,9 @@ void KCMultiDialog::addModule(const QString& path, bool withfallback)
       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;
 }
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
@@ -22,8 +22,8 @@
 #ifndef KCMULTIDIALOG_H
 #define KCMULTIDIALOG_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-#include <qptrdict.h>
+#include <q3ptrdict.h>
 #include <kdialogbase.h>
 #include <kjanuswidget.h>
@@ -75,7 +75,7 @@ public:
 //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 );
@@ -133,7 +133,7 @@ private:
      bool withfallback;
    };
 */
-    QPtrList<KCModule> modules;
+    Q3PtrList<KCModule> modules;
 /*
    QPtrDict<LoadInfo> moduleDict;
    QString _docPath;
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 7120bdd..4ff06a3 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -6,7 +6,7 @@ include( ../variables.pri )
 INCLUDEPATH     += .  ../  ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
 #LIBS            += -lqtcompat
-        TARGET  = microkde
+        TARGET  = xmicrokde
 DESTDIR= ../bin
 DEFINES += DESKTOP_VERSION KDE_QT_ONLY
 unix : {
@@ -178,3 +178,5 @@ KDGanttMinimizeSplitter.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
@@ -7,7 +7,7 @@ LIBS            += -lmicroqtcompat -L$(QPEDIR)/lib
 DEFINES += KDE_QT_ONLY
-        TARGET  = microkde
+        TARGET  = xmicrokde
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/lib
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
@@ -265,7 +265,7 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
    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) ) );
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
@@ -137,7 +137,7 @@ 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;
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,3 +1,5 @@
+//Added by qt3to4:
+#include <Q3MemArray>
 // THIS IS A COPY OF THE FILE FOUND IN $QTDIR/src/kernel. Needed to modify qsplitter
 /****************************************************************************
@@ -55,10 +57,6 @@
 //
-#ifndef QT_H
-#include "qabstractlayout.h"
-#endif // QT_H
 #ifndef QT_NO_LAYOUT
 struct QLayoutStruct
 {
@@ -81,7 +79,7 @@ struct QLayoutStruct
 };
-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 );
author	Michael Krelin <hacker@klever.net>	2007-07-04 11:23:42 (UTC)
committer	Michael Krelin <hacker@klever.net>	2007-07-04 11:23:42 (UTC)
commit	a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff)
tree	8ee90d686081c52e7c69b5ce946e9b1a7d690001 /microkde
parent	11edc920afe4f274c0964436633aa632c8288a40 (diff)
download	kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2