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

---
 Source/Core/DolphinWX/Frame.cpp |  9 ++-----
 Source/Core/DolphinWX/Frame.h   | 44 ++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 5b0b8e1049..01341b316c 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -386,13 +386,8 @@ static BOOL WINAPI s_ctrl_handler(DWORD fdwCtrlType)
 CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos,
                const wxSize& size, bool _UseDebugger, bool _BatchMode, bool ShowLogWindow,
                long style)
-    : CRenderFrame(parent, id, title, pos, size, style), g_pCodeWindow(nullptr),
-      g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr), m_SavedPerspectives(nullptr),
-      m_ToolBar(nullptr), m_GameListCtrl(nullptr), m_Panel(nullptr), m_RenderFrame(nullptr),
-      m_RenderParent(nullptr), m_LogWindow(nullptr), m_LogConfigWindow(nullptr),
-      m_FifoPlayerDlg(nullptr), UseDebugger(_UseDebugger), m_bBatchMode(_BatchMode), m_bEdit(false),
-      m_bTabSplit(false), m_bNoDocking(false), m_bGameLoading(false), m_bClosing(false),
-      m_confirmStop(false), m_menubar_shadow(nullptr)
+    : CRenderFrame(parent, id, title, pos, size, style), UseDebugger(_UseDebugger),
+      m_bBatchMode(_BatchMode)
 {
   for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++)
     bFloatWindow[i] = false;
diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
index cbcee5e374..43a5a3745a 100644
--- a/Source/Core/DolphinWX/Frame.h
+++ b/Source/Core/DolphinWX/Frame.h
@@ -79,9 +79,9 @@ public:
   }
 
   // These have to be public
-  CCodeWindow* g_pCodeWindow;
-  NetPlaySetupFrame* g_NetPlaySetupDiag;
-  wxCheatsWindow* g_CheatsWindow;
+  CCodeWindow* g_pCodeWindow = nullptr;
+  NetPlaySetupFrame* g_NetPlaySetupDiag = nullptr;
+  wxCheatsWindow* g_CheatsWindow = nullptr;
   TASInputDlg* g_TASInputDlg[8];
 
   void InitBitmaps();
@@ -123,11 +123,11 @@ public:
   X11Utils::XRRConfiguration* m_XRRConfig;
 #endif
 
-  wxMenu* m_SavedPerspectives;
+  wxMenu* m_SavedPerspectives = nullptr;
 
-  wxToolBar* m_ToolBar;
+  wxToolBar* m_ToolBar = nullptr;
   // AUI
-  wxAuiManager* m_Mgr;
+  wxAuiManager* m_Mgr = nullptr;
   bool bFloatWindow[IDM_CODE_WINDOW - IDM_LOG_WINDOW + 1];
 
   // Perspectives (Should find a way to make all of this private)
@@ -143,21 +143,21 @@ public:
   u32 ActivePerspective;
 
 private:
-  CGameListCtrl* m_GameListCtrl;
-  wxPanel* m_Panel;
-  CRenderFrame* m_RenderFrame;
-  wxWindow* m_RenderParent;
-  CLogWindow* m_LogWindow;
-  LogConfigWindow* m_LogConfigWindow;
-  FifoPlayerDlg* m_FifoPlayerDlg;
-  bool UseDebugger;
-  bool m_bBatchMode;
-  bool m_bEdit;
-  bool m_bTabSplit;
-  bool m_bNoDocking;
-  bool m_bGameLoading;
-  bool m_bClosing;
-  bool m_confirmStop;
+  CGameListCtrl* m_GameListCtrl = nullptr;
+  wxPanel* m_Panel = nullptr;
+  CRenderFrame* m_RenderFrame = nullptr;
+  wxWindow* m_RenderParent = nullptr;
+  CLogWindow* m_LogWindow = nullptr;
+  LogConfigWindow* m_LogConfigWindow = nullptr;
+  FifoPlayerDlg* m_FifoPlayerDlg = nullptr;
+  bool UseDebugger = false;
+  bool m_bBatchMode = false;
+  bool m_bEdit = false;
+  bool m_bTabSplit = false;
+  bool m_bNoDocking = false;
+  bool m_bGameLoading = false;
+  bool m_bClosing = false;
+  bool m_confirmStop = false;
   int m_saveSlot = 1;
 
   std::vector<std::string> drives;
@@ -191,7 +191,7 @@ private:
 
   wxBitmap m_Bitmaps[EToolbar_Max];
 
-  wxMenuBar* m_menubar_shadow;
+  wxMenuBar* m_menubar_shadow = nullptr;
 
   void PopulateToolbar(wxToolBar* toolBar);
   void RecreateToolbar();