1 files changed, 103 insertions, 91 deletions

diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 72c4e60..4172cd0 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -39,19 +39,28 @@
 #include "qbitmap.h" 
 #if QT_VERSION >= 0x030000
-#include "qptrlist.h"
-#include "qmemarray.h"
+#include "q3ptrlist.h"
+#include "q3memarray.h"
 #else
 #include <qlist.h>
 #include <qarray.h>
-#define QPtrList QList
-#define QMemArray QArray
+#define Q3PtrList QList
+#define Q3MemArray QArray
 #endif
 #include "qlayoutengine_p.h"
-#include "qobjectlist.h"
+#include "qobject.h"
 #include "qstyle.h"
 #include "qapplication.h" //sendPostedEvents
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qcursor.h>
-#include <qframe.h>
+#include <q3frame.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPixmap>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QPaintEvent>
 #ifndef KDGANTT_MASTER_CVS
 //#include "KDGanttMinimizeSplitter.moc"
@@ -66,8 +75,8 @@ 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:
@@ -81,7 +90,8 @@ 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);
@@ -107,8 +117,8 @@ void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
     orient = o;
 #ifndef QT_NO_CURSOR
-    if ( o == KDGanttMinimizeSplitter::Horizontal )
-        setCursor( splitHCursor );
+    if ( o == Qt::Horizontal )
+        setCursor( Qt::splitHCursor );
     else
-        setCursor( splitVCursor );
+        setCursor( Qt::splitVCursor );
 #endif
 }
@@ -118,5 +128,5 @@ void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
 {
     updateCursor( e->pos() );
-    if ( !(e->state()&LeftButton) )
+    if ( !(e->state()&Qt::LeftButton) )
         return;
 
@@ -138,5 +148,5 @@ 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());
@@ -150,11 +160,11 @@ void KDGanttSplitterHandle::updateCursor( const QPoint& p)
 {
     if ( onButton( p ) != 0 ) {
-        setCursor( arrowCursor );
+        setCursor( Qt::arrowCursor );
     }
     else {
-        if ( orient == KDGanttMinimizeSplitter::Horizontal )
-            setCursor( splitHCursor );
+        if ( orient == Qt::Horizontal )
+            setCursor( Qt::splitHCursor );
         else
-            setCursor( splitVCursor );
+            setCursor( Qt::splitVCursor );
     }
 }
@@ -196,5 +206,5 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
     }
     else {
-        if ( !opaque() && e->button() == LeftButton ) {
+        if ( !opaque() && e->button() == Qt::LeftButton ) {
             QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
@@ -212,8 +222,8 @@ 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 );
@@ -230,7 +240,7 @@ int KDGanttSplitterHandle::onButton( const QPoint& p )
 
 
-QValueList<QPointArray> KDGanttSplitterHandle::buttonRegions()
+Q3ValueList<Q3PointArray> KDGanttSplitterHandle::buttonRegions()
 {
-    QValueList<QPointArray> list;
+    Q3ValueList<Q3PointArray> list;
 
     int sw = 8;
@@ -239,5 +249,5 @@ QValueList<QPointArray> KDGanttSplitterHandle::buttonRegions()
     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) {
@@ -312,9 +322,9 @@ void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
     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 ) { 
            
@@ -378,10 +388,10 @@ 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
@@ -462,10 +472,11 @@ static QSize minSizeHint( const QWidget* w )
 */
 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
@@ -476,8 +487,8 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( QWidget *parent, const char *n
   and \a name arguments being passed on to the QFrame constructor.
 */
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Orientation o, QWidget *parent, const char *name )
-    :QFrame(parent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, QWidget *parent, const char *name )
+    :Q3Frame(parent,name)
 { 
-    
+    setAttribute(Qt::WA_PaintUnclipped);
     mRubberBand = 0;
     mFirstHandle = 0;
@@ -506,5 +517,5 @@ void KDGanttMinimizeSplitter::init()
 {
     data = new QSplitterData;
-    if ( orient == Horizontal )
+    if ( orient == Qt::Horizontal )
         setSizePolicy( QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum) );
     else
@@ -535,5 +546,5 @@ void KDGanttMinimizeSplitter::toggle()
   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
@@ -542,5 +553,5 @@ void KDGanttMinimizeSplitter::setOrientation( Orientation o )
     orient = o;
 
-    if ( orient == Horizontal )
+    if ( orient == Qt::Horizontal )
         setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
     else
@@ -587,6 +598,6 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
         tmp += w->name();
         newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() );
-    if ( ! mFirstHandle )
-        mFirstHandle = newHandle;
+        if ( ! mFirstHandle )
+            mFirstHandle = newHandle;
         s->wid = newHandle;
         newHandle->setId(data->list.count());
@@ -601,5 +612,5 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
     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
@@ -622,18 +633,24 @@ 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() );
 
@@ -671,15 +688,15 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
 #ifdef DESKTOP_VERSION
     QPainter paint( this );
-    paint.setPen( gray );
-    paint.setBrush( gray );
-    paint.setRasterOp( XorROP );
+    paint.setPen( Qt::gray );
+    paint.setBrush( Qt::gray );
+    paint.setCompositionMode( QPainter::CompositionMode_Xor );
     QRect r = contentsRect();
     const int rBord = 3; //Themable????
 #if QT_VERSION >= 0x030000
-    int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
+    int sw = style()->pixelMetric(QStyle::PM_SplitterWidth, 0, this);
 #else
     int sw = style().splitterWidth();
 #endif
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         if ( opaqueOldPos >= 0 )
             paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
@@ -697,5 +714,5 @@ void KDGanttMinimizeSplitter::setRubberband( int 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() ) );
@@ -711,5 +728,5 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
     }
     int sw = style().splitterWidth();
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         if ( p >= 0 ) {
             QPoint geo =  mapToGlobal (QPoint ( p  + sw/2 - rBord, r.y()));
@@ -733,5 +750,5 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
 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 )
