Revert drw s commit

Do not expose private API
Better include the .moc

3 files changed, 590 insertions, 564 deletions

diff --git a/libqtaux/libqtaux.pro b/libqtaux/libqtaux.pro
index 56ccc65..a1440e3 100644
--- a/libqtaux/libqtaux.pro
+++ b/libqtaux/libqtaux.pro
@@ -6,20 +6,19 @@ HEADERS         = qcolordialog.h       \
                   qinputdialog.h       \
                                        \
                   ocolorpopupmenu.h    \
                   ocolorbutton.h       
 
 
 SOURCES         = qcolordialog.cpp     \
                   qsplitter.cpp        \
                   qinputdialog.cpp     \
                                        \
                   ocolorpopupmenu.cpp  \
                   ocolorbutton.cpp    
 
 TARGET          = qtaux2
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib
-INTERFACES      =
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/libqtaux/qcolordialog.cpp b/libqtaux/qcolordialog.cpp
index 1574841..b960b04 100644
--- a/libqtaux/qcolordialog.cpp
+++ b/libqtaux/qcolordialog.cpp
@@ -24,625 +24,823 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
 ** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "qcolordialog.h"
 
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qdrawutil.h>
-#include <qdragobject.h>
-#include <qapplication.h>
-#include <qdragobject.h>
+#include "qpainter.h"
+#include "qlayout.h"
+#include "qlabel.h"
+#include "qpushbutton.h"
+#include "qlineedit.h"
+#include "qimage.h"
+#include "qpixmap.h"
+#include "qdrawutil.h"
+#include "qvalidator.h"
+#include "qdragobject.h"
+#include "qapplication.h"
+#include "qdragobject.h"
 
 //////////// QWellArray BEGIN
 
-#include <qobjectdict.h>
+#include "qobjectdict.h"
 
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
 // of qwellarray.cpp and qcolordialog.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
 //
 
