GCC 3.4.2 is so standard conform that it forces the range

of enumns. This broke handling of the 'Help' button in
our decoration. What we do now is to make the 'range'
bigger so that our 'Help'-Button will fit into the range.

2 files changed, 24 insertions, 0 deletions

diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch
index ea03446..307e558 100644
--- a/qt/qt-2.3.7.patch/qte237-all.patch
+++ b/qt/qt-2.3.7.patch/qte237-all.patch
@@ -1260,192 +1260,204 @@ diff -ur qt-2.3.7-old/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollvi
 +                                 bottom-fw-ypos );
  	    else
 -                setVBarGeometry( d->vbar, w-vsbExt, 0,
 +                setVBarGeometry( d->vbar, xpos, ypos,
                                   vsbExt,
 -                                 h-hsbExt );
 +                                 bottom-ypos );
  	}
  	else {
  	    if ( style() == WindowsStyle )
 -                setVBarGeometry( d->vbar, w-vsbExt-fw,
 -                                 fw, vsbExt,
 -                                 bottom-fw-fw );
 +                setVBarGeometry( d->vbar, xpos,
 +                                 ypos, vsbExt,
 +                                 bottom-fw-ypos );
  	    else
 -                setVBarGeometry( d->vbar, w-vsbExt, 0,
 -                                 vsbExt, bottom );
 +                setVBarGeometry( d->vbar, xpos, ypos,
 +                                 vsbExt, bottom-ypos );
  	}
      } else {
  	if ( style() == WindowsStyle )
 @@ -837,12 +848,12 @@
      }
      if ( d->corner ) {
  	if ( style() == WindowsStyle )
 -            d->corner->setGeometry( w-vsbExt-fw,
 +            d->corner->setGeometry( xpos,
                                      h-hsbExt-fw,
                                      vsbExt,
                                      hsbExt );
  	else
 -            d->corner->setGeometry( w-vsbExt,
 +            d->corner->setGeometry( xpos,
                                      h-hsbExt,
                                      vsbExt,
                                      hsbExt );
 @@ -1266,6 +1277,9 @@
  	case QEvent::LayoutHint:
  	    d->autoResizeHint(this);
  	    break;
 +	case QEvent::WindowActivate:
 +	case QEvent::WindowDeactivate:
 +	    return TRUE;
  	default:
  	    break;
  	}
 @@ -1675,7 +1689,7 @@
  }
  
  /*!
 - Scrolls the content by \a x to the left and \a y upwards.
 + Scrolls the content by \a dx to the left and \a dy upwards.
  */
  void QScrollView::scrollBy( int dx, int dy )
  {
 diff -ur qt-2.3.7-old/src/widgets/qtoolbutton.cpp qt-2.3.7/src/widgets/qtoolbutton.cpp
 --- qt-2.3.7-old/src/widgets/qtoolbutton.cpp	2004-07-23 15:22:56.000000000 +0200
 +++ qt-2.3.7/src/widgets/qtoolbutton.cpp	2004-07-23 15:38:13.000000000 +0200
 @@ -230,7 +230,7 @@
  	else
  	    QToolTip::add( this, textLabel );
      }
 -#endif	
 +#endif
  }
  
  
 @@ -324,12 +324,12 @@
  	QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
  	w = pm.width();
  	h = pm.height();
 -	if ( w < 32 )
 -	    w = 32;
 -	if ( h < 32 )
 -	    h = 32;
 +	if ( w < 24 )
 +	    w = 24;
 +	if ( h < 24 )
 +	    h = 24;
      } else {
 -	w = h = 16;
 +	w = h = 14;
  	QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
  	w = pm.width();
  	h = pm.height();
 diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws.cpp
 --- qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp	2004-09-10 21:08:04.000000000 +0200
 +++ qt-2.3.7/src/kernel/qgfxvnc_qws.cpp	2004-09-10 21:10:54.000000000 +0200
 @@ -971,7 +971,7 @@
  void QGfxVNC<depth,type>::drawPoint( int x, int y )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds );
 +    qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds );
      QGfxRaster<depth,type>::drawPoint( x, y );
      QWSDisplay::ungrab();
  }
 @@ -981,8 +981,8 @@
  {
      QWSDisplay::grab( TRUE );
      QRect r = pa.boundingRect();
 -    r.moveBy( xoffs, yoffs );
 -    qvnc_screen->setDirty( r & clipbounds );
 +    r.moveBy( this->xoffs, this->yoffs );
 +    qvnc_screen->setDirty( r & this->clipbounds );
      QGfxRaster<depth,type>::drawPoints( pa, x, y );
      QWSDisplay::ungrab();
  }
 @@ -992,9 +992,9 @@
  {
      QWSDisplay::grab( TRUE );
      QRect r;
 -    r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
 +    r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
      r = r.normalize();
 -    qvnc_screen->setDirty( r & clipbounds );
 +    qvnc_screen->setDirty( r & this->clipbounds );
      QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
      QWSDisplay::ungrab();
  }
 @@ -1003,7 +1003,7 @@
  void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
 +    qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
      QGfxRaster<depth,type>::fillRect( x, y, w, h );
      QWSDisplay::ungrab();
  }
 @@ -1013,8 +1013,8 @@
  {
      QWSDisplay::grab( TRUE );
      QRect r = pa.boundingRect();
 -    r.moveBy( xoffs, yoffs );
 -    qvnc_screen->setDirty( r & clipbounds );
 +    r.moveBy( this->xoffs, this->yoffs );
 +    qvnc_screen->setDirty( r & this->clipbounds );
      QGfxRaster<depth,type>::drawPolyline( pa, x, y );
      QWSDisplay::ungrab();
  }
 @@ -1024,8 +1024,8 @@
  {
      QWSDisplay::grab( TRUE );
      QRect r = pa.boundingRect();
 -    r.moveBy( xoffs, yoffs );
 -    qvnc_screen->setDirty( r & clipbounds );
 +    r.moveBy( this->xoffs, this->yoffs );
 +    qvnc_screen->setDirty( r & this->clipbounds );
      QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
      QWSDisplay::ungrab();
  }
 @@ -1034,7 +1034,7 @@
  void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
 +    qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
      QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
      QWSDisplay::ungrab();
  }
 @@ -1045,8 +1045,8 @@
      QWSDisplay::grab( TRUE );
      int dy = sy - y;
      int dx = sx - x;
 -    qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
 -			   w+abs(dx), h+abs(dy)) & clipbounds );
 +    qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
 +			   w+abs(dx), h+abs(dy)) & this->clipbounds );
      QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
      QWSDisplay::ungrab();
  }
 @@ -1056,7 +1056,7 @@
  void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds );
 +    qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
      QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
      QWSDisplay::ungrab();
  }
 @@ -1066,7 +1066,7 @@
  void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds );
 +    qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
      QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
      QWSDisplay::ungrab();
  }
