Re-format constructors

It was a bit inconsistent before. Admittedly the colon at the end
was the most commonly used style in the quicktemplates2 code base,
but some had a line-break before the colon. This is now chosen as
the one true coding style of QQC2. ;) It makes the initializer list
aligned so that it stands out from the constructor body.

Change-Id: I66835e088df90d7219af04915176006d2a934ddc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

50 files changed, 177 insertions, 182 deletions

diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 2ca6b803..c82cdcd5 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -299,16 +299,16 @@ QList<QQuickAbstractButton *> QQuickAbstractButtonPrivate::findExclusiveButtons(
     return buttons;
 }
 
-QQuickAbstractButton::QQuickAbstractButton(QQuickItem *parent) :
-    QQuickControl(*(new QQuickAbstractButtonPrivate), parent)
+QQuickAbstractButton::QQuickAbstractButton(QQuickItem *parent)
+    : QQuickControl(*(new QQuickAbstractButtonPrivate), parent)
 {
     setActiveFocusOnTab(true);
     setFocusPolicy(Qt::StrongFocus);
     setAcceptedMouseButtons(Qt::LeftButton);
 }
 
-QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent) :
-    QQuickControl(dd, parent)
+QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent)
+    : QQuickControl(dd, parent)
 {
     setActiveFocusOnTab(true);
     setFocusPolicy(Qt::StrongFocus);
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index 12cf1941..a66861da 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -284,8 +284,8 @@ void QQuickApplicationWindowPrivate::setActiveFocusControl(QQuickItem *control)
     }
 }
 
-QQuickApplicationWindow::QQuickApplicationWindow(QWindow *parent) :
-    QQuickWindowQmlImpl(parent), d_ptr(new QQuickApplicationWindowPrivate)
+QQuickApplicationWindow::QQuickApplicationWindow(QWindow *parent)
+    : QQuickWindowQmlImpl(parent), d_ptr(new QQuickApplicationWindowPrivate)
 {
     d_ptr->q_ptr = this;
     connect(this, SIGNAL(activeFocusItemChanged()), this, SLOT(_q_updateActiveFocus()));
diff --git a/src/quicktemplates2/qquickbusyindicator.cpp b/src/quicktemplates2/qquickbusyindicator.cpp
index e37992f8..9ab02e73 100644
--- a/src/quicktemplates2/qquickbusyindicator.cpp
+++ b/src/quicktemplates2/qquickbusyindicator.cpp
@@ -84,8 +84,8 @@ public:
     bool running;
 };
 
-QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) :
-    QQuickControl(*(new QQuickBusyIndicatorPrivate), parent)
+QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent)
+    : QQuickControl(*(new QQuickBusyIndicatorPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp
index 2f9ce0d4..1a614754 100644
--- a/src/quicktemplates2/qquickbutton.cpp
+++ b/src/quicktemplates2/qquickbutton.cpp
@@ -86,13 +86,13 @@ QQuickButtonPrivate::QQuickButtonPrivate()
 {
 }
 
-QQuickButton::QQuickButton(QQuickItem *parent) :
-    QQuickAbstractButton(*(new QQuickButtonPrivate), parent)
+QQuickButton::QQuickButton(QQuickItem *parent)
+    : QQuickAbstractButton(*(new QQuickButtonPrivate), parent)
 {
 }
 
-QQuickButton::QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent) :
-    QQuickAbstractButton(dd, parent)
+QQuickButton::QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent)
+    : QQuickAbstractButton(dd, parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickbuttongroup.cpp b/src/quicktemplates2/qquickbuttongroup.cpp
index ad813437..a9c0d435 100644
--- a/src/quicktemplates2/qquickbuttongroup.cpp
+++ b/src/quicktemplates2/qquickbuttongroup.cpp
@@ -371,8 +371,8 @@ public:
     QQuickButtonGroup *group;
 };
 
-QQuickButtonGroupAttached::QQuickButtonGroupAttached(QObject *parent) :
-    QObject(*(new QQuickButtonGroupAttachedPrivate), parent)
+QQuickButtonGroupAttached::QQuickButtonGroupAttached(QObject *parent)
+    : QObject(*(new QQuickButtonGroupAttachedPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp
index 72b1c5a4..26e266e7 100644
--- a/src/quicktemplates2/qquickcheckbox.cpp
+++ b/src/quicktemplates2/qquickcheckbox.cpp
@@ -101,8 +101,8 @@ public:
     Qt::CheckState checkState;
 };
 
-QQuickCheckBox::QQuickCheckBox(QQuickItem *parent) :
-    QQuickAbstractButton(*(new QQuickCheckBoxPrivate), parent)
+QQuickCheckBox::QQuickCheckBox(QQuickItem *parent)
+    : QQuickAbstractButton(*(new QQuickCheckBoxPrivate), parent)
 {
     setCheckable(true);
 }
diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp
index 42354049..7efda239 100644
--- a/src/quicktemplates2/qquickcheckdelegate.cpp
+++ b/src/quicktemplates2/qquickcheckdelegate.cpp
@@ -98,8 +98,8 @@ public:
     Qt::CheckState checkState;
 };
 
-QQuickCheckDelegate::QQuickCheckDelegate(QQuickItem *parent) :
-    QQuickItemDelegate(*(new QQuickCheckDelegatePrivate), parent)
+QQuickCheckDelegate::QQuickCheckDelegate(QQuickItem *parent)
+    : QQuickItemDelegate(*(new QQuickCheckDelegatePrivate), parent)
 {
     setCheckable(true);
 }
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index d56c1a84..95d5fd45 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -186,8 +186,9 @@ private:
     QQuickComboBox *combo;
 };
 
