optimize QStyle::itemTextRect()

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

diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index dab02b3..6ab4278 100644 (file)
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -448,17 +448,15 @@ void QStyle::polish(QPalette & /* pal */)
 QRect QStyle::itemTextRect(const QFontMetrics &metrics, const QRect &rect, int alignment, bool enabled,
                        const QString &text) const
 {
-    int x, y, w, h;
-    rect.getRect(&x, &y, &w, &h);
     if (!text.isEmpty()) {
-        QRect result = metrics.boundingRect(x, y, w, h, alignment, text);
+        QRect result = metrics.boundingRect(rect.x(), rect.y(), rect.width(), rect.height(), alignment, text);
         if (!enabled && proxy()->styleHint(SH_EtchDisabledText)) {
             result.setWidth(result.width()+1);
             result.setHeight(result.height()+1);
         }
         return result;
     }
-    return QRect(x, y, w, h);
+    return rect;
 }
 
 /*!