diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-19 10:28:27 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-19 10:34:31 +0000 |
commit | 20a613ba5e04f4d899bef8a67850cfefe8111453 (patch) | |
tree | 9c484e38e7b38b05c35fa6f8223e4b334be5e5e7 /src/quicktemplates2 | |
parent | 0c65ffef9b021555c03081e4e60e91a268d46c98 (diff) |
Format initializer lists
Initialize one member per line. Allow empty constructors with one
initialized member on a single line.
Change-Id: Ie115802561ebd19efd4dacda1fa868b64d279109
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
36 files changed, 298 insertions, 171 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index adc66da4..2ca6b803 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -111,10 +111,22 @@ static const int AUTO_REPEAT_INTERVAL = 100; This signal is emitted when the button is interactively double clicked by the user. */ -QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() : - down(false), explicitDown(false), pressed(false), keepPressed(false), checked(false), checkable(false), - autoExclusive(false), autoRepeat(false), wasHeld(false), - holdTimer(0), delayTimer(0), repeatTimer(0), repeatButton(Qt::NoButton), indicator(nullptr), group(nullptr) +QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() + : down(false), + explicitDown(false), + pressed(false), + keepPressed(false), + checked(false), + checkable(false), + autoExclusive(false), + autoRepeat(false), + wasHeld(false), + holdTimer(0), + delayTimer(0), + repeatTimer(0), + repeatButton(Qt::NoButton), + indicator(nullptr), + group(nullptr) { } diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index a79216b1..12cf1941 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -138,14 +138,15 @@ class QQuickApplicationWindowPrivate : public QQuickItemChangeListener public: QQuickApplicationWindowPrivate() - : complete(false) - , background(nullptr) - , contentItem(nullptr) - , header(nullptr) - , footer(nullptr) - , overlay(nullptr) - , activeFocusControl(nullptr) - { } + : complete(false), + background(nullptr), + contentItem(nullptr), + header(nullptr), + footer(nullptr), + overlay(nullptr), + activeFocusControl(nullptr) + { + } static QQuickApplicationWindowPrivate *get(QQuickApplicationWindow *window) { diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp index 5112547f..2f9ce0d4 100644 --- a/src/quicktemplates2/qquickbutton.cpp +++ b/src/quicktemplates2/qquickbutton.cpp @@ -80,8 +80,9 @@ QT_BEGIN_NAMESPACE \sa {Customizing Button}, {Button Controls} */ -QQuickButtonPrivate::QQuickButtonPrivate() : - flat(false), highlighted(false) +QQuickButtonPrivate::QQuickButtonPrivate() + : flat(false), + highlighted(false) { } diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp index dd36121e..72b1c5a4 100644 --- a/src/quicktemplates2/qquickcheckbox.cpp +++ b/src/quicktemplates2/qquickcheckbox.cpp @@ -92,7 +92,8 @@ class QQuickCheckBoxPrivate : public QQuickAbstractButtonPrivate public: QQuickCheckBoxPrivate() - : tristate(false), checkState(Qt::Unchecked) + : tristate(false), + checkState(Qt::Unchecked) { } diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp index 93b5eada..42354049 100644 --- a/src/quicktemplates2/qquickcheckdelegate.cpp +++ b/src/quicktemplates2/qquickcheckdelegate.cpp @@ -89,7 +89,8 @@ class QQuickCheckDelegatePrivate : public QQuickItemDelegatePrivate public: QQuickCheckDelegatePrivate() - : tristate(false), checkState(Qt::Unchecked) + : tristate(false), + checkState(Qt::Unchecked) { } diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 65ec2693..b82e387f 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -144,8 +144,11 @@ static QQuickItem *effectiveContentItem(QQuickItem *item) return item; } -QQuickContainerPrivate::QQuickContainerPrivate() : contentModel(nullptr), currentIndex(-1), updatingCurrent(false), - changeTypes(Destroyed | Parent | SiblingOrder) +QQuickContainerPrivate::QQuickContainerPrivate() + : contentModel(nullptr), + currentIndex(-1), + updatingCurrent(false), + changeTypes(Destroyed | Parent | SiblingOrder) { } diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 651afb59..144c2107 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -108,12 +108,26 @@ QQuickControlPrivate::ExtraData::ExtraData() { } -QQuickControlPrivate::QQuickControlPrivate() : - hasTopPadding(false), hasLeftPadding(false), hasRightPadding(false), hasBottomPadding(false), - hasLocale(false), hovered(false), wheelEnabled(false), explicitHoverEnabled(false), - padding(0), topPadding(0), leftPadding(0), rightPadding(0), bottomPadding(0), spacing(0), - focusPolicy(Qt::NoFocus), focusReason(Qt::OtherFocusReason), - background(nullptr), contentItem(nullptr), accessibleAttached(nullptr) +QQuickControlPrivate::QQuickControlPrivate() + : hasTopPadding(false), + hasLeftPadding(false), + hasRightPadding(false), + hasBottomPadding(false), + hasLocale(false), + hovered(false), + wheelEnabled(false), + explicitHoverEnabled(false), + padding(0), + topPadding(0), + leftPadding(0), + rightPadding(0), + bottomPadding(0), + spacing(0), + focusPolicy(Qt::NoFocus), + focusReason(Qt::OtherFocusReason), + background(nullptr), + contentItem(nullptr), + accessibleAttached(nullptr) { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index bb939dd9..26d34806 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -95,19 +95,19 @@ class QQuickDialPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickDial) public: - QQuickDialPrivate() : - touchId(-1), - from(0), - to(1), - value(0), - position(0), - angle(startAngle), - stepSize(0), - pressed(false), - snapMode(QQuickDial::NoSnap), - wrap(false), - live(false), - handle(nullptr) + QQuickDialPrivate() + : touchId(-1), + from(0), + to(1), + value(0), + position(0), + angle(startAngle), + stepSize(0), + pressed(false), + snapMode(QQuickDial::NoSnap), + wrap(false), + live(false), + handle(nullptr) { } diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index 324a8399..0b19acdd 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -143,11 +143,11 @@ static QPlatformDialogHelper::ButtonRole buttonRole(QQuickAbstractButton *button return attached ? attached->buttonRole() : QPlatformDialogHelper::InvalidRole; } -QQuickDialogButtonBoxPrivate::QQuickDialogButtonBoxPrivate() : - alignment(0), - position(QQuickDialogButtonBox::Footer), - standardButtons(QPlatformDialogHelper::NoButton), - delegate(nullptr) +QQuickDialogButtonBoxPrivate::QQuickDialogButtonBoxPrivate() + : alignment(0), + position(QQuickDialogButtonBox::Footer), + standardButtons(QPlatformDialogHelper::NoButton), + delegate(nullptr) { } diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h index bfde51d1..7247d591 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h +++ b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h @@ -86,9 +86,12 @@ class QQuickDialogButtonBoxAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickDialogButtonBoxAttached) public: - QQuickDialogButtonBoxAttachedPrivate() : buttonBox(nullptr), - buttonRole(QPlatformDialogHelper::InvalidRole), - standardButton(QPlatformDialogHelper::NoButton) { } + QQuickDialogButtonBoxAttachedPrivate() + : buttonBox(nullptr), + buttonRole(QPlatformDialogHelper::InvalidRole), + standardButton(QPlatformDialogHelper::NoButton) + { + } static QQuickDialogButtonBoxAttachedPrivate *get(QQuickDialogButtonBoxAttached *q) { diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index 91356b1d..e6ea747d 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -161,7 +161,9 @@ QT_BEGIN_NAMESPACE */ QQuickDrawerPrivate::QQuickDrawerPrivate() - : edge(Qt::LeftEdge), offset(0), position(0), + : edge(Qt::LeftEdge), + offset(0), + position(0), dragMargin(QGuiApplication::styleHints()->startDragDistance()) { setEdge(Qt::LeftEdge); diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp index a34227f5..2398e113 100644 --- a/src/quicktemplates2/qquickitemdelegate.cpp +++ b/src/quicktemplates2/qquickitemdelegate.cpp @@ -64,8 +64,8 @@ QT_BEGIN_NAMESPACE \sa {Customizing ItemDelegate}, {Delegate Controls} */ -QQuickItemDelegatePrivate::QQuickItemDelegatePrivate() : - highlighted(false) +QQuickItemDelegatePrivate::QQuickItemDelegatePrivate() + : highlighted(false) { } diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index df710733..36efc321 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -92,7 +92,8 @@ QQuickLabel::~QQuickLabel() } QQuickLabelPrivate::QQuickLabelPrivate() - : background(nullptr), accessibleAttached(nullptr) + : background(nullptr), + accessibleAttached(nullptr) { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index d796f484..d8b8fac1 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -101,9 +101,9 @@ QT_BEGIN_NAMESPACE \sa {Customizing Menu}, {Menu Controls}, {Popup Controls} */ -QQuickMenuPrivate::QQuickMenuPrivate() : - contentItem(nullptr), - contentModel(nullptr) +QQuickMenuPrivate::QQuickMenuPrivate() + : contentItem(nullptr), + contentModel(nullptr) { Q_Q(QQuickMenu); contentModel = new QQmlObjectModel(q); diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp index 59822b8e..951c7aa5 100644 --- a/src/quicktemplates2/qquickmenuitem.cpp +++ b/src/quicktemplates2/qquickmenuitem.cpp @@ -93,8 +93,8 @@ public: bool highlighted; }; -QQuickMenuItemPrivate::QQuickMenuItemPrivate() : - highlighted(false) +QQuickMenuItemPrivate::QQuickMenuItemPrivate() + : highlighted(false) { } diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp index 94d3d86b..90be951f 100644 --- a/src/quicktemplates2/qquickoverlay.cpp +++ b/src/quicktemplates2/qquickoverlay.cpp @@ -170,9 +170,9 @@ void QQuickOverlayPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryC q->setSize(QSizeF(item->width(), item->height())); } -QQuickOverlayPrivate::QQuickOverlayPrivate() : - modal(nullptr), - modeless(nullptr) +QQuickOverlayPrivate::QQuickOverlayPrivate() + : modal(nullptr), + modeless(nullptr) { } diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp index e6e2a01d..ff675349 100644 --- a/src/quicktemplates2/qquickpageindicator.cpp +++ b/src/quicktemplates2/qquickpageindicator.cpp @@ -89,8 +89,12 @@ class QQuickPageIndicatorPrivate : public QQuickControlPrivate, public QQuickIte Q_DECLARE_PUBLIC(QQuickPageIndicator) public: - QQuickPageIndicatorPrivate() : count(0), currentIndex(0), - interactive(false), delegate(nullptr), pressedItem(nullptr) + QQuickPageIndicatorPrivate() + : count(0), + currentIndex(0), + interactive(false), + delegate(nullptr), + pressedItem(nullptr) { } diff --git a/src/quicktemplates2/qquickpagelayout.cpp b/src/quicktemplates2/qquickpagelayout.cpp index 18317af8..99d4fe23 100644 --- a/src/quicktemplates2/qquickpagelayout.cpp +++ b/src/quicktemplates2/qquickpagelayout.cpp @@ -74,7 +74,9 @@ static void setPosition(QQuickItem *item, Position position) } QQuickPageLayout::QQuickPageLayout(QQuickControl *control) - : m_header(nullptr), m_footer(nullptr), m_control(control) + : m_header(nullptr), + m_footer(nullptr), + m_control(control) { } diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp index 57200121..6297bda2 100644 --- a/src/quicktemplates2/qquickpane.cpp +++ b/src/quicktemplates2/qquickpane.cpp @@ -104,7 +104,9 @@ QT_BEGIN_NAMESPACE \sa {Customizing Pane}, {Container Controls} */ -QQuickPanePrivate::QQuickPanePrivate() : contentWidth(0), contentHeight(0) +QQuickPanePrivate::QQuickPanePrivate() + : contentWidth(0), + contentHeight(0) { } diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 06a3c34e..5feb9640 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -188,49 +188,48 @@ QT_BEGIN_NAMESPACE */ QQuickPopupPrivate::QQuickPopupPrivate() - : QObjectPrivate() - , focus(false) - , modal(false) - , dim(false) - , hasDim(false) - , visible(false) - , complete(false) - , 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) - , 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(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside) - , parentItem(nullptr) - , dimmer(nullptr) - , window(nullptr) - , enter(nullptr) - , exit(nullptr) - , popupItem(nullptr) - , positioner(nullptr) - , transitionManager(this) + : focus(false), + modal(false), + dim(false), + hasDim(false), + visible(false), + complete(false), + 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), + 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(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside), + parentItem(nullptr), + dimmer(nullptr), + window(nullptr), + enter(nullptr), + exit(nullptr), + popupItem(nullptr), + positioner(nullptr), + transitionManager(this) { } diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp index 0a73ed52..2f320eb3 100644 --- a/src/quicktemplates2/qquickpopuppositioner.cpp +++ b/src/quicktemplates2/qquickpopuppositioner.cpp @@ -49,10 +49,10 @@ static const QQuickItemPrivate::ChangeTypes AncestorChangeTypes = QQuickItemPriv static const QQuickItemPrivate::ChangeTypes ItemChangeTypes = QQuickItemPrivate::Geometry | QQuickItemPrivate::Parent; -QQuickPopupPositioner::QQuickPopupPositioner(QQuickPopup *popup) : - m_positioning(false), - m_parentItem(nullptr), - m_popup(popup) +QQuickPopupPositioner::QQuickPopupPositioner(QQuickPopup *popup) + : m_positioning(false), + m_parentItem(nullptr), + m_popup(popup) { } diff --git a/src/quicktemplates2/qquickpresshandler.cpp b/src/quicktemplates2/qquickpresshandler.cpp index 0c2db981..8f8167cd 100644 --- a/src/quicktemplates2/qquickpresshandler.cpp +++ b/src/quicktemplates2/qquickpresshandler.cpp @@ -45,13 +45,14 @@ QT_BEGIN_NAMESPACE QQuickPressHandler::QQuickPressHandler() - : control(nullptr) - , longPress(false) - , pressAndHoldSignalIndex(-1) - , pressedSignalIndex(-1) - , releasedSignalIndex(-1) - , delayedMousePressEvent(nullptr) -{ } + : control(nullptr), + longPress(false), + pressAndHoldSignalIndex(-1), + pressedSignalIndex(-1), + releasedSignalIndex(-1), + delayedMousePressEvent(nullptr) +{ +} void QQuickPressHandler::mousePressEvent(QMouseEvent *event) { diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp index ec0ebf66..41484b74 100644 --- a/src/quicktemplates2/qquickprogressbar.cpp +++ b/src/quicktemplates2/qquickprogressbar.cpp @@ -89,7 +89,11 @@ QT_BEGIN_NAMESPACE class QQuickProgressBarPrivate : public QQuickControlPrivate { public: - QQuickProgressBarPrivate() : from(0), to(1.0), value(0), indeterminate(false) + QQuickProgressBarPrivate() + : from(0), + to(1.0), + value(0), + indeterminate(false) { } diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index a5c1d747..c2271e3d 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -84,16 +84,16 @@ class QQuickRangeSliderNodePrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQuickRangeSliderNode) public: - QQuickRangeSliderNodePrivate(qreal value, QQuickRangeSlider *slider) : - value(value), - isPendingValue(false), - pendingValue(0), - position(0), - handle(nullptr), - slider(slider), - pressed(false), - hovered(false), - touchId(-1) + QQuickRangeSliderNodePrivate(qreal value, QQuickRangeSlider *slider) + : value(value), + isPendingValue(false), + pendingValue(0), + position(0), + handle(nullptr), + slider(slider), + pressed(false), + hovered(false), + touchId(-1) { } diff --git a/src/quicktemplates2/qquickroundbutton.cpp b/src/quicktemplates2/qquickroundbutton.cpp index 7164eab0..877ba1a2 100644 --- a/src/quicktemplates2/qquickroundbutton.cpp +++ b/src/quicktemplates2/qquickroundbutton.cpp @@ -73,9 +73,9 @@ public: void setRadius(qreal newRadius = -1.0); }; -QQuickRoundButtonPrivate::QQuickRoundButtonPrivate() : - radius(0), - explicitRadius(false) +QQuickRoundButtonPrivate::QQuickRoundButtonPrivate() + : radius(0), + explicitRadius(false) { } diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index d8729637..a0582d48 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -156,9 +156,16 @@ class QQuickScrollBarPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickScrollBar) public: - QQuickScrollBarPrivate() : size(0), position(0), stepSize(0), offset(0), - active(false), pressed(false), moving(false), - orientation(Qt::Vertical), snapMode(QQuickScrollBar::NoSnap) + QQuickScrollBarPrivate() + : size(0), + position(0), + stepSize(0), + offset(0), + active(false), + pressed(false), + moving(false), + orientation(Qt::Vertical), + snapMode(QQuickScrollBar::NoSnap) { } @@ -568,7 +575,12 @@ QAccessible::Role QQuickScrollBar::accessibleRole() const class QQuickScrollBarAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: - QQuickScrollBarAttachedPrivate(QQuickFlickable *flickable) : flickable(flickable), horizontal(nullptr), vertical(nullptr) { } + QQuickScrollBarAttachedPrivate(QQuickFlickable *flickable) + : flickable(flickable), + horizontal(nullptr), + vertical(nullptr) + { + } void activateHorizontal(); void activateVertical(); diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp index e9cadcc7..ccbbf8c8 100644 --- a/src/quicktemplates2/qquickscrollindicator.cpp +++ b/src/quicktemplates2/qquickscrollindicator.cpp @@ -131,8 +131,11 @@ class QQuickScrollIndicatorPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickScrollIndicator) public: - QQuickScrollIndicatorPrivate() : size(0), position(0), - active(false), orientation(Qt::Vertical) + QQuickScrollIndicatorPrivate() + : size(0), + position(0), + active(false), + orientation(Qt::Vertical) { } @@ -295,7 +298,12 @@ void QQuickScrollIndicator::setOrientation(Qt::Orientation orientation) class QQuickScrollIndicatorAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: - QQuickScrollIndicatorAttachedPrivate(QQuickFlickable *flickable) : flickable(flickable), horizontal(nullptr), vertical(nullptr) { } + QQuickScrollIndicatorAttachedPrivate(QQuickFlickable *flickable) + : flickable(flickable), + horizontal(nullptr), + vertical(nullptr) + { + } void activateHorizontal(); void activateVertical(); diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index d8992fa7..7ad1dcd0 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -88,9 +88,18 @@ class QQuickSliderPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickSlider) public: - QQuickSliderPrivate() : from(0), to(1), value(0), position(0), stepSize(0), live(false), pressed(false), - touchId(-1), orientation(Qt::Horizontal), snapMode(QQuickSlider::NoSnap), - handle(nullptr) + QQuickSliderPrivate() + : from(0), + to(1), + value(0), + position(0), + stepSize(0), + live(false), + pressed(false), + touchId(-1), + orientation(Qt::Horizontal), + snapMode(QQuickSlider::NoSnap), + handle(nullptr) { } diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 50fd778e..63b4b2ff 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -106,8 +106,20 @@ class QQuickSpinBoxPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickSpinBox) public: - QQuickSpinBoxPrivate() : editable(false), from(0), to(99), value(0), stepSize(1), - delayTimer(0), repeatTimer(0), up(nullptr), down(nullptr), validator(nullptr), inputMethodHints(Qt::ImhDigitsOnly) { } + QQuickSpinBoxPrivate() + : editable(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) const; void updateValue(); @@ -865,7 +877,13 @@ QAccessible::Role QQuickSpinBox::accessibleRole() const class QQuickSpinButtonPrivate : public QObjectPrivate { public: - QQuickSpinButtonPrivate() : pressed(false), hovered(false), indicator(nullptr) { } + QQuickSpinButtonPrivate() + : pressed(false), + hovered(false), + indicator(nullptr) + { + } + bool pressed; bool hovered; QQuickItem *indicator; diff --git a/src/quicktemplates2/qquickstackelement.cpp b/src/quicktemplates2/qquickstackelement.cpp index 6dcd5e75..2744c3e9 100644 --- a/src/quicktemplates2/qquickstackelement.cpp +++ b/src/quicktemplates2/qquickstackelement.cpp @@ -58,7 +58,11 @@ static QQuickStackViewAttached *attachedStackObject(QQuickStackElement *element) class QQuickStackIncubator : public QQmlIncubator { public: - QQuickStackIncubator(QQuickStackElement *element) : QQmlIncubator(Synchronous), element(element) { } + QQuickStackIncubator(QQuickStackElement *element) + : QQmlIncubator(Synchronous), + element(element) + { + } protected: void setInitialState(QObject *object) override { element->incubate(object); } @@ -67,10 +71,19 @@ private: QQuickStackElement *element; }; -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) +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) { } diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp index 4f592f45..34301c2d 100644 --- a/src/quicktemplates2/qquickstackview_p.cpp +++ b/src/quicktemplates2/qquickstackview_p.cpp @@ -46,7 +46,10 @@ QT_BEGIN_NAMESPACE -QQuickStackViewPrivate::QQuickStackViewPrivate() : busy(false), currentItem(nullptr), transitioner(nullptr) +QQuickStackViewPrivate::QQuickStackViewPrivate() + : busy(false), + currentItem(nullptr), + transitioner(nullptr) { } diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h index 7c2e6c3f..39a9ba9b 100644 --- a/src/quicktemplates2/qquickstackview_p_p.h +++ b/src/quicktemplates2/qquickstackview_p_p.h @@ -102,7 +102,11 @@ class QQuickStackViewAttachedPrivate : public QObjectPrivate, public QQuickItemC Q_DECLARE_PUBLIC(QQuickStackViewAttached) public: - QQuickStackViewAttachedPrivate() : explicitVisible(false), element(nullptr) { } + QQuickStackViewAttachedPrivate() + : explicitVisible(false), + element(nullptr) + { + } static QQuickStackViewAttachedPrivate *get(QQuickStackViewAttached *attached) { diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index 3ee08d1c..9fdab584 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -135,21 +135,21 @@ 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), + 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) { } diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp index c447e5e0..673926dd 100644 --- a/src/quicktemplates2/qquickswipeview.cpp +++ b/src/quicktemplates2/qquickswipeview.cpp @@ -106,7 +106,11 @@ class QQuickSwipeViewPrivate : public QQuickContainerPrivate Q_DECLARE_PUBLIC(QQuickSwipeView) public: - QQuickSwipeViewPrivate() : interactive(true), orientation(Qt::Horizontal) { } + QQuickSwipeViewPrivate() + : interactive(true), + orientation(Qt::Horizontal) + { + } void resizeItem(QQuickItem *item); void resizeItems(); diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp index 9455e619..7ee2df26 100644 --- a/src/quicktemplates2/qquickswitchdelegate.cpp +++ b/src/quicktemplates2/qquickswitchdelegate.cpp @@ -79,10 +79,7 @@ class QQuickSwitchDelegatePrivate : public QQuickItemDelegatePrivate Q_DECLARE_PUBLIC(QQuickSwitchDelegate) public: - QQuickSwitchDelegatePrivate() : - position(0) - { - } + QQuickSwitchDelegatePrivate() : position(0) { } qreal positionAt(const QPointF &point) const; diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index d638a3c2..f063ccd8 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -123,7 +123,11 @@ class QQuickToolTipPrivate : public QQuickPopupPrivate Q_DECLARE_PUBLIC(QQuickToolTip) public: - QQuickToolTipPrivate() : delay(0), timeout(-1) { } + QQuickToolTipPrivate() + : delay(0), + timeout(-1) + { + } void startDelay(); void stopDelay(); @@ -324,7 +328,11 @@ class QQuickToolTipAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickToolTipAttached) public: - QQuickToolTipAttachedPrivate() : delay(0), timeout(-1) { } + QQuickToolTipAttachedPrivate() + : delay(0), + timeout(-1) + { + } QQuickToolTip *instance(bool create) const; |