-QQuickComboBoxDelegateModel::QQuickComboBoxDelegateModel(QQuickComboBox *combo) :
-    QQmlDelegateModel(qmlContext(combo), combo), combo(combo)
+QQuickComboBoxDelegateModel::QQuickComboBoxDelegateModel(QQuickComboBox *combo)
+    : QQmlDelegateModel(qmlContext(combo), combo),
+      combo(combo)
 {
 }
 
@@ -621,8 +622,8 @@ void QQuickComboBoxPrivate::createDelegateModel()
         delete oldModel;
 }
 
-QQuickComboBox::QQuickComboBox(QQuickItem *parent) :
-    QQuickControl(*(new QQuickComboBoxPrivate), parent)
+QQuickComboBox::QQuickComboBox(QQuickItem *parent)
+    : QQuickControl(*(new QQuickComboBoxPrivate), parent)
 {
     setFocusPolicy(Qt::StrongFocus);
     setFlag(QQuickItem::ItemIsFocusScope);
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
index b82e387f..6777fa5d 100644
--- a/src/quicktemplates2/qquickcontainer.cpp
+++ b/src/quicktemplates2/qquickcontainer.cpp
@@ -355,15 +355,15 @@ void QQuickContainerPrivate::contentChildren_clear(QQmlListProperty<QQuickItem>
     p->contentModel->clear();
 }
 
-QQuickContainer::QQuickContainer(QQuickItem *parent) :
-    QQuickControl(*(new QQuickContainerPrivate), parent)
+QQuickContainer::QQuickContainer(QQuickItem *parent)
+    : QQuickControl(*(new QQuickContainerPrivate), parent)
 {
     Q_D(QQuickContainer);
     d->init();
 }
 
-QQuickContainer::QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent) :
-    QQuickControl(dd, parent)
+QQuickContainer::QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent)
+    : QQuickControl(dd, parent)
 {
     Q_D(QQuickContainer);
     d->init();
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 144c2107..25a5b24f 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -476,13 +476,13 @@ bool QQuickControl::setAccessibleProperty(const char *propertyName, const QVaria
     return false;
 }
 
-QQuickControl::QQuickControl(QQuickItem *parent) :
-    QQuickItem(*(new QQuickControlPrivate), parent)
+QQuickControl::QQuickControl(QQuickItem *parent)
+    : QQuickItem(*(new QQuickControlPrivate), parent)
 {
 }
 
-QQuickControl::QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent) :
-    QQuickItem(dd, parent)
+QQuickControl::QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent)
+    : QQuickItem(dd, parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates2/qquickdelaybutton.cpp
index 3c8eaeb0..f8a495b0 100644
--- a/src/quicktemplates2/qquickdelaybutton.cpp
+++ b/src/quicktemplates2/qquickdelaybutton.cpp
@@ -164,8 +164,8 @@ void QQuickDelayButtonPrivate::cancelTransition()
         transitionManager->cancel();
 }
 
-QQuickDelayButton::QQuickDelayButton(QQuickItem *parent) :
-    QQuickAbstractButton(*(new QQuickDelayButtonPrivate), parent)
+QQuickDelayButton::QQuickDelayButton(QQuickItem *parent)
+    : QQuickAbstractButton(*(new QQuickDelayButtonPrivate), parent)
 {
     setCheckable(true);
 }
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 26d34806..2d24dddc 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -254,8 +254,8 @@ void QQuickDialPrivate::handleUngrab()
     q->setPressed(false);
 }
 
-QQuickDial::QQuickDial(QQuickItem *parent) :
-    QQuickControl(*(new QQuickDialPrivate), parent)
+QQuickDial::QQuickDial(QQuickItem *parent)
+    : QQuickControl(*(new QQuickDialPrivate), parent)
 {
     setActiveFocusOnTab(true);
     setAcceptedMouseButtons(Qt::LeftButton);
diff --git a/src/quicktemplates2/qquickdialog.cpp b/src/quicktemplates2/qquickdialog.cpp
index 4e239845..9dba001d 100644
--- a/src/quicktemplates2/qquickdialog.cpp
+++ b/src/quicktemplates2/qquickdialog.cpp
@@ -115,8 +115,8 @@ QT_BEGIN_NAMESPACE
     \sa accepted()
 */
 
-QQuickDialog::QQuickDialog(QObject *parent) :
-    QQuickPopup(*(new QQuickDialogPrivate), parent)
+QQuickDialog::QQuickDialog(QObject *parent)
+    : QQuickPopup(*(new QQuickDialogPrivate), parent)
 {
     Q_D(QQuickDialog);
     d->layout.reset(new QQuickPageLayout(d->popupItem));
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp
index 0b19acdd..7606f26a 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
+++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp
@@ -350,8 +350,8 @@ void QQuickDialogButtonBoxPrivate::removeStandardButtons()
     }
 }
 
-QQuickDialogButtonBox::QQuickDialogButtonBox(QQuickItem *parent) :
-    QQuickContainer(*(new QQuickDialogButtonBoxPrivate), parent)
+QQuickDialogButtonBox::QQuickDialogButtonBox(QQuickItem *parent)
+    : QQuickContainer(*(new QQuickDialogButtonBoxPrivate), parent)
 {
 }
 
@@ -609,8 +609,8 @@ void QQuickDialogButtonBoxAttachedPrivate::setButtonBox(QQuickDialogButtonBox *b
     emit q->buttonBoxChanged();
 }
 
