From 7e4c9a8b846a007b4c57261cf8b90e1ec4250334 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Tue, 3 Apr 2018 04:30:50 +1000
Subject: [PATCH] Rename and move Settings files

---
 Source/Android/Bridge/NotificationClass.cpp   |  2 +-
 Source/Android/Bridge/UISettings.cpp          |  2 +-
 Source/Android/Bridge/jniBridge.cpp           |  2 +-
 Source/Android/Bridge/jniBridgeSettings.cpp   |  2 +-
 Source/Project64-core/Plugins/PluginClass.h   |  2 +-
 Source/Project64-core/Project64-core.vcxproj  |  6 +--
 .../Project64-core.vcxproj.filters            | 18 ++++-----
 .../SettingsClass.cpp => Settings.cpp}        | 40 +++++++++----------
 .../{Settings/SettingsClass.h => Settings.h}  |  2 +-
 .../Settings/SettingType/SettingsType-Base.h  |  2 +-
 .../SettingType/SettingsType-TempString.h     |  2 +-
 .../Settings/{Settings.h => SettingsID.h}     |  0
 Source/Project64-core/stdafx.h                |  2 +-
 Source/Project64/Plugins/PluginList.h         |  2 +-
 Source/Project64/UserInterface.h              |  2 +-
 .../Debugger/Debugger-ViewMemory.h            |  2 +-
 16 files changed, 44 insertions(+), 44 deletions(-)
 rename Source/Project64-core/{Settings/SettingsClass.cpp => Settings.cpp} (97%)
 rename Source/Project64-core/{Settings/SettingsClass.h => Settings.h} (97%)
 rename Source/Project64-core/Settings/{Settings.h => SettingsID.h} (100%)

diff --git a/Source/Android/Bridge/NotificationClass.cpp b/Source/Android/Bridge/NotificationClass.cpp
index c5334ccfc..90a8662c8 100644
--- a/Source/Android/Bridge/NotificationClass.cpp
+++ b/Source/Android/Bridge/NotificationClass.cpp
@@ -11,7 +11,7 @@
 #include <common/StdString.h>
 #include <Common/Trace.h>
 #include <Project64-core/N64System/SystemGlobals.h>
-#include <Project64-core/Settings/SettingsClass.h>
+#include <Project64-core/Settings.h>
 #include <Project64-core/N64System/N64Class.h>
 #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
 #include "NotificationClass.h"
diff --git a/Source/Android/Bridge/UISettings.cpp b/Source/Android/Bridge/UISettings.cpp
index 31298c2bd..41d984bc1 100644
--- a/Source/Android/Bridge/UISettings.cpp
+++ b/Source/Android/Bridge/UISettings.cpp
@@ -8,7 +8,7 @@
 * GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                        *
 *                                                                           *
 ****************************************************************************/
-#include <Project64-core/Settings/SettingsClass.h>
+#include <Project64-core/Settings.h>
 #include <Project64-core/Settings/SettingType/SettingsType-Application.h>
 #include <Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h>
 #include <Project64-core/Settings/SettingType/SettingsType-RelativePath.h>
diff --git a/Source/Android/Bridge/jniBridge.cpp b/Source/Android/Bridge/jniBridge.cpp
index 70cea2c7a..7db0a2435 100644
--- a/Source/Android/Bridge/jniBridge.cpp
+++ b/Source/Android/Bridge/jniBridge.cpp
@@ -18,7 +18,7 @@
 #include <Project64-core/AppInit.h>
 #include <Project64-core/Version.h>
 #include <Project64-core/TraceModulesProject64.h>
-#include <Project64-core/Settings/SettingsClass.h>
+#include <Project64-core/Settings.h>
 #include <Project64-core/Settings/SettingType/SettingsType-Application.h>
 #include <Project64-core/N64System/N64Class.h>
 #include <Project64-core/N64System/SystemGlobals.h>
diff --git a/Source/Android/Bridge/jniBridgeSettings.cpp b/Source/Android/Bridge/jniBridgeSettings.cpp
index 268e251c7..c6c9c6887 100644
--- a/Source/Android/Bridge/jniBridgeSettings.cpp
+++ b/Source/Android/Bridge/jniBridgeSettings.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "jniBridgeSettings.h"
-#include <Project64-core/Settings/SettingsClass.h>
+#include <Project64-core/Settings.h>
 
 int  CJniBridegSettings::m_RefCount = 0; 
 bool CJniBridegSettings::m_bCPURunning; 
