From 2993a9ad572bc7500155adf5bf101045ddd0e093 Mon Sep 17 00:00:00 2001
From: James Buren <ryuo@ryuo.xyz>
Date: Fri, 1 Mar 2019 21:33:11 +0100
Subject: [PATCH] fix several compile warnings (-Wreorder)

---
 src/argparser.cpp          | 27 ++++++++++++++++-----------
 src/configuration.cpp      |  5 +++--
 src/installtransaction.cpp | 36 ++++++++++++++++++++++++++++++------
 src/prtget.cpp             |  5 +++--
 4 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/src/argparser.cpp b/src/argparser.cpp
index 50667e1..7828242 100644
--- a/src/argparser.cpp
+++ b/src/argparser.cpp
@@ -25,18 +25,9 @@ ArgParser::ArgParser( int argc, char** argv )
       m_isAlternateConfigGiven( false ),
       m_useCache( false ),
       m_calledAsPrtCache( false ),
-      m_alternateConfigFile( "" ),
-      m_pkgmkArgs( "" ),
-      m_pkgaddArgs( "" ),
-      m_pkgrmArgs( "" ),
-      m_installRoot( "" ),
-      m_ignore( "" ),
-      m_argc( argc ),
-      m_argv( argv ),
-      m_verbose( 0 ),
-      m_writeLog( false ),
       m_hasFilter( false ),
       m_noStdConfig( false ),
+      m_writeLog( false ),
       m_nodeps( false ),
       m_all( false ),
       m_printPath( false ),
@@ -48,7 +39,21 @@ ArgParser::ArgParser( int argc, char** argv )
       m_fullPath(false),
       m_recursive(false),
       m_printTree(false),
-      m_depSort(false)
+      m_depSort(false),
+      m_alternateConfigFile( "" ),
+      m_pkgmkArgs( "" ),
+      m_pkgaddArgs( "" ),
+      m_pkgrmArgs( "" ),
+      m_sortArgs( "" ),
+      m_filter( "" ),
+      m_commandName( "" ),
+      m_unknownOption( "" ),
+      m_installRoot( "" ),
+      m_ignore( "" ),
+      m_commandType(HELP),
+      m_argc( argc ),
+      m_argv( argv ),
+      m_verbose( 0 )
 {
 }
 
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 90d8a59..8f3d60f 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -24,11 +24,12 @@ Configuration::Configuration( const std::string& configFile,
                               const ArgParser* parser )
     : m_configFile( configFile ),
       m_parser( parser ),
+      m_cacheFile( "" ),
+      m_rootList(),
+      m_logFilePattern( "" ),
       m_writeLog( false ),
       m_appendLog( false ),
       m_removeLogOnSuccess( false ),
-      m_logFilePattern( "" ),
-      m_cacheFile( "" ),
       m_readmeMode( VERBOSE_README ),
       m_runScripts( false ),
       m_preferHigher( false ),
diff --git a/src/installtransaction.cpp b/src/installtransaction.cpp
index 70e5e37..59834f1 100644
--- a/src/installtransaction.cpp
+++ b/src/installtransaction.cpp
@@ -51,9 +51,17 @@ InstallTransaction::InstallTransaction( const list<string>& names,
                                         const Repository* repo,
                                         PkgDB* pkgDB,
                                         const Configuration* config )
-    : m_repo( repo ),
-      m_pkgDB( pkgDB ),
+    : m_pkgDB( pkgDB ),
+      m_resolver(),
+      m_repo( repo ),
       m_depCalced( false ),
+      m_installedPackages(),
+      m_alreadyInstalledPackages(),
+      m_ignoredPackages(),
+      m_depNameList(),
+      m_depList(),
+      m_missingPackages(),
+      m_installErrors(),
       m_config( config )
 {
     list<string>::const_iterator it = names.begin();
@@ -73,9 +81,17 @@ InstallTransaction::InstallTransaction( const list<char*>& names,
                                         const Repository* repo,
                                         PkgDB* pkgDB,
                                         const Configuration* config )
-    : m_repo( repo ),
-      m_pkgDB( pkgDB ),
+    : m_pkgDB( pkgDB ),
+      m_resolver(),
+      m_repo( repo ),
       m_depCalced( false ),
+      m_installedPackages(),
+      m_alreadyInstalledPackages(),
+      m_ignoredPackages(),
+      m_depNameList(),
+      m_depList(),
+      m_missingPackages(),
+      m_installErrors(),
       m_config( config )
 {
     list<char*>::const_iterator it = names.begin();
@@ -97,9 +113,17 @@ InstallTransaction::InstallTransaction( const string& name,
                                         const Repository* repo,
                                         PkgDB* pkgDB,
                                         const Configuration* config )
-    : m_repo( repo ),
-      m_pkgDB( pkgDB ),
+    : m_pkgDB( pkgDB ),
+      m_resolver(), 
+      m_repo( repo ),
       m_depCalced( false ),
+      m_installedPackages(),
+      m_alreadyInstalledPackages(),
+      m_ignoredPackages(),
+      m_depNameList(),
+      m_depList(),
+      m_missingPackages(),
+      m_installErrors(),
       m_config( config )
 {
     m_packages.push_back( make_pair( name, m_repo->getPackage( name ) ) );
diff --git a/src/prtget.cpp b/src/prtget.cpp
index c2c7558..600b04b 100644
--- a/src/prtget.cpp
+++ b/src/prtget.cpp
@@ -56,10 +56,11 @@ const string PrtGet::DEFAULT_CACHE_FILE = LOCALSTATEDIR"/lib/pkg/prt-get.cache";
 PrtGet::PrtGet( const ArgParser* parser )
     : m_repo( 0 ),
       m_config( 0 ),
+      m_currentTransaction( 0 ),
+      m_locker(),
       m_parser( parser ),
       m_cacheFile( DEFAULT_CACHE_FILE ),
-      m_returnValue( PG_OK ),
-      m_currentTransaction( 0 )
+      m_returnValue( PG_OK )
 {
     if ( m_parser->wasCalledAsPrtCached() ) {
         m_appName = "prt-cache";