From 5677e5d74a21a59ee9978b81ff6f59eb74c64147 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 12 May 2018 13:39:35 -0400
Subject: SettingsHandler: Namespace code under the Common namespace

Adds another file in Common to the Common namespace.
---
 Source/Core/Common/SettingsHandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Source/Core/Common/SettingsHandler.cpp')

diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index 6ce08f6579..42d24afe07 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -22,6 +22,8 @@
 #include "Common/SettingsHandler.h"
 #include "Common/Timer.h"
 
+namespace Common
+{
 SettingsHandler::SettingsHandler()
 {
   Reset();
@@ -134,3 +136,4 @@ std::string SettingsHandler::GenerateSerialNumber()
   stream << std::put_time(std::localtime(&t), "%j%H%M%S");
   return stream.str();
 }
+}  // namespace Common
-- 
cgit v1.2.3


From 1da2091801f80ba567908e7d3f08efcfec900bc8 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 12 May 2018 13:43:59 -0400
Subject: SettingsHandler: Remove unnecessary includes

All Windows-specific includes aren't needed here anymore.
---
 Source/Core/Common/SettingsHandler.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'Source/Core/Common/SettingsHandler.cpp')

diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index 42d24afe07..9a22a2e5d7 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -4,23 +4,15 @@
 
 // Thanks to Treeki for writing the original class - 29/01/2012
 
+#include "Common/SettingsHandler.h"
+
 #include <cstddef>
-#include <cstdio>
-#include <cstring>
 #include <ctime>
 #include <iomanip>
 #include <sstream>
 #include <string>
 
-#ifdef _WIN32
-#include <windows.h>
-#include <mmsystem.h>
-#include <sys/timeb.h>
-#endif
-
 #include "Common/CommonTypes.h"
-#include "Common/SettingsHandler.h"
-#include "Common/Timer.h"
 
 namespace Common
 {
-- 
cgit v1.2.3


From 0ef7dca0d4e6aab8eab66a71035d6304f9ca495f Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 12 May 2018 13:46:24 -0400
Subject: SettingsHandler: Remove redundant type qualifier in SetBytes()

Given the qualifier isn't used for the constructor taking a buffer, remove it here
to be consistent.
---
 Source/Core/Common/SettingsHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Core/Common/SettingsHandler.cpp')

diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index 9a22a2e5d7..e7292438ef 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -31,7 +31,7 @@ const SettingsHandler::Buffer& SettingsHandler::GetBytes() const
   return m_buffer;
 }
 
-void SettingsHandler::SetBytes(SettingsHandler::Buffer&& buffer)
+void SettingsHandler::SetBytes(Buffer&& buffer)
 {
   Reset();
   m_buffer = std::move(buffer);
-- 
cgit v1.2.3