From aea55d29d2555c5649c13d3bc11bde4799c6bac5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 3 May 2018 11:23:56 +0200 Subject: 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 --- src/quicktemplates2/qquickdelaybutton.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/quicktemplates2/qquickdelaybutton.cpp') diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates2/qquickdelaybutton.cpp index 128f0c78..5b32fc71 100644 --- a/src/quicktemplates2/qquickdelaybutton.cpp +++ b/src/quicktemplates2/qquickdelaybutton.cpp @@ -80,15 +80,13 @@ class QQuickDelayButtonPrivate : public QQuickAbstractButtonPrivate Q_DECLARE_PUBLIC(QQuickDelayButton) public: - QQuickDelayButtonPrivate(); - void beginTransition(qreal to); void finishTransition(); void cancelTransition(); - int delay; - qreal progress; - QQuickTransition *transition; + int delay = 300; + qreal progress = 0.0; + QQuickTransition *transition = nullptr; QScopedPointer transitionManager; }; @@ -103,7 +101,7 @@ protected: void finished() override; private: - QQuickDelayButton *m_button; + QQuickDelayButton *m_button = nullptr; }; void QQuickDelayTransitionManager::transition(QQuickTransition *transition, qreal progress) @@ -129,13 +127,6 @@ void QQuickDelayTransitionManager::finished() emit m_button->activated(); } -QQuickDelayButtonPrivate::QQuickDelayButtonPrivate() - : delay(3000), - progress(0.0), - transition(nullptr) -{ -} - void QQuickDelayButtonPrivate::beginTransition(qreal to) { Q_Q(QQuickDelayButton); -- cgit v1.2.3