diff --git a/Source/Project64-core/Plugins/PluginClass.h b/Source/Project64-core/Plugins/PluginClass.h
index 34d3b2775..72c5f69ff 100644
--- a/Source/Project64-core/Plugins/PluginClass.h
+++ b/Source/Project64-core/Plugins/PluginClass.h
@@ -10,7 +10,7 @@
 ****************************************************************************/
 #pragma once
 #include <list>
-#include <Project64-core/Settings/SettingsClass.h>
+#include <Project64-core/Settings.h>
 #include <Project64-core/Settings/DebugSettings.h>
 
 #ifndef PLUGIN_INFO_STRUCT
diff --git a/Source/Project64-core/Project64-core.vcxproj b/Source/Project64-core/Project64-core.vcxproj
index d6c3e9fdc..4521d5760 100644
--- a/Source/Project64-core/Project64-core.vcxproj
+++ b/Source/Project64-core/Project64-core.vcxproj
@@ -96,12 +96,12 @@
     <ClCompile Include="Plugins\PluginClass.cpp" />
     <ClCompile Include="Plugins\RSPPlugin.cpp" />
     <ClCompile Include="RomList\RomList.cpp" />
+    <ClCompile Include="Settings.cpp" />
     <ClCompile Include="Settings\DebugSettings.cpp" />
     <ClCompile Include="Settings\GameSettings.cpp" />
     <ClCompile Include="Settings\LoggingSettings.cpp" />
     <ClCompile Include="Settings\N64SystemSettings.cpp" />
     <ClCompile Include="Settings\RecompilerSettings.cpp" />
-    <ClCompile Include="Settings\SettingsClass.cpp" />
     <ClCompile Include="Settings\SettingType\SettingsType-Application.cpp" />
     <ClCompile Include="Settings\SettingType\SettingsType-ApplicationIndex.cpp" />
     <ClCompile Include="Settings\SettingType\SettingsType-ApplicationPath.cpp" />
@@ -200,13 +200,13 @@
     <ClInclude Include="Plugins\PluginClass.h" />
     <ClInclude Include="Plugins\RSPPlugin.h" />
     <ClInclude Include="RomList\RomList.h" />
+    <ClInclude Include="Settings.h" />
     <ClInclude Include="Settings\DebugSettings.h" />
     <ClInclude Include="Settings\GameSettings.h" />
     <ClInclude Include="Settings\LoggingSettings.h" />
     <ClInclude Include="Settings\N64SystemSettings.h" />
     <ClInclude Include="Settings\RecompilerSettings.h" />
-    <ClInclude Include="Settings\Settings.h" />
-    <ClInclude Include="Settings\SettingsClass.h" />
+    <ClInclude Include="Settings\SettingsID.h" />
     <ClInclude Include="Settings\SettingType\SettingsType-Application.h" />
     <ClInclude Include="Settings\SettingType\SettingsType-ApplicationIndex.h" />
     <ClInclude Include="Settings\SettingType\SettingsType-ApplicationPath.h" />
diff --git a/Source/Project64-core/Project64-core.vcxproj.filters b/Source/Project64-core/Project64-core.vcxproj.filters
index 64b467f2d..9c90008c4 100644
--- a/Source/Project64-core/Project64-core.vcxproj.filters
+++ b/Source/Project64-core/Project64-core.vcxproj.filters
@@ -174,9 +174,6 @@
     <ClCompile Include="Settings\RecompilerSettings.cpp">
       <Filter>Source Files\Settings</Filter>
     </ClCompile>
-    <ClCompile Include="Settings\SettingsClass.cpp">
-      <Filter>Source Files\Settings</Filter>
-    </ClCompile>
     <ClCompile Include="Plugins\AudioPlugin.cpp">
       <Filter>Source Files\Plugins</Filter>
     </ClCompile>
@@ -339,6 +336,9 @@
     <ClCompile Include="N64System\Recompiler\Arm\ArmRegInfo.cpp">
       <Filter>Source Files\N64 System\Recompiler\Arm</Filter>
     </ClCompile>
+    <ClCompile Include="Settings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -413,9 +413,6 @@
     <ClInclude Include="Settings\SettingType\SettingsType-TempString.h">
       <Filter>Header Files\Settings\SettingType</Filter>
     </ClInclude>