-QQuickDialogButtonBoxAttached::QQuickDialogButtonBoxAttached(QObject *parent) :
-    QObject(*(new QQuickDialogButtonBoxAttachedPrivate), parent)
+QQuickDialogButtonBoxAttached::QQuickDialogButtonBoxAttached(QObject *parent)
+    : QObject(*(new QQuickDialogButtonBoxAttachedPrivate), parent)
 {
     Q_D(QQuickDialogButtonBoxAttached);
     QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent);
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index e6ea747d..b4a7190a 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -470,8 +470,8 @@ void QQuickDrawerPrivate::setEdge(Qt::Edge e)
     }
 }
 
-QQuickDrawer::QQuickDrawer(QObject *parent) :
-    QQuickPopup(*(new QQuickDrawerPrivate), parent)
+QQuickDrawer::QQuickDrawer(QObject *parent)
+    : QQuickPopup(*(new QQuickDrawerPrivate), parent)
 {
     setFocus(true);
     setModal(true);
diff --git a/src/quicktemplates2/qquickframe.cpp b/src/quicktemplates2/qquickframe.cpp
index dfb6790a..364f6a28 100644
--- a/src/quicktemplates2/qquickframe.cpp
+++ b/src/quicktemplates2/qquickframe.cpp
@@ -68,13 +68,13 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing Frame}, {Container Controls}
 */
 
-QQuickFrame::QQuickFrame(QQuickItem *parent) :
-    QQuickPane(*(new QQuickFramePrivate), parent)
+QQuickFrame::QQuickFrame(QQuickItem *parent)
+    : QQuickPane(*(new QQuickFramePrivate), parent)
 {
 }
 
-QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent) :
-    QQuickPane(dd, parent)
+QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent)
+    : QQuickPane(dd, parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp
index d003e8f5..7d1a5826 100644
--- a/src/quicktemplates2/qquickgroupbox.cpp
+++ b/src/quicktemplates2/qquickgroupbox.cpp
@@ -92,8 +92,8 @@ public:
     QQuickItem *label;
 };
 