+
+#include "qtableview.h"
+
+
+struct QWellArrayData;
+
+class QWellArray : public QTableView
+{
+    Q_OBJECT
+    Q_PROPERTY( int numCols READ numCols )
+    Q_PROPERTY( int numRows READ numRows )
+    Q_PROPERTY( int selectedColumn READ selectedColumn )
+    Q_PROPERTY( int selectedRow READ selectedRow )
+
+public:
+    QWellArray( QWidget *parent=0, const char *name=0, bool popup = FALSE );
+
+    ~QWellArray() {}
+    QString cellContent( int row, int col ) const;
+    // ### Paul !!! virtual void setCellContent( int row, int col, const QString &);
+
+    // ##### Obsolete since not const
+    int numCols() { return nCols; }
+    int numRows() { return nRows; }
+
+    int numCols() const { return nCols; }
+    int numRows() const { return nRows; }
+
+    // ##### Obsolete since not const
+    int selectedColumn() { return selCol; }
+    int selectedRow() { return selRow; }
+
+    int selectedColumn() const { return selCol; }
+    int selectedRow() const { return selRow; }
+
+    virtual void setSelected( int row, int col );
+
+    void setCellSize( int w, int h ) { setCellWidth(w);setCellHeight( h ); }
+
+    QSize sizeHint() const;
+
+    virtual void setDimension( int rows, int cols );
+    virtual void setCellBrush( int row, int col, const QBrush & );
+    QBrush cellBrush( int row, int col );
+
+signals:
+    void selected( int row, int col );
+
+protected:
+    virtual void setCurrent( int row, int col );
+
+    virtual void drawContents( QPainter *, int row, int col, const QRect& );
+    void drawContents( QPainter * );
+
+    void paintCell( QPainter*, int row, int col );
+    void mousePressEvent( QMouseEvent* );
+    void mouseReleaseEvent( QMouseEvent* );
+    void mouseMoveEvent( QMouseEvent* );
+    void keyPressEvent( QKeyEvent* );
+    void focusInEvent( QFocusEvent* );
+    void focusOutEvent( QFocusEvent* );
+
+private:
+    int curRow;
+    int curCol;
+    int selRow;
+    int selCol;
+    int nCols;
+    int nRows;
+    bool smallStyle;
+    QWellArrayData *d;
+
+        private:// Disabled copy constructor and operator=
+#if defined(Q_DISABLE_COPY)
+    QWellArray( const QWellArray & );
+    QWellArray& operator=( const QWellArray & );
+#endif
+};
+
+
+
+// non-interface ...
+
+
+
+struct QWellArrayData {
+    QBrush *brush;
+};
+
+// NOT REVISED
+/* WARNING, NOT
+  \class QWellArray qwellarray_p.h
+  \brief ....
+
+  ....
+
+  \ingroup advanced
+*/
+
 QWellArray::QWellArray( QWidget *parent, const char * name, bool popup )
     : QTableView( parent, name,
-          popup ? (WStyle_Customize|WStyle_Tool|WStyle_NoBorder) : 0 )
+                  popup ? (WStyle_Customize|WStyle_Tool|WStyle_NoBorder) : 0 )
 {
     d = 0;
     setFocusPolicy( StrongFocus );
     setBackgroundMode( PaletteButton );
     nCols = 7;
     nRows = 7;
-    int w = 24;        // cell width
-    int h = 21;        // cell height
+            int w = 24;         // cell width
+            int h = 21;         // cell height
     smallStyle = popup;
 
     if ( popup ) {
-    w = h = 18;
-    if ( style() == WindowsStyle )
-        setFrameStyle( QFrame::WinPanel | QFrame::Raised );
-    else
-        setFrameStyle( QFrame::Panel | QFrame::Raised );
-    setMargin( 1 );
-    setLineWidth( 2 );
+        w = h = 18;
+        if ( style() == WindowsStyle )
+            setFrameStyle( QFrame::WinPanel | QFrame::Raised );
+        else
+            setFrameStyle( QFrame::Panel | QFrame::Raised );
+        setMargin( 1 );
+        setLineWidth( 2 );
     }
     setNumCols( nCols );
     setNumRows( nRows );
     setCellWidth( w );
     setCellHeight( h );
     curCol = 0;
     curRow = 0;
     selCol = -1;
     selRow = -1;
 
     if ( smallStyle )
-    setMouseTracking( TRUE );
+        setMouseTracking( TRUE );
     setOffset( 5 , 10 );
 
     resize( sizeHint() );
 
 }
 
 
 QSize QWellArray::sizeHint() const
 {
     constPolish();
     int f = frameWidth() * 2;
     int w = nCols * cellWidth() + f;
     int h = nRows * cellHeight() + f;
     return QSize( w, h );
 }
 
 
 void QWellArray::paintCell( QPainter* p, int row, int col )
 {
-    int w = cellWidth( col );            // width of cell in pixels
-    int h = cellHeight( row );            // height of cell in pixels
+            int w = cellWidth( col );           // width of cell in pixels
+            int h = cellHeight( row );          // height of cell in pixels
     int b = 1;
 
     if ( !smallStyle )
-    b = 3;
+        b = 3;
 
     const QColorGroup & g = colorGroup();
     p->setPen( QPen( black, 0, SolidLine ) );
     if ( !smallStyle && row ==selRow && col == selCol &&
-     style() != MotifStyle ) {
-    int n = 2;
-    p->drawRect( n, n, w-2*n, h-2*n );
+         style() != MotifStyle ) {
+        int n = 2;
+        p->drawRect( n, n, w-2*n, h-2*n );
     }
 
 
     if ( style() == WindowsStyle ) {
-    qDrawWinPanel( p, b, b ,  w - 2*b,  h - 2*b,
-               g, TRUE );
-    b += 2;
+        qDrawWinPanel( p, b, b ,  w - 2*b,  h - 2*b,
+                       g, TRUE );
+        b += 2;
     } else {
-    if ( smallStyle ) {
-        qDrawShadePanel( p, b, b ,  w - 2*b,  h - 2*b,
-                 g, TRUE, 2 );
-        b += 2;
-    } else {
-        int t = ( row == selRow && col == selCol ) ? 2 : 0;
-        b -= t;
-        qDrawShadePanel( p, b, b ,  w - 2*b,  h - 2*b,
-                 g, TRUE, 2 );
-        b += 2 + t;
-    }
+        if ( smallStyle ) {
+            qDrawShadePanel( p, b, b ,  w - 2*b,  h - 2*b,
+                             g, TRUE, 2 );
+            b += 2;
+        } else {
+            int t = ( row == selRow && col == selCol ) ? 2 : 0;
+            b -= t;
+            qDrawShadePanel( p, b, b ,  w - 2*b,  h - 2*b,
+                             g, TRUE, 2 );
+            b += 2 + t;
+        }
     }
 
 
     if ( (row == curRow) && (col == curCol) ) {
-    if ( smallStyle ) {
-        p->setPen ( white );
-        p->drawRect( 1, 1, w-2, h-2 );
-        p->setPen ( black );
-        p->drawRect( 0, 0, w, h );
-        p->drawRect( 2, 2, w-4, h-4 );
-        b = 3;
-    } else if ( hasFocus() ) {
-        style().drawFocusRect(p, QRect(0,0,w,h), g );
-    }
+        if ( smallStyle ) {
+            p->setPen ( white );
+            p->drawRect( 1, 1, w-2, h-2 );
+            p->setPen ( black );
+            p->drawRect( 0, 0, w, h );
+            p->drawRect( 2, 2, w-4, h-4 );
+            b = 3;
+        } else if ( hasFocus() ) {
+            style().drawFocusRect(p, QRect(0,0,w,h), g );
+        }
     }
     drawContents( p, row, col, QRect(b, b, w - 2*b, h - 2*b) );
 }
 
 /*!
   Pass-through to QTableView::drawContents() to avoid hiding.
 */
 void QWellArray::drawContents( QPainter *p )
 {
     QTableView::drawContents(p);
 }
 
 /*!
   Reimplement this function to change the contents of the well array.
  */
 void QWellArray::drawContents( QPainter *p, int row, int col, const QRect &r )
 {
 
     if ( d ) {
-    p->fillRect( r, d->brush[row*nCols+col] );
+        p->fillRect( r, d->brush[row*nCols+col] );
     } else {
-    p->fillRect( r, white );
-    p->setPen( black );
-    p->drawLine( r.topLeft(), r.bottomRight() );
-    p->drawLine( r.topRight(), r.bottomLeft() );
+        p->fillRect( r, white );
+        p->setPen( black );
+        p->drawLine( r.topLeft(), r.bottomRight() );
+        p->drawLine( r.topRight(), r.bottomLeft() );
     }
 }
 
 
 /*\reimp
 */
 void QWellArray::mousePressEvent( QMouseEvent* e )
 {
     // The current cell marker is set to the cell the mouse is pressed
     // in.
     QPoint pos = e->pos();
     setCurrent( findRow( pos.y() ), findCol( pos.x() ) );
 }
 
 /*\reimp
 */
 void QWellArray::mouseReleaseEvent( QMouseEvent* )
 {
     // The current cell marker is set to the cell the mouse is clicked
     // in.
     setSelected( curRow, curCol );
 }
 
 
 /*\reimp
 */
 void QWellArray::mouseMoveEvent( QMouseEvent* e )
 {
     //   The current cell marker is set to the cell the mouse is
     //   clicked in.
     if ( smallStyle ) {
-    QPoint pos = e->pos();
-    setCurrent( findRow( pos.y() ), findCol( pos.x() ) );
+        QPoint pos = e->pos();
+        setCurrent( findRow( pos.y() ), findCol( pos.x() ) );
     }
 }
 
 /*
   Sets the cell currently having the focus. This is not necessarily
   the same as the currently selected cell.
 */
 
 void QWellArray::setCurrent( int row, int col )
 {
 
     if ( (curRow == row) && (curCol == col) )
-    return;
+        return;
 
     if ( row < 0 || col < 0 )
-    row = col = -1;
+        row = col = -1;
 
     int oldRow = curRow;
     int oldCol = curCol;
 
     curRow = row;
     curCol = col;
 
     updateCell( oldRow, oldCol );
     updateCell( curRow, curCol );
 }
 
 
 /*!
   Sets the currently selected cell to \a row, \a col.  If \a row or \a
   col are less than zero, the current cell is unselected.
 
   Does not set the position of the focus indicator.
 */
 
 void QWellArray::setSelected( int row, int col )
 {
     if ( (selRow == row) && (selCol == col) )
-    return;
+        return;
 
     int oldRow = selRow;
     int oldCol = selCol;
 
     if ( row < 0 || col < 0 )
-    row = col = -1;
+        row = col = -1;
 
     selCol = col;
     selRow = row;
 
     updateCell( oldRow, oldCol );
     updateCell( selRow, selCol );
     if ( row >= 0 )
-    emit selected( row, col );
+        emit selected( row, col );
 
     if ( isVisible() && parentWidget() && parentWidget()->inherits("QPopupMenu") )
-    parentWidget()->close();
+        parentWidget()->close();
 
 }
 
 
 
 /*!\reimp
 */
 void QWellArray::focusInEvent( QFocusEvent* )
 {
     updateCell( curRow, curCol );
 }
 
 
 /*!
   Sets the size of the well array to be \c rows cells by \c cols.
   Resets any brush info set by setCellBrush().
 
   Must be called by reimplementors.
  */
 void QWellArray::setDimension( int rows, int cols )
 {
     nRows = rows;
     nCols = cols;
     if ( d ) {
-    if ( d->brush )
-        delete[] d->brush;
-    delete d;
-    d = 0;
+        if ( d->brush )
+            delete[] d->brush;
+        delete d;
+        d = 0;
     }
     setNumCols( nCols );
     setNumRows( nRows );
 }
 
 void QWellArray::setCellBrush( int row, int col, const QBrush &b )
 {
     if ( !d ) {
-    d = new QWellArrayData;
-    d->brush = new QBrush[nRows*nCols];
+        d = new QWellArrayData;
+        d->brush = new QBrush[nRows*nCols];
     }
     if ( row >= 0 && row < nRows && col >= 0 && col < nCols )
-    d->brush[row*nCols+col] = b;
+        d->brush[row*nCols+col] = b;
 #ifdef CHECK_RANGE
     else
-    qWarning( "QWellArray::setCellBrush( %d, %d ) out of range", row, col );
+        qWarning( "QWellArray::setCellBrush( %d, %d ) out of range", row, col );
 #endif
 }
 
 
 
 /*!
   Returns the brush set for the cell at \a row, \a col. If no brush is set,
   \c NoBrush is returned.
 */
 
 QBrush QWellArray::cellBrush( int row, int col )
 {
     if ( d && row >= 0 && row < nRows && col >= 0 && col < nCols )
-    return d->brush[row*nCols+col];
+        return d->brush[row*nCols+col];
     return NoBrush;
 }
 
 
 
 /*!\reimp
 */
 
 void QWellArray::focusOutEvent( QFocusEvent* )
 {
     updateCell( curRow, curCol );
 }
 
 /*\reimp
 */
 void QWellArray::keyPressEvent( QKeyEvent* e )
 {
-    switch( e->key() ) {            // Look at the key code
-    case Key_Left:                // If 'left arrow'-key,
-    if( curCol > 0 ) {            // and cr't not in leftmost col
-        setCurrent( curRow, curCol - 1);    // set cr't to next left column
-        int edge = leftCell();        // find left edge
-        if ( curCol < edge )        // if we have moved off  edge,
-        setLeftCell( edge - 1 );    // scroll view to rectify
-    }
-    break;
-    case Key_Right:                // Correspondingly...
-    if( curCol < numCols()-1 ) {
-        setCurrent( curRow, curCol + 1);
-        int edge = lastColVisible();
-        if ( curCol >= edge )
-        setLeftCell( leftCell() + 1 );
-    }
-    break;
+            switch( e->key() ) {                // Look at the key code
+            case Key_Left:                      // If 'left arrow'-key,
+                if( curCol > 0 ) {              // and cr't not in leftmost col
+                    setCurrent( curRow, curCol - 1);// set cr't to next left column
+                    int edge = leftCell();      // find left edge
+                    if ( curCol < edge )        // if we have moved off  edge,
+                        setLeftCell( edge - 1 );// scroll view to rectify
+        }
+        break;
+            case Key_Right:                     // Correspondingly...
+        if( curCol < numCols()-1 ) {
+            setCurrent( curRow, curCol + 1);
+            int edge = lastColVisible();
+            if ( curCol >= edge )
+                setLeftCell( leftCell() + 1 );
+        }
+        break;
     case Key_Up:
-    if( curRow > 0 ) {
-        setCurrent( curRow - 1, curCol);
-        int edge = topCell();
-        if ( curRow < edge )
-        setTopCell( edge - 1 );
-    } else if ( smallStyle )
-        focusNextPrevChild( FALSE );
-    break;
+        if( curRow > 0 ) {
+            setCurrent( curRow - 1, curCol);
+            int edge = topCell();
+            if ( curRow < edge )
+                setTopCell( edge - 1 );
+        } else if ( smallStyle )
+            focusNextPrevChild( FALSE );
+        break;
     case Key_Down:
-    if( curRow < numRows()-1 ) {
-        setCurrent( curRow + 1, curCol);
-        int edge = lastRowVisible();
-        if ( curRow >= edge )
-        setTopCell( topCell() + 1 );
-    } else if ( smallStyle )
-        focusNextPrevChild( TRUE );
-    break;
+        if( curRow < numRows()-1 ) {
+            setCurrent( curRow + 1, curCol);
+            int edge = lastRowVisible();
+            if ( curRow >= edge )
+                setTopCell( topCell() + 1 );
+        } else if ( smallStyle )
+            focusNextPrevChild( TRUE );
+        break;
     case Key_Space:
     case Key_Return:
     case Key_Enter:
-    setSelected( curRow, curCol );
-    break;
-    default:                // If not an interesting key,
-    e->ignore();            // we don't accept the event
-    return;
+        setSelected( curRow, curCol );
+        break;
+            default:                    // If not an interesting key,
+                e->ignore();            // we don't accept the event
+        return;
     }
 
 }
 
 //////////// QWellArray END
 
 static bool initrgb = FALSE;
 static QRgb stdrgb[6*8];
 static QRgb cusrgb[2*8];
 
 
 static void initRGB()
 {
     if ( initrgb )
-    return;
+        return;
     initrgb = TRUE;
     int i = 0;
     for ( int g = 0; g < 4; g++ )
-    for ( int r = 0;  r < 4; r++ )
-        for ( int b = 0; b < 3; b++ )
-        stdrgb[i++] = qRgb( r*255/3, g*255/3, b*255/2 );
+        for ( int r = 0;  r < 4; r++ )
+            for ( int b = 0; b < 3; b++ )
+                stdrgb[i++] = qRgb( r*255/3, g*255/3, b*255/2 );
 
     for ( i = 0; i < 2*8; i++ )
-    cusrgb[i] = qRgb(0xff,0xff,0xff);
+        cusrgb[i] = qRgb(0xff,0xff,0xff);
 }
 
 /*!
   Returns the number of custom colors supported by
   QColorDialog. All color dialogs share the same custom colors.
 */
 int QColorDialog::customCount()
 {
     return 2*8;
 }
 
 /*!
   Returns custom color number \a i as a QRgb.
  */
 QRgb QColorDialog::customColor( int i )
 {
     initRGB();
     if ( i < 0 || i >= customCount() ) {
 #ifdef CHECK_RANGE
-    qWarning( "QColorDialog::customColor() index %d out of range", i );
-#endif
-    i = 0;
+        qWarning( "QColorDialog::customColor() index %d out of range", i );
+        #endif
+        i = 0;
     }
     return cusrgb[i];
 }
 
 /*!
   Sets custom color number \a i to the QRgb value \a c.
 */
 void QColorDialog::setCustomColor( int i, QRgb c )
 {
     initRGB();
     if ( i < 0 || i >= customCount() ) {
 #ifdef CHECK_RANGE
-    qWarning( "QColorDialog::customColor() index %d out of range", i );
-#endif
-    return;
+        qWarning( "QColorDialog::customColor() index %d out of range", i );
+        #endif
+        return;
     }
     cusrgb[i] = c;
 }
 
 static inline void rgb2hsv( QRgb rgb, int&h, int&s, int&v )
 {
     QColor c;
     c.setRgb( rgb );
     c.getHsv(h,s,v);
 }
 
+class QColorWell : public QWellArray
+{
+public:
+    QColorWell( QWidget *parent, int r, int c, QRgb *vals )
+        :QWellArray( parent, "" ), values( vals ), mousePressed( FALSE ), oldCurrent( -1, -1 )
+    { setDimension(r,c); setWFlags( WResizeNoErase ); }
+    QSizePolicy sizePolicy() const;
+
+protected:
+    void drawContents( QPainter *, int row, int col, const QRect& );
+    void drawContents( QPainter *p ) { QWellArray::drawContents(p); }
+    void mousePressEvent( QMouseEvent *e );
+    void mouseMoveEvent( QMouseEvent *e );
+    void mouseReleaseEvent( QMouseEvent *e );
+#ifndef QT_NO_DRAGANDDROP
+    void dragEnterEvent( QDragEnterEvent *e );
+    void dragLeaveEvent( QDragLeaveEvent *e );
+    void dragMoveEvent( QDragMoveEvent *e );
+    void dropEvent( QDropEvent *e );
+#endif
+
+private:
+    QRgb *values;
+    bool mousePressed;
+    QPoint pressPos;
+    QPoint oldCurrent;
+
+};
+
 QSizePolicy QColorWell::sizePolicy() const
 {
     return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
 }
 
 void QColorWell::drawContents( QPainter *p, int row, int col, const QRect &r )
 {
     int i = row + col*numRows();
     p->fillRect( r, QColor( values[i] ) );
 }
 
 void QColorWell::mousePressEvent( QMouseEvent *e )
 {
     oldCurrent = QPoint( selectedRow(), selectedColumn() );
     QWellArray::mousePressEvent( e );
     mousePressed = TRUE;
     pressPos = e->pos();
 }
 
 void QColorWell::mouseMoveEvent( QMouseEvent *e )
 {
     QWellArray::mouseMoveEvent( e );
 #ifndef QT_NO_DRAGANDDROP
     if ( !mousePressed )
-    return;
+        return;
     if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) {
-    setCurrent( oldCurrent.x(), oldCurrent.y() );
-    int i = findRow( e->y() ) + findCol( e->x() ) * numRows();
-    QColor col( values[ i ] );
-    QColorDrag *drg = new QColorDrag( col, this );
-    QPixmap pix( cellWidth(), cellHeight() );
-    pix.fill( col );
-    QPainter p( &pix );
-    p.drawRect( 0, 0, pix.width(), pix.height() );
-    p.end();
-    drg->setPixmap( pix );
-    mousePressed = FALSE;
-    drg->dragCopy();
+        setCurrent( oldCurrent.x(), oldCurrent.y() );
+        int i = findRow( e->y() ) + findCol( e->x() ) * numRows();
+        QColor col( values[ i ] );
+        QColorDrag *drg = new QColorDrag( col, this );
+        QPixmap pix( cellWidth(), cellHeight() );
+        pix.fill( col );
+        QPainter p( &pix );
+        p.drawRect( 0, 0, pix.width(), pix.height() );
+        p.end();
+        drg->setPixmap( pix );
+        mousePressed = FALSE;
+        drg->dragCopy();
     }
 #endif
 }
 
 #ifndef QT_NO_DRAGANDDROP
 void QColorWell::dragEnterEvent( QDragEnterEvent *e )
 {
     setFocus();
     if ( QColorDrag::canDecode( e ) )
-    e->accept();
+        e->accept();
     else
-    e->ignore();
+        e->ignore();
 }
 
 void QColorWell::dragLeaveEvent( QDragLeaveEvent * )
 {
     if ( hasFocus() )
-    parentWidget()->setFocus();
+        parentWidget()->setFocus();
 }
 
 void QColorWell::dragMoveEvent( QDragMoveEvent *e )
 {
     if ( QColorDrag::canDecode( e ) ) {
-    setCurrent( findRow( e->pos().y() ), findCol( e->pos().x() ) );
-    e->accept();
+        setCurrent( findRow( e->pos().y() ), findCol( e->pos().x() ) );
+        e->accept();
     } else
-    e->ignore();
+        e->ignore();
 }
 
 void QColorWell::dropEvent( QDropEvent *e )
 {
     if ( QColorDrag::canDecode( e ) ) {
-    int i = findRow( e->pos().y() ) + findCol( e->pos().x() ) * numRows();
-    QColor col;
-    QColorDrag::decode( e, col );
-    values[ i ] = col.rgb();
-    repaint( FALSE );
-    e->accept();
+        int i = findRow( e->pos().y() ) + findCol( e->pos().x() ) * numRows();
+        QColor col;
+        QColorDrag::decode( e, col );
+        values[ i ] = col.rgb();
+        repaint( FALSE );
+        e->accept();
     } else {
-    e->ignore();
+        e->ignore();
     }
 }
 
 #endif // QT_NO_DRAGANDDROP
 
 void QColorWell::mouseReleaseEvent( QMouseEvent *e )
 {
     if ( !mousePressed )
-    return;
+        return;
     QWellArray::mouseReleaseEvent( e );
     mousePressed = FALSE;
 }
 
