From 2ef6a789e9cd91a9245c65201a6fe3d3322712ad Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 18 Sep 2015 12:52:57 +0200 Subject: Tidy up QQuickControlPrivate::updateFontRecur() a bit Change-Id: I420c48e95380f79c4d4f3aaa40f7f65f1646834d Reviewed-by: Liang Qi --- src/templates/qquickcontrol.cpp | 29 ++++++++++++----------------- 1 file 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(child)) { - QQuickControlPrivate *qcp = QQuickControlPrivate::get(qc); - qcp->resolveFont(); - } else if (QQuickLabel *ql = qobject_cast(child)) { - QQuickLabelPrivate *qlp = QQuickLabelPrivate::get(ql); - qlp->resolveFont(); - } else if (QQuickTextArea *qta = qobject_cast(child)) { - QQuickTextAreaPrivate *qtap = QQuickTextAreaPrivate::get(qta); - qtap->resolveFont(); - } else if (QQuickTextField *qtf = qobject_cast(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(child)) + QQuickControlPrivate::get(control)->resolveFont(); + else if (QQuickLabel *label = qobject_cast(child)) + QQuickLabelPrivate::get(label)->resolveFont(); + else if (QQuickTextArea *textArea = qobject_cast(child)) + QQuickTextAreaPrivate::get(textArea)->resolveFont(); + else if (QQuickTextField *textField = qobject_cast(child)) + QQuickTextFieldPrivate::get(textField)->resolveFont(); + else QQuickControlPrivate::updateFontRecur(child, f); - } } } -- cgit v1.2.3