+diff -ur qt-2.3.7_old/src/kernel/qwsdecoration_qws.h qt-2.3.7/src/kernel/qwsdecoration_qws.h
+--- qt-2.3.7_old/src/kernel/qwsdecoration_qws.h	2003-07-17 03:20:26.000000000 +0200
++++ qt-2.3.7/src/kernel/qwsdecoration_qws.h	2004-09-13 15:44:13.000000000 +0200
+@@ -50,7 +50,7 @@
+     enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6,
+ 		TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10,
+ 		Close=11, Minimize=12, Maximize=13, Normalize=14,
+-		Menu=15, LastRegion=Menu };
++		Menu=15, LastRegion=Menu, UserDefined = 100 };
+ 
+     virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0;
+     virtual void close( QWidget * );
diff --git a/qt/qt-2.3.7.patch/qte237-gcc34.patch b/qt/qt-2.3.7.patch/qte237-gcc34.patch
index 9a0f28c..a7f1681 100644
--- a/qt/qt-2.3.7.patch/qte237-gcc34.patch
+++ b/qt/qt-2.3.7.patch/qte237-gcc34.patch
@@ -307,192 +307,204 @@ diff -ur qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws
      QWSDisplay::ungrab();
 @@ -227,8 +226,8 @@
  void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
  {
      QWSDisplay::grab( TRUE );
 -    if ( is_screen_gfx )
 -	qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) );
 +    if ( this->is_screen_gfx )
 +	qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) );
      QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
      QWSDisplay::ungrab();
  }
 @@ -238,8 +237,8 @@
  void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h )
  {
      QWSDisplay::grab( TRUE );
 -    if ( is_screen_gfx )
 -	qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) );
 +    if ( this->is_screen_gfx )
 +	qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) );
      QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
      QWSDisplay::ungrab();
  }
 diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws.cpp
 --- qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp	2004-09-10 21:08:04.000000000 +0200
 +++ qt-2.3.7/src/kernel/qgfxvnc_qws.cpp	2004-09-10 21:10:54.000000000 +0200
 @@ -971,7 +971,7 @@
  void QGfxVNC<depth,type>::drawPoint( int x, int y )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds );
 +    qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds );
      QGfxRaster<depth,type>::drawPoint( x, y );
      QWSDisplay::ungrab();
  }
 @@ -981,8 +981,8 @@
  {
      QWSDisplay::grab( TRUE );
      QRect r = pa.boundingRect();
 -    r.moveBy( xoffs, yoffs );
 -    qvnc_screen->setDirty( r & clipbounds );
 +    r.moveBy( this->xoffs, this->yoffs );
 +    qvnc_screen->setDirty( r & this->clipbounds );
      QGfxRaster<depth,type>::drawPoints( pa, x, y );
      QWSDisplay::ungrab();
  }
 @@ -992,9 +992,9 @@
  {
      QWSDisplay::grab( TRUE );
      QRect r;
 -    r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
 +    r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
      r = r.normalize();
 -    qvnc_screen->setDirty( r & clipbounds );
 +    qvnc_screen->setDirty( r & this->clipbounds );
      QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
      QWSDisplay::ungrab();
  }
 @@ -1003,7 +1003,7 @@
  void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
 +    qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
      QGfxRaster<depth,type>::fillRect( x, y, w, h );
      QWSDisplay::ungrab();
  }
 @@ -1013,8 +1013,8 @@
  {
      QWSDisplay::grab( TRUE );
      QRect r = pa.boundingRect();
 -    r.moveBy( xoffs, yoffs );
 -    qvnc_screen->setDirty( r & clipbounds );
 +    r.moveBy( this->xoffs, this->yoffs );
 +    qvnc_screen->setDirty( r & this->clipbounds );
      QGfxRaster<depth,type>::drawPolyline( pa, x, y );
      QWSDisplay::ungrab();
  }
 @@ -1024,8 +1024,8 @@
  {
      QWSDisplay::grab( TRUE );
      QRect r = pa.boundingRect();
 -    r.moveBy( xoffs, yoffs );
 -    qvnc_screen->setDirty( r & clipbounds );
 +    r.moveBy( this->xoffs, this->yoffs );
 +    qvnc_screen->setDirty( r & this->clipbounds );
      QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
      QWSDisplay::ungrab();
  }
 @@ -1034,7 +1034,7 @@
  void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
 +    qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
      QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
      QWSDisplay::ungrab();
  }
 @@ -1045,8 +1045,8 @@
      QWSDisplay::grab( TRUE );
      int dy = sy - y;
      int dx = sx - x;
 -    qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
 -			   w+abs(dx), h+abs(dy)) & clipbounds );
 +    qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
 +			   w+abs(dx), h+abs(dy)) & this->clipbounds );
      QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
      QWSDisplay::ungrab();
  }
 @@ -1056,7 +1056,7 @@
  void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds );
 +    qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
      QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
      QWSDisplay::ungrab();
  }
 @@ -1066,7 +1066,7 @@
  void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h )
  {
      QWSDisplay::grab( TRUE );
 -    qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds );
 +    qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
      QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
      QWSDisplay::ungrab();
  }
 diff -ur qt-2.3.7_old/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h
 --- qt-2.3.7_old/src/tools/qcstring.h	2004-09-10 21:08:04.000000000 +0200
 +++ qt-2.3.7/src/tools/qcstring.h	2004-09-10 21:08:42.000000000 +0200
 @@ -119,7 +119,7 @@
  //                   We want to keep source compatibility for 2.x
  // ### TODO for 4.0: completely remove these and the cstr* functions
  
 -#if !defined(QT_GENUINE_STR)
 +#if 0
  
  #undef	strlen
  #define strlen qstrlen
 diff -ur qt-2.3.7_old/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h
 --- qt-2.3.7_old/src/tools/qglobal.h	2004-09-10 21:08:04.000000000 +0200
 +++ qt-2.3.7/src/tools/qglobal.h	2004-09-10 21:08:42.000000000 +0200
 @@ -207,8 +207,16 @@
  #if __GNUC__ == 2 && __GNUC_MINOR__ == 96
  #define Q_FP_CCAST_BROKEN
  #endif
 +/* ARM gcc pads structs to 32 bits, even when they contain a single
 +   char, or short.  We tell gcc to pack QChars to 16 bits, to avoid
 +   QString bloat. However, gcc 3.4 doesn't allow us to create references to
 +   members of a packed struct. (Pointers are OK, because then you
 +   supposedly know what you are doing.) */
  #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
  #define Q_PACKED __attribute__ ((packed))
 +#    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
 +#      define Q_NO_PACKED_REFERENCE
 +#    endif
  #endif
  #elif defined(__xlC__)
  #define _CC_XLC_
 diff -ur qt-2.3.7_old/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h
 --- qt-2.3.7_old/src/tools/qsortedlist.h	2004-09-10 21:08:04.000000000 +0200
 +++ qt-2.3.7/src/tools/qsortedlist.h	2004-09-10 21:08:42.000000000 +0200
 @@ -48,7 +48,7 @@
  public:
      QSortedList() {}
      QSortedList( const QSortedList<type> &l ) : QList<type>(l) {}
 -    ~QSortedList() { clear(); }
 +    ~QSortedList() { this->clear(); }
      QSortedList<type> &operator=(const QSortedList<type> &l)
        { return (QSortedList<type>&)QList<type>::operator=(l); }
  
 diff -ur qt-2.3.7_old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h
 --- qt-2.3.7_old/src/tools/qstring.h	2004-09-10 21:08:04.000000000 +0200
 +++ qt-2.3.7/src/tools/qstring.h	2004-09-10 21:08:42.000000000 +0200
 @@ -163,8 +163,16 @@
      bool isLetterOrNumber() const;
      bool isDigit() const;
  
 +
 +#ifdef Q_NO_PACKED_REFERENCE
 +    uchar& cell() { return *(&cl); }
 +    uchar& row()  { return *(&rw); }
 +#else
      uchar& cell() { return cl; }
 -    uchar& row() { return rw; }
 +    uchar& row()  { return rw; }
 +#endif
 +
 +  
      uchar cell() const { return cl; }
      uchar row() const { return rw; }
  
+diff -ur qt-2.3.7_old/src/kernel/qwsdecoration_qws.h qt-2.3.7/src/kernel/qwsdecoration_qws.h
+--- qt-2.3.7_old/src/kernel/qwsdecoration_qws.h	2003-07-17 03:20:26.000000000 +0200
++++ qt-2.3.7/src/kernel/qwsdecoration_qws.h	2004-09-13 15:44:13.000000000 +0200
+@@ -50,7 +50,7 @@
+     enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6,
+ 		TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10,
+ 		Close=11, Minimize=12, Maximize=13, Normalize=14,
+-		Menu=15, LastRegion=Menu };
++		Menu=15, LastRegion=Menu, UserDefined = 100 };
+ 
+     virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0;
+     virtual void close( QWidget * );