+class QColorPicker : public QFrame
+{
+    Q_OBJECT
+public:
+    QColorPicker(QWidget* parent=0, const char* name=0);
+    ~QColorPicker();
+
+public slots:
+    void setCol( int h, int s );
+
+signals:
+    void newCol( int h, int s );
+
+protected:
+    QSize sizeHint() const;
+    QSizePolicy sizePolicy() const;
+    void drawContents(QPainter* p);
+    void mouseMoveEvent( QMouseEvent * );
+    void mousePressEvent( QMouseEvent * );
+
+private:
+    int hue;
+    int sat;
+
+    QPoint colPt();
+    int huePt( const QPoint &pt );
+    int satPt( const QPoint &pt );
+    void setCol( const QPoint &pt );
+
+    QPixmap *pix;
+};
+
 static int pWidth = 200;
 static int pHeight = 200;
 
+class QColorLuminancePicker : public QWidget
+{
+    Q_OBJECT
+public:
+    QColorLuminancePicker(QWidget* parent=0, const char* name=0);
+    ~QColorLuminancePicker();
+
+public slots:
+    void setCol( int h, int s, int v );
+    void setCol( int h, int s );
+
+signals:
+    void newHsv( int h, int s, int v );
+
+protected:
+//    QSize sizeHint() const;
+//    QSizePolicy sizePolicy() const;
+    void paintEvent( QPaintEvent*);
+    void mouseMoveEvent( QMouseEvent * );
+    void mousePressEvent( QMouseEvent * );
+
+private:
+    enum { foff = 3, coff = 4 }; //frame and contents offset
+    int val;
+    int hue;
+    int sat;
+
+    int y2val( int y );
+    int val2y( int val );
+    void setVal( int v );
+
+    QPixmap *pix;
+};
+
+
 int QColorLuminancePicker::y2val( int y )
 {
     int d = height() - 2*coff - 1;
     return 255 - (y - coff)*255/d;
 }
 
 int QColorLuminancePicker::val2y( int v )
 {
     int d = height() - 2*coff - 1;
     return coff + (255-v)*d/255;
 }
 
 QColorLuminancePicker::QColorLuminancePicker(QWidget* parent,
-                          const char* name)
+                                                  const char* name)
     :QWidget( parent, name )
 {
     hue = 100; val = 100; sat = 100;
     pix = 0;
     //    setBackgroundMode( NoBackground );
 }
 
 QColorLuminancePicker::~QColorLuminancePicker()
 {
     delete pix;
 }
 
 void QColorLuminancePicker::mouseMoveEvent( QMouseEvent *m )
 {
     setVal( y2val(m->y()) );
 }
 void QColorLuminancePicker::mousePressEvent( QMouseEvent *m )
 {
     setVal( y2val(m->y()) );
 }
 
 void QColorLuminancePicker::setVal( int v )
 {
     if ( val == v )
-    return;
+        return;
     val = QMAX( 0, QMIN(v,255));
     delete pix; pix=0;
     repaint( FALSE ); //###
     emit newHsv( hue, sat, val );
 }
 
 //receives from a hue,sat chooser and relays.
 void QColorLuminancePicker::setCol( int h, int s )
 {
     setCol( h, s, val );
     emit newHsv( h, s, val );
 }
 
 void QColorLuminancePicker::paintEvent( QPaintEvent * )
 {
     int w = width() - 5;
 
     QRect r( 0, foff, w, height() - 2*foff );
     int wi = r.width() - 2;
     int hi = r.height() - 2;
     if ( !pix || pix->height() != hi || pix->width() != wi ) {
-    delete pix;
-    QImage img( wi, hi, 32 );
-    int y;
-    for ( y = 0; y < hi; y++ ) {
-        QColor c( hue, sat, y2val(y+coff), QColor::Hsv );
-        QRgb r = c.rgb();
-        int x;
-        for ( x = 0; x < wi; x++ )
-        img.setPixel( x, y, r );
-    }
-    pix = new QPixmap;
-    pix->convertFromImage(img);
+        delete pix;
+        QImage img( wi, hi, 32 );
+        int y;
+        for ( y = 0; y < hi; y++ ) {
+            QColor c( hue, sat, y2val(y+coff), QColor::Hsv );
+            QRgb r = c.rgb();
+            int x;
+            for ( x = 0; x < wi; x++ )
+                img.setPixel( x, y, r );
+        }
+        pix = new QPixmap;
+        pix->convertFromImage(img);
     }
     QPainter p(this);
     p.drawPixmap( 1, coff, *pix );
     QColorGroup g = colorGroup();
     qDrawShadePanel( &p, r, g, TRUE );
     p.setPen( g.foreground() );
     p.setBrush( g.foreground() );
     QPointArray a;
     int y = val2y(val);
     a.setPoints( 3, w, y, w+5, y+5, w+5, y-5 );
     erase( w, 0, 5, height() );
     p.drawPolygon( a );
 }
 
 void QColorLuminancePicker::setCol( int h, int s , int v )
 {
@@ -658,63 +856,63 @@ QPoint QColorPicker::colPt()
 int QColorPicker::huePt( const QPoint &pt )
 { return 360 - pt.x()*360/(pWidth-1); }
 int QColorPicker::satPt( const QPoint &pt )
 { return 255 - pt.y()*255/(pHeight-1) ; }
 void QColorPicker::setCol( const QPoint &pt )
 { setCol( huePt(pt), satPt(pt) ); }
 
 QColorPicker::QColorPicker(QWidget* parent, const char* name )
     : QFrame( parent, name )
 {
     hue = 0; sat = 0;
     setCol( 150, 255 );
 
     QImage img( pWidth, pHeight, 32 );
     int x,y;
     for ( y = 0; y < pHeight; y++ )
-    for ( x = 0; x < pWidth; x++ ) {
-        QPoint p( x, y );
-        img.setPixel( x, y, QColor(huePt(p), satPt(p),
-                       200, QColor::Hsv).rgb() );
-    }
+        for ( x = 0; x < pWidth; x++ ) {
+            QPoint p( x, y );
+            img.setPixel( x, y, QColor(huePt(p), satPt(p),
+                                       200, QColor::Hsv).rgb() );
+        }
     pix = new QPixmap;
     pix->convertFromImage(img);
     setBackgroundMode( NoBackground );
 }
 
 QColorPicker::~QColorPicker()
 {
     delete pix;
 }
 
 QSize QColorPicker::sizeHint() const
 {
     return QSize( pWidth + 2*frameWidth(), pHeight + 2*frameWidth() );
 }
 
 QSizePolicy QColorPicker::sizePolicy() const
 {
     return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
 }
 
 void QColorPicker::setCol( int h, int s )
 {
     int nhue = QMIN( QMAX(0,h), 360 );
     int nsat = QMIN( QMAX(0,s), 255);
     if ( nhue == hue && nsat == sat )
-    return;
+        return;
     QRect r( colPt(), QSize(20,20) );
     hue = nhue; sat = nsat;
     r = r.unite( QRect( colPt(), QSize(20,20) ) );
     r.moveBy( contentsRect().x()-9, contentsRect().y()-9 );
     //    update( r );
     repaint( r, FALSE );
 }
 
 void QColorPicker::mouseMoveEvent( QMouseEvent *m )
 {
     QPoint p = m->pos() - contentsRect().topLeft();
     setCol( p );
     emit newCol( hue, sat );
 }
 
 void QColorPicker::mousePressEvent( QMouseEvent *m )
@@ -724,139 +922,249 @@ void QColorPicker::mousePressEvent( QMouseEvent *m )
     emit newCol( hue, sat );
 }
 
 void QColorPicker::drawContents(QPainter* p)
 {
     QRect r = contentsRect();
 
     p->drawPixmap( r.topLeft(), *pix );
     QPoint pt = colPt() + r.topLeft();
     p->setPen( QPen(black) );
 
     p->fillRect( pt.x()-9, pt.y(), 20, 2, black );
     p->fillRect( pt.x(), pt.y()-9, 2, 20, black );
 
 }
 