-QQuickGroupBox::QQuickGroupBox(QQuickItem *parent) :
-    QQuickFrame(*(new QQuickGroupBoxPrivate), parent)
+QQuickGroupBox::QQuickGroupBox(QQuickItem *parent)
+    : QQuickFrame(*(new QQuickGroupBoxPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp
index 2398e113..7e8b92db 100644
--- a/src/quicktemplates2/qquickitemdelegate.cpp
+++ b/src/quicktemplates2/qquickitemdelegate.cpp
@@ -69,14 +69,14 @@ QQuickItemDelegatePrivate::QQuickItemDelegatePrivate()
 {
 }
 
-QQuickItemDelegate::QQuickItemDelegate(QQuickItem *parent) :
-    QQuickAbstractButton(*(new QQuickItemDelegatePrivate), parent)
+QQuickItemDelegate::QQuickItemDelegate(QQuickItem *parent)
+    : QQuickAbstractButton(*(new QQuickItemDelegatePrivate), parent)
 {
     setFocusPolicy(Qt::NoFocus);
 }
 
-QQuickItemDelegate::QQuickItemDelegate(QQuickItemDelegatePrivate &dd, QQuickItem *parent) :
-    QQuickAbstractButton(dd, parent)
+QQuickItemDelegate::QQuickItemDelegate(QQuickItemDelegatePrivate &dd, QQuickItem *parent)
+    : QQuickAbstractButton(dd, parent)
 {
     setFocusPolicy(Qt::NoFocus);
 }
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index 36efc321..21a6da7e 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -79,8 +79,8 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing Label}
 */
 
-QQuickLabel::QQuickLabel(QQuickItem *parent) :
-    QQuickText(*(new QQuickLabelPrivate), parent)
+QQuickLabel::QQuickLabel(QQuickItem *parent)
+    : QQuickText(*(new QQuickLabelPrivate), parent)
 {
     Q_D(QQuickLabel);
     QObjectPrivate::connect(this, &QQuickText::textChanged,
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index d8b8fac1..98ddae30 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -284,8 +284,8 @@ void QQuickMenuPrivate::contentData_clear(QQmlListProperty<QObject> *prop)
     p->contentData.clear();
 }
 
-QQuickMenu::QQuickMenu(QObject *parent) :
-    QQuickPopup(*(new QQuickMenuPrivate), parent)
+QQuickMenu::QQuickMenu(QObject *parent)
+    : QQuickPopup(*(new QQuickMenuPrivate), parent)
 {
     setFocus(true);
     setClosePolicy(CloseOnEscape | CloseOnPressOutside | CloseOnReleaseOutside);
diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp
index 951c7aa5..185686db 100644
--- a/src/quicktemplates2/qquickmenuitem.cpp
+++ b/src/quicktemplates2/qquickmenuitem.cpp
@@ -104,8 +104,8 @@ QQuickMenuItemPrivate::QQuickMenuItemPrivate()
     This signal is emitted when the menu item is triggered by the user.
 */
 
-QQuickMenuItem::QQuickMenuItem(QQuickItem *parent) :
-    QQuickAbstractButton(*(new QQuickMenuItemPrivate), parent)
+QQuickMenuItem::QQuickMenuItem(QQuickItem *parent)
+    : QQuickAbstractButton(*(new QQuickMenuItemPrivate), parent)
 {
     connect(this, &QQuickAbstractButton::clicked, this, &QQuickMenuItem::triggered);
 }
diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates2/qquickmenuseparator.cpp
index 8e4c6384..0a40b6f2 100644
--- a/src/quicktemplates2/qquickmenuseparator.cpp
+++ b/src/quicktemplates2/qquickmenuseparator.cpp
@@ -65,8 +65,8 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing MenuSeparator}, {Separator Controls}
 */
 
-QQuickMenuSeparator::QQuickMenuSeparator(QQuickItem *parent) :
-    QQuickControl(parent)
+QQuickMenuSeparator::QQuickMenuSeparator(QQuickItem *parent)
+    : QQuickControl(parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index 11d55444..13698500 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
@@ -111,8 +111,8 @@ QQuickItem *QQuickPagePrivate::getContentItem()
     return contentItem;
 }
 
-QQuickPage::QQuickPage(QQuickItem *parent) :
-    QQuickControl(*(new QQuickPagePrivate), parent)
+QQuickPage::QQuickPage(QQuickItem *parent)
+    : QQuickControl(*(new QQuickPagePrivate), parent)
 {
     Q_D(QQuickPage);
     setFlag(ItemIsFocusScope);
diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp
index ff675349..2abc321b 100644
--- a/src/quicktemplates2/qquickpageindicator.cpp
+++ b/src/quicktemplates2/qquickpageindicator.cpp
@@ -170,8 +170,8 @@ void QQuickPageIndicatorPrivate::itemChildAdded(QQuickItem *, QQuickItem *child)
         setContextProperty(child, QStringLiteral("pressed"), false);
 }
 
-QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent) :
-    QQuickControl(*(new QQuickPageIndicatorPrivate), parent)
+QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent)
+    : QQuickControl(*(new QQuickPageIndicatorPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp
index 6297bda2..ffd56b3a 100644
--- a/src/quicktemplates2/qquickpane.cpp
+++ b/src/quicktemplates2/qquickpane.cpp
@@ -118,15 +118,15 @@ QQuickItem *QQuickPanePrivate::getContentItem()
     return contentItem;
 }
 
-QQuickPane::QQuickPane(QQuickItem *parent) :
-    QQuickControl(*(new QQuickPanePrivate), parent)
+QQuickPane::QQuickPane(QQuickItem *parent)
+    : QQuickControl(*(new QQuickPanePrivate), parent)
 {
     setFlag(QQuickItem::ItemIsFocusScope);
     setAcceptedMouseButtons(Qt::AllButtons);
 }
 
-QQuickPane::QQuickPane(QQuickPanePrivate &dd, QQuickItem *parent) :
-    QQuickControl(dd, parent)
+QQuickPane::QQuickPane(QQuickPanePrivate &dd, QQuickItem *parent)
+    : QQuickControl(dd, parent)
 {
     setFlag(QQuickItem::ItemIsFocusScope);
     setAcceptedMouseButtons(Qt::AllButtons);
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp
index 75a23556..8c05c8be 100644
--- a/src/quicktemplates2/qquickpopupitem.cpp
+++ b/src/quicktemplates2/qquickpopupitem.cpp
@@ -98,8 +98,8 @@ QQuickItem *QQuickPopupItemPrivate::getContentItem()
     return contentItem;
 }
 
-QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup) :
-    QQuickControl(*(new QQuickPopupItemPrivate(popup)), nullptr)
+QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup)
+    : QQuickControl(*(new QQuickPopupItemPrivate(popup)), nullptr)
 {
     setParent(popup);
     setVisible(false);
diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp
index 41484b74..73050cf4 100644
--- a/src/quicktemplates2/qquickprogressbar.cpp
+++ b/src/quicktemplates2/qquickprogressbar.cpp
@@ -103,8 +103,8 @@ public:
     bool indeterminate;
 };
 
