Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -16,40 +16,40 @@ extern CFrame* main_frame;
class DolphinApp : public wxApp
{
public:
CFrame* GetCFrame();
CFrame* GetCFrame();
private:
bool OnInit() override;
int OnExit() override;
void OnInitCmdLine(wxCmdLineParser& parser) override;
bool OnCmdLineParsed(wxCmdLineParser& parser) override;
void OnFatalException() override;
bool Initialize(int& c, wxChar** v) override;
bool OnInit() override;
int OnExit() override;
void OnInitCmdLine(wxCmdLineParser& parser) override;
bool OnCmdLineParsed(wxCmdLineParser& parser) override;
void OnFatalException() override;
bool Initialize(int& c, wxChar** v) override;
#ifdef __APPLE__
void MacOpenFile(const wxString &fileName) override;
void MacOpenFile(const wxString& fileName) override;
#endif
void OnEndSession(wxCloseEvent& event);
void InitLanguageSupport();
void AfterInit();
void OnIdle(wxIdleEvent&);
void OnEndSession(wxCloseEvent& event);
void InitLanguageSupport();
void AfterInit();
void OnIdle(wxIdleEvent&);
bool m_batch_mode = false;
bool m_confirm_stop = false;
bool m_load_file = false;
bool m_play_movie = false;
bool m_use_debugger = false;
bool m_use_logger = false;
bool m_select_video_backend = false;
bool m_select_audio_emulation = false;
wxString m_confirm_setting;
wxString m_video_backend_name;
wxString m_audio_emulation_name;
wxString m_user_path;
wxString m_file_to_load;
wxString m_movie_file;
std::unique_ptr<wxLocale> m_locale;
bool m_batch_mode = false;
bool m_confirm_stop = false;
bool m_load_file = false;
bool m_play_movie = false;
bool m_use_debugger = false;
bool m_use_logger = false;
bool m_select_video_backend = false;
bool m_select_audio_emulation = false;
wxString m_confirm_setting;
wxString m_video_backend_name;
wxString m_audio_emulation_name;
wxString m_user_path;
wxString m_file_to_load;
wxString m_movie_file;
std::unique_ptr<wxLocale> m_locale;
};
DECLARE_APP(DolphinApp);