+class QColorShowLabel;
+
+
+
+class QColIntValidator: public QIntValidator
+{
+public:
+    QColIntValidator( int bottom, int top,
+                   QWidget * parent, const char *name = 0 )
+        :QIntValidator( bottom, top, parent, name ) {}
+
+    QValidator::State validate( QString &, int & ) const;
+};
+
 QValidator::State QColIntValidator::validate( QString &s, int &pos ) const
 {
     State state = QIntValidator::validate(s,pos);
     if ( state == Valid ) {
-    long int val = s.toLong();
-    // This is not a general solution, assumes that top() > 0 and
-    // bottom >= 0
-    if ( val < 0 ) {
-        s = "0";
-        pos = 1;
-    } else if ( val > top() ) {
-        s.setNum( top() );
-        pos = s.length();
-    }
+        long int val = s.toLong();
+        // This is not a general solution, assumes that top() > 0 and
+        // bottom >= 0
+        if ( val < 0 ) {
+            s = "0";
+            pos = 1;
+        } else if ( val > top() ) {
+            s.setNum( top() );
+            pos = s.length();
+        }
     }
     return state;
 }
 
+
+
+class QColNumLineEdit : public QLineEdit
+{
+public:
+    QColNumLineEdit( QWidget *parent, const char* name = 0 )
+        : QLineEdit( parent, name ) { setMaxLength( 3 );}
+    QSize sizeHint() const {
+        return QSize( 30, //#####
+                     QLineEdit::sizeHint().height() ); }
+    void setNum( int i ) {
+        QString s;
+        s.setNum(i);
+        bool block = signalsBlocked();
+        blockSignals(TRUE);
+        setText( s );
+        blockSignals(block);
+    }
+    int val() const { return text().toInt(); }
+};
+
+
+class QColorShower : public QWidget
+{
+    Q_OBJECT
+public:
+    QColorShower( QWidget *parent, const char *name = 0 );
+
+    //things that don't emit signals
+    void setHsv( int h, int s, int v );
+
+    int currentAlpha() const { return alphaEd->val(); }
+    void setCurrentAlpha( int a ) { alphaEd->setNum( a ); }
+    void showAlpha( bool b );
+
+
+    QRgb currentColor() const { return curCol; }
+
+public slots:
+    void setRgb( QRgb rgb );
+
+signals:
+    void newCol( QRgb rgb );
+private slots:
+    void rgbEd();
+    void hsvEd();
+private:
+    void showCurrentColor();
+    int hue, sat, val;
+    QRgb curCol;
+    QColNumLineEdit *hEd;
+    QColNumLineEdit *sEd;
+    QColNumLineEdit *vEd;
+    QColNumLineEdit *rEd;
+    QColNumLineEdit *gEd;
+    QColNumLineEdit *bEd;
+    QColNumLineEdit *alphaEd;
+    QLabel *alphaLab;
+    QColorShowLabel *lab;
+    bool rgbOriginal;
+};
+
+class QColorShowLabel : public QFrame
+{
+    Q_OBJECT
+
+public:
+    QColorShowLabel( QWidget *parent ) :QFrame( parent ) {
+        setFrameStyle( QFrame::Panel|QFrame::Sunken );
+        setBackgroundMode( PaletteBackground );
+        setAcceptDrops( TRUE );
+        mousePressed = FALSE;
+    }
+    void setColor( QColor c ) { col = c; }
+
+signals:
+    void colorDropped( QRgb );
+
+protected:
+    void drawContents( QPainter *p );
+    void mousePressEvent( QMouseEvent *e );
+    void mouseMoveEvent( QMouseEvent *e );
+    void mouseReleaseEvent( QMouseEvent *e );
+#ifndef QT_NO_DRAGANDDROP
+    void dragEnterEvent( QDragEnterEvent *e );
+    void dragLeaveEvent( QDragLeaveEvent *e );
+    void dropEvent( QDropEvent *e );
+#endif
+
+private:
+    QColor col;
+    bool mousePressed;
+    QPoint pressPos;
+
+};
+
 void QColorShowLabel::drawContents( QPainter *p )
 {
     p->fillRect( contentsRect(), col );
 }
 
 void QColorShower::showAlpha( bool b )
 {
     if ( b ) {
-    alphaLab->show();
-    alphaEd->show();
+        alphaLab->show();
+        alphaEd->show();
     } else {
-    alphaLab->hide();
-    alphaEd->hide();
+        alphaLab->hide();
+        alphaEd->hide();
     }
 }
 
 void QColorShowLabel::mousePressEvent( QMouseEvent *e )
 {
     mousePressed = TRUE;
     pressPos = e->pos();
 }
 
 void QColorShowLabel::mouseMoveEvent( QMouseEvent *e )
 {
 #ifndef QT_NO_DRAGANDDROP
     if ( !mousePressed )
-    return;
+        return;
     if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) {
-    QColorDrag *drg = new QColorDrag( col, this );
-    QPixmap pix( 30, 20 );
-    pix.fill( col );
-    QPainter p( &pix );
-    p.drawRect( 0, 0, pix.width(), pix.height() );
-    p.end();
-    drg->setPixmap( pix );
-    mousePressed = FALSE;
-    drg->dragCopy();
+        QColorDrag *drg = new QColorDrag( col, this );
+        QPixmap pix( 30, 20 );
+        pix.fill( col );
+        QPainter p( &pix );
+        p.drawRect( 0, 0, pix.width(), pix.height() );
+        p.end();
+        drg->setPixmap( pix );
+        mousePressed = FALSE;
+        drg->dragCopy();
     }
 #endif
 }
 
 #ifndef QT_NO_DRAGANDDROP
 void QColorShowLabel::dragEnterEvent( QDragEnterEvent *e )
 {
     if ( QColorDrag::canDecode( e ) )
-    e->accept();
+        e->accept();
     else
-    e->ignore();
+        e->ignore();
 }
 
 void QColorShowLabel::dragLeaveEvent( QDragLeaveEvent * )
 {
 }
 
 void QColorShowLabel::dropEvent( QDropEvent *e )
 {
     if ( QColorDrag::canDecode( e ) ) {
-    QColorDrag::decode( e, col );
-    repaint( FALSE );
-    emit colorDropped( col.rgb() );
-    e->accept();
+        QColorDrag::decode( e, col );
+        repaint( FALSE );
+        emit colorDropped( col.rgb() );
+        e->accept();
     } else {
-    e->ignore();
+        e->ignore();
     }
 }
 #endif // QT_NO_DRAGANDDROP
 
 void QColorShowLabel::mouseReleaseEvent( QMouseEvent * )
 {
     if ( !mousePressed )
-    return;
+        return;
     mousePressed = FALSE;
 }
 
 QColorShower::QColorShower( QWidget *parent, const char *name )
     :QWidget( parent, name)
 {
     curCol = qRgb( -1, -1, -1 );
     QColIntValidator *val256 = new QColIntValidator( 0, 255, this );
     QColIntValidator *val360 = new QColIntValidator( 0, 360, this );
 
     QGridLayout *gl = new QGridLayout( this, 1, 1, 6 );
     lab = new QColorShowLabel( this );
     lab->setMinimumWidth( 60 ); //###
     gl->addMultiCellWidget(lab, 0,-1,0,0);
     connect( lab, SIGNAL( colorDropped(QRgb) ),
-         this, SIGNAL( newCol(QRgb) ) );
+             this, SIGNAL( newCol(QRgb) ) );
     connect( lab, SIGNAL( colorDropped(QRgb) ),
-         this, SLOT( setRgb(QRgb) ) );
+             this, SLOT( setRgb(QRgb) ) );
 
     hEd = new QColNumLineEdit( this );
     hEd->setValidator( val360 );
     QLabel *l = new QLabel( hEd, QColorDialog::tr("Hu&e:"), this );
     l->setAlignment( AlignRight|AlignVCenter );
     gl->addWidget( l, 0, 1 );
     gl->addWidget( hEd, 0, 2 );
 
     sEd = new QColNumLineEdit( this );
     sEd->setValidator( val256 );
     l = new QLabel( sEd, QColorDialog::tr("&Sat:"), this );
     l->setAlignment( AlignRight|AlignVCenter );
     gl->addWidget( l, 1, 1 );
     gl->addWidget( sEd, 1, 2 );
 
     vEd = new QColNumLineEdit( this );
