Automated update from Qt3

1 files changed, 10 insertions, 3 deletions

diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index ad866982..bf850778 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -42,6 +42,7 @@
 
 #ifndef QT_NO_STYLE
 
+#include "ntqmutex.h"
 #include "ntqmenubar.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
@@ -2782,6 +2783,9 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
 		ret = TQMAX( TQFontMetrics(ceData.font).lineSpacing(), 18 );
 	    }
 	}
+	else {
+		ret = 0;
+	}
 	break; }
     case PM_ScrollBarSliderMin:
 	ret = 9;
@@ -2853,12 +2857,15 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
 	    int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
 	    int ticks = ceData.tickMarkSetting;
 
-	    if ( ticks == TQSlider::Both )
+	    if ( ticks == TQSlider::Both ) {
 		ret = (space - thickness) / 2;
-	    else if ( ticks == TQSlider::Above )
+	    }
+	    else if ( ticks == TQSlider::Above ) {
 		ret = space - thickness;
-	    else
+	    }
+	    else {
 		ret = 0;
+	    }
 	    break;
 	}