optimize QCommonStyle::drawPrimitive() and QCommonStyle::drawControl()

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 625b6a4..736e8c8 100644 (file)
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -153,13 +153,11 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
         }
         break;
     case PE_IndicatorRadioButton: {
-        QRect ir = opt->rect;
         p->setPen(opt->palette.dark().color());
         p->drawArc(opt->rect, 0, 5760);
         if (opt->state & (State_Sunken | State_On)) {
-            ir.adjust(2, 2, -2, -2);
             p->setBrush(opt->palette.foreground());
-            p->drawEllipse(ir);
+            p->drawEllipse(opt->rect.adjusted(2, 2, -2, -2));
         }
         break; }
     case PE_FrameFocusRect:
@@ -176,8 +174,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
             } else {
                 p->setPen(opt->palette.foreground().color());
             }
-            QRect focusRect = opt->rect.adjusted(1, 1, -1, -1);
-            p->drawRect(focusRect.adjusted(0, 0, -1, -1)); //draw pen inclusive
+            p->drawRect(opt->rect.adjusted(1, 1, -2, -2)); //draw pen inclusive
             p->setPen(oldPen);
         }
         break;
@@ -240,8 +237,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
         }
 
         break;
-   case PE_PanelMenu:
-        break;
+    case PE_PanelMenu:
     case PE_PanelToolBar:
        break;
 #endif // QT_NO_TOOLBAR
@@ -461,9 +457,8 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
 #ifndef QT_NO_SPINBOX
     case PE_IndicatorSpinPlus:
     case PE_IndicatorSpinMinus: {
-        QRect r = opt->rect;
         int fw = proxy()->pixelMetric(PM_DefaultFrameWidth, opt, widget);
-        QRect br = r.adjusted(fw, fw, -fw, -fw);
+        QRect br = opt->rect.adjusted(fw, fw, -fw, -fw);
 
         int offset = (opt->state & State_Sunken) ? 1 : 0;
         int step = (br.width() + 4) / 5;
@@ -611,11 +606,10 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
     break; }
 #endif //QT_NO_COLUMNVIEW
     case PE_IndicatorItemViewItemDrop: {
-        QRect rect = opt->rect;
         if (opt->rect.height() == 0)
-            p->drawLine(rect.topLeft(), rect.topRight());
+            p->drawLine(opt->rect.topLeft(), opt->rect.topRight());
         else
-            p->drawRect(rect);
+            p->drawRect(opt->rect);
         break; }
 #ifndef QT_NO_ITEMVIEWS
     case PE_PanelItemViewRow:
@@ -1848,16 +1842,15 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
             tiledPixmap = QPixmap::fromImage(tiledPixmap.toImage());
 
             p->save();
-            QRect r = opt->rect;
             QStyleHintReturnMask mask;
             if (proxy()->styleHint(QStyle::SH_RubberBand_Mask, opt, widget, &mask))
                 p->setClipRegion(mask.region);
-            p->drawTiledPixmap(r.x(), r.y(), r.width(), r.height(), tiledPixmap);
+            p->drawTiledPixmap(opt->rect.x(), opt->rect.y(), opt->rect.width(), opt->rect.height(), tiledPixmap);
             p->setPen(opt->palette.color(QPalette::Active, QPalette::WindowText));
             p->setBrush(Qt::NoBrush);
-            p->drawRect(r.adjusted(0, 0, -1, -1));
+            p->drawRect(opt->rect.adjusted(0, 0, -1, -1));
             if (rbOpt->shape == QRubberBand::Rectangle)
-                p->drawRect(r.adjusted(3, 3, -4, -4));
+                p->drawRect(opt->rect.adjusted(3, 3, -4, -4));
             p->restore();
         }
         break; }