@@ -965,32 +1273,61 @@ void QColorShower::setHsv( int h, int s, int v )
     rgbOriginal = FALSE;
     hue = h; val = v; sat = s; //Range check###
     curCol = QColor( hue, sat, val, QColor::Hsv ).rgb();
 
     hEd->setNum( hue );
     sEd->setNum( sat );
     vEd->setNum( val );
 
     rEd->setNum( qRed(currentColor()) );
     gEd->setNum( qGreen(currentColor()) );
     bEd->setNum( qBlue(currentColor()) );
 
 
     showCurrentColor();
 }
 
+class QColorDialogPrivate : public QObject
+{
+Q_OBJECT
+public:
+    QColorDialogPrivate( QColorDialog *p );
+    QRgb currentColor() const { return cs->currentColor(); }
+    void setCurrentColor( QRgb rgb );
+
+    int currentAlpha() const { return cs->currentAlpha(); }
+    void setCurrentAlpha( int a ) { cs->setCurrentAlpha( a ); }
+    void showAlpha( bool b ) { cs->showAlpha( b ); }
+
+private slots:
+    void addCustom();
+
+    void newHsv( int h, int s, int v );
+    void newColorTypedIn( QRgb rgb );
+    void newCustom( int, int );
+    void newStandard( int, int );
+private:
+    QColorPicker *cp;
+    QColorLuminancePicker *lp;
+    QWellArray *custom;
+    QWellArray *standard;
+    QColorShower *cs;
+    int nextCust;
+    bool compact;
+};
+
 //sets all widgets to display h,s,v
 void QColorDialogPrivate::newHsv( int h, int s, int v )
 {
     cs->setHsv( h, s, v );
     cp->setCol( h, s );
     lp->setCol( h, s, v );
 }
 
 //sets all widgets to display rgb
 void QColorDialogPrivate::setCurrentColor( QRgb rgb )
 {
     cs->setRgb( rgb );
     newColorTypedIn( rgb );
 }
 
 //sets all widgets exept cs to display rgb
