summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-19 18:19:15 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-19 20:25:06 +0000
commit148faf6278186986d1ca6afcdea0c361bcbf199e (patch)
treef9944bbf678a7e43a090aa9c4d23eb924b7b32f9
parenteb06a755e79fe93e5308197178d38e8dde26a540 (diff)
downloadqtquickcontrols-148faf6278186986d1ca6afcdea0c361bcbf199e.tar.gz
QQuickStyleItem: replace if-else chain with switch
Change-Id: Ife49b85c31c32e7da900ce6a06dea46f831529a6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/controls/Private/qquickstyleitem.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index 7e05b745..c8be5685 100644
--- a/src/controls/Private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
@@ -906,7 +906,6 @@ QString QQuickStyleItem::hitTest(int px, int py)
return QStringLiteral("up");
else if (subcontrol == QStyle::SC_SpinBoxDown)
return QStringLiteral("down");
-
}
break;
@@ -916,27 +915,35 @@ QString QQuickStyleItem::hitTest(int px, int py)
QPoint(px,py), 0);
if (subcontrol == QStyle::SC_SliderHandle)
return QStringLiteral("handle");
-
}
break;
+
case ScrollBar: {
subcontrol = qApp->style()->hitTestComplexControl(QStyle::CC_ScrollBar,
qstyleoption_cast<QStyleOptionComplex*>(m_styleoption),
QPoint(px,py), 0);
- if (subcontrol == QStyle::SC_ScrollBarSlider)
+ switch (subcontrol) {
+ case QStyle::SC_ScrollBarSlider:
return QStringLiteral("handle");
- if (subcontrol == QStyle::SC_ScrollBarSubLine)
+ case QStyle::SC_ScrollBarSubLine:
return QStringLiteral("up");
- else if (subcontrol == QStyle::SC_ScrollBarSubPage)
+
+ case QStyle::SC_ScrollBarSubPage:
return QStringLiteral("upPage");
- if (subcontrol == QStyle::SC_ScrollBarAddLine)
+ case QStyle::SC_ScrollBarAddLine:
return QStringLiteral("down");
- else if (subcontrol == QStyle::SC_ScrollBarAddPage)
+
+ case QStyle::SC_ScrollBarAddPage:
return QStringLiteral("downPage");
+
+ default:
+ break;
+ }
}
break;
+
default:
break;
}