@@ -756,5 +773,5 @@ void KDGanttMinimizeSplitter::drawSplitter( QPainter *p,
     style().drawPrimitive(QStyle::PE_Splitter, p, QRect(x, y, w, h), colorGroup(),
                           (orientation() == Qt::Horizontal ?
-                           QStyle::Style_Horizontal : 0));
+                           QStyle::State_Horizontal : 0));
 #endif
 }
@@ -797,7 +814,7 @@ 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;
@@ -814,6 +831,6 @@ void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
 void KDGanttMinimizeSplitter::setG( QWidget *w, int p, int s, bool isSplitter )
 {
-    if ( orient == Horizontal ) {
-        if ( false && orient == Horizontal && !isSplitter )
+    if ( orient == Qt::Horizontal ) {
+        if ( false && orient == Qt::Horizontal && !isSplitter )
             p = contentsRect().width() - p - s;
         w->setGeometry( p, contentsRect().y(), s, contentsRect().height() );
@@ -841,5 +858,5 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
         int pos1, pos2;
         int dd = s->sizer;
-        if( false && orient == Horizontal ) {
+        if( false && orient == Qt::Horizontal ) {
             pos1 = pos;
             pos2 = pos + dd;
@@ -857,5 +874,5 @@ 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())));
@@ -894,5 +911,5 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
         int dd = s->sizer;
         int pos1, pos2;
-        if( false && orient == Horizontal ) {
+        if( false && orient == Qt::Horizontal ) {
             pos2 = pos - dd;
             pos1 = pos2 + 1;
@@ -911,5 +928,5 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
         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())));
@@ -989,7 +1006,7 @@ 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();
@@ -1031,5 +1048,5 @@ void KDGanttMinimizeSplitter::doResize()
     int i;
     int n = data->list.count();
-    QMemArray<QLayoutStruct> a( n );
+    Q3MemArray<QLayoutStruct> a( n );
     for ( i = 0; i< n; i++ ) {
         a[i].init();
@@ -1133,5 +1150,5 @@ void KDGanttMinimizeSplitter::recalc( bool update )
         maxt = mint;
 
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         setMaximumSize( maxl, maxt );
         setMinimumSize( minl, mint );
@@ -1268,11 +1285,8 @@ QSize KDGanttMinimizeSplitter::sizeHint() const
     int l = 0;
     int t = 0;
-    if ( children() ) {
-        const QObjectList * c = children();
-        QObjectListIt it( *c );
-        QObject * o;
-
-        while( (o=it.current()) != 0 ) {
-            ++it;
+    if ( !children().empty() ) {
+        const QObjectList c = children();
+        for(QObjectList::const_iterator i=c.begin();i!=c.end();++i) {
+            QObject * o = *i;
             if ( o->isWidgetType() &&
                  !((QWidget*)o)->isHidden() ) {
@@ -1285,5 +1299,5 @@ QSize KDGanttMinimizeSplitter::sizeHint() const
         }
     }
-    return orientation() == Horizontal ? QSize( l, t ) : QSize( t, l );
+    return orientation() == Qt::Horizontal ? QSize( l, t ) : QSize( t, l );
 }
 
@@ -1298,11 +1312,8 @@ QSize KDGanttMinimizeSplitter::minimumSizeHint() const
     int l = 0;
     int t = 0;
-    if ( children() ) {
-        const QObjectList * c = children();
-        QObjectListIt it( *c );
-        QObject * o;
-
-        while( (o=it.current()) != 0 ) {
-            ++it;
+    if ( !children().empty() ) {
+        const QObjectList c = children();
+        for(QObjectList::const_iterator i=c.begin();i!=c.end();++i) {
+            QObject * o = *i;
             if ( o->isWidgetType() &&
                  !((QWidget*)o)->isHidden() ) {
@@ -1315,5 +1326,5 @@ QSize KDGanttMinimizeSplitter::minimumSizeHint() const
         }
     }
-    return orientation() == Horizontal ? QSize( l, t ) : QSize( t, l );
+    return orientation() == Qt::Horizontal ? QSize( l, t ) : QSize( t, l );
 }
 
@@ -1403,11 +1414,12 @@ bool KDGanttMinimizeSplitter::isHidden( QWidget *w ) const
 */
 
-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 ) {
@@ -1434,8 +1446,8 @@ QValueList<int> KDGanttMinimizeSplitter::sizes() const
 */
 
-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() ) {
@@ -1457,5 +1469,5 @@ void KDGanttMinimizeSplitter::setSizes( QValueList<int> list )
 void KDGanttMinimizeSplitter::processChildEvents()
 {
-    QApplication::sendPostedEvents( this, QEvent::ChildInserted );
+    QApplication::sendPostedEvents( this, QEvent::ChildAdded );
 }
 
@@ -1469,5 +1481,5 @@ 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();
@@ -1480,5 +1492,5 @@ void KDGanttMinimizeSplitter::styleChange( QStyle& old )
     }
     doResize();
-    QFrame::styleChange( old );
+    Q3Frame::styleChange( old );
 }
 
@@ -1513,5 +1525,5 @@ 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 )
 {