diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-05-03 13:00:13 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-04 12:55:57 +0000 |
commit | 2338fdc30b200c516356742802267b8c62bc7788 (patch) | |
tree | a763a892645765ade3053610209334066b1b9946 /src/quickcontrols2/qquickiconlabel_p_p.h | |
parent | aea55d29d2555c5649c13d3bc11bde4799c6bac5 (diff) |
Controls: use C++11 default member initialization
Change-Id: Ief81868a8d314f7e7722fc0cb6670ae0dc4da50f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickiconlabel_p_p.h')
-rw-r--r-- | src/quickcontrols2/qquickiconlabel_p_p.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/quickcontrols2/qquickiconlabel_p_p.h b/src/quickcontrols2/qquickiconlabel_p_p.h index f0f4df4c..6a2a0f58 100644 --- a/src/quickcontrols2/qquickiconlabel_p_p.h +++ b/src/quickcontrols2/qquickiconlabel_p_p.h @@ -62,8 +62,6 @@ class QQuickIconLabelPrivate : public QQuickItemPrivate, public QQuickItemChange Q_DECLARE_PUBLIC(QQuickIconLabel) public: - explicit QQuickIconLabelPrivate(); - bool hasIcon() const; bool hasText() const; @@ -92,20 +90,20 @@ public: void itemImplicitHeightChanged(QQuickItem *) override; void itemDestroyed(QQuickItem *item) override; - bool mirrored; - QQuickIconLabel::Display display; - Qt::Alignment alignment; - qreal spacing; - qreal topPadding; - qreal leftPadding; - qreal rightPadding; - qreal bottomPadding; + bool mirrored = false; + QQuickIconLabel::Display display = QQuickIconLabel::TextBesideIcon; + Qt::Alignment alignment = Qt::AlignCenter; + qreal spacing = 0; + qreal topPadding = 0; + qreal leftPadding = 0; + qreal rightPadding = 0; + qreal bottomPadding = 0; QFont font; QColor color; QString text; QQuickIcon icon; - QQuickIconImage *image; - QQuickMnemonicLabel *label; + QQuickIconImage *image = nullptr; + QQuickMnemonicLabel *label = nullptr; }; QT_END_NAMESPACE |