From bf0ab794397ddc882b592c12c66f352521d88d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Sun, 25 Sep 2016 19:20:02 +0200
Subject: [PATCH] ConfigManager: In-class initialise member variables

---
 Source/Core/Core/ConfigManager.cpp |  18 -----
 Source/Core/Core/ConfigManager.h   | 107 +++++++++++++++--------------
 2 files changed, 57 insertions(+), 68 deletions(-)

diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index 0cf06f4e97..1e71008ed1 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -27,24 +27,6 @@
 SConfig* SConfig::m_Instance;
 
 SConfig::SConfig()
-    : bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false), bJITNoBlockCache(false),
-      bJITNoBlockLinking(false), bJITOff(false), bJITLoadStoreOff(false),
-      bJITLoadStorelXzOff(false), bJITLoadStorelwzOff(false), bJITLoadStorelbzxOff(false),
-      bJITLoadStoreFloatingOff(false), bJITLoadStorePairedOff(false), bJITFloatingPointOff(false),
-      bJITIntegerOff(false), bJITPairedOff(false), bJITSystemRegistersOff(false),
-      bJITBranchOff(false), bJITILTimeProfiling(false), bJITILOutputIR(false), bFPRF(false),
-      bAccurateNaNs(false), iTimingVariance(40), bCPUThread(true), bDSPThread(false), bDSPHLE(true),
-      bSkipIdle(true), bSyncGPUOnSkipIdleHack(true), bNTSC(false), bForceNTSCJ(false),
-      bHLE_BS2(true), bEnableCheats(false), bEnableMemcardSdWriting(true), bDPL2Decoder(false),
-      iLatency(14), bRunCompareServer(false), bRunCompareClient(false), bMMU(false),
-      bDCBZOFF(false), iBBDumpPort(0), bFastDiscSpeed(false), bSyncGPU(false), SelectedLanguage(0),
-      bOverrideGCLanguage(false), bWii(false), bConfirmStop(false), bHideCursor(false),
-      bAutoHideCursor(false), bUsePanicHandlers(true), bOnScreenDisplayMessages(true),
-      iRenderWindowXPos(-1), iRenderWindowYPos(-1), iRenderWindowWidth(640),
-      iRenderWindowHeight(480), bRenderWindowAutoSize(false), bKeepWindowOnTop(false),
-      bFullscreen(false), bRenderToMain(false), bProgressive(false), bPAL60(false),
-      bDisableScreenSaver(false), iPosX(100), iPosY(100), iWidth(800), iHeight(600),
-      m_analytics_enabled(false), m_analytics_permission_asked(false), bLoopFifoReplay(true)
 {
   LoadDefaults();
   // Make sure we have log manager
diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
index e8fa5eee7d..684596cb24 100644
--- a/Source/Core/Core/ConfigManager.h
+++ b/Source/Core/Core/ConfigManager.h
@@ -53,91 +53,98 @@ struct SConfig : NonCopyable
   bool m_RecursiveISOFolder;
 
   // Settings
-  bool bEnableDebugging;
+  bool bEnableDebugging = false;
 #ifdef USE_GDBSTUB
   int iGDBPort;
 #ifndef _WIN32
   std::string gdb_socket;
 #endif
 #endif
-  bool bAutomaticStart;
-  bool bBootToPause;
+  bool bAutomaticStart = false;
+  bool bBootToPause = false;
 
   int iCPUCore;
 
   // JIT (shared between JIT and JITIL)
-  bool bJITNoBlockCache, bJITNoBlockLinking;
-  bool bJITOff;
-  bool bJITLoadStoreOff, bJITLoadStorelXzOff, bJITLoadStorelwzOff, bJITLoadStorelbzxOff;
-  bool bJITLoadStoreFloatingOff;
-  bool bJITLoadStorePairedOff;
-  bool bJITFloatingPointOff;
-  bool bJITIntegerOff;
-  bool bJITPairedOff;
-  bool bJITSystemRegistersOff;
-  bool bJITBranchOff;
-  bool bJITILTimeProfiling;
-  bool bJITILOutputIR;
+  bool bJITNoBlockCache = false;
+  bool bJITNoBlockLinking = false;
+  bool bJITOff = false;
+  bool bJITLoadStoreOff = false;
+  bool bJITLoadStorelXzOff = false;
+  bool bJITLoadStorelwzOff = false;
+  bool bJITLoadStorelbzxOff = false;
+  bool bJITLoadStoreFloatingOff = false;
+  bool bJITLoadStorePairedOff = false;
+  bool bJITFloatingPointOff = false;
+  bool bJITIntegerOff = false;
+  bool bJITPairedOff = false;
+  bool bJITSystemRegistersOff = false;
+  bool bJITBranchOff = false;
+  bool bJITILTimeProfiling = false;
+  bool bJITILOutputIR = false;
 
   bool bFastmem;
-  bool bFPRF;
-  bool bAccurateNaNs;
+  bool bFPRF = false;
+  bool bAccurateNaNs = false;
 
-  int iTimingVariance;  // in milli secounds
-  bool bCPUThread;
-  bool bDSPThread;
-  bool bDSPHLE;
-  bool bSkipIdle;
-  bool bSyncGPUOnSkipIdleHack;
-  bool bNTSC;
-  bool bForceNTSCJ;
-  bool bHLE_BS2;
-  bool bEnableCheats;
-  bool bEnableMemcardSdWriting;
+  int iTimingVariance = 40;  // in milli secounds
+  bool bCPUThread = true;
+  bool bDSPThread = false;
+  bool bDSPHLE = true;
+  bool bSkipIdle = true;
+  bool bSyncGPUOnSkipIdleHack = true;
+  bool bNTSC = false;
+  bool bForceNTSCJ = false;
+  bool bHLE_BS2 = true;
+  bool bEnableCheats = false;
+  bool bEnableMemcardSdWriting = true;
 
-  bool bDPL2Decoder;
-  int iLatency;
+  bool bDPL2Decoder = false;
+  int iLatency = 14;
 
-  bool bRunCompareServer;
-  bool bRunCompareClient;
+  bool bRunCompareServer = false;
+  bool bRunCompareClient = false;
 
-  bool bMMU;
-  bool bDCBZOFF;
-  int iBBDumpPort;
-  bool bFastDiscSpeed;
+  bool bMMU = false;
+  bool bDCBZOFF = false;
+  int iBBDumpPort = 0;
+  bool bFastDiscSpeed = false;
 
-  bool bSyncGPU;
+  bool bSyncGPU = false;
   int iSyncGpuMaxDistance;
   int iSyncGpuMinDistance;
   float fSyncGpuOverclock;
 
-  int SelectedLanguage;
-  bool bOverrideGCLanguage;
+  int SelectedLanguage = 0;
+  bool bOverrideGCLanguage = false;
 
-  bool bWii;
+  bool bWii = false;
 
   // Interface settings
-  bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages;
+  bool bConfirmStop = false;
+  bool bHideCursor = false, bAutoHideCursor = false;
+  bool bUsePanicHandlers = true;
+  bool bOnScreenDisplayMessages = true;
   std::string theme_name;
 
   // Display settings
   std::string strFullscreenResolution;
-  int iRenderWindowXPos, iRenderWindowYPos;
-  int iRenderWindowWidth, iRenderWindowHeight;
-  bool bRenderWindowAutoSize, bKeepWindowOnTop;
-  bool bFullscreen, bRenderToMain;
-  bool bProgressive, bPAL60;
-  bool bDisableScreenSaver;
+  int iRenderWindowXPos = -1, iRenderWindowYPos = -1;
+  int iRenderWindowWidth = 640, iRenderWindowHeight = 480;
+  bool bRenderWindowAutoSize = false, bKeepWindowOnTop = false;
+  bool bFullscreen = false, bRenderToMain = false;
+  bool bProgressive = false, bPAL60 = false;
+  bool bDisableScreenSaver = false;
 
   int iPosX, iPosY, iWidth, iHeight;
 
   // Analytics settings.
   std::string m_analytics_id;
-  bool m_analytics_enabled;
-  bool m_analytics_permission_asked;
+  bool m_analytics_enabled = false;
+  bool m_analytics_permission_asked = false;
 
   // Fifo Player related settings
-  bool bLoopFifoReplay;
+  bool bLoopFifoReplay = true;
 
   // Custom RTC
   bool bEnableCustomRTC;