-    <ClInclude Include="Settings\Settings.h">
-      <Filter>Header Files\Settings</Filter>
-    </ClInclude>
     <ClInclude Include="Notification.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -596,9 +593,6 @@
     <ClInclude Include="N64System\Interpreter\InterpreterOps.h">
       <Filter>Header Files\N64 System\Interpreter</Filter>
     </ClInclude>
-    <ClInclude Include="Settings\SettingsClass.h">
-      <Filter>Header Files\Settings</Filter>
-    </ClInclude>
     <ClInclude Include="N64System\SpeedLimiterClass.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -656,6 +650,12 @@
     <ClInclude Include="Debugger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingsID.h">
+      <Filter>Header Files\Settings</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ClassDiagram.cd" />
diff --git a/Source/Project64-core/Settings/SettingsClass.cpp b/Source/Project64-core/Settings.cpp
similarity index 97%
rename from Source/Project64-core/Settings/SettingsClass.cpp
rename to Source/Project64-core/Settings.cpp
index fda4c6b3e..a297a0afe 100644
--- a/Source/Project64-core/Settings/SettingsClass.cpp
+++ b/Source/Project64-core/Settings.cpp
@@ -11,26 +11,26 @@
 #include "stdafx.h"
 
 #include <Common/Platform.h>
-#include "SettingType/SettingsType-Application.h"
-#include "SettingType/SettingsType-ApplicationPath.h"
-#include "SettingType/SettingsType-ApplicationIndex.h"
-#include "SettingType/SettingsType-Cheats.h"
-#include "SettingType/SettingsType-GameSetting.h"
-#include "SettingType/SettingsType-GameSettingIndex.h"
-#include "SettingType/SettingsType-RelativePath.h"
-#include "SettingType/SettingsType-RomDatabase.h"
-#include "SettingType/SettingsType-RomDatabaseSetting.h"
-#include "SettingType/SettingsType-RomDatabaseIndex.h"
-#include "SettingType/SettingsType-RDBCpuType.h"
-#include "SettingType/SettingsType-RDBRamSize.h"
-#include "SettingType/SettingsType-RDBSaveChip.h"
-#include "SettingType/SettingsType-RDBYesNo.h"
-#include "SettingType/SettingsType-RDBOnOff.h"
-#include "SettingType/SettingsType-SelectedDirectory.h"
-#include "SettingType/SettingsType-TempString.h"
-#include "SettingType/SettingsType-TempNumber.h"
-#include "SettingType/SettingsType-TempBool.h"
-#include <Project64-core/Settings/SettingsClass.h>
+#include "Settings/SettingType/SettingsType-Application.h"
+#include "Settings/SettingType/SettingsType-ApplicationPath.h"
+#include "Settings/SettingType/SettingsType-ApplicationIndex.h"
+#include "Settings/SettingType/SettingsType-Cheats.h"
+#include "Settings/SettingType/SettingsType-GameSetting.h"
+#include "Settings/SettingType/SettingsType-GameSettingIndex.h"
+#include "Settings/SettingType/SettingsType-RelativePath.h"
+#include "Settings/SettingType/SettingsType-RomDatabase.h"
+#include "Settings/SettingType/SettingsType-RomDatabaseSetting.h"
+#include "Settings/SettingType/SettingsType-RomDatabaseIndex.h"
+#include "Settings/SettingType/SettingsType-RDBCpuType.h"
+#include "Settings/SettingType/SettingsType-RDBRamSize.h"
+#include "Settings/SettingType/SettingsType-RDBSaveChip.h"
+#include "Settings/SettingType/SettingsType-RDBYesNo.h"
+#include "Settings/SettingType/SettingsType-RDBOnOff.h"
+#include "Settings/SettingType/SettingsType-SelectedDirectory.h"
+#include "Settings/SettingType/SettingsType-TempString.h"
+#include "Settings/SettingType/SettingsType-TempNumber.h"
+#include "Settings/SettingType/SettingsType-TempBool.h"
+#include <Project64-core/Settings.h>
 #include <Project64-core/N64System/N64Types.h>
 #include <Common/Trace.h>
 
