aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-09-18 12:52:57 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-09-18 12:34:10 +0000
commit2ef6a789e9cd91a9245c65201a6fe3d3322712ad (patch)
tree07b34dcc1ea82c6b7416af69eab2a863ad9417de /src
parent9827d50c720c91837e2674db246144717f3afb71 (diff)
Tidy up QQuickControlPrivate::updateFontRecur() a bit
Change-Id: I420c48e95380f79c4d4f3aaa40f7f65f1646834d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/templates/qquickcontrol.cpp29
1 files changed, 12 insertions, 17 deletions
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index bdca042a..eefd2bd4 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
@@ -210,24 +210,19 @@ void QQuickControlPrivate::updateFont(const QFont &f)
emit q->fontChanged();
}
-void QQuickControlPrivate::updateFontRecur(QQuickItem *i, const QFont &f)
-{
- foreach (QQuickItem *child, i->childItems()) {
- if (QQuickControl *qc = qobject_cast<QQuickControl *>(child)) {
- QQuickControlPrivate *qcp = QQuickControlPrivate::get(qc);
- qcp->resolveFont();
- } else if (QQuickLabel *ql = qobject_cast<QQuickLabel *>(child)) {
- QQuickLabelPrivate *qlp = QQuickLabelPrivate::get(ql);
- qlp->resolveFont();
- } else if (QQuickTextArea *qta = qobject_cast<QQuickTextArea *>(child)) {
- QQuickTextAreaPrivate *qtap = QQuickTextAreaPrivate::get(qta);
- qtap->resolveFont();
- } else if (QQuickTextField *qtf = qobject_cast<QQuickTextField *>(child)) {
- QQuickTextFieldPrivate *qtfp = QQuickTextFieldPrivate::get(qtf);
- qtfp->resolveFont();
- } else {
+void QQuickControlPrivate::updateFontRecur(QQuickItem *item, const QFont &f)
+{
+ foreach (QQuickItem *child, item->childItems()) {
+ if (QQuickControl *control = qobject_cast<QQuickControl *>(child))
+ QQuickControlPrivate::get(control)->resolveFont();
+ else if (QQuickLabel *label = qobject_cast<QQuickLabel *>(child))
+ QQuickLabelPrivate::get(label)->resolveFont();
+ else if (QQuickTextArea *textArea = qobject_cast<QQuickTextArea *>(child))
+ QQuickTextAreaPrivate::get(textArea)->resolveFont();
+ else if (QQuickTextField *textField = qobject_cast<QQuickTextField *>(child))
+ QQuickTextFieldPrivate::get(textField)->resolveFont();
+ else
QQuickControlPrivate::updateFontRecur(child, f);
- }
}
}