Lefthand Patch rediffed and applies now to QtE 2.3.7

It is the one from Qt2.3.8

1 files changed, 63 insertions, 63 deletions

diff --git a/qt/qt-2.3.7.patch/qte237-lefthand.patch b/qt/qt-2.3.7.patch/qte237-lefthand.patch
index 1cddd29..0a0cccf 100644
--- a/qt/qt-2.3.7.patch/qte237-lefthand.patch
+++ b/qt/qt-2.3.7.patch/qte237-lefthand.patch
@@ -1,5 +1,5 @@
-diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollview.cpp
---- qt-2.3.7/src/widgets/qscrollview.cpp	2004-06-13 20:45:16.000000000 +0200
-+++ qt-2.3.7_orig/src/widgets/qscrollview.cpp	2004-06-13 20:42:54.000000000 +0200
-@@ -526,16 +526,15 @@
+diff -u qt-2.3.7_orig/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp
+--- qt-2.3.7_orig/src/widgets/qscrollview.cpp	2004-06-13 20:42:54.000000000 +0200
++++ qt-2.3.7/src/widgets/qscrollview.cpp	2004-06-13 20:45:16.000000000 +0200
+@@ -526,15 +526,16 @@
  	     this, SLOT( doDragAutoScroll() ) );
@@ -7,10 +7,10 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  
--    connect( &d->hbar, SIGNAL( valueChanged(int) ),
--	this, SLOT( hslide(int) ) );
--    connect( &d->vbar, SIGNAL( valueChanged(int) ),
--	this, SLOT( vslide(int) ) );
-+    connect( &d->hbar, SIGNAL( valueChanged( int ) ),
-+	this, SLOT( hslide( int ) ) );
-+    connect( &d->vbar, SIGNAL( valueChanged( int ) ),
-+	this, SLOT( vslide( int ) ) );
+-    connect( &d->hbar, SIGNAL( valueChanged( int ) ),
+-	this, SLOT( hslide( int ) ) );
+-    connect( &d->vbar, SIGNAL( valueChanged( int ) ),
+-	this, SLOT( vslide( int ) ) );
++    connect( &d->hbar, SIGNAL( valueChanged(int) ),
++	this, SLOT( hslide(int) ) );
++    connect( &d->vbar, SIGNAL( valueChanged(int) ),
++	this, SLOT( vslide(int) ) );
      d->viewport.installEventFilter( this );
@@ -20,3 +20,3 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
      setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
--
++
  }
@@ -24,3 +24,3 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  
-@@ -684,11 +683,6 @@
+@@ -683,6 +684,11 @@
  		  h-tmarg-bmarg - (showh ? hsbExt : 0) );
@@ -28,7 +28,7 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  
--/*
--  The surrounding environment (or application, if there is no
--  environment, may set this. Requires Qt >= 2.3.8.
--*/
--bool qt_left_hand_scrollbars = FALSE;
++/*
++  The surrounding environment (or application, if there is no
++  environment, may set this. Requires Qt >= 2.3.8.
++*/
++bool qt_left_hand_scrollbars = FALSE;
  
@@ -36,3 +36,3 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
    Updates scrollbars - all possibilities considered.  You should never
-@@ -792,50 +786,45 @@
+@@ -786,45 +792,50 @@
  
@@ -40,7 +40,7 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
      int bottom;