@@ -1010,126 +1347,126 @@ void QColorDialogPrivate::newCustom( int r, int c )
     standard->setSelected(-1,-1);
 }
 
 void QColorDialogPrivate::newStandard( int r, int c )
 {
     setCurrentColor( stdrgb[r+c*6] );
     custom->setSelected(-1,-1);
 }
 
 QColorDialogPrivate::QColorDialogPrivate( QColorDialog *dialog ) :
     QObject(dialog)
 {
     compact = FALSE;
     // small displays (e.g. PDAs cannot fit the full color dialog,
     // so just use the color picker.
     if ( qApp->desktop()->width() < 480 || qApp->desktop()->height() < 350 )
-    compact = TRUE;
+        compact = TRUE;
 
     nextCust = 0;
     const int lumSpace = 3;
     int border = 12;
     if ( compact )
-    border = 6;
+        border = 6;
     QHBoxLayout *topLay = new QHBoxLayout( dialog, border, 6 );
     QVBoxLayout *leftLay = 0;
 
     if ( !compact )
-    leftLay = new QVBoxLayout( topLay );
+        leftLay = new QVBoxLayout( topLay );
 
     initRGB();
 
     if ( !compact ) {
-    standard = new QColorWell( dialog, 6, 8, stdrgb );
-    standard->setCellSize( 28, 24 );
-    QLabel * lab = new QLabel( standard,
-                QColorDialog::tr( "&Basic colors"), dialog );
-    connect( standard, SIGNAL(selected(int,int)), SLOT(newStandard(int,int)));
-    leftLay->addWidget( lab );
-    leftLay->addWidget( standard );
-
-
-    leftLay->addStretch();
-
-    custom = new QColorWell( dialog, 2, 8, cusrgb );
-    custom->setCellSize( 28, 24 );
-    custom->setAcceptDrops( TRUE );
-
-    connect( custom, SIGNAL(selected(int,int)), SLOT(newCustom(int,int)));
-    lab = new QLabel( custom, QColorDialog::tr( "&Custom colors") , dialog );
-    leftLay->addWidget( lab );
-    leftLay->addWidget( custom );
-
-    QPushButton *custbut =
-        new QPushButton( QColorDialog::tr("&Define Custom Colors >>"),
-                        dialog );
-    custbut->setEnabled( FALSE );
-    leftLay->addWidget( custbut );
+        standard = new QColorWell( dialog, 6, 8, stdrgb );
+        standard->setCellSize( 28, 24 );
+        QLabel * lab = new QLabel( standard,
+                                QColorDialog::tr( "&Basic colors"), dialog );
+        connect( standard, SIGNAL(selected(int,int)), SLOT(newStandard(int,int)));
+        leftLay->addWidget( lab );
+        leftLay->addWidget( standard );
+
+
+        leftLay->addStretch();
+
+        custom = new QColorWell( dialog, 2, 8, cusrgb );
+        custom->setCellSize( 28, 24 );
+        custom->setAcceptDrops( TRUE );
+
+        connect( custom, SIGNAL(selected(int,int)), SLOT(newCustom(int,int)));
+        lab = new QLabel( custom, QColorDialog::tr( "&Custom colors") , dialog );
+        leftLay->addWidget( lab );
+        leftLay->addWidget( custom );
+
+        QPushButton *custbut =
+            new QPushButton( QColorDialog::tr("&Define Custom Colors >>"),
+                                                dialog );
+        custbut->setEnabled( FALSE );
+        leftLay->addWidget( custbut );
     } else {
-    // better color picker size for small displays
-    pWidth = 150;
-    pHeight = 100;
+        // better color picker size for small displays
+        pWidth = 150;
+        pHeight = 100;
     }
 
     QVBoxLayout *rightLay = new QVBoxLayout( topLay );
 
     QHBoxLayout *pickLay = new QHBoxLayout( rightLay );
 
 
     QVBoxLayout *cLay = new QVBoxLayout( pickLay );
     cp = new QColorPicker( dialog );
     cp->setFrameStyle( QFrame::Panel + QFrame::Sunken );
     cLay->addSpacing( lumSpace );
     cLay->addWidget( cp );
     cLay->addSpacing( lumSpace );
 
     lp = new QColorLuminancePicker( dialog );
     lp->setFixedWidth( 20 ); //###
     pickLay->addWidget( lp );
 
     connect( cp, SIGNAL(newCol(int,int)), lp, SLOT(setCol(int,int)) );
     connect( lp, SIGNAL(newHsv(int,int,int)), this, SLOT(newHsv(int,int,int)) );
 
     rightLay->addStretch();
 
     cs = new QColorShower( dialog );
     connect( cs, SIGNAL(newCol(QRgb)), this, SLOT(newColorTypedIn(QRgb)));
     rightLay->addWidget( cs );
 
     QHBoxLayout *buttons;
     if ( compact )
-    buttons = new QHBoxLayout( rightLay );
+        buttons = new QHBoxLayout( rightLay );
     else
-    buttons = new QHBoxLayout( leftLay );
+        buttons = new QHBoxLayout( leftLay );
 
     QPushButton *ok, *cancel;
     ok = new QPushButton( QColorDialog::tr("OK"), dialog );
     connect( ok, SIGNAL(clicked()), dialog, SLOT(accept()) );
     ok->setDefault(TRUE);
     cancel = new QPushButton( QColorDialog::tr("Cancel"), dialog );
     connect( cancel, SIGNAL(clicked()), dialog, SLOT(reject()) );
     buttons->addWidget( ok );
     buttons->addWidget( cancel );
     buttons->addStretch();
 
     if ( !compact ) {
-    QPushButton *addCusBt = new QPushButton(
-                    QColorDialog::tr("&Add To Custom Colors"),
-                         dialog );
-    rightLay->addWidget( addCusBt );
-    connect( addCusBt, SIGNAL(clicked()), this, SLOT(addCustom()) );
+        QPushButton *addCusBt = new QPushButton(
+                                        QColorDialog::tr("&Add To Custom Colors"),
+                                                 dialog );
+        rightLay->addWidget( addCusBt );
+        connect( addCusBt, SIGNAL(clicked()), this, SLOT(addCustom()) );
     }
 }
 
 void QColorDialogPrivate::addCustom()
 {
     cusrgb[nextCust] = cs->currentColor();
     custom->repaint( FALSE ); //###
     nextCust = (nextCust+1) % 16;
 }
 
 
 // BEING REVISED: jo
 /*!
   \class QColorDialog qcolordialog.h
   \brief The QColorDialog class provides a dialog widget for specifying colors.
   \ingroup dialogs
@@ -1160,81 +1497,81 @@ void QColorDialogPrivate::addCustom()
 QColorDialog::QColorDialog(QWidget* parent, const char* name, bool modal) :
     QDialog(parent, name, modal )
 {
     setSizeGripEnabled( TRUE );
     d = new QColorDialogPrivate( this );
 }
 
 
 /*!
   Pops up a modal color dialog letting the user choose a color and returns
   that color. The color is initially set to \a initial. Returns an  \link QColor::isValid() invalid\endlink color if the user cancels
   the dialog. All colors allocated by the dialog will be deallocated
   before this function returns.
 */
 
 QColor QColorDialog::getColor( QColor initial, QWidget *parent,
-                   const char *name )
+                               const char *name )
 {
     int allocContext = QColor::enterAllocContext();
     QColorDialog *dlg = new QColorDialog( parent, name, TRUE );  //modal
     if ( parent && parent->icon() && !parent->icon()->isNull() )
-    dlg->setIcon( *parent->icon() );
+        dlg->setIcon( *parent->icon() );
     else if ( qApp->mainWidget() && qApp->mainWidget()->icon() && !qApp->mainWidget()->icon()->isNull() )
-    dlg->setIcon( *qApp->mainWidget()->icon() );
+        dlg->setIcon( *qApp->mainWidget()->icon() );
 
     dlg->setCaption( QColorDialog::tr( "Select color" ) );
     dlg->setColor( initial );
     int resultCode = dlg->exec();
     QColor::leaveAllocContext();
     QColor result;
     if ( resultCode == QDialog::Accepted )
-    result = dlg->color();
+        result = dlg->color();
     QColor::destroyAllocContext(allocContext);
     delete dlg;
     return result;
 }
 
 
 /*!
   Pops up a modal color dialog, letting the user choose a color and an
   alpha channel value. The color+alpha is initially set to \a initial.
 
   If \a ok is non-null, \c *ok is set to TRUE if the user clicked OK,
   and FALSE if the user clicked Cancel.
 
   If the user clicks Cancel the \a initial value is returned.
 */
 
 QRgb QColorDialog::getRgba( QRgb initial, bool *ok,
-                QWidget *parent, const char* name )
+                            QWidget *parent, const char* name )
 {
     int allocContext = QColor::enterAllocContext();
     QColorDialog *dlg = new QColorDialog( parent, name, TRUE );  //modal
     dlg->setColor( initial );
     dlg->setSelectedAlpha( qAlpha(initial) );
     int resultCode = dlg->exec();
     QColor::leaveAllocContext();
     QRgb result = initial;
     if ( resultCode == QDialog::Accepted ) {
-    QRgb c = dlg->color().rgb();
-    int alpha = dlg->selectedAlpha();
-    result = qRgba( qRed(c), qGreen(c), qBlue(c), alpha );
+        QRgb c = dlg->color().rgb();
+        int alpha = dlg->selectedAlpha();
+        result = qRgba( qRed(c), qGreen(c), qBlue(c), alpha );
     }
     if ( ok )
-    *ok = resultCode == QDialog::Accepted;
+        *ok = resultCode == QDialog::Accepted;
 
     QColor::destroyAllocContext(allocContext);
     delete dlg;
     return result;
 }
 
 
 
 
 
 /*!
   Returns the color currently selected in the dialog.
 
   \sa setColor()
 */
 
