diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-05-03 11:23:56 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-04 12:53:00 +0000 |
commit | aea55d29d2555c5649c13d3bc11bde4799c6bac5 (patch) | |
tree | 52434edff3041005f98b6899566fce119855efae /src/quicktemplates2/qquickdialogbuttonbox_p_p.h | |
parent | a5d2731b1ec56580a79784759307d3b3c21ab87f (diff) |
Templates: use C++11 default member initialization
The code is more readable and less error-prone (this patch caught a few
uninitialized members) when the members are initialized in the same
place where they are declared. In many cases, empty default destructors
can be entirely removed, and we get faster implicitly declared inline
default constructors defined by the compiler.
Change-Id: I14c5448afc901f9b2ac5965f28c1c26c0b646c08
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdialogbuttonbox_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox_p_p.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h index 7247d591..a98a299b 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h +++ b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h @@ -58,8 +58,6 @@ class QQuickDialogButtonBoxPrivate : public QQuickContainerPrivate Q_DECLARE_PUBLIC(QQuickDialogButtonBox) public: - QQuickDialogButtonBoxPrivate(); - static QQuickDialogButtonBoxPrivate *get(QQuickDialogButtonBox *box) { return box->d_func(); @@ -75,10 +73,10 @@ public: QQuickAbstractButton *createStandardButton(QPlatformDialogHelper::StandardButton button); void removeStandardButtons(); - Qt::Alignment alignment; - QQuickDialogButtonBox::Position position; - QPlatformDialogHelper::StandardButtons standardButtons; - QQmlComponent *delegate; + Qt::Alignment alignment = 0; + QQuickDialogButtonBox::Position position = QQuickDialogButtonBox::Footer; + QPlatformDialogHelper::StandardButtons standardButtons = QPlatformDialogHelper::NoButton; + QQmlComponent *delegate = nullptr; }; class QQuickDialogButtonBoxAttachedPrivate : public QObjectPrivate @@ -86,13 +84,6 @@ class QQuickDialogButtonBoxAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickDialogButtonBoxAttached) public: - QQuickDialogButtonBoxAttachedPrivate() - : buttonBox(nullptr), - buttonRole(QPlatformDialogHelper::InvalidRole), - standardButton(QPlatformDialogHelper::NoButton) - { - } - static QQuickDialogButtonBoxAttachedPrivate *get(QQuickDialogButtonBoxAttached *q) { return q->d_func(); @@ -100,9 +91,9 @@ public: void setButtonBox(QQuickDialogButtonBox *box); - QQuickDialogButtonBox *buttonBox; - QPlatformDialogHelper::ButtonRole buttonRole; - QPlatformDialogHelper::StandardButton standardButton; + QQuickDialogButtonBox *buttonBox = nullptr; + QPlatformDialogHelper::ButtonRole buttonRole = QPlatformDialogHelper::InvalidRole; + QPlatformDialogHelper::StandardButton standardButton = QPlatformDialogHelper::NoButton; }; QT_END_NAMESPACE |