diff options
83 files changed, 406 insertions, 1065 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index 0a8b8ddf..47ed0fff 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -51,10 +51,6 @@ QT_BEGIN_NAMESPACE -// copied from qabstractbutton.cpp -static const int AUTO_REPEAT_DELAY = 300; -static const int AUTO_REPEAT_INTERVAL = 100; - /*! \qmltype AbstractButton \inherits Control @@ -117,33 +113,6 @@ static const int AUTO_REPEAT_INTERVAL = 100; This signal is emitted when the button is interactively double clicked by the user via touch or mouse. */ -QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() - : explicitText(false), - down(false), - explicitDown(false), - pressed(false), - keepPressed(false), - checked(false), - checkable(false), - autoExclusive(false), - autoRepeat(false), - wasHeld(false), - holdTimer(0), - delayTimer(0), - repeatTimer(0), - repeatDelay(AUTO_REPEAT_DELAY), - repeatInterval(AUTO_REPEAT_INTERVAL), -#if QT_CONFIG(shortcut) - shortcutId(0), -#endif - pressButtons(Qt::NoButton), - indicator(nullptr), - group(nullptr), - display(QQuickAbstractButton::TextBesideIcon), - action(nullptr) -{ -} - void QQuickAbstractButtonPrivate::setPressPoint(const QPointF &point) { pressPoint = point; diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h index bb74e143..1b3b59ba 100644 --- a/src/quicktemplates2/qquickabstractbutton_p_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p_p.h @@ -62,8 +62,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButtonPrivate : public QQui Q_DECLARE_PUBLIC(QQuickAbstractButton) public: - QQuickAbstractButtonPrivate(); - static QQuickAbstractButtonPrivate *get(QQuickAbstractButton *button) { return button->d_func(); @@ -105,34 +103,38 @@ public: void cancelIndicator(); void executeIndicator(bool complete = false); - QString text; - bool explicitText; - bool down; - bool explicitDown; - bool pressed; - bool keepPressed; - bool checked; - bool checkable; - bool autoExclusive; - bool autoRepeat; - bool wasHeld; - int holdTimer; - int delayTimer; - int repeatTimer; - int repeatDelay; - int repeatInterval; + // copied from qabstractbutton.cpp + static const int AUTO_REPEAT_DELAY = 300; + static const int AUTO_REPEAT_INTERVAL = 100; + + bool explicitText = false; + bool down = false; + bool explicitDown = false; + bool pressed = false; + bool keepPressed = false; + bool checked = false; + bool checkable = false; + bool autoExclusive = false; + bool autoRepeat = false; + bool wasHeld = false; + int holdTimer = 0; + int delayTimer = 0; + int repeatTimer = 0; + int repeatDelay = AUTO_REPEAT_DELAY; + int repeatInterval = AUTO_REPEAT_INTERVAL; #if QT_CONFIG(shortcut) - int shortcutId; + int shortcutId = 0; QKeySequence shortcut; #endif + QString text; QQuickIcon icon; QQuickIcon effectiveIcon; QPointF pressPoint; QPointF movePoint; - Qt::MouseButtons pressButtons; + Qt::MouseButtons pressButtons = Qt::NoButton; + QQuickAbstractButton::Display display = QQuickAbstractButton::TextBesideIcon; QQuickDeferredPointer<QQuickItem> indicator; - QQuickButtonGroup *group; - QQuickAbstractButton::Display display; + QQuickButtonGroup *group = nullptr; QPointer<QQuickAction> action; }; diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp index fd899d0b..6ff3a183 100644 --- a/src/quicktemplates2/qquickaction.cpp +++ b/src/quicktemplates2/qquickaction.cpp @@ -121,8 +121,7 @@ static QKeySequence variantToKeySequence(const QVariant &var) } QQuickActionPrivate::ShortcutEntry::ShortcutEntry(QObject *target) - : m_shortcutId(0), - m_target(target) + : m_target(target) { } @@ -170,16 +169,6 @@ void QQuickActionPrivate::ShortcutEntry::setEnabled(bool enabled) QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enabled, m_shortcutId, m_target); } -QQuickActionPrivate::QQuickActionPrivate() - : explicitEnabled(false), - enabled(true), - checked(false), - checkable(false), - defaultShortcutEntry(nullptr), - group(nullptr) -{ -} - QVariant QQuickActionPrivate::shortcut() const { return vshortcut; diff --git a/src/quicktemplates2/qquickaction_p_p.h b/src/quicktemplates2/qquickaction_p_p.h index 331bcb65..98b0973b 100644 --- a/src/quicktemplates2/qquickaction_p_p.h +++ b/src/quicktemplates2/qquickaction_p_p.h @@ -64,8 +64,6 @@ class QQuickActionPrivate : public QObjectPrivate, public QQuickItemChangeListen Q_DECLARE_PUBLIC(QQuickAction) public: - QQuickActionPrivate(); - static QQuickActionPrivate *get(QQuickAction *action) { return action->d_func(); @@ -104,24 +102,24 @@ public: void setEnabled(bool enabled); private: - int m_shortcutId; - QObject *m_target; + int m_shortcutId = 0; + QObject *m_target = nullptr; }; ShortcutEntry *findShortcutEntry(QObject *target) const; void updateDefaultShortcutEntry(); - bool explicitEnabled; - bool enabled; - bool checked; - bool checkable; + bool explicitEnabled = false; + bool enabled = true; + bool checked = false; + bool checkable = false; QString text; QQuickIcon icon; QVariant vshortcut; QKeySequence keySequence; - ShortcutEntry *defaultShortcutEntry; + ShortcutEntry *defaultShortcutEntry = nullptr; QVector<ShortcutEntry *> shortcutEntries; - QQuickActionGroup *group; + QQuickActionGroup *group = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickactiongroup.cpp b/src/quicktemplates2/qquickactiongroup.cpp index 64895689..f831660b 100644 --- a/src/quicktemplates2/qquickactiongroup.cpp +++ b/src/quicktemplates2/qquickactiongroup.cpp @@ -142,13 +142,6 @@ class QQuickActionGroupPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickActionGroup) public: - QQuickActionGroupPrivate() - : enabled(true), - exclusive(true), - checkedAction(nullptr) - { - } - void clear(); void actionTriggered(); void _q_updateCurrent(); @@ -160,8 +153,8 @@ public: static QQuickAction *actions_at(QQmlListProperty<QQuickAction> *prop, int index); static void actions_clear(QQmlListProperty<QQuickAction> *prop); - bool enabled; - bool exclusive; + bool enabled = true; + bool exclusive = true; QPointer<QQuickAction> checkedAction; QVector<QQuickAction*> actions; }; @@ -423,9 +416,7 @@ void QQuickActionGroup::removeAction(QQuickAction *action) class QQuickActionGroupAttachedPrivate : public QObjectPrivate { public: - QQuickActionGroupAttachedPrivate() : group(nullptr) { } - - QQuickActionGroup *group; + QQuickActionGroup *group = nullptr; }; QQuickActionGroupAttached::QQuickActionGroupAttached(QObject *parent) diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 77cf5465..be28cb2a 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -123,18 +123,6 @@ class QQuickApplicationWindowPrivate : public QQuickItemChangeListener Q_DECLARE_PUBLIC(QQuickApplicationWindow) public: - QQuickApplicationWindowPrivate() - : complete(true), - background(nullptr), - contentItem(nullptr), - menuBar(nullptr), - header(nullptr), - footer(nullptr), - overlay(nullptr), - activeFocusControl(nullptr) - { - } - static QQuickApplicationWindowPrivate *get(QQuickApplicationWindow *window) { return window->d_func(); @@ -171,18 +159,18 @@ public: void cancelBackground(); void executeBackground(bool complete = false); - bool complete; + bool complete = true; QQuickDeferredPointer<QQuickItem> background; - QQuickItem *contentItem; - QQuickItem *menuBar; - QQuickItem *header; - QQuickItem *footer; - QQuickOverlay *overlay; + QQuickItem *contentItem = nullptr; + QQuickItem *menuBar = nullptr; + QQuickItem *header = nullptr; + QQuickItem *footer = nullptr; + QQuickOverlay *overlay = nullptr; QFont font; QLocale locale; QPalette palette; - QQuickItem *activeFocusControl; - QQuickApplicationWindow *q_ptr; + QQuickItem *activeFocusControl = nullptr; + QQuickApplicationWindow *q_ptr = nullptr; }; static void layoutItem(QQuickItem *item, qreal y, qreal width) @@ -862,17 +850,11 @@ class QQuickApplicationWindowAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickApplicationWindowAttached) public: - QQuickApplicationWindowAttachedPrivate() - : window(nullptr), - activeFocusControl(nullptr) - { - } - void windowChange(QQuickWindow *wnd); void activeFocusChange(); - QQuickWindow *window; - QQuickItem *activeFocusControl; + QQuickWindow *window = nullptr; + QQuickItem *activeFocusControl = nullptr; }; void QQuickApplicationWindowAttachedPrivate::windowChange(QQuickWindow *wnd) diff --git a/src/quicktemplates2/qquickbusyindicator.cpp b/src/quicktemplates2/qquickbusyindicator.cpp index e4f20d83..eea8eadb 100644 --- a/src/quicktemplates2/qquickbusyindicator.cpp +++ b/src/quicktemplates2/qquickbusyindicator.cpp @@ -79,9 +79,7 @@ QT_BEGIN_NAMESPACE class QQuickBusyIndicatorPrivate : public QQuickControlPrivate { public: - QQuickBusyIndicatorPrivate() : running(true) { } - - bool running; + bool running = true; }; QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp index a1bea792..74b78408 100644 --- a/src/quicktemplates2/qquickbutton.cpp +++ b/src/quicktemplates2/qquickbutton.cpp @@ -84,12 +84,6 @@ QT_BEGIN_NAMESPACE \sa {Customizing Button}, {Button Controls} */ -QQuickButtonPrivate::QQuickButtonPrivate() - : flat(false), - highlighted(false) -{ -} - QQuickButton::QQuickButton(QQuickItem *parent) : QQuickAbstractButton(*(new QQuickButtonPrivate), parent) { diff --git a/src/quicktemplates2/qquickbutton_p_p.h b/src/quicktemplates2/qquickbutton_p_p.h index 5aaf2788..1d02e2ea 100644 --- a/src/quicktemplates2/qquickbutton_p_p.h +++ b/src/quicktemplates2/qquickbutton_p_p.h @@ -57,10 +57,8 @@ class QQuickButtonPrivate : public QQuickAbstractButtonPrivate Q_DECLARE_PUBLIC(QQuickButton) public: - QQuickButtonPrivate(); - - bool flat; - bool highlighted; + bool flat = false; + bool highlighted = false; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickbuttongroup.cpp b/src/quicktemplates2/qquickbuttongroup.cpp index e2b1a557..cddfb199 100644 --- a/src/quicktemplates2/qquickbuttongroup.cpp +++ b/src/quicktemplates2/qquickbuttongroup.cpp @@ -154,14 +154,6 @@ class QQuickButtonGroupPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickButtonGroup) public: - QQuickButtonGroupPrivate() - : complete(true), - exclusive(true), - settingCheckState(false), - checkState(Qt::Unchecked) - { - } - void clear(); void buttonClicked(); void _q_updateCurrent(); @@ -173,10 +165,10 @@ public: static QQuickAbstractButton *buttons_at(QQmlListProperty<QQuickAbstractButton> *prop, int index); static void buttons_clear(QQmlListProperty<QQuickAbstractButton> *prop); - bool complete; - bool exclusive; - bool settingCheckState; - Qt::CheckState checkState; + bool complete = true; + bool exclusive = true; + bool settingCheckState = false; + Qt::CheckState checkState = Qt::Unchecked; QPointer<QQuickAbstractButton> checkedButton; QVector<QQuickAbstractButton*> buttons; }; @@ -500,9 +492,7 @@ void QQuickButtonGroup::componentComplete() class QQuickButtonGroupAttachedPrivate : public QObjectPrivate { public: - QQuickButtonGroupAttachedPrivate() : group(nullptr) { } - - QQuickButtonGroup *group; + QQuickButtonGroup *group = nullptr; }; QQuickButtonGroupAttached::QQuickButtonGroupAttached(QObject *parent) diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp index c6519338..1f66966c 100644 --- a/src/quicktemplates2/qquickcheckbox.cpp +++ b/src/quicktemplates2/qquickcheckbox.cpp @@ -102,16 +102,10 @@ class QQuickCheckBoxPrivate : public QQuickAbstractButtonPrivate Q_DECLARE_PUBLIC(QQuickCheckBox) public: - QQuickCheckBoxPrivate() - : tristate(false), - checkState(Qt::Unchecked) - { - } - void setNextCheckState(const QJSValue &callback); - bool tristate; - Qt::CheckState checkState; + bool tristate = false; + Qt::CheckState checkState = Qt::Unchecked; QJSValue nextCheckState; }; diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp index b53877df..f02c0bfa 100644 --- a/src/quicktemplates2/qquickcheckdelegate.cpp +++ b/src/quicktemplates2/qquickcheckdelegate.cpp @@ -89,16 +89,10 @@ class QQuickCheckDelegatePrivate : public QQuickItemDelegatePrivate Q_DECLARE_PUBLIC(QQuickCheckDelegate) public: - QQuickCheckDelegatePrivate() - : tristate(false), - checkState(Qt::Unchecked) - { - } - void setNextCheckState(const QJSValue &callback); - bool tristate; - Qt::CheckState checkState; + bool tristate = false; + Qt::CheckState checkState = Qt::Unchecked; QJSValue nextCheckState; }; diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index c61ea9ed..f7b5f157 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -187,7 +187,7 @@ public: QString stringValue(int index, const QString &role) override; private: - QQuickComboBox *combo; + QQuickComboBox *combo = nullptr; }; QQuickComboBoxDelegateModel::QQuickComboBoxDelegateModel(QQuickComboBox *combo) @@ -220,8 +220,6 @@ class QQuickComboBoxPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickComboBox) public: - QQuickComboBoxPrivate(); - bool isPopupVisible() const; void showPopup(); void hidePopup(bool accept); @@ -263,62 +261,37 @@ public: void cancelPopup(); void executePopup(bool complete = false); - bool flat; - bool down; - bool hasDown; - bool pressed; - bool ownModel; - bool keyNavigating; - bool hasDisplayText; - bool hasCurrentIndex; - int highlightedIndex; - int currentIndex; + bool flat = false; + bool down = false; + bool hasDown = false; + bool pressed = false; + bool ownModel = false; + bool keyNavigating = false; + bool hasDisplayText = false; + bool hasCurrentIndex = false; + int highlightedIndex = -1; + int currentIndex = -1; QVariant model; QString textRole; QString currentText; QString displayText; - QQuickItem *pressedItem; - QQmlInstanceModel *delegateModel; - QQmlComponent *delegate; + QQuickItem *pressedItem = nullptr; + QQmlInstanceModel *delegateModel = nullptr; + QQmlComponent *delegate = nullptr; QQuickDeferredPointer<QQuickItem> indicator; QQuickDeferredPointer<QQuickPopup> popup; struct ExtraData { - ExtraData() - : editable(false), - accepting(false), - allowComplete(false), - inputMethodHints(Qt::ImhNone), - validator(nullptr) { } - - bool editable; - bool accepting; - bool allowComplete; - Qt::InputMethodHints inputMethodHints; + bool editable = false; + bool accepting = false; + bool allowComplete = false; + Qt::InputMethodHints inputMethodHints = Qt::ImhNone; QString editText; - QValidator *validator; + QValidator *validator = nullptr; }; QLazilyAllocated<ExtraData> extra; }; -QQuickComboBoxPrivate::QQuickComboBoxPrivate() - : flat(false), - down(false), - hasDown(false), - pressed(false), - ownModel(false), - keyNavigating(false), - hasDisplayText(false), - hasCurrentIndex(false), - highlightedIndex(-1), - currentIndex(-1), - delegateModel(nullptr), - delegate(nullptr), - indicator(nullptr), - popup(nullptr) -{ -} - bool QQuickComboBoxPrivate::isPopupVisible() const { return popup && popup->isVisible(); diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 048cfdfa..3dfefdc0 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -192,14 +192,6 @@ static QQuickItem *effectiveContentItem(QQuickItem *item) return item; } -QQuickContainerPrivate::QQuickContainerPrivate() - : contentModel(nullptr), - currentIndex(-1), - updatingCurrent(false), - changeTypes(Destroyed | Parent | SiblingOrder) -{ -} - void QQuickContainerPrivate::init() { Q_Q(QQuickContainer); diff --git a/src/quicktemplates2/qquickcontainer_p_p.h b/src/quicktemplates2/qquickcontainer_p_p.h index 7791b69c..4e53aa8f 100644 --- a/src/quicktemplates2/qquickcontainer_p_p.h +++ b/src/quicktemplates2/qquickcontainer_p_p.h @@ -60,8 +60,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainerPrivate : public QQuickCon Q_DECLARE_PUBLIC(QQuickContainer) public: - QQuickContainerPrivate(); - static QQuickContainerPrivate *get(QQuickContainer *container) { return container->d_func(); @@ -94,10 +92,10 @@ public: static void contentChildren_clear(QQmlListProperty<QQuickItem> *prop); QObjectList contentData; - QQmlObjectModel *contentModel; - int currentIndex; - bool updatingCurrent; - QQuickItemPrivate::ChangeTypes changeTypes; + QQmlObjectModel *contentModel = nullptr; + int currentIndex = -1; + bool updatingCurrent = false; + QQuickItemPrivate::ChangeTypes changeTypes = Destroyed | Parent | SiblingOrder; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 9f796a70..28e8c429 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -105,32 +105,7 @@ static bool isKeyFocusReason(Qt::FocusReason reason) return reason == Qt::TabFocusReason || reason == Qt::BacktabFocusReason || reason == Qt::ShortcutFocusReason; } -QQuickControlPrivate::ExtraData::ExtraData() -{ -} - QQuickControlPrivate::QQuickControlPrivate() - : hasTopPadding(false), - hasLeftPadding(false), - hasRightPadding(false), - hasBottomPadding(false), - hasLocale(false), - wheelEnabled(false), -#if QT_CONFIG(quicktemplates2_hover) - hovered(false), - explicitHoverEnabled(false), -#endif - touchId(-1), - padding(0), - topPadding(0), - leftPadding(0), - rightPadding(0), - bottomPadding(0), - spacing(0), - focusPolicy(Qt::NoFocus), - focusReason(Qt::OtherFocusReason), - background(nullptr), - contentItem(nullptr) { #if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index 7d040ded..f90bb094 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -72,7 +72,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemP public: QQuickControlPrivate(); - virtual ~QQuickControlPrivate(); + ~QQuickControlPrivate(); static QQuickControlPrivate *get(QQuickControl *control) { @@ -147,34 +147,33 @@ public: virtual void executeBackground(bool complete = false); struct ExtraData { - ExtraData(); QFont requestedFont; QPalette requestedPalette; }; QLazilyAllocated<ExtraData> extra; - bool hasTopPadding; - bool hasLeftPadding; - bool hasRightPadding; - bool hasBottomPadding; - bool hasLocale; - bool wheelEnabled; + bool hasTopPadding = false; + bool hasLeftPadding = false; + bool hasRightPadding = false; + bool hasBottomPadding = false; + bool hasLocale = false; + bool wheelEnabled = false; #if QT_CONFIG(quicktemplates2_hover) - bool hovered; - bool explicitHoverEnabled; + bool hovered = false; + bool explicitHoverEnabled = false; #endif - int touchId; - qreal padding; - qreal topPadding; - qreal leftPadding; - qreal rightPadding; - qreal bottomPadding; - qreal spacing; + int touchId = -1; + qreal padding = 0; + qreal topPadding = 0; + qreal leftPadding = 0; + qreal rightPadding = 0; + qreal bottomPadding = 0; + qreal spacing = 0; QLocale locale; QFont resolvedFont; QPalette resolvedPalette; - Qt::FocusPolicy focusPolicy; - Qt::FocusReason focusReason; + Qt::FocusPolicy focusPolicy = Qt::NoFocus; + Qt::FocusReason focusReason = Qt::OtherFocusReason; QQuickDeferredPointer<QQuickItem> background; QQuickDeferredPointer<QQuickItem> contentItem; }; diff --git a/src/quicktemplates2/qquickdeferredpointer_p_p.h b/src/quicktemplates2/qquickdeferredpointer_p_p.h index c793964f..f70b5dc6 100644 --- a/src/quicktemplates2/qquickdeferredpointer_p_p.h +++ b/src/quicktemplates2/qquickdeferredpointer_p_p.h @@ -79,7 +79,7 @@ public: inline QQuickDeferredPointer<T> &operator=(const QQuickDeferredPointer &o); private: - quintptr ptr_value; + quintptr ptr_value = 0; static const quintptr WasExecutedBit = 0x1; static const quintptr IsExecutingBit = 0x2; @@ -88,7 +88,6 @@ private: template<typename T> QQuickDeferredPointer<T>::QQuickDeferredPointer() -: ptr_value(0) { } 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<QQuickDelayTransitionManager> 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); diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index 03aee27e..a4124678 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -96,21 +96,6 @@ class QQuickDialPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickDial) public: - QQuickDialPrivate() - : from(0), - to(1), - value(0), - position(0), - angle(startAngle), - stepSize(0), - pressed(false), - snapMode(QQuickDial::NoSnap), - wrap(false), - live(true), - handle(nullptr) - { - } - qreal valueAt(qreal position) const; qreal snapPosition(qreal position) const; qreal positionAt(const QPointF &point) const; @@ -126,17 +111,17 @@ public: void cancelHandle(); void executeHandle(bool complete = false); - qreal from; - qreal to; - qreal value; - qreal position; - qreal angle; - qreal stepSize; - bool pressed; + qreal from = 0; + qreal to = 1; + qreal value = 0; + qreal position = 0; + qreal angle = startAngle; + qreal stepSize = 0; + bool pressed = false; QPointF pressPoint; - QQuickDial::SnapMode snapMode; - bool wrap; - bool live; + QQuickDial::SnapMode snapMode = QQuickDial::NoSnap; + bool wrap = false; + bool live = true; QQuickDeferredPointer<QQuickItem> handle; }; diff --git a/src/quicktemplates2/qquickdialog_p_p.h b/src/quicktemplates2/qquickdialog_p_p.h index e26182ac..e8008cec 100644 --- a/src/quicktemplates2/qquickdialog_p_p.h +++ b/src/quicktemplates2/qquickdialog_p_p.h @@ -63,8 +63,6 @@ class QQuickDialogPrivate : public QQuickPopupPrivate Q_DECLARE_PUBLIC(QQuickDialog) public: - QQuickDialogPrivate() : result(0), buttonBox(nullptr) { } - static QQuickDialogPrivate *get(QQuickDialog *dialog) { return dialog->d_func(); @@ -74,11 +72,11 @@ public: void handleClick(QQuickAbstractButton *button); - int result; + int result = 0; QString title; - QQuickDialogButtonBox *buttonBox; + QQuickDialogButtonBox *buttonBox = nullptr; QScopedPointer<QQuickPageLayout> layout; - QPlatformDialogHelper::StandardButtons standardButtons; + QPlatformDialogHelper::StandardButtons standardButtons = QPlatformDialogHelper::NoButton; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index 52171f5b..e53313b1 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -192,14 +192,6 @@ QT_BEGIN_NAMESPACE \sa accepted(), rejected(), helpRequested() */ -QQuickDialogButtonBoxPrivate::QQuickDialogButtonBoxPrivate() - : alignment(0), - position(QQuickDialogButtonBox::Footer), - standardButtons(QPlatformDialogHelper::NoButton), - delegate(nullptr) -{ -} - void QQuickDialogButtonBoxPrivate::itemImplicitWidthChanged(QQuickItem *item) { Q_UNUSED(item); 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 diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index 2d60e649..e06d9bba 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -171,15 +171,6 @@ QT_BEGIN_NAMESPACE \sa SwipeView, {Customizing Drawer}, {Navigation Controls}, {Popup Controls} */ -QQuickDrawerPrivate::QQuickDrawerPrivate() - : edge(Qt::LeftEdge), - offset(0), - position(0), - dragMargin(QGuiApplication::styleHints()->startDragDistance()) -{ - setEdge(Qt::LeftEdge); -} - qreal QQuickDrawerPrivate::offsetAt(const QPointF &point) const { qreal offset = positionAt(point) - position; @@ -608,6 +599,10 @@ bool QQuickDrawerPrivate::setEdge(Qt::Edge e) QQuickDrawer::QQuickDrawer(QObject *parent) : QQuickPopup(*(new QQuickDrawerPrivate), parent) { + Q_D(QQuickDrawer); + d->dragMargin = QGuiApplication::styleHints()->startDragDistance(); + d->setEdge(Qt::LeftEdge); + setFocus(true); setModal(true); setFiltersChildMouseEvents(true); diff --git a/src/quicktemplates2/qquickdrawer_p_p.h b/src/quicktemplates2/qquickdrawer_p_p.h index 0ceaf2e7..00055cee 100644 --- a/src/quicktemplates2/qquickdrawer_p_p.h +++ b/src/quicktemplates2/qquickdrawer_p_p.h @@ -59,8 +59,6 @@ class QQuickDrawerPrivate : public QQuickPopupPrivate Q_DECLARE_PUBLIC(QQuickDrawer) public: - QQuickDrawerPrivate(); - static QQuickDrawerPrivate *get(QQuickDrawer *drawer) { return drawer->d_func(); @@ -91,10 +89,10 @@ public: bool setEdge(Qt::Edge edge); - Qt::Edge edge; - qreal offset; - qreal position; - qreal dragMargin; + Qt::Edge edge = Qt::LeftEdge; + qreal offset = 0; + qreal position = 0; + qreal dragMargin = 0; QQuickVelocityCalculator velocityCalculator; }; diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp index 4f4c5eed..8cc91f11 100644 --- a/src/quicktemplates2/qquickgroupbox.cpp +++ b/src/quicktemplates2/qquickgroupbox.cpp @@ -89,8 +89,6 @@ class QQuickGroupBoxPrivate : public QQuickFramePrivate Q_DECLARE_PUBLIC(QQuickGroupBox) public: - QQuickGroupBoxPrivate() : label(nullptr) { } - void cancelLabel(); void executeLabel(bool complete = false); diff --git a/src/quicktemplates2/qquickicon.cpp b/src/quicktemplates2/qquickicon.cpp index 79af62b1..1b8f4797 100644 --- a/src/quicktemplates2/qquickicon.cpp +++ b/src/quicktemplates2/qquickicon.cpp @@ -41,19 +41,11 @@ QT_BEGIN_NAMESPACE class QQuickIconPrivate : public QSharedData { public: - QQuickIconPrivate() - : width(0), - height(0), - color(Qt::transparent), - resolveMask(0) - { - } - QString name; QUrl source; - int width; - int height; - QColor color; + int width = 0; + int height = 0; + QColor color = Qt::transparent; enum ResolveProperties { NameResolved = 0x0001, @@ -65,7 +57,7 @@ public: }; // This is based on QFont's resolve_mask. - int resolveMask; + int resolveMask = 0; }; QQuickIcon::QQuickIcon() diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp index 044141f2..c13cd7ed 100644 --- a/src/quicktemplates2/qquickitemdelegate.cpp +++ b/src/quicktemplates2/qquickitemdelegate.cpp @@ -64,11 +64,6 @@ QT_BEGIN_NAMESPACE \sa {Customizing ItemDelegate}, {Delegate Controls} */ -QQuickItemDelegatePrivate::QQuickItemDelegatePrivate() - : highlighted(false) -{ -} - QQuickItemDelegate::QQuickItemDelegate(QQuickItem *parent) : QQuickAbstractButton(*(new QQuickItemDelegatePrivate), parent) { diff --git a/src/quicktemplates2/qquickitemdelegate_p_p.h b/src/quicktemplates2/qquickitemdelegate_p_p.h index 9896da0c..4995f050 100644 --- a/src/quicktemplates2/qquickitemdelegate_p_p.h +++ b/src/quicktemplates2/qquickitemdelegate_p_p.h @@ -57,9 +57,7 @@ class QQuickItemDelegatePrivate : public QQuickAbstractButtonPrivate Q_DECLARE_PUBLIC(QQuickItemDelegate) public: - QQuickItemDelegatePrivate(); - - bool highlighted; + bool highlighted = false; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index d39006cd..2b23616a 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -80,7 +80,6 @@ QT_BEGIN_NAMESPACE */ QQuickLabelPrivate::QQuickLabelPrivate() - : background(nullptr) { #if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 5dbfe3d9..ecdd2825 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -184,15 +184,9 @@ static bool shouldCascade() } QQuickMenuPrivate::QQuickMenuPrivate() - : cascade(shouldCascade()), - hoverTimer(0), - currentIndex(-1), - overlap(0), - contentItem(nullptr), - contentModel(nullptr), - delegate(nullptr) { Q_Q(QQuickMenu); + cascade = shouldCascade(); contentModel = new QQmlObjectModel(q); } 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; }; diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp index 8398633c..efb83a17 100644 --- a/src/quicktemplates2/qquickmenubar.cpp +++ b/src/quicktemplates2/qquickmenubar.cpp @@ -76,18 +76,6 @@ QT_BEGIN_NAMESPACE {Focus Management in Qt Quick Controls 2} */ -QQuickMenuBarPrivate::QQuickMenuBarPrivate() - : popupMode(false), - triggering(false), - hasContentWidth(false), - hasContentHeight(false), - contentWidth(0), - contentHeight(0), - delegate(nullptr) -{ - changeTypes |= Geometry; -} - QQuickItem *QQuickMenuBarPrivate::beginCreateItem() { Q_Q(QQuickMenuBar); @@ -303,6 +291,8 @@ void QQuickMenuBarPrivate::menus_clear(QQmlListProperty<QQuickMenu> *prop) QQuickMenuBar::QQuickMenuBar(QQuickItem *parent) : QQuickContainer(*(new QQuickMenuBarPrivate), parent) { + Q_D(QQuickMenuBar); + d->changeTypes |= QQuickItemPrivate::Geometry; setFlag(ItemIsFocusScope); setFocusPolicy(Qt::ClickFocus); } diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates2/qquickmenubar_p_p.h index 161806fb..b6fdc9eb 100644 --- a/src/quicktemplates2/qquickmenubar_p_p.h +++ b/src/quicktemplates2/qquickmenubar_p_p.h @@ -61,8 +61,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuBarPrivate : public QQuickConta Q_DECLARE_PUBLIC(QQuickMenuBar) public: - QQuickMenuBarPrivate(); - static QQuickMenuBarPrivate *get(QQuickMenuBar *menuBar) { return menuBar->d_func(); @@ -92,13 +90,13 @@ public: static QQuickMenu *menus_at(QQmlListProperty<QQuickMenu> *prop, int index); static void menus_clear(QQmlListProperty<QQuickMenu> *prop); - bool popupMode; - bool triggering; - bool hasContentWidth; - bool hasContentHeight; - qreal contentWidth; - qreal contentHeight; - QQmlComponent *delegate; + bool popupMode = false; + bool triggering = false; + bool hasContentWidth = false; + bool hasContentHeight = false; + qreal contentWidth = 0; + qreal contentHeight = 0; + QQmlComponent *delegate = nullptr; QPointer<QQuickMenuBarItem> currentItem; }; diff --git a/src/quicktemplates2/qquickmenubaritem_p_p.h b/src/quicktemplates2/qquickmenubaritem_p_p.h index bd4c3a43..a36e8949 100644 --- a/src/quicktemplates2/qquickmenubaritem_p_p.h +++ b/src/quicktemplates2/qquickmenubaritem_p_p.h @@ -61,13 +61,6 @@ class QQuickMenuBarItemPrivate : public QQuickAbstractButtonPrivate Q_DECLARE_PUBLIC(QQuickMenuBarItem) public: - QQuickMenuBarItemPrivate() - : highlighted(false), - menu(nullptr), - menuBar(nullptr) - { - } - static QQuickMenuBarItemPrivate *get(QQuickMenuBarItem *item) { return item->d_func(); @@ -75,9 +68,9 @@ public: void setMenuBar(QQuickMenuBar *menuBar); - bool highlighted; - QQuickMenu *menu; - QQuickMenuBar *menuBar; + bool highlighted = false; + QQuickMenu *menu = nullptr; + QQuickMenuBar *menuBar = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp index 6693d4f8..7a7b9b0b 100644 --- a/src/quicktemplates2/qquickmenuitem.cpp +++ b/src/quicktemplates2/qquickmenuitem.cpp @@ -89,14 +89,6 @@ QT_BEGIN_NAMESPACE \sa {Customizing Menu}, Menu, {Menu Controls} */ -QQuickMenuItemPrivate::QQuickMenuItemPrivate() - : highlighted(false), - arrow(nullptr), - menu(nullptr), - subMenu(nullptr) -{ -} - void QQuickMenuItemPrivate::setMenu(QQuickMenu *newMenu) { Q_Q(QQuickMenuItem); diff --git a/src/quicktemplates2/qquickmenuitem_p_p.h b/src/quicktemplates2/qquickmenuitem_p_p.h index 5deea6e3..034a199a 100644 --- a/src/quicktemplates2/qquickmenuitem_p_p.h +++ b/src/quicktemplates2/qquickmenuitem_p_p.h @@ -60,8 +60,6 @@ class QQuickMenuItemPrivate : public QQuickAbstractButtonPrivate Q_DECLARE_PUBLIC(QQuickMenuItem) public: - QQuickMenuItemPrivate(); - static QQuickMenuItemPrivate *get(QQuickMenuItem *item) { return item->d_func(); @@ -75,10 +73,10 @@ public: void cancelArrow(); void executeArrow(bool complete = false); - bool highlighted; + bool highlighted = false; QQuickDeferredPointer<QQuickItem> arrow; - QQuickMenu *menu; - QQuickMenu *subMenu; + QQuickMenu *menu = nullptr; + QQuickMenu *subMenu = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp index fe61dae2..eba31fe2 100644 --- a/src/quicktemplates2/qquickoverlay.cpp +++ b/src/quicktemplates2/qquickoverlay.cpp @@ -97,12 +97,6 @@ void QQuickOverlayPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChang updateGeometry(); } -QQuickOverlayPrivate::QQuickOverlayPrivate() - : modal(nullptr), - modeless(nullptr) -{ -} - bool QQuickOverlayPrivate::startDrag(QEvent *event, const QPointF &pos) { Q_Q(QQuickOverlay); @@ -563,18 +557,11 @@ class QQuickOverlayAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickOverlayAttached) public: - QQuickOverlayAttachedPrivate() - : window(nullptr), - modal(nullptr), - modeless(nullptr) - { - } - void setWindow(QQuickWindow *newWindow); - QQuickWindow *window; - QQmlComponent *modal; - QQmlComponent *modeless; + QQuickWindow *window = nullptr; + QQmlComponent *modal = nullptr; + QQmlComponent *modeless = nullptr; }; void QQuickOverlayAttachedPrivate::setWindow(QQuickWindow *newWindow) diff --git a/src/quicktemplates2/qquickoverlay_p_p.h b/src/quicktemplates2/qquickoverlay_p_p.h index a290ecc2..b445f87a 100644 --- a/src/quicktemplates2/qquickoverlay_p_p.h +++ b/src/quicktemplates2/qquickoverlay_p_p.h @@ -63,8 +63,6 @@ class QQuickOverlayPrivate : public QQuickItemPrivate, public QQuickItemChangeLi Q_DECLARE_PUBLIC(QQuickOverlay) public: - QQuickOverlayPrivate(); - static QQuickOverlayPrivate *get(QQuickOverlay *overlay) { return overlay->d_func(); @@ -91,8 +89,8 @@ public: void updateGeometry(); - QQmlComponent *modal; - QQmlComponent *modeless; + QQmlComponent *modal = nullptr; + QQmlComponent *modeless = nullptr; QVector<QQuickPopup *> allPopups; QVector<QQuickDrawer *> allDrawers; QPointer<QQuickPopup> mouseGrabberPopup; diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 8f34dca9..25dce5e6 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -89,22 +89,14 @@ class QQuickPagePrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickPage) public: - QQuickPagePrivate(); - QQuickItem *getContentItem() override; - qreal contentWidth; - qreal contentHeight; + qreal contentWidth = 0; + qreal contentHeight = 0; QString title; QScopedPointer<QQuickPageLayout> layout; }; -QQuickPagePrivate::QQuickPagePrivate() - : contentWidth(0), - contentHeight(0) -{ -} - QQuickItem *QQuickPagePrivate::getContentItem() { Q_Q(QQuickPage); diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp index df720c91..dd90402e 100644 --- a/src/quicktemplates2/qquickpageindicator.cpp +++ b/src/quicktemplates2/qquickpageindicator.cpp @@ -89,15 +89,6 @@ class QQuickPageIndicatorPrivate : public QQuickControlPrivate, public QQuickIte Q_DECLARE_PUBLIC(QQuickPageIndicator) public: - QQuickPageIndicatorPrivate() - : count(0), - currentIndex(0), - interactive(false), - delegate(nullptr), - pressedItem(nullptr) - { - } - void handlePress(const QPointF &point) override; void handleMove(const QPointF &point) override; void handleRelease(const QPointF &point) override; @@ -109,11 +100,11 @@ public: void itemChildAdded(QQuickItem *, QQuickItem *child) override; - int count; - int currentIndex; - bool interactive; - QQmlComponent *delegate; - QQuickItem *pressedItem; + int count = 0; + int currentIndex = 0; + bool interactive = false; + QQmlComponent *delegate = nullptr; + QQuickItem *pressedItem = nullptr; }; void QQuickPageIndicatorPrivate::handlePress(const QPointF &point) diff --git a/src/quicktemplates2/qquickpagelayout.cpp b/src/quicktemplates2/qquickpagelayout.cpp index 595db560..6312cc97 100644 --- a/src/quicktemplates2/qquickpagelayout.cpp +++ b/src/quicktemplates2/qquickpagelayout.cpp @@ -75,9 +75,7 @@ static void setPosition(QQuickItem *item, Position position) } QQuickPageLayout::QQuickPageLayout(QQuickControl *control) - : m_header(nullptr), - m_footer(nullptr), - m_control(control) + : m_control(control) { } diff --git a/src/quicktemplates2/qquickpagelayout_p_p.h b/src/quicktemplates2/qquickpagelayout_p_p.h index aac52ca3..a3807b62 100644 --- a/src/quicktemplates2/qquickpagelayout_p_p.h +++ b/src/quicktemplates2/qquickpagelayout_p_p.h @@ -76,9 +76,9 @@ protected: void itemDestroyed(QQuickItem *item) override; private: - QQuickItem *m_header; - QQuickItem *m_footer; - QQuickControl *m_control; + QQuickItem *m_header = nullptr; + QQuickItem *m_footer = nullptr; + QQuickControl *m_control = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp index 8038f1b1..7d3754de 100644 --- a/src/quicktemplates2/qquickpane.cpp +++ b/src/quicktemplates2/qquickpane.cpp @@ -106,12 +106,6 @@ QT_BEGIN_NAMESPACE {Focus Management in Qt Quick Controls 2} */ -QQuickPanePrivate::QQuickPanePrivate() - : contentWidth(0), - contentHeight(0) -{ -} - QQuickItem *QQuickPanePrivate::getContentItem() { Q_Q(QQuickPane); diff --git a/src/quicktemplates2/qquickpane_p_p.h b/src/quicktemplates2/qquickpane_p_p.h index 16a07f08..c811c487 100644 --- a/src/quicktemplates2/qquickpane_p_p.h +++ b/src/quicktemplates2/qquickpane_p_p.h @@ -59,12 +59,10 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPanePrivate : public QQuickControlP Q_DECLARE_PUBLIC(QQuickPane) public: - QQuickPanePrivate(); - QQuickItem *getContentItem() override; - qreal contentWidth; - qreal contentHeight; + qreal contentWidth = 0; + qreal contentHeight = 0; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index a481805f..b69dab64 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -213,57 +213,10 @@ QT_BEGIN_NAMESPACE \sa closed() */ -static const QQuickPopup::ClosePolicy DefaultClosePolicy = QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside; +const QQuickPopup::ClosePolicy QQuickPopupPrivate::DefaultClosePolicy = QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside; QQuickPopupPrivate::QQuickPopupPrivate() - : focus(false), - modal(false), - dim(false), - hasDim(false), - visible(false), - complete(true), - positioning(false), - hasWidth(false), - hasHeight(false), - hasTopMargin(false), - hasLeftMargin(false), - hasRightMargin(false), - hasBottomMargin(false), - allowVerticalFlip(false), - allowHorizontalFlip(false), - allowVerticalMove(true), - allowHorizontalMove(true), - allowVerticalResize(true), - allowHorizontalResize(true), - hadActiveFocusBeforeExitTransition(false), - interactive(true), - hasClosePolicy(false), - touchId(-1), - x(0), - y(0), - effectiveX(0), - effectiveY(0), - margins(-1), - topMargin(0), - leftMargin(0), - rightMargin(0), - bottomMargin(0), - contentWidth(0), - contentHeight(0), - transitionState(QQuickPopupPrivate::NoTransition), - closePolicy(DefaultClosePolicy), - parentItem(nullptr), - dimmer(nullptr), - window(nullptr), - enter(nullptr), - exit(nullptr), - popupItem(nullptr), - positioner(nullptr), - transitionManager(this) -{ -} - -QQuickPopupPrivate::~QQuickPopupPrivate() + : transitionManager(this) { } @@ -717,7 +670,7 @@ void QQuickPopupPrivate::resizeOverlay() } QQuickPopupTransitionManager::QQuickPopupTransitionManager(QQuickPopupPrivate *popup) - : QQuickTransitionManager(), popup(popup) + : popup(popup) { } @@ -1995,7 +1948,7 @@ void QQuickPopup::setClosePolicy(ClosePolicy policy) void QQuickPopup::resetClosePolicy() { Q_D(QQuickPopup); - setClosePolicy(DefaultClosePolicy); + setClosePolicy(QQuickPopupPrivate::DefaultClosePolicy); d->hasClosePolicy = false; } diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index 6890fdac..318ae598 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -77,7 +77,7 @@ protected: void finished() override; private: - QQuickPopupPrivate *popup; + QQuickPopupPrivate *popup = nullptr; }; class Q_AUTOTEST_EXPORT QQuickPopupPrivate : public QObjectPrivate, public QQuickItemChangeListener @@ -86,7 +86,6 @@ class Q_AUTOTEST_EXPORT QQuickPopupPrivate : public QObjectPrivate, public QQuic public: QQuickPopupPrivate(); - ~QQuickPopupPrivate(); static QQuickPopupPrivate *get(QQuickPopup *popup) { @@ -142,50 +141,52 @@ public: NoTransition, EnterTransition, ExitTransition }; - bool focus; - bool modal; - bool dim; - bool hasDim; - bool visible; - bool complete; - bool positioning; - bool hasWidth; - bool hasHeight; - bool hasTopMargin; - bool hasLeftMargin; - bool hasRightMargin; - bool hasBottomMargin; - bool allowVerticalFlip; - bool allowHorizontalFlip; - bool allowVerticalMove; - bool allowHorizontalMove; - bool allowVerticalResize; - bool allowHorizontalResize; - bool hadActiveFocusBeforeExitTransition; - bool interactive; - bool hasClosePolicy; - int touchId; - qreal x; - qreal y; - qreal effectiveX; - qreal effectiveY; - qreal margins; - qreal topMargin; - qreal leftMargin; - qreal rightMargin; - qreal bottomMargin; - qreal contentWidth; - qreal contentHeight; + static const QQuickPopup::ClosePolicy DefaultClosePolicy; + + bool focus = false; + bool modal = false; + bool dim = false; + bool hasDim = false; + bool visible = false; + bool complete = true; + bool positioning = false; + bool hasWidth = false; + bool hasHeight = false; + bool hasTopMargin = false; + bool hasLeftMargin = false; + bool hasRightMargin = false; + bool hasBottomMargin = false; + bool allowVerticalFlip = false; + bool allowHorizontalFlip = false; + bool allowVerticalMove = true; + bool allowHorizontalMove = true; + bool allowVerticalResize = true; + bool allowHorizontalResize = true; + bool hadActiveFocusBeforeExitTransition = false; + bool interactive = true; + bool hasClosePolicy = false; + int touchId = -1; + qreal x = 0; + qreal y = 0; + qreal effectiveX = 0; + qreal effectiveY = 0; + qreal margins = -1; + qreal topMargin = 0; + qreal leftMargin = 0; + qreal rightMargin = 0; + qreal bottomMargin = 0; + qreal contentWidth = 0; + qreal contentHeight = 0; QPointF pressPoint; - TransitionState transitionState; - QQuickPopup::ClosePolicy closePolicy; - QQuickItem *parentItem; - QQuickItem *dimmer; - QQuickWindow *window; - QQuickTransition *enter; - QQuickTransition *exit; - QQuickPopupItem *popupItem; - QQuickPopupPositioner *positioner; + TransitionState transitionState = NoTransition; + QQuickPopup::ClosePolicy closePolicy = DefaultClosePolicy; + QQuickItem *parentItem = nullptr; + QQuickItem *dimmer = nullptr; + QQuickWindow *window = nullptr; + QQuickTransition *enter = nullptr; + QQuickTransition *exit = nullptr; + QQuickPopupItem *popupItem = nullptr; + QQuickPopupPositioner *positioner = nullptr; QList<QQuickStateAction> enterActions; QList<QQuickStateAction> exitActions; QQuickPopupTransitionManager transitionManager; diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index 566a5245..f835aef4 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -67,15 +67,13 @@ public: void cancelBackground() override; void executeBackground(bool complete = false) override; - int backId; - int escapeId; - QQuickPopup *popup; + int backId = 0; + int escapeId = 0; + QQuickPopup *popup = nullptr; }; QQuickPopupItemPrivate::QQuickPopupItemPrivate(QQuickPopup *popup) - : backId(0), - escapeId(0), - popup(popup) + : popup(popup) { isTabFence = true; } diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp index f2d02df1..841eac9c 100644 --- a/src/quicktemplates2/qquickpopuppositioner.cpp +++ b/src/quicktemplates2/qquickpopuppositioner.cpp @@ -50,9 +50,7 @@ static const QQuickItemPrivate::ChangeTypes ItemChangeTypes = QQuickItemPrivate: | QQuickItemPrivate::Parent; QQuickPopupPositioner::QQuickPopupPositioner(QQuickPopup *popup) - : m_positioning(false), - m_parentItem(nullptr), - m_popup(popup) + : m_popup(popup) { } diff --git a/src/quicktemplates2/qquickpopuppositioner_p_p.h b/src/quicktemplates2/qquickpopuppositioner_p_p.h index 45b33538..db1f9b17 100644 --- a/src/quicktemplates2/qquickpopuppositioner_p_p.h +++ b/src/quicktemplates2/qquickpopuppositioner_p_p.h @@ -75,9 +75,9 @@ private: void removeAncestorListeners(QQuickItem *item); void addAncestorListeners(QQuickItem *item); - bool m_positioning; - QQuickItem *m_parentItem; - QQuickPopup *m_popup; + bool m_positioning = false; + QQuickItem *m_parentItem = nullptr; + QQuickPopup *m_popup = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickpresshandler.cpp b/src/quicktemplates2/qquickpresshandler.cpp index 8f8167cd..8df25a82 100644 --- a/src/quicktemplates2/qquickpresshandler.cpp +++ b/src/quicktemplates2/qquickpresshandler.cpp @@ -44,16 +44,6 @@ QT_BEGIN_NAMESPACE -QQuickPressHandler::QQuickPressHandler() - : control(nullptr), - longPress(false), - pressAndHoldSignalIndex(-1), - pressedSignalIndex(-1), - releasedSignalIndex(-1), - delayedMousePressEvent(nullptr) -{ -} - void QQuickPressHandler::mousePressEvent(QMouseEvent *event) { longPress = false; diff --git a/src/quicktemplates2/qquickpresshandler_p_p.h b/src/quicktemplates2/qquickpresshandler_p_p.h index 7b2c88f3..99ef94bd 100644 --- a/src/quicktemplates2/qquickpresshandler_p_p.h +++ b/src/quicktemplates2/qquickpresshandler_p_p.h @@ -59,8 +59,6 @@ class QTimerEvent; struct QQuickPressHandler { - QQuickPressHandler(); - void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); @@ -69,14 +67,14 @@ struct QQuickPressHandler void clearDelayedMouseEvent(); bool isActive(); - QQuickItem *control; + QQuickItem *control = nullptr; QBasicTimer timer; QPointF pressPos; - bool longPress; - int pressAndHoldSignalIndex; - int pressedSignalIndex; - int releasedSignalIndex; - QMouseEvent *delayedMousePressEvent; + bool longPress = false; + int pressAndHoldSignalIndex = -1; + int pressedSignalIndex = -1; + int releasedSignalIndex = -1; + QMouseEvent *delayedMousePressEvent = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp index c5a24f6c..041d4d88 100644 --- a/src/quicktemplates2/qquickprogressbar.cpp +++ b/src/quicktemplates2/qquickprogressbar.cpp @@ -89,18 +89,10 @@ QT_BEGIN_NAMESPACE class QQuickProgressBarPrivate : public QQuickControlPrivate { public: - QQuickProgressBarPrivate() - : from(0), - to(1.0), - value(0), - indeterminate(false) - { - } - - qreal from; - qreal to; - qreal value; - bool indeterminate; + qreal from = 0; + qreal to = 1; + qreal value = 0; + bool indeterminate = false; }; QQuickProgressBar::QQuickProgressBar(QQuickItem *parent) diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 35797203..569d7645 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -98,14 +98,7 @@ class QQuickRangeSliderNodePrivate : public QObjectPrivate public: QQuickRangeSliderNodePrivate(qreal value, QQuickRangeSlider *slider) : value(value), - isPendingValue(false), - pendingValue(0), - position(0), - handle(nullptr), - slider(slider), - pressed(false), - hovered(false), - touchId(-1) + slider(slider) { } @@ -119,15 +112,15 @@ public: static QQuickRangeSliderNodePrivate *get(QQuickRangeSliderNode *node); - qreal value; - bool isPendingValue; - qreal pendingValue; - qreal position; + qreal value = 0; + bool isPendingValue = false; + qreal pendingValue = 0; + qreal position = 0; QQuickDeferredPointer<QQuickItem> handle; - QQuickRangeSlider *slider; - bool pressed; - bool hovered; - int touchId; + QQuickRangeSlider *slider = nullptr; + bool pressed = false; + bool hovered = false; + int touchId = -1; }; bool QQuickRangeSliderNodePrivate::isFirst() const @@ -355,18 +348,6 @@ class QQuickRangeSliderPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickRangeSlider) public: - QQuickRangeSliderPrivate() - : live(true), - from(defaultFrom), - to(defaultTo), - stepSize(0), - first(nullptr), - second(nullptr), - orientation(Qt::Horizontal), - snapMode(QQuickRangeSlider::NoSnap) - { - } - QQuickRangeSliderNode *pressedNode(int touchId = -1) const; #if QT_CONFIG(quicktemplates2_multitouch) @@ -379,15 +360,15 @@ public: void updateHover(const QPointF &pos); - bool live; - qreal from; - qreal to; - qreal stepSize; - QQuickRangeSliderNode *first; - QQuickRangeSliderNode *second; + bool live = true; + qreal from = defaultFrom; + qreal to = defaultTo; + qreal stepSize = 0; + QQuickRangeSliderNode *first = nullptr; + QQuickRangeSliderNode *second = nullptr; QPointF pressPoint; - Qt::Orientation orientation; - QQuickRangeSlider::SnapMode snapMode; + Qt::Orientation orientation = Qt::Horizontal; + QQuickRangeSlider::SnapMode snapMode = QQuickRangeSlider::NoSnap; }; static qreal valueAt(const QQuickRangeSlider *slider, qreal position) diff --git a/src/quicktemplates2/qquickroundbutton.cpp b/src/quicktemplates2/qquickroundbutton.cpp index 0784de81..d930edbe 100644 --- a/src/quicktemplates2/qquickroundbutton.cpp +++ b/src/quicktemplates2/qquickroundbutton.cpp @@ -65,19 +65,11 @@ class QQuickRoundButtonPrivate : public QQuickButtonPrivate Q_DECLARE_PUBLIC(QQuickRoundButton) public: - QQuickRoundButtonPrivate(); - - qreal radius; - bool explicitRadius; - void setRadius(qreal newRadius = -1.0); -}; -QQuickRoundButtonPrivate::QQuickRoundButtonPrivate() - : radius(0), - explicitRadius(false) -{ -} + qreal radius = 0; + bool explicitRadius = false; +}; void QQuickRoundButtonPrivate::setRadius(qreal newRadius) { diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index 67195ba8..9e6fe684 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -155,23 +155,6 @@ static const QQuickItemPrivate::ChangeTypes changeTypes = QQuickItemPrivate::Geo static const QQuickItemPrivate::ChangeTypes horizontalChangeTypes = changeTypes | QQuickItemPrivate::ImplicitHeight; static const QQuickItemPrivate::ChangeTypes verticalChangeTypes = changeTypes | QQuickItemPrivate::ImplicitWidth; -QQuickScrollBarPrivate::QQuickScrollBarPrivate() - : size(0), - position(0), - stepSize(0), - offset(0), - minimumSize(0), - active(false), - pressed(false), - moving(false), - interactive(true), - explicitInteractive(false), - orientation(Qt::Vertical), - snapMode(QQuickScrollBar::NoSnap), - policy(QQuickScrollBar::AsNeeded) -{ -} - QQuickScrollBarPrivate::VisualArea QQuickScrollBarPrivate::visualArea() const { qreal visualPos = position; @@ -751,13 +734,6 @@ QAccessible::Role QQuickScrollBar::accessibleRole() const } #endif -QQuickScrollBarAttachedPrivate::QQuickScrollBarAttachedPrivate() - : flickable(nullptr), - horizontal(nullptr), - vertical(nullptr) -{ -} - void QQuickScrollBarAttachedPrivate::setFlickable(QQuickFlickable *item) { if (flickable) { diff --git a/src/quicktemplates2/qquickscrollbar_p_p.h b/src/quicktemplates2/qquickscrollbar_p_p.h index 384348b4..5c7628b9 100644 --- a/src/quicktemplates2/qquickscrollbar_p_p.h +++ b/src/quicktemplates2/qquickscrollbar_p_p.h @@ -61,8 +61,6 @@ class QQuickScrollBarPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickScrollBar) public: - QQuickScrollBarPrivate(); - static QQuickScrollBarPrivate *get(QQuickScrollBar *bar) { return bar->d_func(); @@ -72,8 +70,8 @@ public: { VisualArea(qreal pos, qreal sz) : position(pos), size(sz) { } - qreal position; - qreal size; + qreal position = 0; + qreal size = 0; }; VisualArea visualArea() const; @@ -92,26 +90,24 @@ public: void visualAreaChange(const VisualArea &newVisualArea, const VisualArea &oldVisualArea); - qreal size; - qreal position; - qreal stepSize; - qreal offset; - qreal minimumSize; - bool active; - bool pressed; - bool moving; - bool interactive; - bool explicitInteractive; - Qt::Orientation orientation; - QQuickScrollBar::SnapMode snapMode; - QQuickScrollBar::Policy policy; + qreal size = 0; + qreal position = 0; + qreal stepSize = 0; + qreal offset = 0; + qreal minimumSize = 0; + bool active = false; + bool pressed = false; + bool moving = false; + bool interactive = true; + bool explicitInteractive = false; + Qt::Orientation orientation = Qt::Vertical; + QQuickScrollBar::SnapMode snapMode = QQuickScrollBar::NoSnap; + QQuickScrollBar::Policy policy = QQuickScrollBar::AsNeeded; }; class QQuickScrollBarAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: - QQuickScrollBarAttachedPrivate(); - static QQuickScrollBarAttachedPrivate *get(QQuickScrollBarAttached *attached) { return attached->d_func(); @@ -137,9 +133,9 @@ public: void itemImplicitHeightChanged(QQuickItem *item) override; void itemDestroyed(QQuickItem *item) override; - QQuickFlickable *flickable; - QQuickScrollBar *horizontal; - QQuickScrollBar *vertical; + QQuickFlickable *flickable = nullptr; + QQuickScrollBar *horizontal = nullptr; + QQuickScrollBar *vertical = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp index 511a8311..1e411bce 100644 --- a/src/quicktemplates2/qquickscrollindicator.cpp +++ b/src/quicktemplates2/qquickscrollindicator.cpp @@ -135,32 +135,23 @@ class QQuickScrollIndicatorPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickScrollIndicator) public: - QQuickScrollIndicatorPrivate() - : size(0), - minimumSize(0), - position(0), - active(false), - orientation(Qt::Vertical) - { - } - struct VisualArea { VisualArea(qreal pos, qreal sz) : position(pos), size(sz) { } - qreal position; - qreal size; + qreal position = 0; + qreal size = 0; }; VisualArea visualArea() const; void visualAreaChange(const VisualArea &newVisualArea, const VisualArea &oldVisualArea); void resizeContent() override; - qreal size; - qreal minimumSize; - qreal position; - bool active; - Qt::Orientation orientation; + qreal size = 0; + qreal minimumSize = 0; + qreal position = 0; + bool active = false; + Qt::Orientation orientation = Qt::Vertical; }; QQuickScrollIndicatorPrivate::VisualArea QQuickScrollIndicatorPrivate::visualArea() const @@ -427,13 +418,6 @@ qreal QQuickScrollIndicator::visualPosition() const class QQuickScrollIndicatorAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: - QQuickScrollIndicatorAttachedPrivate() - : flickable(nullptr), - horizontal(nullptr), - vertical(nullptr) - { - } - void activateHorizontal(); void activateVertical(); @@ -445,9 +429,9 @@ public: void itemImplicitHeightChanged(QQuickItem *item) override; void itemDestroyed(QQuickItem *item) override; - QQuickFlickable *flickable; - QQuickScrollIndicator *horizontal; - QQuickScrollIndicator *vertical; + QQuickFlickable *flickable = nullptr; + QQuickScrollIndicator *horizontal = nullptr; + QQuickScrollIndicator *vertical = nullptr; }; void QQuickScrollIndicatorAttachedPrivate::activateHorizontal() diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates2/qquickscrollview.cpp index 30750aa8..dba0d95c 100644 --- a/src/quicktemplates2/qquickscrollview.cpp +++ b/src/quicktemplates2/qquickscrollview.cpp @@ -106,8 +106,6 @@ class QQuickScrollViewPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickScrollView) public: - QQuickScrollViewPrivate(); - QQuickItem *getContentItem() override; QQuickFlickable *ensureFlickable(bool content); @@ -131,21 +129,12 @@ public: static QQuickItem *contentChildren_at(QQmlListProperty<QQuickItem> *prop, int index); static void contentChildren_clear(QQmlListProperty<QQuickItem> *prop); - bool wasTouched; - qreal contentWidth; - qreal contentHeight; - QQuickFlickable *flickable; + bool wasTouched = false; + qreal contentWidth = -1; + qreal contentHeight = -1; + QQuickFlickable *flickable = nullptr; }; -QQuickScrollViewPrivate::QQuickScrollViewPrivate() - : wasTouched(false), - contentWidth(-1), - contentHeight(-1), - flickable(nullptr) -{ - wheelEnabled = true; -} - QQuickItem *QQuickScrollViewPrivate::getContentItem() { if (!contentItem) @@ -359,6 +348,7 @@ QQuickScrollView::QQuickScrollView(QQuickItem *parent) setFlag(ItemIsFocusScope); setActiveFocusOnTab(true); setFiltersChildMouseEvents(true); + setWheelEnabled(true); } /*! diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index e9717368..5806aad5 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -92,20 +92,6 @@ class QQuickSliderPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickSlider) public: - QQuickSliderPrivate() - : from(0), - to(1), - value(0), - position(0), - stepSize(0), - live(true), - pressed(false), - orientation(Qt::Horizontal), - snapMode(QQuickSlider::NoSnap), - handle(nullptr) - { - } - qreal snapPosition(qreal position) const; qreal positionAt(const QPointF &point) const; void setPosition(qreal position); @@ -119,16 +105,16 @@ public: void cancelHandle(); void executeHandle(bool complete = false); - qreal from; - qreal to; - qreal value; - qreal position; - qreal stepSize; - bool live; - bool pressed; + qreal from = 0; + qreal to = 1; + qreal value = 0; + qreal position = 0; + qreal stepSize = 0; + bool live = true; + bool pressed = false; QPointF pressPoint; - Qt::Orientation orientation; - QQuickSlider::SnapMode snapMode; + Qt::Orientation orientation = Qt::Horizontal; + QQuickSlider::SnapMode snapMode = QQuickSlider::NoSnap; QQuickDeferredPointer<QQuickItem> handle; }; diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 7412936c..08c59cca 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -108,22 +108,6 @@ class QQuickSpinBoxPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickSpinBox) public: - QQuickSpinBoxPrivate() - : editable(false), - wrap(false), - from(0), - to(99), - value(0), - stepSize(1), - delayTimer(0), - repeatTimer(0), - up(nullptr), - down(nullptr), - validator(nullptr), - inputMethodHints(Qt::ImhDigitsOnly) - { - } - int boundValue(int value, bool wrap) const; void updateValue(); bool setValue(int value, bool wrap, bool modified); @@ -151,21 +135,21 @@ public: void handleRelease(const QPointF &point) override; void handleUngrab() override; - bool editable; - bool wrap; - int from; - int to; - int value; - int stepSize; - int delayTimer; - int repeatTimer; + bool editable = false; + bool wrap = false; + int from = 0; + int to = 99; + int value = 0; + int stepSize = 1; + int delayTimer = 0; + int repeatTimer = 0; QString displayText; - QQuickSpinButton *up; - QQuickSpinButton *down; - QValidator *validator; + QQuickSpinButton *up = nullptr; + QQuickSpinButton *down = nullptr; + QValidator *validator = nullptr; mutable QJSValue textFromValue; mutable QJSValue valueFromText; - Qt::InputMethodHints inputMethodHints; + Qt::InputMethodHints inputMethodHints = Qt::ImhDigitsOnly; }; class QQuickSpinButtonPrivate : public QObjectPrivate @@ -173,13 +157,6 @@ class QQuickSpinButtonPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickSpinButton) public: - QQuickSpinButtonPrivate() - : pressed(false), - hovered(false), - indicator(nullptr) - { - } - static QQuickSpinButtonPrivate *get(QQuickSpinButton *button) { return button->d_func(); @@ -188,8 +165,8 @@ public: void cancelIndicator(); void executeIndicator(bool complete = false); - bool pressed; - bool hovered; + bool pressed = false; + bool hovered = false; QQuickDeferredPointer<QQuickItem> indicator; }; diff --git a/src/quicktemplates2/qquickstackelement.cpp b/src/quicktemplates2/qquickstackelement.cpp index 887d43af..7ae5c495 100644 --- a/src/quicktemplates2/qquickstackelement.cpp +++ b/src/quicktemplates2/qquickstackelement.cpp @@ -72,18 +72,7 @@ private: }; QQuickStackElement::QQuickStackElement() - : QQuickItemViewTransitionableItem(nullptr), - index(-1), - init(false), - removal(false), - ownItem(false), - ownComponent(false), - widthValid(false), - heightValid(false), - context(nullptr), - component(nullptr), - view(nullptr), - status(QQuickStackView::Inactive) + : QQuickItemViewTransitionableItem(nullptr) { } diff --git a/src/quicktemplates2/qquickstackelement_p_p.h b/src/quicktemplates2/qquickstackelement_p_p.h index 2308f47d..65e73244 100644 --- a/src/quicktemplates2/qquickstackelement_p_p.h +++ b/src/quicktemplates2/qquickstackelement_p_p.h @@ -85,18 +85,18 @@ public: void itemDestroyed(QQuickItem *item) override; - int index; - bool init; - bool removal; - bool ownItem; - bool ownComponent; - bool widthValid; - bool heightValid; - QQmlContext *context; - QQmlComponent *component; - QQuickStackView *view; + int index = -1; + bool init = false; + bool removal = false; + bool ownItem = false; + bool ownComponent = false; + bool widthValid = false; + bool heightValid = false; + QQmlContext *context = nullptr; + QQmlComponent *component = nullptr; + QQuickStackView *view = nullptr; QPointer<QQuickItem> originalParent; - QQuickStackView::Status status; + QQuickStackView::Status status = QQuickStackView::Inactive; QV4::PersistentValue properties; QV4::PersistentValue qmlCallingContext; }; diff --git a/src/quicktemplates2/qquickstacktransition.cpp b/src/quicktemplates2/qquickstacktransition.cpp index 058359c3..a0192d1b 100644 --- a/src/quicktemplates2/qquickstacktransition.cpp +++ b/src/quicktemplates2/qquickstacktransition.cpp @@ -44,23 +44,18 @@ static QQuickStackTransition exitTransition(QQuickStackView::Operation operation { QQuickStackTransition st; st.status = QQuickStackView::Deactivating; - st.transition = nullptr; st.element = element; const QQuickItemViewTransitioner *transitioner = QQuickStackViewPrivate::get(view)->transitioner; switch (operation) { case QQuickStackView::PushTransition: - st.target = false; st.type = QQuickItemViewTransitioner::AddTransition; - st.viewBounds = QRectF(); if (transitioner) st.transition = transitioner->addDisplacedTransition; break; case QQuickStackView::ReplaceTransition: - st.target = false; st.type = QQuickItemViewTransitioner::MoveTransition; - st.viewBounds = QRectF(); if (transitioner) st.transition = transitioner->moveDisplacedTransition; break; @@ -83,7 +78,6 @@ static QQuickStackTransition enterTransition(QQuickStackView::Operation operatio { QQuickStackTransition st; st.status = QQuickStackView::Activating; - st.transition = nullptr; st.element = element; const QQuickItemViewTransitioner *transitioner = QQuickStackViewPrivate::get(view)->transitioner; @@ -104,9 +98,7 @@ static QQuickStackTransition enterTransition(QQuickStackView::Operation operatio st.transition = transitioner->moveTransition; break; case QQuickStackView::PopTransition: - st.target = false; st.type = QQuickItemViewTransitioner::RemoveTransition; - st.viewBounds = QRectF(); if (transitioner) st.transition = transitioner->removeDisplacedTransition; break; diff --git a/src/quicktemplates2/qquickstacktransition_p_p.h b/src/quicktemplates2/qquickstacktransition_p_p.h index 7101420c..3a08fb4a 100644 --- a/src/quicktemplates2/qquickstacktransition_p_p.h +++ b/src/quicktemplates2/qquickstacktransition_p_p.h @@ -66,12 +66,12 @@ struct QQuickStackTransition static QQuickStackTransition replaceExit(QQuickStackView::Operation operation, QQuickStackElement *element, QQuickStackView *view); static QQuickStackTransition replaceEnter(QQuickStackView::Operation operation, QQuickStackElement *element, QQuickStackView *view); - bool target; - QQuickStackView::Status status; - QQuickItemViewTransitioner::TransitionType type; + bool target = false; + QQuickStackView::Status status = QQuickStackView::Inactive; + QQuickItemViewTransitioner::TransitionType type = QQuickItemViewTransitioner::NoTransition; QRectF viewBounds; - QQuickStackElement *element; - QQuickTransition *transition; + QQuickStackElement *element = nullptr; + QQuickTransition *transition = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp index 606d259a..e0e1d9ef 100644 --- a/src/quicktemplates2/qquickstackview_p.cpp +++ b/src/quicktemplates2/qquickstackview_p.cpp @@ -47,13 +47,6 @@ QT_BEGIN_NAMESPACE -QQuickStackViewPrivate::QQuickStackViewPrivate() - : busy(false), - currentItem(nullptr), - transitioner(nullptr) -{ -} - void QQuickStackViewPrivate::warn(const QString &error) { Q_Q(QQuickStackView); diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h index 7f1b77b1..74ea3e7a 100644 --- a/src/quicktemplates2/qquickstackview_p_p.h +++ b/src/quicktemplates2/qquickstackview_p_p.h @@ -66,8 +66,6 @@ class QQuickStackViewPrivate : public QQuickControlPrivate, public QQuickItemVie Q_DECLARE_PUBLIC(QQuickStackView) public: - QQuickStackViewPrivate(); - static QQuickStackViewPrivate *get(QQuickStackView *view) { return view->d_func(); @@ -94,14 +92,14 @@ public: void setBusy(bool busy); void depthChange(int newDepth, int oldDepth); - bool busy; + bool busy = false; QString operation; QJSValue initialItem; - QQuickItem *currentItem; + QQuickItem *currentItem = nullptr; QSet<QQuickStackElement*> removing; QList<QQuickStackElement*> removed; QStack<QQuickStackElement *> elements; - QQuickItemViewTransitioner *transitioner; + QQuickItemViewTransitioner *transitioner = nullptr; }; class QQuickStackViewAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener @@ -109,12 +107,6 @@ class QQuickStackViewAttachedPrivate : public QObjectPrivate, public QQuickItemC Q_DECLARE_PUBLIC(QQuickStackViewAttached) public: - QQuickStackViewAttachedPrivate() - : explicitVisible(false), - element(nullptr) - { - } - static QQuickStackViewAttachedPrivate *get(QQuickStackViewAttached *attached) { return attached->d_func(); @@ -122,8 +114,8 @@ public: void itemParentChanged(QQuickItem *item, QQuickItem *parent); - bool explicitVisible; - QQuickStackElement *element; + bool explicitVisible = false; + QQuickStackElement *element = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index dcf93437..fab50116 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -127,7 +127,7 @@ protected: void finished() override; private: - QQuickSwipe *m_swipe; + QQuickSwipe *m_swipe = nullptr; }; class QQuickSwipePrivate : public QObjectPrivate @@ -135,23 +135,7 @@ class QQuickSwipePrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickSwipe) public: - QQuickSwipePrivate(QQuickSwipeDelegate *control) - : control(control), - positionBeforePress(0), - position(0), - wasComplete(false), - complete(false), - enabled(true), - left(nullptr), - behind(nullptr), - right(nullptr), - leftItem(nullptr), - behindItem(nullptr), - rightItem(nullptr), - transition(nullptr), - transitionManager(nullptr) - { - } + QQuickSwipePrivate(QQuickSwipeDelegate *control) : control(control) { } static QQuickSwipePrivate *get(QQuickSwipe *swipe); @@ -175,24 +159,24 @@ public: void beginTransition(qreal position); void finishTransition(); - QQuickSwipeDelegate *control; + QQuickSwipeDelegate *control = nullptr; // Same range as position, but is set before press events so that we can // keep track of which direction the user must swipe when using left and right delegates. - qreal positionBeforePress; - qreal position; + qreal positionBeforePress = 0; + qreal position = 0; // A "less strict" version of complete that is true if complete was true // before the last press event. - bool wasComplete; - bool complete; - bool enabled; + bool wasComplete = false; + bool complete = false; + bool enabled = true; QQuickVelocityCalculator velocityCalculator; - QQmlComponent *left; - QQmlComponent *behind; - QQmlComponent *right; - QQuickItem *leftItem; - QQuickItem *behindItem; - QQuickItem *rightItem; - QQuickTransition *transition; + QQmlComponent *left = nullptr; + QQmlComponent *behind = nullptr; + QQmlComponent *right = nullptr; + QQuickItem *leftItem = nullptr; + QQuickItem *behindItem = nullptr; + QQuickItem *rightItem = nullptr; + QQuickTransition *transition = nullptr; QScopedPointer<QQuickSwipeTransitionManager> transitionManager; }; @@ -1245,10 +1229,8 @@ class QQuickSwipeDelegateAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickSwipeDelegateAttached) public: - QQuickSwipeDelegateAttachedPrivate() : pressed(false) { } - // True when left/right/behind is non-interactive and is pressed. - bool pressed; + bool pressed = false; }; /*! diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp index 60bc9477..d3026597 100644 --- a/src/quicktemplates2/qquickswipeview.cpp +++ b/src/quicktemplates2/qquickswipeview.cpp @@ -108,19 +108,13 @@ class QQuickSwipeViewPrivate : public QQuickContainerPrivate Q_DECLARE_PUBLIC(QQuickSwipeView) public: - QQuickSwipeViewPrivate() - : interactive(true), - orientation(Qt::Horizontal) - { - } - void resizeItem(QQuickItem *item); void resizeItems(); static QQuickSwipeViewPrivate *get(QQuickSwipeView *view); - bool interactive; - Qt::Orientation orientation; + bool interactive = true; + Qt::Orientation orientation = Qt::Horizontal; }; class QQuickSwipeViewAttachedPrivate : public QObjectPrivate @@ -128,13 +122,6 @@ class QQuickSwipeViewAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickSwipeViewAttached) public: - QQuickSwipeViewAttachedPrivate() - : swipeView(nullptr), - index(-1), - currentIndex(-1) - { - } - static QQuickSwipeViewAttachedPrivate *get(QQuickSwipeViewAttached *attached) { return attached->d_func(); @@ -144,9 +131,9 @@ public: void updateCurrentIndex(); void setCurrentIndex(int i); - QQuickSwipeView *swipeView; - int index; - int currentIndex; + QQuickSwipeView *swipeView = nullptr; + int index = -1; + int currentIndex = -1; }; void QQuickSwipeViewPrivate::resizeItems() diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp index da1f0408..3c84bbc7 100644 --- a/src/quicktemplates2/qquickswitch.cpp +++ b/src/quicktemplates2/qquickswitch.cpp @@ -82,15 +82,13 @@ class QQuickSwitchPrivate : public QQuickAbstractButtonPrivate Q_DECLARE_PUBLIC(QQuickSwitch) public: - QQuickSwitchPrivate() : position(0) { } - qreal positionAt(const QPointF &point) const; bool canDrag(const QPointF &movePoint) const; void handleMove(const QPointF &point) override; void handleRelease(const QPointF &point) override; - qreal position; + qreal position = 0; }; qreal QQuickSwitchPrivate::positionAt(const QPointF &point) const diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp index d8ce8096..9257a5fd 100644 --- a/src/quicktemplates2/qquickswitchdelegate.cpp +++ b/src/quicktemplates2/qquickswitchdelegate.cpp @@ -79,15 +79,13 @@ class QQuickSwitchDelegatePrivate : public QQuickItemDelegatePrivate Q_DECLARE_PUBLIC(QQuickSwitchDelegate) public: - QQuickSwitchDelegatePrivate() : position(0) { } - qreal positionAt(const QPointF &point) const; bool canDrag(const QPointF &movePoint) const; void handleMove(const QPointF &point) override; void handleRelease(const QPointF &point) override; - qreal position; + qreal position = 0; }; qreal QQuickSwitchDelegatePrivate::positionAt(const QPointF &point) const diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp index cd0c5c45..2d732152 100644 --- a/src/quicktemplates2/qquicktabbar.cpp +++ b/src/quicktemplates2/qquicktabbar.cpp @@ -100,8 +100,6 @@ class QQuickTabBarPrivate : public QQuickContainerPrivate Q_DECLARE_PUBLIC(QQuickTabBar) public: - QQuickTabBarPrivate(); - void updateCurrentItem(); void updateCurrentIndex(); void updateLayout(); @@ -110,12 +108,12 @@ public: void itemImplicitWidthChanged(QQuickItem *item) override; void itemImplicitHeightChanged(QQuickItem *item) override; - bool updatingLayout; - bool hasContentWidth; - bool hasContentHeight; - qreal contentWidth; - qreal contentHeight; - QQuickTabBar::Position position; + bool updatingLayout = false; + bool hasContentWidth = false; + bool hasContentHeight = false; + qreal contentWidth = 0; + qreal contentHeight = 0; + QQuickTabBar::Position position = QQuickTabBar::Header; }; class QQuickTabBarAttachedPrivate : public QObjectPrivate @@ -123,12 +121,6 @@ class QQuickTabBarAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickTabBarAttached) public: - QQuickTabBarAttachedPrivate() - : index(-1), - tabBar(nullptr) - { - } - static QQuickTabBarAttachedPrivate *get(QQuickTabBarAttached *attached) { return attached->d_func(); @@ -136,21 +128,10 @@ public: void update(QQuickTabBar *tabBar, int index); - int index; - QQuickTabBar *tabBar; + int index = -1; + QQuickTabBar *tabBar = nullptr; }; -QQuickTabBarPrivate::QQuickTabBarPrivate() - : updatingLayout(false), - hasContentWidth(false), - hasContentHeight(false), - contentWidth(0), - contentHeight(0), - position(QQuickTabBar::Header) -{ - changeTypes |= Geometry | ImplicitWidth | ImplicitHeight; -} - void QQuickTabBarPrivate::updateCurrentItem() { QQuickTabButton *button = qobject_cast<QQuickTabButton *>(contentModel->get(currentIndex)); @@ -258,6 +239,7 @@ QQuickTabBar::QQuickTabBar(QQuickItem *parent) : QQuickContainer(*(new QQuickTabBarPrivate), parent) { Q_D(QQuickTabBar); + d->changeTypes |= QQuickItemPrivate::Geometry | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight; setFlag(ItemIsFocusScope); QObjectPrivate::connect(this, &QQuickTabBar::currentIndexChanged, d, &QQuickTabBarPrivate::updateCurrentItem); } diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index aca13d5e..db6d9283 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -132,14 +132,6 @@ QT_BEGIN_NAMESPACE */ QQuickTextAreaPrivate::QQuickTextAreaPrivate() - : QQuickTextEditPrivate(), -#if QT_CONFIG(quicktemplates2_hover) - hovered(false), - explicitHoverEnabled(false), -#endif - background(nullptr), - focusReason(Qt::OtherFocusReason), - flickable(nullptr) { #if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); @@ -892,9 +884,7 @@ void QQuickTextArea::timerEvent(QTimerEvent *event) class QQuickTextAreaAttachedPrivate : public QObjectPrivate { public: - QQuickTextAreaAttachedPrivate() : control(nullptr) { } - - QQuickTextArea *control; + QQuickTextArea *control = nullptr; }; QQuickTextAreaAttached::QQuickTextAreaAttached(QObject *parent) diff --git a/src/quicktemplates2/qquicktextarea_p_p.h b/src/quicktemplates2/qquicktextarea_p_p.h index 8621c61c..9120c61c 100644 --- a/src/quicktemplates2/qquicktextarea_p_p.h +++ b/src/quicktemplates2/qquicktextarea_p_p.h @@ -129,8 +129,8 @@ public: void executeBackground(bool complete = false); #if QT_CONFIG(quicktemplates2_hover) - bool hovered; - bool explicitHoverEnabled; + bool hovered = false; + bool explicitHoverEnabled = false; #endif struct ExtraData { @@ -142,9 +142,9 @@ public: QPalette resolvedPalette; QQuickDeferredPointer<QQuickItem> background; QString placeholder; - Qt::FocusReason focusReason; + Qt::FocusReason focusReason = Qt::OtherFocusReason; QQuickPressHandler pressHandler; - QQuickFlickable *flickable; + QQuickFlickable *flickable = nullptr; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 876ceca6..e7c66f84 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -113,13 +113,6 @@ QT_BEGIN_NAMESPACE */ QQuickTextFieldPrivate::QQuickTextFieldPrivate() - : QQuickTextInputPrivate(), -#if QT_CONFIG(quicktemplates2_hover) - hovered(false), - explicitHoverEnabled(false), -#endif - background(nullptr), - focusReason(Qt::OtherFocusReason) { #if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); diff --git a/src/quicktemplates2/qquicktextfield_p_p.h b/src/quicktemplates2/qquicktextfield_p_p.h index 41843370..e863a92d 100644 --- a/src/quicktemplates2/qquicktextfield_p_p.h +++ b/src/quicktemplates2/qquicktextfield_p_p.h @@ -117,8 +117,8 @@ public: void executeBackground(bool complete = false); #if QT_CONFIG(quicktemplates2_hover) - bool hovered; - bool explicitHoverEnabled; + bool hovered = false; + bool explicitHoverEnabled = false; #endif struct ExtraData { @@ -130,7 +130,7 @@ public: QPalette resolvedPalette; QQuickDeferredPointer<QQuickItem> background; QString placeholder; - Qt::FocusReason focusReason; + Qt::FocusReason focusReason = Qt::OtherFocusReason; QQuickPressHandler pressHandler; }; diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp index 99775c6a..a2f129fa 100644 --- a/src/quicktemplates2/qquicktoolbar.cpp +++ b/src/quicktemplates2/qquicktoolbar.cpp @@ -99,9 +99,7 @@ QT_BEGIN_NAMESPACE class QQuickToolBarPrivate : public QQuickPanePrivate { public: - QQuickToolBarPrivate() : position(QQuickToolBar::Header) { } - - QQuickToolBar::Position position; + QQuickToolBar::Position position = QQuickToolBar::Header; }; QQuickToolBar::QQuickToolBar(QQuickItem *parent) diff --git a/src/quicktemplates2/qquicktoolseparator.cpp b/src/quicktemplates2/qquicktoolseparator.cpp index 2ec7799f..a6fdfc5b 100644 --- a/src/quicktemplates2/qquicktoolseparator.cpp +++ b/src/quicktemplates2/qquicktoolseparator.cpp @@ -66,9 +66,7 @@ class QQuickToolSeparatorPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickToolSeparator) public: - QQuickToolSeparatorPrivate() : orientation(Qt::Vertical) { } - - Qt::Orientation orientation; + Qt::Orientation orientation = Qt::Vertical; }; QQuickToolSeparator::QQuickToolSeparator(QQuickItem *parent) diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index 1bf6ca55..282b093d 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -124,20 +124,14 @@ class QQuickToolTipPrivate : public QQuickPopupPrivate Q_DECLARE_PUBLIC(QQuickToolTip) public: - QQuickToolTipPrivate() - : delay(0), - timeout(-1) - { - } - void startDelay(); void stopDelay(); void startTimeout(); void stopTimeout(); - int delay; - int timeout; + int delay = 0; + int timeout = -1; QString text; QBasicTimer delayTimer; QBasicTimer timeoutTimer; @@ -335,16 +329,10 @@ class QQuickToolTipAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickToolTipAttached) public: - QQuickToolTipAttachedPrivate() - : delay(0), - timeout(-1) - { - } - QQuickToolTip *instance(bool create) const; - int delay; - int timeout; + int delay = 0; + int timeout = -1; QString text; }; diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp index efa61dad..cc32a4e3 100644 --- a/src/quicktemplates2/qquicktumbler.cpp +++ b/src/quicktemplates2/qquicktumbler.cpp @@ -86,27 +86,6 @@ QT_BEGIN_NAMESPACE \sa {Customizing Tumbler}, {Input Controls} */ -QQuickTumblerPrivate::QQuickTumblerPrivate() - : delegate(nullptr), - visibleItemCount(5), - wrap(true), - explicitWrap(false), - ignoreWrapChanges(false), - view(nullptr), - viewContentItem(nullptr), - viewContentItemType(UnsupportedContentItemType), - currentIndex(-1), - pendingCurrentIndex(-1), - ignoreCurrentIndexChanges(false), - count(0), - ignoreSignals(false) -{ -} - -QQuickTumblerPrivate::~QQuickTumblerPrivate() -{ -} - namespace { static inline qreal delegateHeight(const QQuickTumbler *tumbler) { @@ -792,13 +771,6 @@ QPalette QQuickTumbler::defaultPalette() const return QQuickControlPrivate::themePalette(QPlatformTheme::ItemViewPalette); } -QQuickTumblerAttachedPrivate::QQuickTumblerAttachedPrivate() - : tumbler(nullptr), - index(-1), - displacement(0) -{ -} - void QQuickTumblerAttachedPrivate::init(QQuickItem *delegateItem) { if (!delegateItem->parentItem()) { diff --git a/src/quicktemplates2/qquicktumbler_p_p.h b/src/quicktemplates2/qquicktumbler_p_p.h index 75b1a396..7f824482 100644 --- a/src/quicktemplates2/qquicktumbler_p_p.h +++ b/src/quicktemplates2/qquicktumbler_p_p.h @@ -59,9 +59,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerPrivate : public QQuickContr Q_DECLARE_PUBLIC(QQuickTumbler) public: - QQuickTumblerPrivate(); - ~QQuickTumblerPrivate(); - enum ContentItemType { NoContentItem, UnsupportedContentItemType, @@ -76,23 +73,23 @@ public: static QQuickTumblerPrivate *get(QQuickTumbler *tumbler); QVariant model; - QQmlComponent *delegate; - int visibleItemCount; - bool wrap; - bool explicitWrap; - bool ignoreWrapChanges; - QQuickItem *view; - QQuickItem *viewContentItem; - ContentItemType viewContentItemType; + QQmlComponent *delegate = nullptr; + int visibleItemCount = 5; + bool wrap = true; + bool explicitWrap = false; + bool ignoreWrapChanges = false; + QQuickItem *view = nullptr; + QQuickItem *viewContentItem = nullptr; + ContentItemType viewContentItemType = UnsupportedContentItemType; union { qreal viewOffset; // PathView qreal viewContentY; // ListView }; - int currentIndex; - int pendingCurrentIndex; - bool ignoreCurrentIndexChanges; - int count; - bool ignoreSignals; + int currentIndex = -1; + int pendingCurrentIndex = -1; + bool ignoreCurrentIndexChanges = false; + int count = 0; + bool ignoreSignals = false; void _q_updateItemHeights(); void _q_updateItemWidths(); @@ -123,8 +120,6 @@ class QQuickTumblerAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickTumblerAttached) public: - QQuickTumblerAttachedPrivate(); - static QQuickTumblerAttachedPrivate *get(QQuickTumblerAttached *attached) { return attached->d_func(); @@ -138,9 +133,9 @@ public: // The Tumbler that contains the delegate. Required to calculated the displacement. QPointer<QQuickTumbler> tumbler; // The index of the delegate. Used to calculate the displacement. - int index; + int index = -1; // The displacement for our delegate. - qreal displacement; + qreal displacement = 0; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickvelocitycalculator.cpp b/src/quicktemplates2/qquickvelocitycalculator.cpp index b98eeff9..a0c5ec0d 100644 --- a/src/quicktemplates2/qquickvelocitycalculator.cpp +++ b/src/quicktemplates2/qquickvelocitycalculator.cpp @@ -58,12 +58,6 @@ QT_BEGIN_NAMESPACE doSomethingElse(); */ -QQuickVelocityCalculator::QQuickVelocityCalculator() - : m_point1Timestamp(0), - m_point2Timestamp(0) -{ -} - void QQuickVelocityCalculator::startMeasuring(const QPointF &point1, qint64 timestamp) { m_point1 = point1; diff --git a/src/quicktemplates2/qquickvelocitycalculator_p_p.h b/src/quicktemplates2/qquickvelocitycalculator_p_p.h index 144fe429..2b13ff07 100644 --- a/src/quicktemplates2/qquickvelocitycalculator_p_p.h +++ b/src/quicktemplates2/qquickvelocitycalculator_p_p.h @@ -56,8 +56,6 @@ QT_BEGIN_NAMESPACE class QQuickVelocityCalculator { public: - QQuickVelocityCalculator(); - void startMeasuring(const QPointF &point1, qint64 timestamp = 0); void stopMeasuring(const QPointF &m_point2, qint64 timestamp = 0); void reset(); @@ -66,8 +64,8 @@ public: private: QPointF m_point1; QPointF m_point2; - qint64 m_point1Timestamp; - qint64 m_point2Timestamp; + qint64 m_point1Timestamp = 0; + qint64 m_point2Timestamp = 0; // When a timestamp isn't available, we must use a timer. // When stopMeasuring() has been called, we store the elapsed time in point2timestamp. QElapsedTimer m_timer; |