@@ -1277,16 +1614,17 @@ void QColorDialog::setSelectedAlpha( int a )
 {
     d->showAlpha( TRUE );
     d->setCurrentAlpha( a );
 }
 
 
 /*!
   Returns the value selected for the alpha channel.
 */
 
 int QColorDialog::selectedAlpha() const
 {
     return d->currentAlpha();
 }
 
 
+#include "qcolordialog.moc"
\ No newline at end of file
diff --git a/libqtaux/qcolordialog.h b/libqtaux/qcolordialog.h
index 50c6482..89c6283 100644
--- a/libqtaux/qcolordialog.h
+++ b/libqtaux/qcolordialog.h
@@ -29,367 +29,56 @@
 **   information about Qt Commercial License Agreements.
 ** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QCOLORDIALOG_H
 #define QCOLORDIALOG_H
 
 #ifndef QT_H
 #include <qdialog.h>
 #endif // QT_H
 
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qtableview.h>
-#include <qvalidator.h>
-
-struct QWellArrayData;
-
-class QWellArray : public QTableView
-{
-    Q_OBJECT
-//    Q_PROPERTY( int numCols READ numCols )
-//    Q_PROPERTY( int numRows READ numRows )
-//    Q_PROPERTY( int selectedColumn READ selectedColumn )
-//    Q_PROPERTY( int selectedRow READ selectedRow )
-
-public:
-    QWellArray( QWidget *parent=0, const char *name=0, bool popup = FALSE );
-
-    ~QWellArray() {}
-    QString cellContent( int row, int col ) const;
-    // ### Paul !!! virtual void setCellContent( int row, int col, const QString &);
-
-    // ##### Obsolete since not const
-    int numCols() { return nCols; }
-    int numRows() { return nRows; }
-
-    int numCols() const { return nCols; }
-    int numRows() const { return nRows; }
-
-    // ##### Obsolete since not const
-    int selectedColumn() { return selCol; }
-    int selectedRow() { return selRow; }
-
-    int selectedColumn() const { return selCol; }
-    int selectedRow() const { return selRow; }
-
-    virtual void setSelected( int row, int col );
-
-    void setCellSize( int w, int h ) { setCellWidth(w);setCellHeight( h ); }
-
-    QSize sizeHint() const;
-
-    virtual void setDimension( int rows, int cols );
-    virtual void setCellBrush( int row, int col, const QBrush & );
-    QBrush cellBrush( int row, int col );
-
-signals:
-    void selected( int row, int col );
-
-protected:
-    virtual void setCurrent( int row, int col );
-
-    virtual void drawContents( QPainter *, int row, int col, const QRect& );
-    void drawContents( QPainter * );
-
-    void paintCell( QPainter*, int row, int col );
-    void mousePressEvent( QMouseEvent* );
-    void mouseReleaseEvent( QMouseEvent* );
-    void mouseMoveEvent( QMouseEvent* );
-    void keyPressEvent( QKeyEvent* );
-    void focusInEvent( QFocusEvent* );
-    void focusOutEvent( QFocusEvent* );
-
-private:
-    int curRow;
-    int curCol;
-    int selRow;
-    int selCol;
-    int nCols;
-    int nRows;
-    bool smallStyle;
-    QWellArrayData *d;
-
-private:    // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
-    QWellArray( const QWellArray & );
-    QWellArray& operator=( const QWellArray & );
-#endif
-};
-
-struct QWellArrayData {
-    QBrush *brush;
-};
-
-class QColNumLineEdit : public QLineEdit
-{
-public:
-    QColNumLineEdit( QWidget *parent, const char* name = 0 )
-    : QLineEdit( parent, name ) { setMaxLength( 3 );}
-    QSize sizeHint() const {
-    return QSize( 30, //#####
-             QLineEdit::sizeHint().height() ); }
-    void setNum( int i ) {
-    QString s;
-    s.setNum(i);
-    bool block = signalsBlocked();
-    blockSignals(TRUE);
-    setText( s );
-    blockSignals(block);
-    }
-    int val() const { return text().toInt(); }
-};
-
-class QColorShowLabel : public QFrame
-{
-    Q_OBJECT
-
-public:
-    QColorShowLabel( QWidget *parent ) :QFrame( parent ) {
-    setFrameStyle( QFrame::Panel|QFrame::Sunken );
-    setBackgroundMode( PaletteBackground );
-    setAcceptDrops( TRUE );
-    mousePressed = FALSE;
-    }
-    void setColor( QColor c ) { col = c; }
-
-signals:
-    void colorDropped( QRgb );
-
-protected:
-    void drawContents( QPainter *p );
-    void mousePressEvent( QMouseEvent *e );
-    void mouseMoveEvent( QMouseEvent *e );
-    void mouseReleaseEvent( QMouseEvent *e );
-#ifndef QT_NO_DRAGANDDROP
-    void dragEnterEvent( QDragEnterEvent *e );
-    void dragLeaveEvent( QDragLeaveEvent *e );
-    void dropEvent( QDropEvent *e );
-#endif
-
-private:
-    QColor col;
-    bool mousePressed;
-    QPoint pressPos;
-
-};
-
-class QColorShower : public QWidget
-{
-    Q_OBJECT
-public:
-    QColorShower( QWidget *parent, const char *name = 0 );
-
-    //things that don't emit signals
-    void setHsv( int h, int s, int v );
-
-    int currentAlpha() const { return alphaEd->val(); }
-    void setCurrentAlpha( int a ) { alphaEd->setNum( a ); }
-    void showAlpha( bool b );
-
-
-    QRgb currentColor() const { return curCol; }
-
-public slots:
-    void setRgb( QRgb rgb );
-
-signals:
-    void newCol( QRgb rgb );
-private slots:
-    void rgbEd();
-    void hsvEd();
-private:
-    void showCurrentColor();
-    int hue, sat, val;
-    QRgb curCol;
-    QColNumLineEdit *hEd;
-    QColNumLineEdit *sEd;
-    QColNumLineEdit *vEd;
-    QColNumLineEdit *rEd;
-    QColNumLineEdit *gEd;
-    QColNumLineEdit *bEd;
-    QColNumLineEdit *alphaEd;
-    QLabel *alphaLab;
-    QColorShowLabel *lab;
-    bool rgbOriginal;
-};
-
-class QColorPicker : public QFrame
-{
-    Q_OBJECT
-public:
-    QColorPicker(QWidget* parent=0, const char* name=0);
-    ~QColorPicker();
-
-public slots:
-    void setCol( int h, int s );
-
-signals:
-    void newCol( int h, int s );
-
-protected:
-    QSize sizeHint() const;
-    QSizePolicy sizePolicy() const;
-    void drawContents(QPainter* p);
-    void mouseMoveEvent( QMouseEvent * );
-    void mousePressEvent( QMouseEvent * );
-
-private:
-    int hue;
-    int sat;
-
-    QPoint colPt();
-    int huePt( const QPoint &pt );
-    int satPt( const QPoint &pt );
-    void setCol( const QPoint &pt );
-
-    QPixmap *pix;
-};
-
-class QColorLuminancePicker : public QWidget
-{
-    Q_OBJECT
-public:
-    QColorLuminancePicker(QWidget* parent=0, const char* name=0);
-    ~QColorLuminancePicker();
-
-public slots:
-    void setCol( int h, int s, int v );
-    void setCol( int h, int s );
-
-signals:
-    void newHsv( int h, int s, int v );
-
-protected:
-//    QSize sizeHint() const;
-//    QSizePolicy sizePolicy() const;
-    void paintEvent( QPaintEvent*);
-    void mouseMoveEvent( QMouseEvent * );
-    void mousePressEvent( QMouseEvent * );
-
-private:
-    enum { foff = 3, coff = 4 }; //frame and contents offset
-    int val;
-    int hue;
-    int sat;
-
-    int y2val( int y );
-    int val2y( int val );
-    void setVal( int v );
-
-    QPixmap *pix;
-};
-
-class QColorWell : public QWellArray
-{
-public:
-    QColorWell( QWidget *parent, int r, int c, QRgb *vals )
-    :QWellArray( parent, "" ), values( vals ), mousePressed( FALSE ), oldCurrent( -1, -1 )
-    { setDimension(r,c); setWFlags( WResizeNoErase ); }
-    QSizePolicy sizePolicy() const;
-
-protected:
-    void drawContents( QPainter *, int row, int col, const QRect& );
-    void drawContents( QPainter *p ) { QWellArray::drawContents(p); }
-    void mousePressEvent( QMouseEvent *e );
-    void mouseMoveEvent( QMouseEvent *e );
-    void mouseReleaseEvent( QMouseEvent *e );
-#ifndef QT_NO_DRAGANDDROP
-    void dragEnterEvent( QDragEnterEvent *e );
-    void dragLeaveEvent( QDragLeaveEvent *e );
-    void dragMoveEvent( QDragMoveEvent *e );
-    void dropEvent( QDropEvent *e );
-#endif
-
-private:
-    QRgb *values;
-    bool mousePressed;
-    QPoint pressPos;
-    QPoint oldCurrent;
-
-};
-
-class QColIntValidator: public QIntValidator
-{
-public:
-    QColIntValidator( int bottom, int top,
-           QWidget * parent, const char *name = 0 )
-    :QIntValidator( bottom, top, parent, name ) {}
-
-    QValidator::State validate( QString &, int & ) const;
-};
-
 class QColorDialogPrivate;
 
 class Q_EXPORT QColorDialog : public QDialog
 {
     Q_OBJECT
 
 public:
     static QColor getColor( QColor, QWidget *parent=0, const char* name=0 ); // ### 3.0: make const QColor&
     static QRgb getRgba( QRgb, bool* ok = 0,
-             QWidget *parent=0, const char* name=0 );
+                         QWidget *parent=0, const char* name=0 );
 
 
     static int customCount();
     static QRgb customColor( int );
     static void setCustomColor( int, QRgb );
 
 private:
     ~QColorDialog();
 
     QColorDialog( QWidget* parent=0, const char* name=0, bool modal=FALSE );
     void setColor( QColor ); // ### 3.0: make const QColor&
     QColor color() const;
 
 private:
     void setSelectedAlpha( int );
     int selectedAlpha() const;
 
     void showCustom( bool=TRUE );
 private:
     QColorDialogPrivate *d;
     friend class QColorDialogPrivate;
 
-private:    // Disabled copy constructor and operator=
+        private:// Disabled copy constructor and operator=
 #if defined(Q_DISABLE_COPY)
     QColorDialog( const QColorDialog & );
     QColorDialog& operator=( const QColorDialog & );
 #endif
 };
 
-class QColorDialogPrivate : public QObject
-{
-Q_OBJECT
-public:
-    QColorDialogPrivate( QColorDialog *p );
-    QRgb currentColor() const { return cs->currentColor(); }
-    void setCurrentColor( QRgb rgb );
-
-    int currentAlpha() const { return cs->currentAlpha(); }
-    void setCurrentAlpha( int a ) { cs->setCurrentAlpha( a ); }
-    void showAlpha( bool b ) { cs->showAlpha( b ); }
-
-private slots:
-    void addCustom();
-
-    void newHsv( int h, int s, int v );
-    void newColorTypedIn( QRgb rgb );
-    void newCustom( int, int );
-    void newStandard( int, int );
-private:
-    QColorPicker *cp;
-    QColorLuminancePicker *lp;
-    QWellArray *custom;
-    QWellArray *standard;
-    QColorShower *cs;
-    int nextCust;
-    bool compact;
-};
-
 #endif