Merge pull request #9404 from Filoppi/patch-5

Fix typos and code coding conventions

6 files changed, 11 insertions, 13 deletions

diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
index 9e4edf2b54..487f31eeeb 100644
--- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -39,7 +39,7 @@ static void TryToConnectBalanceBoard(std::unique_ptr<Wiimote>);
 static bool TryToConnectWiimoteToSlot(std::unique_ptr<Wiimote>&, unsigned int);
 static void HandleWiimoteDisconnect(int index);
 
-static bool g_real_wiimotes_initialized = false;
+static bool s_real_wiimotes_initialized = false;
 
 // This is used to store connected Wiimotes' IDs, so we don't connect
 // more than once to the same device.
@@ -807,7 +807,7 @@ void LoadSettings()
 // config dialog calls this when some settings change
 void Initialize(::Wiimote::InitializeMode init_mode)
 {
-  if (!g_real_wiimotes_initialized)
+  if (!s_real_wiimotes_initialized)
   {
     s_wiimote_scanner.StartThread();
   }
@@ -829,12 +829,12 @@ void Initialize(::Wiimote::InitializeMode init_mode)
     }
   }
 
-  if (g_real_wiimotes_initialized)
+  if (s_real_wiimotes_initialized)
     return;
 
   NOTICE_LOG_FMT(WIIMOTE, "WiimoteReal::Initialize");
 
-  g_real_wiimotes_initialized = true;
+  s_real_wiimotes_initialized = true;
 }
 
 // called on emulation shutdown
@@ -848,7 +848,7 @@ void Stop()
 // called when the Dolphin app exits
 void Shutdown()
 {
-  g_real_wiimotes_initialized = false;
+  s_real_wiimotes_initialized = false;
   s_wiimote_scanner.StopThread();
 
   NOTICE_LOG_FMT(WIIMOTE, "WiimoteReal::Shutdown");
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
index cd494d1a94..8326ae8815 100644
--- a/Source/Core/Core/State.cpp
+++ b/Source/Core/Core/State.cpp
@@ -99,11 +99,11 @@ enum
   STATE_LOAD = 2,
 };
 
-static bool g_use_compression = true;
+static bool s_use_compression = true;
 
 void EnableCompression(bool compression)
 {
-  g_use_compression = compression;
+  s_use_compression = compression;
 }
 
 // Returns true if state version matches current Dolphin state version, false otherwise.
@@ -358,7 +358,7 @@ static void CompressAndDumpState(CompressAndDumpState_args save_args)
   // Setting up the header
   StateHeader header{};
   SConfig::GetInstance().GetGameID().copy(header.gameID, std::size(header.gameID));
-  header.size = g_use_compression ? (u32)buffer_size : 0;
+  header.size = s_use_compression ? (u32)buffer_size : 0;
   header.time = Common::Timer::GetDoubleTime();
 
   f.WriteArray(&header, 1);
diff --git a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
index a1be828d3f..41a85a0304 100644
--- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
@@ -20,7 +20,6 @@
 #include "DolphinQt/Config/Graphics/GraphicsSlider.h"
 #include "DolphinQt/Config/Graphics/GraphicsWindow.h"
 #include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
-#include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/Settings.h"
 
 #include "UICommon/VideoUtils.h"
diff --git a/Source/Core/DolphinQt/QtUtils/ElidedButton.cpp b/Source/Core/DolphinQt/QtUtils/ElidedButton.cpp
index e18c6fd21c..00eb1e1f29 100644
--- a/Source/Core/DolphinQt/QtUtils/ElidedButton.cpp
+++ b/Source/Core/DolphinQt/QtUtils/ElidedButton.cpp
@@ -4,7 +4,6 @@
 
 #include "DolphinQt/QtUtils/ElidedButton.h"
 
-#include <QFontMetrics>
 #include <QStyleOptionButton>
 #include <QStylePainter>
 
diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
index bcc25886f3..eaca692ced 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
@@ -220,7 +220,7 @@ public:
   }
 
 protected:
-  // TODO: Wiimote attachment has its own member that isn't being used..
+  // TODO: Wiimote attachment has its own member that isn't being used.
   ciface::ExpressionParser::ControlEnvironment::VariableContainer m_expression_vars;
 
   void UpdateReferences(ciface::ExpressionParser::ControlEnvironment& env);
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index c16dcd95c3..f281ff5a87 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -1194,7 +1194,7 @@ void Renderer::UpdateWidescreenHeuristic()
     // with NON-anamorphic orthographic projections.
     // This can cause incorrect changes to 4:3 when perspective projections are temporarily not
     // shown. e.g. Animal Crossing's inventory menu.
-    // Unless we were in a sitation which was orthographically anamorphic
+    // Unless we were in a situation which was orthographically anamorphic
     // we won't consider orthographic data for changes from 16:9 to 4:3.
     m_is_game_widescreen = false;
   }
@@ -1332,7 +1332,7 @@ void Renderer::Swap(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height, u6
         Core::Callback_FramePresented();
       }
 
-      // Handle any config changes, this gets propogated to the backend.
+      // Handle any config changes, this gets propagated to the backend.
       CheckForConfigChanges();
       g_Config.iSaveTargetId = 0;