diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2018-05-12 11:19:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-12 11:19:40 -0700 |
| commit | 36adf76f4acef0b56150c6b377fe5b74589187fe (patch) | |
| tree | f852622b4817ac3d31cd05e5b4c441e84ae841c6 /Source/Core/Common/SettingsHandler.cpp | |
| parent | bf0ee9f7022208ac612212a94a7d3bf899718c28 (diff) | |
| parent | 0ef7dca0d4e6aab8eab66a71035d6304f9ca495f (diff) | |
Merge pull request #6830 from lioncash/namespace
SettingsHandler: Namespace code under the Common namespace
Diffstat (limited to 'Source/Core/Common/SettingsHandler.cpp')
| -rw-r--r-- | Source/Core/Common/SettingsHandler.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp index 6ce08f6579..e7292438ef 100644 --- a/Source/Core/Common/SettingsHandler.cpp +++ b/Source/Core/Common/SettingsHandler.cpp @@ -4,24 +4,18 @@ // 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 +{ SettingsHandler::SettingsHandler() { Reset(); @@ -37,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); @@ -134,3 +128,4 @@ std::string SettingsHandler::GenerateSerialNumber() stream << std::put_time(std::localtime(&t), "%j%H%M%S"); return stream.str(); } +} // namespace Common |