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/qquickmenu_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/qquickmenu_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickmenu_p_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h index 0c8ffb4d..83fe3e36 100644 --- a/src/quicktemplates2/qquickmenu_p_p.h +++ b/src/quicktemplates2/qquickmenu_p_p.h @@ -120,16 +120,16 @@ public: static QObject *contentData_at(QQmlListProperty<QObject> *prop, int index); static void contentData_clear(QQmlListProperty<QObject> *prop); - bool cascade; - int hoverTimer; - int currentIndex; - qreal overlap; + bool cascade = false; + int hoverTimer = 0; + int currentIndex = -1; + qreal overlap = 0; QPointer<QQuickMenu> parentMenu; QPointer<QQuickMenuItem> currentItem; - QQuickItem *contentItem; // TODO: cleanup + QQuickItem *contentItem = nullptr; // TODO: cleanup QVector<QObject *> contentData; QQmlObjectModel *contentModel; - QQmlComponent *delegate; + QQmlComponent *delegate = nullptr; QString title; }; |