-QQuickProgressBar::QQuickProgressBar(QQuickItem *parent) :
-    QQuickControl(*(new QQuickProgressBarPrivate), parent)
+QQuickProgressBar::QQuickProgressBar(QQuickItem *parent)
+    : QQuickControl(*(new QQuickProgressBarPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp
index 9aa57b0a..db9613f1 100644
--- a/src/quicktemplates2/qquickradiobutton.cpp
+++ b/src/quicktemplates2/qquickradiobutton.cpp
@@ -90,8 +90,8 @@ QT_BEGIN_NAMESPACE
     \sa ButtonGroup, {Customizing RadioButton}, {Button Controls}, RadioDelegate
 */
 
-QQuickRadioButton::QQuickRadioButton(QQuickItem *parent) :
-    QQuickAbstractButton(parent)
+QQuickRadioButton::QQuickRadioButton(QQuickItem *parent)
+    : QQuickAbstractButton(parent)
 {
     setCheckable(true);
     setAutoExclusive(true);
diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp
index e2747d93..bbc6664c 100644
--- a/src/quicktemplates2/qquickradiodelegate.cpp
+++ b/src/quicktemplates2/qquickradiodelegate.cpp
@@ -91,8 +91,8 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing RadioDelegate}, {Delegate Controls}, RadioButton
 */
 
-QQuickRadioDelegate::QQuickRadioDelegate(QQuickItem *parent) :
-    QQuickItemDelegate(parent)
+QQuickRadioDelegate::QQuickRadioDelegate(QQuickItem *parent)
+    : QQuickItemDelegate(parent)
 {
     setCheckable(true);
     setAutoExclusive(true);
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index c2271e3d..683fd2bf 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -147,8 +147,8 @@ QQuickRangeSliderNodePrivate *QQuickRangeSliderNodePrivate::get(QQuickRangeSlide
     return node->d_func();
 }
 
-QQuickRangeSliderNode::QQuickRangeSliderNode(qreal value, QQuickRangeSlider *slider) :
-    QObject(*(new QQuickRangeSliderNodePrivate(value, slider)), slider)
+QQuickRangeSliderNode::QQuickRangeSliderNode(qreal value, QQuickRangeSlider *slider)
+    : QObject(*(new QQuickRangeSliderNodePrivate(value, slider)), slider)
 {
 }
 
@@ -314,15 +314,15 @@ class QQuickRangeSliderPrivate : public QQuickControlPrivate
     Q_DECLARE_PUBLIC(QQuickRangeSlider)
 
 public:
-    QQuickRangeSliderPrivate() :
-        live(false),
-        from(defaultFrom),
-        to(defaultTo),
-        stepSize(0),
-        first(nullptr),
-        second(nullptr),
-        orientation(Qt::Horizontal),
-        snapMode(QQuickRangeSlider::NoSnap)
+    QQuickRangeSliderPrivate()
+        : live(false),
+          from(defaultFrom),
+          to(defaultTo),
+          stepSize(0),
+          first(nullptr),
+          second(nullptr),
+          orientation(Qt::Horizontal),
+          snapMode(QQuickRangeSlider::NoSnap)
     {
     }
 
@@ -513,8 +513,8 @@ void QQuickRangeSliderPrivate::updateHover(const QPointF &pos)
     second->setHovered(secondHandle && secondHandle->isEnabled() && secondHandle->contains(q->mapToItem(secondHandle, pos)));
 }
 
-QQuickRangeSlider::QQuickRangeSlider(QQuickItem *parent) :
-    QQuickControl(*(new QQuickRangeSliderPrivate), parent)
+QQuickRangeSlider::QQuickRangeSlider(QQuickItem *parent)
+    : QQuickControl(*(new QQuickRangeSliderPrivate), parent)
 {
     Q_D(QQuickRangeSlider);
     d->first = new QQuickRangeSliderNode(0.0, this);
diff --git a/src/quicktemplates2/qquickroundbutton.cpp b/src/quicktemplates2/qquickroundbutton.cpp
index 877ba1a2..0784de81 100644
--- a/src/quicktemplates2/qquickroundbutton.cpp
+++ b/src/quicktemplates2/qquickroundbutton.cpp
@@ -92,8 +92,8 @@ void QQuickRoundButtonPrivate::setRadius(qreal newRadius)
         emit q->radiusChanged();
 }
 
-QQuickRoundButton::QQuickRoundButton(QQuickItem *parent) :
-    QQuickButton(*(new QQuickRoundButtonPrivate), parent)
+QQuickRoundButton::QQuickRoundButton(QQuickItem *parent)
+    : QQuickButton(*(new QQuickRoundButtonPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index a0582d48..66df3dc9 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -270,8 +270,8 @@ void QQuickScrollBarPrivate::handleUngrab()
     q->setPressed(false);
 }
 
-QQuickScrollBar::QQuickScrollBar(QQuickItem *parent) :
-    QQuickControl(*(new QQuickScrollBarPrivate), parent)
+QQuickScrollBar::QQuickScrollBar(QQuickItem *parent)
+    : QQuickControl(*(new QQuickScrollBarPrivate), parent)
 {
     setKeepMouseGrab(true);
     setAcceptedMouseButtons(Qt::LeftButton);
@@ -696,8 +696,8 @@ void QQuickScrollBarAttachedPrivate::itemDestroyed(QQuickItem *item)
         vertical = nullptr;
 }
 
-QQuickScrollBarAttached::QQuickScrollBarAttached(QQuickFlickable *flickable) :
-    QObject(*(new QQuickScrollBarAttachedPrivate(flickable)), flickable)
+QQuickScrollBarAttached::QQuickScrollBarAttached(QQuickFlickable *flickable)
+    : QObject(*(new QQuickScrollBarAttachedPrivate(flickable)), flickable)
 {
     Q_D(QQuickScrollBarAttached);
     if (flickable) {
diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp
index ccbbf8c8..8080d325 100644
--- a/src/quicktemplates2/qquickscrollindicator.cpp
+++ b/src/quicktemplates2/qquickscrollindicator.cpp
@@ -167,8 +167,8 @@ void QQuickScrollIndicatorPrivate::resizeContent()
     }
 }
 
-QQuickScrollIndicator::QQuickScrollIndicator(QQuickItem *parent) :
-    QQuickControl(*(new QQuickScrollIndicatorPrivate), parent)
+QQuickScrollIndicator::QQuickScrollIndicator(QQuickItem *parent)
+    : QQuickControl(*(new QQuickScrollIndicatorPrivate), parent)
 {
 }
 
@@ -379,8 +379,8 @@ void QQuickScrollIndicatorAttachedPrivate::itemDestroyed(QQuickItem *item)
         vertical = nullptr;
 }
 
-QQuickScrollIndicatorAttached::QQuickScrollIndicatorAttached(QQuickFlickable *flickable) :
-    QObject(*(new QQuickScrollIndicatorAttachedPrivate(flickable)), flickable)
+QQuickScrollIndicatorAttached::QQuickScrollIndicatorAttached(QQuickFlickable *flickable)
+    : QObject(*(new QQuickScrollIndicatorAttachedPrivate(flickable)), flickable)
 {
     Q_D(QQuickScrollIndicatorAttached);
     if (flickable) {
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 7ad1dcd0..34f0f7d9 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -236,8 +236,8 @@ void QQuickSliderPrivate::handleUngrab()
     q->setPressed(false);
 }
 
-QQuickSlider::QQuickSlider(QQuickItem *parent) :
-    QQuickControl(*(new QQuickSliderPrivate), parent)
+QQuickSlider::QQuickSlider(QQuickItem *parent)
+    : QQuickControl(*(new QQuickSliderPrivate), parent)
 {
     setActiveFocusOnTab(true);
     setFocusPolicy(Qt::StrongFocus);
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 63b4b2ff..4dd7518c 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -318,8 +318,8 @@ bool QQuickSpinBoxPrivate::handleMouseUngrabEvent(QQuickItem *)
     return false;
 }
 
-QQuickSpinBox::QQuickSpinBox(QQuickItem *parent) :
-    QQuickControl(*(new QQuickSpinBoxPrivate), parent)
+QQuickSpinBox::QQuickSpinBox(QQuickItem *parent)
+    : QQuickControl(*(new QQuickSpinBoxPrivate), parent)
 {
     Q_D(QQuickSpinBox);
     d->up = new QQuickSpinButton(this);
@@ -889,8 +889,8 @@ public:
     QQuickItem *indicator;
 };
 
-QQuickSpinButton::QQuickSpinButton(QQuickSpinBox *parent) :
-    QObject(*(new QQuickSpinButtonPrivate), parent)
+QQuickSpinButton::QQuickSpinButton(QQuickSpinBox *parent)
+    : QObject(*(new QQuickSpinButtonPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index e68f2028..2e4d2528 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
@@ -297,8 +297,8 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing StackView}, {Navigation Controls}, {Container Controls}
 */
 
-QQuickStackView::QQuickStackView(QQuickItem *parent) :
-    QQuickControl(*(new QQuickStackViewPrivate), parent)
+QQuickStackView::QQuickStackView(QQuickItem *parent)
+    : QQuickControl(*(new QQuickStackViewPrivate), parent)
 {
     setFlag(ItemIsFocusScope);
 }
@@ -1033,8 +1033,8 @@ void QQuickStackViewAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickI
         emit q->statusChanged();
 }
 
-QQuickStackViewAttached::QQuickStackViewAttached(QObject *parent) :
-    QObject(*(new QQuickStackViewAttachedPrivate), parent)
+QQuickStackViewAttached::QQuickStackViewAttached(QObject *parent)
+    : QObject(*(new QQuickStackViewAttachedPrivate), parent)
 {
     Q_D(QQuickStackViewAttached);
     QQuickItem *item = qobject_cast<QQuickItem *>(parent);
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index 9fdab584..2ca54312 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -440,8 +440,8 @@ void QQuickSwipePrivate::finishTransition()
         emit q->closed();
 }
 
-QQuickSwipe::QQuickSwipe(QQuickSwipeDelegate *control) :
-    QObject(*(new QQuickSwipePrivate(control)))
+QQuickSwipe::QQuickSwipe(QQuickSwipeDelegate *control)
+    : QObject(*(new QQuickSwipePrivate(control)))
 {
 }
 
@@ -719,8 +719,8 @@ void QQuickSwipe::close()
     d->velocityCalculator.reset();
 }
 
-QQuickSwipeDelegatePrivate::QQuickSwipeDelegatePrivate(QQuickSwipeDelegate *control) :
-    swipe(control)
+QQuickSwipeDelegatePrivate::QQuickSwipeDelegatePrivate(QQuickSwipeDelegate *control)
+    : swipe(control)
 {
 }
 
@@ -953,8 +953,8 @@ void QQuickSwipeDelegatePrivate::resizeContent()
     }
 }
 
-QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) :
-    QQuickItemDelegate(*(new QQuickSwipeDelegatePrivate(this)), parent)
+QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent)
+    : QQuickItemDelegate(*(new QQuickSwipeDelegatePrivate(this)), parent)
 {
 }
 
@@ -1238,10 +1238,7 @@ class QQuickSwipeDelegateAttachedPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickSwipeDelegateAttached)
 
 public:
-    QQuickSwipeDelegateAttachedPrivate() :
-        pressed(false)
-    {
-    }
+    QQuickSwipeDelegateAttachedPrivate() : pressed(false) { }
 
     // True when left/right/behind is non-interactive and is pressed.
     bool pressed;
@@ -1267,8 +1264,8 @@ public:
     \sa pressed
 */
 
-QQuickSwipeDelegateAttached::QQuickSwipeDelegateAttached(QObject *object) :
-    QObject(*(new QQuickSwipeDelegateAttachedPrivate), object)
+QQuickSwipeDelegateAttached::QQuickSwipeDelegateAttached(QObject *object)
+    : QObject(*(new QQuickSwipeDelegateAttachedPrivate), object)
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(object);
     if (item) {
diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp
index 673926dd..dca2fbf4 100644
--- a/src/quicktemplates2/qquickswipeview.cpp
+++ b/src/quicktemplates2/qquickswipeview.cpp
@@ -149,8 +149,8 @@ QQuickSwipeViewPrivate *QQuickSwipeViewPrivate::get(QQuickSwipeView *view)
     return view->d_func();
 }
 
