[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdebase/kwin/kcmkwin/kwindecoration
From:       Sandro Giessl <ceebx () users ! sourceforge ! net>
Date:       2004-03-30 13:54:12
Message-ID: 20040330135412.CB0F799D0 () office ! kde ! org
[Download RAW message or body]

CVS commit by giessl: 

backport rev. 1.9


  M +5 -3      preview.cpp   1.8.2.1


--- kdebase/kwin/kcmkwin/kwindecoration/preview.cpp  #1.8:1.8.2.1
@@ -107,5 +107,6 @@ void KDecorationPreview::resizeEvent( QR
 void KDecorationPreview::positionPreviews()
     {
-    int titleBarHeight, leftBorder, rightBorder, xoffset, dummy;
+    int titleBarHeight, leftBorder, rightBorder, xoffset,
+        dummy1, dummy2, dummy3;
     QRect geometry;
     QSize size;
@@ -116,6 +117,7 @@ void KDecorationPreview::positionPreview
         return; 
 
-    deco[Active]->borders( dummy, dummy, titleBarHeight, dummy );
-    deco[Inactive]->borders( leftBorder, rightBorder, dummy, dummy );
+    // don't have more than one reference to the same dummy variable in one borders() call.
+    deco[Active]->borders( dummy1, dummy2, titleBarHeight, dummy3 );
+    deco[Inactive]->borders( leftBorder, rightBorder, dummy1, dummy2 );
 
     titleBarHeight = kMin( int( titleBarHeight * .9 ), 30 );


[prev in list] [next in list] [prev in thread] [next in thread]