ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename and move Settings files

This commit is contained in:
zilmar 2018-04-03 04:30:50 +10:00
parent 88a824be60
commit 7e4c9a8b84
16 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/Bridge/NotificationClass.cpp
View File

@ -11,7 +11,7 @@
#include <common/StdString.h> #include <common/StdString.h>
#include <Common/Trace.h> #include <Common/Trace.h>
#include <Project64-core/N64System/SystemGlobals.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/N64Class.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include "NotificationClass.h" #include "NotificationClass.h"

2
Source/Android/Bridge/UISettings.cpp
View File

@ -8,7 +8,7 @@
* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html * * 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-Application.h>
#include <Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h> #include <Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h>
#include <Project64-core/Settings/SettingType/SettingsType-RelativePath.h> #include <Project64-core/Settings/SettingType/SettingsType-RelativePath.h>

2
Source/Android/Bridge/jniBridge.cpp
View File

@ -18,7 +18,7 @@
#include <Project64-core/AppInit.h> #include <Project64-core/AppInit.h>
#include <Project64-core/Version.h> #include <Project64-core/Version.h>
#include <Project64-core/TraceModulesProject64.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/Settings/SettingType/SettingsType-Application.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64Class.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>

2
Source/Android/Bridge/jniBridgeSettings.cpp
View File

@ -9,7 +9,7 @@
* * * *
****************************************************************************/ ****************************************************************************/
#include "jniBridgeSettings.h" #include "jniBridgeSettings.h"
#include <Project64-core/Settings/SettingsClass.h> #include <Project64-core/Settings.h>
int CJniBridegSettings::m_RefCount = 0; int CJniBridegSettings::m_RefCount = 0;
bool CJniBridegSettings::m_bCPURunning; bool CJniBridegSettings::m_bCPURunning;

2
Source/Project64-core/Plugins/PluginClass.h
View File

@ -10,7 +10,7 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <list> #include <list>
#include <Project64-core/Settings/SettingsClass.h> #include <Project64-core/Settings.h>
#include <Project64-core/Settings/DebugSettings.h> #include <Project64-core/Settings/DebugSettings.h>
#ifndef PLUGIN_INFO_STRUCT #ifndef PLUGIN_INFO_STRUCT

6
Source/Project64-core/Project64-core.vcxproj
View File

@ -96,12 +96,12 @@
<ClCompile Include="Plugins\PluginClass.cpp" /> <ClCompile Include="Plugins\PluginClass.cpp" />
<ClCompile Include="Plugins\RSPPlugin.cpp" /> <ClCompile Include="Plugins\RSPPlugin.cpp" />
<ClCompile Include="RomList\RomList.cpp" /> <ClCompile Include="RomList\RomList.cpp" />
<ClCompile Include="Settings.cpp" />
<ClCompile Include="Settings\DebugSettings.cpp" /> <ClCompile Include="Settings\DebugSettings.cpp" />
<ClCompile Include="Settings\GameSettings.cpp" /> <ClCompile Include="Settings\GameSettings.cpp" />
<ClCompile Include="Settings\LoggingSettings.cpp" /> <ClCompile Include="Settings\LoggingSettings.cpp" />
<ClCompile Include="Settings\N64SystemSettings.cpp" /> <ClCompile Include="Settings\N64SystemSettings.cpp" />
<ClCompile Include="Settings\RecompilerSettings.cpp" /> <ClCompile Include="Settings\RecompilerSettings.cpp" />
<ClCompile Include="Settings\SettingsClass.cpp" />
<ClCompile Include="Settings\SettingType\SettingsType-Application.cpp" /> <ClCompile Include="Settings\SettingType\SettingsType-Application.cpp" />
<ClCompile Include="Settings\SettingType\SettingsType-ApplicationIndex.cpp" /> <ClCompile Include="Settings\SettingType\SettingsType-ApplicationIndex.cpp" />
<ClCompile Include="Settings\SettingType\SettingsType-ApplicationPath.cpp" /> <ClCompile Include="Settings\SettingType\SettingsType-ApplicationPath.cpp" />
@ -200,13 +200,13 @@
<ClInclude Include="Plugins\PluginClass.h" /> <ClInclude Include="Plugins\PluginClass.h" />
<ClInclude Include="Plugins\RSPPlugin.h" /> <ClInclude Include="Plugins\RSPPlugin.h" />
<ClInclude Include="RomList\RomList.h" /> <ClInclude Include="RomList\RomList.h" />
<ClInclude Include="Settings.h" />
<ClInclude Include="Settings\DebugSettings.h" /> <ClInclude Include="Settings\DebugSettings.h" />
<ClInclude Include="Settings\GameSettings.h" /> <ClInclude Include="Settings\GameSettings.h" />
<ClInclude Include="Settings\LoggingSettings.h" /> <ClInclude Include="Settings\LoggingSettings.h" />
<ClInclude Include="Settings\N64SystemSettings.h" /> <ClInclude Include="Settings\N64SystemSettings.h" />
<ClInclude Include="Settings\RecompilerSettings.h" /> <ClInclude Include="Settings\RecompilerSettings.h" />
<ClInclude Include="Settings\Settings.h" /> <ClInclude Include="Settings\SettingsID.h" />
<ClInclude Include="Settings\SettingsClass.h" />
<ClInclude Include="Settings\SettingType\SettingsType-Application.h" /> <ClInclude Include="Settings\SettingType\SettingsType-Application.h" />
<ClInclude Include="Settings\SettingType\SettingsType-ApplicationIndex.h" /> <ClInclude Include="Settings\SettingType\SettingsType-ApplicationIndex.h" />
<ClInclude Include="Settings\SettingType\SettingsType-ApplicationPath.h" /> <ClInclude Include="Settings\SettingType\SettingsType-ApplicationPath.h" />