--    int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0;
--    int xpos    =   qt_left_hand_scrollbars ? 0 : w-vsbExt;
--    xpos    =  (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw;
--    int ypos    = tmarg;
--    ypos        = (style() == WindowsStyle) ? ypos +fw : 0;
++    int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0;
++    int xpos    =   qt_left_hand_scrollbars ? 0 : w-vsbExt;
++    xpos    =  (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw;
++    int ypos    = tmarg;
++    ypos        = (style() == WindowsStyle) ? ypos +fw : 0;
      if ( showh ) {
@@ -48,8 +48,8 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  	if ( style() == WindowsStyle )
--            setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw,
-+            setHBarGeometry(d->hbar, fw, h-hsbExt-fw,
+-            setHBarGeometry(d->hbar, fw, h-hsbExt-fw,
++            setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw,
                              right-fw-fw, hsbExt );
  	else
--            setHBarGeometry(d->hbar, 0+  xoffset, h-hsbExt, right,
-+            setHBarGeometry(d->hbar, 0, h-hsbExt, right,
+-            setHBarGeometry(d->hbar, 0, h-hsbExt, right,
++            setHBarGeometry(d->hbar, 0+  xoffset, h-hsbExt, right,
                              hsbExt );
@@ -60,4 +60,4 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
      if ( showv ) {
--	clipper()->setGeometry( lmarg + xoffset, tmarg,
-+	clipper()->setGeometry( lmarg, tmarg,
+-	clipper()->setGeometry( lmarg, tmarg,
++	clipper()->setGeometry( lmarg + xoffset, tmarg,
                                  w-vsbExt-lmarg-rmarg,
@@ -66,21 +66,21 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  	if ( style() == WindowsStyle )
--	    changeFrameRect(QRect(xoffset, 0, w, h) );
-+	    changeFrameRect(QRect(0, 0, w, h) );
+-	    changeFrameRect(QRect(0, 0, w, h) );
++	    changeFrameRect(QRect(xoffset, 0, w, h) );
  	else
--	    changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom));
-+	    changeFrameRect(QRect(0, 0, w-vsbExt, bottom));
+-	    changeFrameRect(QRect(0, 0, w-vsbExt, bottom));
++	    changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom));
  	if (cornerWidget()) {
  	    if ( style() == WindowsStyle )
--                setVBarGeometry( d->vbar, xpos,
--                                 ypos, vsbExt,
--                                 bottom-fw-ypos );
-+                setVBarGeometry( d->vbar, w-vsbExt-fw,
-+                                 fw, vsbExt,
-+                                 h-hsbExt-fw-fw );
+-                setVBarGeometry( d->vbar, w-vsbExt-fw,
+-                                 fw, vsbExt,
+-                                 h-hsbExt-fw-fw );
++                setVBarGeometry( d->vbar, xpos,
++                                 ypos, vsbExt,
++                                 bottom-fw-ypos );
  	    else
--                setVBarGeometry( d->vbar, xpos, ypos,
-+                setVBarGeometry( d->vbar, w-vsbExt, 0,
+-                setVBarGeometry( d->vbar, w-vsbExt, 0,
++                setVBarGeometry( d->vbar, xpos, ypos,
                                   vsbExt,
--                                 bottom-ypos );
-+                                 h-hsbExt );
+-                                 h-hsbExt );
++                                 bottom-ypos );
  	}
@@ -88,13 +88,13 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  	    if ( style() == WindowsStyle )
--                setVBarGeometry( d->vbar, xpos,
--                                 ypos, vsbExt,
--                                 bottom-fw-ypos );
-+                setVBarGeometry( d->vbar, w-vsbExt-fw,
-+                                 fw, vsbExt,
-+                                 bottom-fw-fw );
+-                setVBarGeometry( d->vbar, w-vsbExt-fw,
+-                                 fw, vsbExt,
+-                                 bottom-fw-fw );
++                setVBarGeometry( d->vbar, xpos,
++                                 ypos, vsbExt,
++                                 bottom-fw-ypos );
  	    else
--                setVBarGeometry( d->vbar, xpos, ypos,
--                                 vsbExt, bottom-ypos );
-+                setVBarGeometry( d->vbar, w-vsbExt, 0,
-+                                 vsbExt, bottom );
+-                setVBarGeometry( d->vbar, w-vsbExt, 0,
+-                                 vsbExt, bottom );
++                setVBarGeometry( d->vbar, xpos, ypos,
++                                 vsbExt, bottom-ypos );
  	}
@@ -102,3 +102,3 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  	if ( style() == WindowsStyle )
-@@ -848,12 +837,12 @@
+@@ -837,12 +848,12 @@
      }
@@ -106,4 +106,4 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  	if ( style() == WindowsStyle )
--            d->corner->setGeometry( xpos,
-+            d->corner->setGeometry( w-vsbExt-fw,
+-            d->corner->setGeometry( w-vsbExt-fw,
++            d->corner->setGeometry( xpos,
                                      h-hsbExt-fw,
@@ -112,4 +112,4 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  	else
--            d->corner->setGeometry( xpos,
-+            d->corner->setGeometry( w-vsbExt,
+-            d->corner->setGeometry( w-vsbExt,
++            d->corner->setGeometry( xpos,
                                      h-hsbExt,
@@ -117,3 +117,3 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
                                      hsbExt );
-@@ -1686,7 +1675,7 @@
+@@ -1675,7 +1686,7 @@
  }
@@ -121,4 +121,4 @@ diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollvi
  /*!
-- Scrolls the content by \a dx to the left and \a dy upwards.
-+ Scrolls the content by \a x to the left and \a y upwards.
+- 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.
  */