Fix delaration order

To get rid of [-Wreorder] warnings

Change-Id: I2b0b071100eeb1830017da2913b62c00a18823bd
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

5 files changed, 24 insertions, 24 deletions

diff --git a/src/libs/installer/componentselectionpage_p.cpp b/src/libs/installer/componentselectionpage_p.cpp
index 048561f67..db42cdfd1 100644
--- a/src/libs/installer/componentselectionpage_p.cpp
+++ b/src/libs/installer/componentselectionpage_p.cpp
@@ -71,14 +71,14 @@ ComponentSelectionPagePrivate::ComponentSelectionPagePrivate(ComponentSelectionP
         : q(qq)
         , m_core(core)
         , m_treeView(new QTreeView(q))
-        , m_allModel(m_core->defaultComponentModel())
-        , m_updaterModel(m_core->updaterComponentModel())
-        , m_currentModel(m_allModel)
-        , m_allowCompressedRepositoryInstall(false)
         , m_tabWidget(nullptr)
         , m_descriptionBaseWidget(nullptr)
         , m_categoryWidget(Q_NULLPTR)
+        , m_allowCompressedRepositoryInstall(false)
         , m_categoryLayoutVisible(false)
+        , m_allModel(m_core->defaultComponentModel())
+        , m_updaterModel(m_core->updaterComponentModel())
+        , m_currentModel(m_allModel)
         , m_proxyModel(new ComponentSortFilterProxyModel(q))
         , m_componentsResolved(false)
         , m_headerStretchLastSection(false)
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 2cf5fa3b3..b38633531 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -161,15 +161,23 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
     , m_needsHardRestart(false)
     , m_testChecksum(false)
     , m_launchedAsRoot(AdminAuthorization::hasAdminRights())
+    , m_commandLineInstance(false)
+    , m_defaultInstall(false)
+    , m_userSetBinaryMarker(false)
+    , m_checkAvailableSpace(true)
     , m_completeUninstall(false)
     , m_needToWriteMaintenanceTool(false)
     , m_dependsOnLocalInstallerBinary(false)
+    , m_autoAcceptLicenses(false)
+    , m_disableWriteMaintenanceTool(false)
+    , m_autoConfirmCommand(false)
     , m_core(core)
     , m_updates(false)
     , m_repoFetched(false)
     , m_updateSourcesAdded(false)
     , m_magicBinaryMarker(0) // initialize with pseudo marker
     , m_magicMarkerSupplement(BinaryContent::Default)
+    , m_foundEssentialUpdate(false)
     , m_componentScriptEngine(nullptr)
     , m_controlScriptEngine(nullptr)
     , m_installerCalculator(nullptr)
@@ -179,14 +187,6 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
     , m_updaterModel(nullptr)
     , m_guiObject(nullptr)
     , m_remoteFileEngineHandler(nullptr)
-    , m_foundEssentialUpdate(false)
-    , m_commandLineInstance(false)
-    , m_defaultInstall(false)
-    , m_userSetBinaryMarker(false)
-    , m_checkAvailableSpace(true)
-    , m_autoAcceptLicenses(false)
-    , m_disableWriteMaintenanceTool(false)
-    , m_autoConfirmCommand(false)
     , m_datFileName(QString())
 {
 }
@@ -199,15 +199,23 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q
     , m_needsHardRestart(false)
     , m_testChecksum(false)
     , m_launchedAsRoot(AdminAuthorization::hasAdminRights())
+    , m_commandLineInstance(false)
+    , m_defaultInstall(false)
+    , m_userSetBinaryMarker(false)
+    , m_checkAvailableSpace(true)
     , m_completeUninstall(false)
     , m_needToWriteMaintenanceTool(false)
     , m_dependsOnLocalInstallerBinary(false)
+    , m_autoAcceptLicenses(false)
+    , m_disableWriteMaintenanceTool(false)
+    , m_autoConfirmCommand(false)
     , m_core(core)
     , m_updates(false)
     , m_repoFetched(false)
     , m_updateSourcesAdded(false)
     , m_magicBinaryMarker(magicInstallerMaker)
     , m_magicMarkerSupplement(BinaryContent::Default)
+    , m_foundEssentialUpdate(false)
     , m_componentScriptEngine(nullptr)
     , m_controlScriptEngine(nullptr)
     , m_installerCalculator(nullptr)
@@ -217,14 +225,6 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q
     , m_updaterModel(nullptr)
     , m_guiObject(nullptr)
     , m_remoteFileEngineHandler(new RemoteFileEngineHandler)
-    , m_foundEssentialUpdate(false)
-    , m_commandLineInstance(false)
-    , m_defaultInstall(false)
-    , m_userSetBinaryMarker(false)
-    , m_checkAvailableSpace(true)
-    , m_autoAcceptLicenses(false)
-    , m_disableWriteMaintenanceTool(false)
-    , m_autoConfirmCommand(false)
     , m_datFileName(datFileName)
 {
     foreach (const OperationBlob &operation, performedOperations) {
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index cc49380b9..9943d2c76 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1245,10 +1245,10 @@ void PackageManagerGui::currentPageChanged(int newId)
 PackageManagerPage::PackageManagerPage(PackageManagerCore *core)
     : m_complete(true)
     , m_titleColor(QString())
+    , m_showOnPageList(true)
     , m_needsSettingsButton(false)
     , m_core(core)
     , validatorComponent(nullptr)
-    , m_showOnPageList(true)
 {
     if (!m_core->settings().titleColor().isEmpty())
         m_titleColor = m_core->settings().titleColor();
diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp
index 4ef8f9f25..fc02bd2ef 100644
--- a/src/libs/installer/repository.cpp
+++ b/src/libs/installer/repository.cpp
@@ -62,8 +62,8 @@ Repository::Repository(const Repository &other)
     , m_username(other.m_username)
     , m_password(other.m_password)
     , m_displayname(other.m_displayname)
-    , m_compressed(other.m_compressed)
     , m_categoryname(other.m_categoryname)
+    , m_compressed(other.m_compressed)
     , m_xmlChecksum(other.m_xmlChecksum)
 {
 }
diff --git a/src/libs/installer/repositorycategory.cpp b/src/libs/installer/repositorycategory.cpp
index 6be292330..ef1f4fe07 100644
--- a/src/libs/installer/repositorycategory.cpp
+++ b/src/libs/installer/repositorycategory.cpp
@@ -65,8 +65,8 @@ RepositoryCategory::RepositoryCategory()
     Constructs a new category by using all fields of the given category \a other.
 */
 RepositoryCategory::RepositoryCategory(const RepositoryCategory &other)
-    : m_displayname(other.m_displayname), m_data(other.m_data), m_enabled(other.m_enabled),
-      m_tooltip(other.m_tooltip)
+    : m_data(other.m_data), m_displayname(other.m_displayname), m_tooltip(other.m_tooltip),
+    m_enabled(other.m_enabled)
 {
     registerMetaType();
 }