18
Source/Project64-core/Project64-core.vcxproj.filters
View File

@ -174,9 +174,6 @@
<ClCompile Include="Settings\RecompilerSettings.cpp"> <ClCompile Include="Settings\RecompilerSettings.cpp">
<Filter>Source Files\Settings</Filter> <Filter>Source Files\Settings</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Settings\SettingsClass.cpp">
<Filter>Source Files\Settings</Filter>
</ClCompile>
<ClCompile Include="Plugins\AudioPlugin.cpp"> <ClCompile Include="Plugins\AudioPlugin.cpp">
<Filter>Source Files\Plugins</Filter> <Filter>Source Files\Plugins</Filter>
</ClCompile> </ClCompile>
@ -339,6 +336,9 @@
<ClCompile Include="N64System\Recompiler\Arm\ArmRegInfo.cpp"> <ClCompile Include="N64System\Recompiler\Arm\ArmRegInfo.cpp">
<Filter>Source Files\N64 System\Recompiler\Arm</Filter> <Filter>Source Files\N64 System\Recompiler\Arm</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Settings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="stdafx.h"> <ClInclude Include="stdafx.h">
@ -413,9 +413,6 @@
<ClInclude Include="Settings\SettingType\SettingsType-TempString.h"> <ClInclude Include="Settings\SettingType\SettingsType-TempString.h">
<Filter>Header Files\Settings\SettingType</Filter> <Filter>Header Files\Settings\SettingType</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Settings\Settings.h">
<Filter>Header Files\Settings</Filter>
</ClInclude>
<ClInclude Include="Notification.h"> <ClInclude Include="Notification.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -596,9 +593,6 @@
<ClInclude Include="N64System\Interpreter\InterpreterOps.h"> <ClInclude Include="N64System\Interpreter\InterpreterOps.h">
<Filter>Header Files\N64 System\Interpreter</Filter> <Filter>Header Files\N64 System\Interpreter</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Settings\SettingsClass.h">
<Filter>Header Files\Settings</Filter>
</ClInclude>
<ClInclude Include="N64System\SpeedLimiterClass.h"> <ClInclude Include="N64System\SpeedLimiterClass.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -656,6 +650,12 @@
<ClInclude Include="Debugger.h"> <ClInclude Include="Debugger.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Settings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Settings\SettingsID.h">
<Filter>Header Files\Settings</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="ClassDiagram.cd" /> <None Include="ClassDiagram.cd" />

40
Source/Project64-core/Settings/SettingsClass.cpp → Source/Project64-core/Settings.cpp
View File