diff --git a/Source/Project64-core/Settings/SettingsClass.h b/Source/Project64-core/Settings.h
similarity index 97%
rename from Source/Project64-core/Settings/SettingsClass.h
rename to Source/Project64-core/Settings.h
index fed426783..b999b6253 100644
--- a/Source/Project64-core/Settings/SettingsClass.h
+++ b/Source/Project64-core/Settings.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include <Project64-core/Settings/SettingType/SettingsType-Base.h>
+#include <Project64-core/Settings/SettingsID.h>
 #include <map>
 
 enum SettingDataType
@@ -29,7 +30,6 @@ class CSettings
 public:
     typedef void(*SettingChangedFunc)(void *);
 
-public:
     CSettings(void);
     ~CSettings(void);
 
diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Base.h b/Source/Project64-core/Settings/SettingType/SettingsType-Base.h
index a1ff58f40..4781cfa28 100644
--- a/Source/Project64-core/Settings/SettingType/SettingsType-Base.h
+++ b/Source/Project64-core/Settings/SettingType/SettingsType-Base.h
@@ -10,7 +10,7 @@
 ****************************************************************************/
 #pragma once
 
-#include <Project64-core/Settings/Settings.h>
+#include <Project64-core/Settings.h>
 #include <Common/StdString.h>
 #include <Common/stdtypes.h>
 
diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h
index 9976adb8a..f81e0c0ed 100644
--- a/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h
+++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h
@@ -47,5 +47,5 @@ private:
     CSettingTypeTempString(const CSettingTypeTempString&);            // Disable copy constructor
     CSettingTypeTempString& operator=(const CSettingTypeTempString&); // Disable assignment
 
-    stdstr m_value;
+    std::string m_value;
 };
diff --git a/Source/Project64-core/Settings/Settings.h b/Source/Project64-core/Settings/SettingsID.h
similarity index 100%
rename from Source/Project64-core/Settings/Settings.h
rename to Source/Project64-core/Settings/SettingsID.h
diff --git a/Source/Project64-core/stdafx.h b/Source/Project64-core/stdafx.h
index 96a563ce2..b02cd5304 100644
--- a/Source/Project64-core/stdafx.h
+++ b/Source/Project64-core/stdafx.h
@@ -8,5 +8,5 @@
 #include <Project64-core/Multilanguage.h>
 #include <Project64-core/Notification.h>
 #include "Version.h"
-#include <Project64-core/Settings/SettingsClass.h>
+#include <Project64-core/Settings.h>
 #include <Project64-core/TraceModulesProject64.h>
diff --git a/Source/Project64/Plugins/PluginList.h b/Source/Project64/Plugins/PluginList.h
index 6ddc7ab48..3680ed13c 100644
--- a/Source/Project64/Plugins/PluginList.h
+++ b/Source/Project64/Plugins/PluginList.h
@@ -10,7 +10,7 @@
 ****************************************************************************/
 #pragma once
 
-#include <Project64-core/Settings/Settings.h>
+#include <Project64-core/Settings.h>
 
 class CPluginList
 {
diff --git a/Source/Project64/UserInterface.h b/Source/Project64/UserInterface.h
index 7e255662b..90e4dda5f 100644
--- a/Source/Project64/UserInterface.h
+++ b/Source/Project64/UserInterface.h
@@ -14,7 +14,7 @@
 #include "Support.h"
 
 #include <Project64-core/Multilanguage.h>
-#include <Project64-core/Settings/SettingsClass.h>
+#include <Project64-core/Settings.h>
 
 #include "WTLApp.h"
 #include "UserInterface/MenuShortCuts.h"
diff --git a/Source/Project64/UserInterface/Debugger/Debugger-ViewMemory.h b/Source/Project64/UserInterface/Debugger/Debugger-ViewMemory.h
index 3c1525a7c..582e8b62f 100644
--- a/Source/Project64/UserInterface/Debugger/Debugger-ViewMemory.h
+++ b/Source/Project64/UserInterface/Debugger/Debugger-ViewMemory.h
@@ -34,7 +34,7 @@ private:
         MESSAGE_HANDLER(WM_ACTIVATE, OnActivate)
         MSG_WM_DESTROY(OnDestroy)
         MSG_WM_VSCROLL(OnVScroll)
-        END_MSG_MAP()
+    END_MSG_MAP()
 
     LRESULT  OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
     LRESULT  OnClicked(WORD wNotifyCode, WORD wID, HWND /*hWndCtl*/, BOOL& bHandled);