-QQuickSwipeView::QQuickSwipeView(QQuickItem *parent) :
-    QQuickContainer(*(new QQuickSwipeViewPrivate), parent)
+QQuickSwipeView::QQuickSwipeView(QQuickItem *parent)
+    : QQuickContainer(*(new QQuickSwipeViewPrivate), parent)
 {
     setFlag(ItemIsFocusScope);
     setActiveFocusOnTab(true);
@@ -286,11 +286,11 @@ class QQuickSwipeViewAttachedPrivate : public QObjectPrivate, public QQuickItemC
 {
     Q_DECLARE_PUBLIC(QQuickSwipeViewAttached)
 public:
-    QQuickSwipeViewAttachedPrivate() :
-        item(nullptr),
-        swipeView(nullptr),
-        index(-1),
-        currentIndex(-1)
+    QQuickSwipeViewAttachedPrivate()
+        : item(nullptr),
+          swipeView(nullptr),
+          index(-1),
+          currentIndex(-1)
     {
     }
 
@@ -431,8 +431,8 @@ void QQuickSwipeViewAttachedPrivate::itemDestroyed(QQuickItem *item)
     QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent | QQuickItemPrivate::Destroyed);
 }
 
-QQuickSwipeViewAttached::QQuickSwipeViewAttached(QObject *parent) :
-    QObject(*(new QQuickSwipeViewAttachedPrivate), parent)
+QQuickSwipeViewAttached::QQuickSwipeViewAttached(QObject *parent)
+    : QObject(*(new QQuickSwipeViewAttachedPrivate), parent)
 {
     Q_D(QQuickSwipeViewAttached);
     d->item = qobject_cast<QQuickItem *>(parent);
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index 15f8c4ec..217b305d 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -100,8 +100,8 @@ qreal QQuickSwitchPrivate::positionAt(const QPointF &point) const
     return pos;
 }
 
-QQuickSwitch::QQuickSwitch(QQuickItem *parent) :
-    QQuickAbstractButton(*(new QQuickSwitchPrivate), parent)
+QQuickSwitch::QQuickSwitch(QQuickItem *parent)
+    : QQuickAbstractButton(*(new QQuickSwitchPrivate), parent)
 {
     Q_D(QQuickSwitch);
     d->keepPressed = true;
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 7ee2df26..0523e332 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -97,8 +97,8 @@ qreal QQuickSwitchDelegatePrivate::positionAt(const QPointF &point) const
     return pos;
 }
 
-QQuickSwitchDelegate::QQuickSwitchDelegate(QQuickItem *parent) :
-    QQuickItemDelegate(*(new QQuickSwitchDelegatePrivate), parent)
+QQuickSwitchDelegate::QQuickSwitchDelegate(QQuickItem *parent)
+    : QQuickItemDelegate(*(new QQuickSwitchDelegatePrivate), parent)
 {
     Q_D(QQuickSwitchDelegate);
     d->keepPressed = true;
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index fd21b3e6..7696e51c 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -221,8 +221,8 @@ void QQuickTabBarPrivate::itemImplicitHeightChanged(QQuickItem *)
         updateLayout();
 }
 
