From 635408b6862612934c4cb33ad8553625608ab91a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 18 Oct 2014 22:55:23 -0400 Subject: [PATCH] Debugger: Fix class indentation --- Source/Core/DolphinWX/Debugger/CodeWindow.h | 186 +++++++++--------- .../Core/DolphinWX/Debugger/MemoryCheckDlg.h | 24 +-- Source/Core/DolphinWX/Debugger/MemoryWindow.h | 82 ++++---- 3 files changed, 143 insertions(+), 149 deletions(-) diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h index 2b4dc25155..1953c85493 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.h +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h @@ -32,117 +32,113 @@ class wxListBox; class wxMenu; class wxMenuBar; -class CCodeWindow - : public wxPanel +class CCodeWindow : public wxPanel { - public: +public: + CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, + CFrame * parent, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxBORDER_NONE, + const wxString& name = _("Code")); - CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, - CFrame * parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxBORDER_NONE, - const wxString& name = _("Code") - ); + void Load(); + void Save(); - void Load(); - void Save(); + // Parent interaction + CFrame *Parent; + wxMenuBar * GetMenuBar(); + wxToolBar * GetToolBar(); + wxBitmap m_Bitmaps[ToolbarDebugBitmapMax]; - // Parent interaction - CFrame *Parent; - wxMenuBar * GetMenuBar(); - wxToolBar * GetToolBar(); - wxBitmap m_Bitmaps[ToolbarDebugBitmapMax]; + bool UseInterpreter(); + bool BootToPause(); + bool AutomaticStart(); + bool JITNoBlockCache(); + bool JITNoBlockLinking(); + bool JumpToAddress(u32 address); - bool UseInterpreter(); - bool BootToPause(); - bool AutomaticStart(); - bool JITNoBlockCache(); - bool JITNoBlockLinking(); - bool JumpToAddress(u32 address); + void Update() override; + void NotifyMapLoaded(); + void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar); + void CreateMenuOptions(wxMenu *pMenu); + void CreateMenuSymbols(wxMenuBar *pMenuBar); + void RecreateToolbar(wxToolBar*); + void PopulateToolbar(wxToolBar* toolBar); + void UpdateButtonStates(); + void OpenPages(); + void UpdateManager(); - void Update() override; - void NotifyMapLoaded(); - void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar); - void CreateMenuOptions(wxMenu *pMenu); - void CreateMenuSymbols(wxMenuBar *pMenuBar); - void RecreateToolbar(wxToolBar*); - void PopulateToolbar(wxToolBar* toolBar); - void UpdateButtonStates(); - void OpenPages(); - void UpdateManager(); + // Menu bar + // ------------------- + void OnCPUMode(wxCommandEvent& event); // CPU Mode menu + void OnJITOff(wxCommandEvent& event); - // Menu bar - // ------------------- - void OnCPUMode(wxCommandEvent& event); // CPU Mode menu - void OnJITOff(wxCommandEvent& event); + void ToggleCodeWindow(bool bShow); + void ToggleRegisterWindow(bool bShow); + void ToggleBreakPointWindow(bool bShow); + void ToggleMemoryWindow(bool bShow); + void ToggleJitWindow(bool bShow); + void ToggleSoundWindow(bool bShow); + void ToggleVideoWindow(bool bShow); - void ToggleCodeWindow(bool bShow); - void ToggleRegisterWindow(bool bShow); - void ToggleBreakPointWindow(bool bShow); - void ToggleMemoryWindow(bool bShow); - void ToggleJitWindow(bool bShow); - void ToggleSoundWindow(bool bShow); - void ToggleVideoWindow(bool bShow); + void OnChangeFont(wxCommandEvent& event); - void OnChangeFont(wxCommandEvent& event); + void OnCodeStep(wxCommandEvent& event); + void OnAddrBoxChange(wxCommandEvent& event); + void OnSymbolsMenu(wxCommandEvent& event); + void OnJitMenu(wxCommandEvent& event); + void OnProfilerMenu(wxCommandEvent& event); - void OnCodeStep(wxCommandEvent& event); - void OnAddrBoxChange(wxCommandEvent& event); - void OnSymbolsMenu(wxCommandEvent& event); - void OnJitMenu(wxCommandEvent& event); - void OnProfilerMenu(wxCommandEvent& event); + // Sub dialogs + CRegisterWindow* m_RegisterWindow; + CBreakPointWindow* m_BreakpointWindow; + CMemoryWindow* m_MemoryWindow; + CJitWindow* m_JitWindow; + DSPDebuggerLLE* m_SoundWindow; + GFXDebuggerPanel* m_VideoWindow; - // Sub dialogs - CRegisterWindow* m_RegisterWindow; - CBreakPointWindow* m_BreakpointWindow; - CMemoryWindow* m_MemoryWindow; - CJitWindow* m_JitWindow; - DSPDebuggerLLE* m_SoundWindow; - GFXDebuggerPanel* m_VideoWindow; + // Settings + bool bAutomaticStart; bool bBootToPause; + bool bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW + 1]; + int iNbAffiliation[IDM_CODEWINDOW - IDM_LOGWINDOW + 1]; - // Settings - bool bAutomaticStart; bool bBootToPause; - bool bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW + 1]; - int iNbAffiliation[IDM_CODEWINDOW - IDM_LOGWINDOW + 1]; +private: + enum + { + // Debugger GUI Objects + ID_CODEVIEW, + ID_CALLSTACKLIST, + ID_CALLERSLIST, + ID_CALLSLIST, + ID_SYMBOLLIST + }; - private: + void OnSymbolListChange(wxCommandEvent& event); + void OnSymbolListContextMenu(wxContextMenuEvent& event); + void OnCallstackListChange(wxCommandEvent& event); + void OnCallersListChange(wxCommandEvent& event); + void OnCallsListChange(wxCommandEvent& event); + void OnCodeViewChange(wxCommandEvent &event); + void OnHostMessage(wxCommandEvent& event); - enum - { - // Debugger GUI Objects - ID_CODEVIEW, - ID_CALLSTACKLIST, - ID_CALLERSLIST, - ID_CALLSLIST, - ID_SYMBOLLIST - }; + // Debugger functions + void SingleStep(); + void StepOver(); + void ToggleBreakpoint(); - void OnSymbolListChange(wxCommandEvent& event); - void OnSymbolListContextMenu(wxContextMenuEvent& event); - void OnCallstackListChange(wxCommandEvent& event); - void OnCallersListChange(wxCommandEvent& event); - void OnCallsListChange(wxCommandEvent& event); - void OnCodeViewChange(wxCommandEvent &event); - void OnHostMessage(wxCommandEvent& event); + void UpdateLists(); + void UpdateCallstack(); - // Debugger functions - void SingleStep(); - void StepOver(); - void ToggleBreakpoint(); + void InitBitmaps(); - void UpdateLists(); - void UpdateCallstack(); + CCodeView* codeview; + wxListBox* callstack; + wxListBox* symbols; + wxListBox* callers; + wxListBox* calls; + Common::Event sync_event; - void InitBitmaps(); - - CCodeView* codeview; - wxListBox* callstack; - wxListBox* symbols; - wxListBox* callers; - wxListBox* calls; - Common::Event sync_event; - - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h index bb392db1b8..3a725f9717 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h +++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h @@ -13,19 +13,19 @@ class wxTextCtrl; class MemoryCheckDlg : public wxDialog { - public: - MemoryCheckDlg(CBreakPointWindow *parent); +public: + MemoryCheckDlg(CBreakPointWindow *parent); - private: - CBreakPointWindow *m_parent; - wxCheckBox* m_pReadFlag; - wxCheckBox* m_pWriteFlag; - wxCheckBox* m_log_flag; - wxCheckBox* m_break_flag; - wxTextCtrl* m_pEditEndAddress; - wxTextCtrl* m_pEditStartAddress; +private: + CBreakPointWindow *m_parent; + wxCheckBox* m_pReadFlag; + wxCheckBox* m_pWriteFlag; + wxCheckBox* m_log_flag; + wxCheckBox* m_break_flag; + wxTextCtrl* m_pEditEndAddress; + wxTextCtrl* m_pEditStartAddress; - void OnOK(wxCommandEvent& event); + void OnOK(wxCommandEvent& event); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE(); }; diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h index 59b7d1da9d..ba23bdf01e 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h @@ -22,54 +22,52 @@ class wxListBox; class wxTextCtrl; class wxWindow; -class CMemoryWindow - : public wxPanel +class CMemoryWindow : public wxPanel { - public: +public: + CMemoryWindow(wxWindow* parent, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxBORDER_NONE, + const wxString& name = _("Memory")); - CMemoryWindow(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxBORDER_NONE, - const wxString& name = _("Memory")); + wxCheckBox* chk8; + wxCheckBox* chk16; + wxCheckBox* chk32; + wxButton* btnSearch; + wxCheckBox* chkAscii; + wxCheckBox* chkHex; + void Save(IniFile& _IniFile) const; + void Load(IniFile& _IniFile); - wxCheckBox* chk8; - wxCheckBox* chk16; - wxCheckBox* chk32; - wxButton* btnSearch; - wxCheckBox* chkAscii; - wxCheckBox* chkHex; - void Save(IniFile& _IniFile) const; - void Load(IniFile& _IniFile); + void Update() override; + void NotifyMapLoaded(); - void Update() override; - void NotifyMapLoaded(); + void JumpToAddress(u32 _Address); - void JumpToAddress(u32 _Address); +private: + DECLARE_EVENT_TABLE() - private: - DECLARE_EVENT_TABLE() + CMemoryView* memview; + wxListBox* symbols; - CMemoryView* memview; - wxListBox* symbols; + wxButton* buttonGo; + wxTextCtrl* addrbox; + wxTextCtrl* valbox; - wxButton* buttonGo; - wxTextCtrl* addrbox; - wxTextCtrl* valbox; - - void U8(wxCommandEvent& event); - void U16(wxCommandEvent& event); - void U32(wxCommandEvent& event); - void onSearch(wxCommandEvent& event); - void onAscii(wxCommandEvent& event); - void onHex(wxCommandEvent& event); - void OnSymbolListChange(wxCommandEvent& event); - void OnCallstackListChange(wxCommandEvent& event); - void OnAddrBoxChange(wxCommandEvent& event); - void OnHostMessage(wxCommandEvent& event); - void SetMemoryValue(wxCommandEvent& event); - void OnDumpMemory(wxCommandEvent& event); - void OnDumpMem2(wxCommandEvent& event); - void OnDumpFakeVMEM(wxCommandEvent& event); + void U8(wxCommandEvent& event); + void U16(wxCommandEvent& event); + void U32(wxCommandEvent& event); + void onSearch(wxCommandEvent& event); + void onAscii(wxCommandEvent& event); + void onHex(wxCommandEvent& event); + void OnSymbolListChange(wxCommandEvent& event); + void OnCallstackListChange(wxCommandEvent& event); + void OnAddrBoxChange(wxCommandEvent& event); + void OnHostMessage(wxCommandEvent& event); + void SetMemoryValue(wxCommandEvent& event); + void OnDumpMemory(wxCommandEvent& event); + void OnDumpMem2(wxCommandEvent& event); + void OnDumpFakeVMEM(wxCommandEvent& event); };