@ -11,26 +11,26 @@
#include "stdafx.h" #include "stdafx.h"
#include <Common/Platform.h> #include <Common/Platform.h>
#include "SettingType/SettingsType-Application.h" #include "Settings/SettingType/SettingsType-Application.h"
#include "SettingType/SettingsType-ApplicationPath.h" #include "Settings/SettingType/SettingsType-ApplicationPath.h"
#include "SettingType/SettingsType-ApplicationIndex.h" #include "Settings/SettingType/SettingsType-ApplicationIndex.h"
#include "SettingType/SettingsType-Cheats.h" #include "Settings/SettingType/SettingsType-Cheats.h"
#include "SettingType/SettingsType-GameSetting.h" #include "Settings/SettingType/SettingsType-GameSetting.h"
#include "SettingType/SettingsType-GameSettingIndex.h" #include "Settings/SettingType/SettingsType-GameSettingIndex.h"
#include "SettingType/SettingsType-RelativePath.h" #include "Settings/SettingType/SettingsType-RelativePath.h"
#include "SettingType/SettingsType-RomDatabase.h" #include "Settings/SettingType/SettingsType-RomDatabase.h"
#include "SettingType/SettingsType-RomDatabaseSetting.h" #include "Settings/SettingType/SettingsType-RomDatabaseSetting.h"
#include "SettingType/SettingsType-RomDatabaseIndex.h" #include "Settings/SettingType/SettingsType-RomDatabaseIndex.h"
#include "SettingType/SettingsType-RDBCpuType.h" #include "Settings/SettingType/SettingsType-RDBCpuType.h"
#include "SettingType/SettingsType-RDBRamSize.h" #include "Settings/SettingType/SettingsType-RDBRamSize.h"
#include "SettingType/SettingsType-RDBSaveChip.h" #include "Settings/SettingType/SettingsType-RDBSaveChip.h"
#include "SettingType/SettingsType-RDBYesNo.h" #include "Settings/SettingType/SettingsType-RDBYesNo.h"
#include "SettingType/SettingsType-RDBOnOff.h" #include "Settings/SettingType/SettingsType-RDBOnOff.h"
#include "SettingType/SettingsType-SelectedDirectory.h" #include "Settings/SettingType/SettingsType-SelectedDirectory.h"
#include "SettingType/SettingsType-TempString.h" #include "Settings/SettingType/SettingsType-TempString.h"
#include "SettingType/SettingsType-TempNumber.h" #include "Settings/SettingType/SettingsType-TempNumber.h"
#include "SettingType/SettingsType-TempBool.h" #include "Settings/SettingType/SettingsType-TempBool.h"
#include <Project64-core/Settings/SettingsClass.h> #include <Project64-core/Settings.h>
#include <Project64-core/N64System/N64Types.h> #include <Project64-core/N64System/N64Types.h>
#include <Common/Trace.h> #include <Common/Trace.h>

2
Source/Project64-core/Settings/SettingsClass.h → Source/Project64-core/Settings.h
View File

@ -11,6 +11,7 @@
#pragma once #pragma once
#include <Project64-core/Settings/SettingType/SettingsType-Base.h> #include <Project64-core/Settings/SettingType/SettingsType-Base.h>
#include <Project64-core/Settings/SettingsID.h>
#include <map> #include <map>
enum SettingDataType enum SettingDataType
@ -29,7 +30,6 @@ class CSettings
public: public:
typedef void(*SettingChangedFunc)(void *); typedef void(*SettingChangedFunc)(void *);
public:
CSettings(void); CSettings(void);
~CSettings(void); ~CSettings(void);

2
Source/Project64-core/Settings/SettingType/SettingsType-Base.h
View File

@ -10,7 +10,7 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <Project64-core/Settings/Settings.h> #include <Project64-core/Settings.h>
#include <Common/StdString.h> #include <Common/StdString.h>
#include <Common/stdtypes.h> #include <Common/stdtypes.h>

2
Source/Project64-core/Settings/SettingType/SettingsType-TempString.h
View File

@ -47,5 +47,5 @@ private:
CSettingTypeTempString(const CSettingTypeTempString&); // Disable copy constructor CSettingTypeTempString(const CSettingTypeTempString&); // Disable copy constructor
CSettingTypeTempString& operator=(const CSettingTypeTempString&); // Disable assignment CSettingTypeTempString& operator=(const CSettingTypeTempString&); // Disable assignment
stdstr m_value; std::string m_value;
}; };

0
Source/Project64-core/Settings/Settings.h → Source/Project64-core/Settings/SettingsID.h
View File

2
Source/Project64-core/stdafx.h
View File

@ -8,5 +8,5 @@
#include <Project64-core/Multilanguage.h> #include <Project64-core/Multilanguage.h>
#include <Project64-core/Notification.h> #include <Project64-core/Notification.h>
#include "Version.h" #include "Version.h"
#include <Project64-core/Settings/SettingsClass.h> #include <Project64-core/Settings.h>
#include <Project64-core/TraceModulesProject64.h> #include <Project64-core/TraceModulesProject64.h>

2
Source/Project64/Plugins/PluginList.h
View File

@ -10,7 +10,7 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <Project64-core/Settings/Settings.h> #include <Project64-core/Settings.h>
class CPluginList class CPluginList
{ {

2
Source/Project64/UserInterface.h
View File

@ -14,7 +14,7 @@
#include "Support.h" #include "Support.h"
#include <Project64-core/Multilanguage.h> #include <Project64-core/Multilanguage.h>
#include <Project64-core/Settings/SettingsClass.h> #include <Project64-core/Settings.h>
#include "WTLApp.h" #include "WTLApp.h"
#include "UserInterface/MenuShortCuts.h" #include "UserInterface/MenuShortCuts.h"