-QQuickTabBar::QQuickTabBar(QQuickItem *parent) :
-    QQuickContainer(*(new QQuickTabBarPrivate), parent)
+QQuickTabBar::QQuickTabBar(QQuickItem *parent)
+    : QQuickContainer(*(new QQuickTabBarPrivate), parent)
 {
     Q_D(QQuickTabBar);
     setFlag(ItemIsFocusScope);
diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp
index 375897d1..c7190a6a 100644
--- a/src/quicktemplates2/qquicktabbutton.cpp
+++ b/src/quicktemplates2/qquicktabbutton.cpp
@@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE
     \sa TabBar, {Customizing TabButton}, {Button Controls}, {Navigation Controls}
 */
 
-QQuickTabButton::QQuickTabButton(QQuickItem *parent) :
-    QQuickAbstractButton(parent)
+QQuickTabButton::QQuickTabButton(QQuickItem *parent)
+    : QQuickAbstractButton(parent)
 {
     setCheckable(true);
     setAutoExclusive(true);
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index c0758876..0a6ae07d 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -305,8 +305,8 @@ void QQuickTextAreaPrivate::implicitHeightChanged()
     emit q->implicitHeightChanged3();
 }
 
-QQuickTextArea::QQuickTextArea(QQuickItem *parent) :
-    QQuickTextEdit(*(new QQuickTextAreaPrivate), parent)
+QQuickTextArea::QQuickTextArea(QQuickItem *parent)
+    : QQuickTextEdit(*(new QQuickTextAreaPrivate), parent)
 {
     Q_D(QQuickTextArea);
     setActiveFocusOnTab(true);
@@ -743,8 +743,8 @@ public:
     QQuickTextArea *control;
 };
 
-QQuickTextAreaAttached::QQuickTextAreaAttached(QObject *parent) :
-    QObject(*(new QQuickTextAreaAttachedPrivate), parent)
+QQuickTextAreaAttached::QQuickTextAreaAttached(QObject *parent)
+    : QObject(*(new QQuickTextAreaAttachedPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 4c916381..34f86d97 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -172,8 +172,8 @@ void QQuickTextFieldPrivate::implicitHeightChanged()
     emit q->implicitHeightChanged3();
 }
 
-QQuickTextField::QQuickTextField(QQuickItem *parent) :
-    QQuickTextInput(*(new QQuickTextFieldPrivate), parent)
+QQuickTextField::QQuickTextField(QQuickItem *parent)
+    : QQuickTextInput(*(new QQuickTextFieldPrivate), parent)
 {
     Q_D(QQuickTextField);
     d->pressHandler.control = this;
diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp
index 7b9d1444..1d2893c6 100644
--- a/src/quicktemplates2/qquicktoolbar.cpp
+++ b/src/quicktemplates2/qquicktoolbar.cpp
@@ -104,8 +104,8 @@ public:
     QQuickToolBar::Position position;
 };
 
-QQuickToolBar::QQuickToolBar(QQuickItem *parent) :
-    QQuickPane(*(new QQuickToolBarPrivate), parent)
+QQuickToolBar::QQuickToolBar(QQuickItem *parent)
+    : QQuickPane(*(new QQuickToolBarPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp
index 5589162b..5ef25e3e 100644
--- a/src/quicktemplates2/qquicktoolbutton.cpp
+++ b/src/quicktemplates2/qquicktoolbutton.cpp
@@ -64,8 +64,8 @@ QT_BEGIN_NAMESPACE
     \sa ToolBar, {Customizing ToolButton}, {Button Controls}
 */
 
-QQuickToolButton::QQuickToolButton(QQuickItem *parent) :
-    QQuickButton(parent)
+QQuickToolButton::QQuickToolButton(QQuickItem *parent)
+    : QQuickButton(parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquicktoolseparator.cpp b/src/quicktemplates2/qquicktoolseparator.cpp
index 676bf201..e3ffea98 100644
--- a/src/quicktemplates2/qquicktoolseparator.cpp
+++ b/src/quicktemplates2/qquicktoolseparator.cpp
@@ -66,16 +66,13 @@ class QQuickToolSeparatorPrivate : public QQuickControlPrivate
     Q_DECLARE_PUBLIC(QQuickToolSeparator)
 
 public:
-    QQuickToolSeparatorPrivate() :
-        orientation(Qt::Vertical)
-    {
-    }
+    QQuickToolSeparatorPrivate() : orientation(Qt::Vertical) { }
 
     Qt::Orientation orientation;
 };
 
-QQuickToolSeparator::QQuickToolSeparator(QQuickItem *parent) :
-    QQuickControl(*(new QQuickToolSeparatorPrivate), parent)
+QQuickToolSeparator::QQuickToolSeparator(QQuickItem *parent)
+    : QQuickControl(*(new QQuickToolSeparatorPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index f063ccd8..8fbf3353 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -166,8 +166,8 @@ void QQuickToolTipPrivate::stopTimeout()
     timeoutTimer.stop();
 }
 
-QQuickToolTip::QQuickToolTip(QQuickItem *parent) :
-    QQuickPopup(*(new QQuickToolTipPrivate), parent)
+QQuickToolTip::QQuickToolTip(QQuickItem *parent)
+    : QQuickPopup(*(new QQuickToolTipPrivate), parent)
 {
     Q_D(QQuickToolTip);
     d->allowVerticalFlip = true;
@@ -368,8 +368,8 @@ QQuickToolTip *QQuickToolTipAttachedPrivate::instance(bool create) const
     return tip;
 }
 
-QQuickToolTipAttached::QQuickToolTipAttached(QObject *parent) :
-    QObject(*(new QQuickToolTipAttachedPrivate), parent)
+QQuickToolTipAttached::QQuickToolTipAttached(QObject *parent)
+    : QObject(*(new QQuickToolTipAttachedPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp
index d70b0932..05e4612d 100644
--- a/src/quicktemplates2/qquicktumbler.cpp
+++ b/src/quicktemplates2/qquicktumbler.cpp
@@ -85,19 +85,19 @@ 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)
+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)
 {
 }
 
@@ -231,8 +231,8 @@ void QQuickTumblerPrivate::itemChildRemoved(QQuickItem *, QQuickItem *)
     _q_updateItemHeights();
 }
 
-QQuickTumbler::QQuickTumbler(QQuickItem *parent) :
-    QQuickControl(*(new QQuickTumblerPrivate), parent)
+QQuickTumbler::QQuickTumbler(QQuickItem *parent)
+    : QQuickControl(*(new QQuickTumblerPrivate), parent)
 {
     setActiveFocusOnTab(true);
 
@@ -682,10 +682,10 @@ class QQuickTumblerAttachedPrivate : public QObjectPrivate, public QQuickItemCha
 {
     Q_DECLARE_PUBLIC(QQuickTumblerAttached)
 public:
-    QQuickTumblerAttachedPrivate() :
-        tumbler(nullptr),
-        index(-1),
-        displacement(0)
+    QQuickTumblerAttachedPrivate()
+        : tumbler(nullptr),
+          index(-1),
+          displacement(0)
     {
     }
 
@@ -809,8 +809,8 @@ void QQuickTumblerAttachedPrivate::emitIfDisplacementChanged(qreal oldDisplaceme
         emit q->displacementChanged();
 }
 
-QQuickTumblerAttached::QQuickTumblerAttached(QObject *parent) :
-    QObject(*(new QQuickTumblerAttachedPrivate), parent)
+QQuickTumblerAttached::QQuickTumblerAttached(QObject *parent)
+    : QObject(*(new QQuickTumblerAttachedPrivate), parent)
 {
     Q_D(QQuickTumblerAttached);
     QQuickItem *delegateItem = qobject_cast<QQuickItem *>(parent);
diff --git a/src/quicktemplates2/qquickvelocitycalculator.cpp b/src/quicktemplates2/qquickvelocitycalculator.cpp
index 21b8b27d..b98eeff9 100644
--- a/src/quicktemplates2/qquickvelocitycalculator.cpp
+++ b/src/quicktemplates2/qquickvelocitycalculator.cpp
@@ -58,9 +58,9 @@ QT_BEGIN_NAMESPACE
         doSomethingElse();
 */
 
-QQuickVelocityCalculator::QQuickVelocityCalculator() :
-    m_point1Timestamp(0),
-    m_point2Timestamp(0)
+QQuickVelocityCalculator::QQuickVelocityCalculator()
+    : m_point1Timestamp(0),
+      m_point2Timestamp(0)
 {
 }