From 0df188969f7954e0df4ac4233391170fe27af5d8 Mon Sep 17 00:00:00 2001
From: Alexandre LittleWhite Laurent <lw.demoscene@googlemail.com>
Date: Fri, 19 Aug 2016 14:35:22 +0200
Subject: [PATCH] Code guidelines fixes

---
 src/citra/emu_window/emu_window_sdl2.cpp |  8 ++++----
 src/citra/emu_window/emu_window_sdl2.h   |  2 +-
 src/citra_qt/bootmanager.h               | 14 ++++----------
 src/citra_qt/config.cpp                  |  2 +-
 src/citra_qt/main.cpp                    | 13 +++++--------
 src/citra_qt/main.h                      |  2 +-
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp
index 9e24bc457..40b9adb86 100644
--- a/src/citra/emu_window/emu_window_sdl2.cpp
+++ b/src/citra/emu_window/emu_window_sdl2.cpp
@@ -63,16 +63,16 @@ void EmuWindow_SDL2::OnResize() {
 }
 
 void EmuWindow_SDL2::WaitForFocus() {
-    while(!has_focus) {
+    while (!has_focus) {
         SDL_Event event;
         SDL_WaitEvent(&event);
-        if(event.type == SDL_WINDOWEVENT) {
+        if (event.type == SDL_WINDOWEVENT) {
             switch (event.window.event) {
             case SDL_WINDOWEVENT_FOCUS_GAINED:
-                has_focus=true;
+                has_focus = true;
                 break;
             case SDL_WINDOWEVENT_CLOSE:
-                has_focus=true;
+                has_focus = true;
                 is_open = false;
                 break;
             }
diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h
index 854db17ec..a92f7b49f 100644
--- a/src/citra/emu_window/emu_window_sdl2.h
+++ b/src/citra/emu_window/emu_window_sdl2.h
@@ -58,7 +58,7 @@ private:
     /// Is the window still open?
     bool is_open = true;
 
-    /// Is the window has focus
+    /// Does the window has focus
     bool has_focus = true;
 
     /// Internal SDL2 render window
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index 6965f4256..fa6e83bad 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -136,22 +136,16 @@ public slots:
 signals:
     /// Emitted when the window is closed
     void Closed();
-    /// Emitted when the window focus changed
-    void focusChanged(bool hasFocus);
+    /// Emitted when the window focus changes
+    void focusChanged(bool has_focus);
 
 private:
     void OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) override;
 
-    /**
-     * Capture focus gain to unset pause
-     * @param event
-     */
+    /// Capture focus gain to unset pause
     void focusInEvent(QFocusEvent*) override;
 
-    /**
-     * Capture focus lost to set pause
-     * @param event
-     */
+    /// Capture focus lost to set pause
     void focusOutEvent(QFocusEvent*) override;
 
     GGLWidgetInternal* child;
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index 48fb636ed..934dd33ec 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -116,7 +116,7 @@ void Config::ReadValues() {
 
     UISettings::values.single_window_mode = qt_config->value("singleWindowMode", true).toBool();
     UISettings::values.display_titlebar = qt_config->value("displayTitleBars", true).toBool();
-    UISettings::values.pause_onfocuslost = qt_config->value("pauseOnFocusLost",false).toBool();
+    UISettings::values.pause_onfocuslost = qt_config->value("pauseOnFocusLost", false).toBool();
     UISettings::values.confirm_before_closing = qt_config->value("confirmClose",true).toBool();
     UISettings::values.first_start = qt_config->value("firstStart", true).toBool();
 
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 7e87037b2..768360267 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -489,20 +489,17 @@ void GMainWindow::OnStopGame() {
     ShutdownGame();
 }
 
-void GMainWindow::OnFocusChanged(bool hasFocus) {
+void GMainWindow::OnFocusChanged(bool has_focus) {
     // The focus change does not impact actual emulator state if:
     // - the option is disabled
     // - the emulation is not started
     // - the emulation has been paused through menu
-    if(!UISettings::values.pause_onfocuslost ||
-       !emu_thread ||
-       emulation_paused)
+    if (!UISettings::values.pause_onfocuslost ||
+        !emu_thread ||
+        emulation_paused)
         return;
 
-    if (hasFocus)
-        emu_thread->SetRunning(true);
-    else // focus lost
-        emu_thread->SetRunning(false);
+    emu_thread->SetRunning(has_focus);
 }
 
 void GMainWindow::ToggleWindowMode() {
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index 7893102c0..75b6d706c 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -99,7 +99,7 @@ private slots:
     void OnPauseGame();
     void OnStopGame();
     /// Called whenever the render window focus is changed
-    void OnFocusChanged(bool hasFocus);
+    void OnFocusChanged(bool has_focus);
     /// Called whenever a user selects a game in the game list widget.
     void OnGameListLoadFile(QString game_path);
     void OnMenuLoadFile();