diff --git a/Source/Android/Bridge/Bridge.vcxproj b/Source/Android/Bridge/Bridge.vcxproj index e61a739e9..8ddef6a2c 100644 --- a/Source/Android/Bridge/Bridge.vcxproj +++ b/Source/Android/Bridge/Bridge.vcxproj @@ -34,7 +34,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/Source/Android/Bridge/Bridge.vcxproj.filters b/Source/Android/Bridge/Bridge.vcxproj.filters index ab726a7c3..d0a49793f 100644 --- a/Source/Android/Bridge/Bridge.vcxproj.filters +++ b/Source/Android/Bridge/Bridge.vcxproj.filters @@ -18,7 +18,7 @@ Source Files - + Source Files @@ -38,7 +38,7 @@ - + Header Files diff --git a/Source/Android/Bridge/NotificationClass.cpp b/Source/Android/Bridge/Notification.cpp similarity index 97% rename from Source/Android/Bridge/NotificationClass.cpp rename to Source/Android/Bridge/Notification.cpp index 0b2f43ccf..e1e4846bb 100644 --- a/Source/Android/Bridge/NotificationClass.cpp +++ b/Source/Android/Bridge/Notification.cpp @@ -2,9 +2,9 @@ #include #include #include -#include +#include #include -#include "NotificationClass.h" +#include "Notification.h" #include "JavaBridge.h" #if defined(ANDROID) #include diff --git a/Source/Android/Bridge/NotificationClass.h b/Source/Android/Bridge/Notification.h similarity index 100% rename from Source/Android/Bridge/NotificationClass.h rename to Source/Android/Bridge/Notification.h diff --git a/Source/Android/Bridge/jniBridge.cpp b/Source/Android/Bridge/jniBridge.cpp index c5c770d94..f76e9ab2d 100644 --- a/Source/Android/Bridge/jniBridge.cpp +++ b/Source/Android/Bridge/jniBridge.cpp @@ -4,13 +4,13 @@ #include #include #endif -#include "NotificationClass.h" +#include "Notification.h" #include #include #include #include #include -#include +#include #include #include #include diff --git a/Source/Common/Common.vcxproj b/Source/Common/Common.vcxproj index 210547abd..418667c02 100644 --- a/Source/Common/Common.vcxproj +++ b/Source/Common/Common.vcxproj @@ -38,11 +38,11 @@ - - + + - - + + @@ -57,11 +57,11 @@ - - + + - - + + diff --git a/Source/Common/Common.vcxproj.filters b/Source/Common/Common.vcxproj.filters index a3128ee2f..a66f43e13 100644 --- a/Source/Common/Common.vcxproj.filters +++ b/Source/Common/Common.vcxproj.filters @@ -14,13 +14,13 @@ Source Files - + Source Files - + Source Files - + Source Files @@ -56,7 +56,7 @@ Source Files - + Source Files @@ -67,13 +67,13 @@ Header Files - + Header Files - + Header Files - + Header Files @@ -115,7 +115,7 @@ Header Files - + Header Files diff --git a/Source/Common/DateTimeClass.cpp b/Source/Common/DateTime.cpp similarity index 92% rename from Source/Common/DateTimeClass.cpp rename to Source/Common/DateTime.cpp index e6015a2bb..8d2a8635a 100644 --- a/Source/Common/DateTimeClass.cpp +++ b/Source/Common/DateTime.cpp @@ -1,4 +1,4 @@ -#include "DateTimeClass.h" +#include "DateTime.h" #include CDateTime::CDateTime() diff --git a/Source/Common/DateTimeClass.h b/Source/Common/DateTime.h similarity index 100% rename from Source/Common/DateTimeClass.h rename to Source/Common/DateTime.h diff --git a/Source/Common/FileClass.cpp b/Source/Common/File.cpp similarity index 95% rename from Source/Common/FileClass.cpp rename to Source/Common/File.cpp index c38842cf4..47990f4f3 100644 --- a/Source/Common/FileClass.cpp +++ b/Source/Common/File.cpp @@ -1,4 +1,4 @@ -#include "FileClass.h" +#include "File.h" #ifdef _WIN32 #include #define USE_WINDOWS_API diff --git a/Source/Common/FileClass.h b/Source/Common/File.h similarity index 74% rename from Source/Common/FileClass.h rename to Source/Common/File.h index 2dd63720b..19c2b7f22 100644 --- a/Source/Common/FileClass.h +++ b/Source/Common/File.h @@ -6,20 +6,25 @@ class CFileBase public: enum OpenFlags { - modeRead = 0x0000, - modeWrite = 0x0001, - modeReadWrite = 0x0002, - shareCompat = 0x0000, - shareExclusive = 0x0010, - shareDenyWrite = 0x0020, - shareDenyRead = 0x0030, - shareDenyNone = 0x0040, - modeNoInherit = 0x0080, - modeCreate = 0x1000, - modeNoTruncate = 0x2000, + modeRead = 0x0000, + modeWrite = 0x0001, + modeReadWrite = 0x0002, + shareCompat = 0x0000, + shareExclusive = 0x0010, + shareDenyWrite = 0x0020, + shareDenyRead = 0x0030, + shareDenyNone = 0x0040, + modeNoInherit = 0x0080, + modeCreate = 0x1000, + modeNoTruncate = 0x2000, }; - enum SeekPosition { begin = 0x0, current = 0x1, end = 0x2 }; + enum SeekPosition + { + begin = 0x0, + current = 0x1, + end = 0x2 + }; virtual bool Open(const char * lpszFileName, uint32_t nOpenFlags ) = 0; diff --git a/Source/Common/IniFileClass.cpp b/Source/Common/IniFile.cpp similarity index 96% rename from Source/Common/IniFileClass.cpp rename to Source/Common/IniFile.cpp index 7f71b4765..4cb0b4a81 100644 --- a/Source/Common/IniFileClass.cpp +++ b/Source/Common/IniFile.cpp @@ -1,4 +1,4 @@ -#include "IniFileClass.h" +#include "IniFile.h" #include #include diff --git a/Source/Common/IniFileClass.h b/Source/Common/IniFile.h similarity index 96% rename from Source/Common/IniFileClass.h rename to Source/Common/IniFile.h index 54ad21e3b..e8140095b 100644 --- a/Source/Common/IniFileClass.h +++ b/Source/Common/IniFile.h @@ -4,7 +4,7 @@ #include #endif -#include "FileClass.h" +#include "File.h" #include "CriticalSection.h" #include #include diff --git a/Source/Common/LogClass.cpp b/Source/Common/Log.cpp similarity index 94% rename from Source/Common/LogClass.cpp rename to Source/Common/Log.cpp index 06055225a..f0694c6bb 100644 --- a/Source/Common/LogClass.cpp +++ b/Source/Common/Log.cpp @@ -1,4 +1,4 @@ -#include "LogClass.h" +#include "Log.h" #include "path.h" #include "Platform.h" #include diff --git a/Source/Common/LogClass.h b/Source/Common/Log.h similarity index 94% rename from Source/Common/LogClass.h rename to Source/Common/Log.h index 8726cf356..19b3d9d91 100644 --- a/Source/Common/LogClass.h +++ b/Source/Common/Log.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "FileClass.h" +#include "File.h" class CLog { diff --git a/Source/Common/Trace.h b/Source/Common/Trace.h index fb63555ea..ee852fd2a 100644 --- a/Source/Common/Trace.h +++ b/Source/Common/Trace.h @@ -1,5 +1,5 @@ #pragma once -#include "LogClass.h" +#include "Log.h" enum TraceSeverity { diff --git a/Source/JoinSettings/main.cpp b/Source/JoinSettings/main.cpp index 6fb491f81..9d191a5db 100644 --- a/Source/JoinSettings/main.cpp +++ b/Source/JoinSettings/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/Source/Project64-audio/trace.cpp b/Source/Project64-audio/trace.cpp index ee2eb91b6..d01502b25 100644 --- a/Source/Project64-audio/trace.cpp +++ b/Source/Project64-audio/trace.cpp @@ -1,7 +1,7 @@ #include "trace.h" #include #include -#include +#include #include "AudioSettings.h" #ifdef ANDROID diff --git a/Source/Project64-core/AppInit.cpp b/Source/Project64-core/AppInit.cpp index 9954b249f..dd46e319e 100644 --- a/Source/Project64-core/AppInit.cpp +++ b/Source/Project64-core/AppInit.cpp @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "Settings/SettingType/SettingsType-Application.h" diff --git a/Source/Project64-core/Logging.cpp b/Source/Project64-core/Logging.cpp index 1ac95ce6e..5e1232490 100644 --- a/Source/Project64-core/Logging.cpp +++ b/Source/Project64-core/Logging.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include CFile * CLogging::m_hLogFile = nullptr; diff --git a/Source/Project64-core/Logging.h b/Source/Project64-core/Logging.h index 54236f6c7..0dca880f5 100644 --- a/Source/Project64-core/Logging.h +++ b/Source/Project64-core/Logging.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include class CLogging : public CLogSettings diff --git a/Source/Project64-core/MemoryExceptionFilter.cpp b/Source/Project64-core/MemoryExceptionFilter.cpp index 5fb73035d..123d0c391 100644 --- a/Source/Project64-core/MemoryExceptionFilter.cpp +++ b/Source/Project64-core/MemoryExceptionFilter.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include -#include +#include #include #include -#include +#include #ifndef _WIN32 #include #endif diff --git a/Source/Project64-core/Multilanguage.h b/Source/Project64-core/Multilanguage.h index 21c90a06c..037be7723 100644 --- a/Source/Project64-core/Multilanguage.h +++ b/Source/Project64-core/Multilanguage.h @@ -630,4 +630,4 @@ enum LanguageStringID ANDROID_VIDEO_NATIVE_RES = 3200, }; -#include "Multilanguage/LanguageClass.h" +#include "Multilanguage/Language.h" diff --git a/Source/Project64-core/Multilanguage/LanguageClass.cpp b/Source/Project64-core/Multilanguage/Language.cpp similarity index 100% rename from Source/Project64-core/Multilanguage/LanguageClass.cpp rename to Source/Project64-core/Multilanguage/Language.cpp diff --git a/Source/Project64-core/Multilanguage/LanguageClass.h b/Source/Project64-core/Multilanguage/Language.h similarity index 100% rename from Source/Project64-core/Multilanguage/LanguageClass.h rename to Source/Project64-core/Multilanguage/Language.h diff --git a/Source/Project64-core/N64System/EmulationThread.cpp b/Source/Project64-core/N64System/EmulationThread.cpp index e779b01ed..bc6fdcbc0 100644 --- a/Source/Project64-core/N64System/EmulationThread.cpp +++ b/Source/Project64-core/N64System/EmulationThread.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include #include #include diff --git a/Source/Project64-core/N64System/Enhancement/Enhancement.cpp b/Source/Project64-core/N64System/Enhancement/Enhancement.cpp index a34b3cf1b..21e642ca9 100644 --- a/Source/Project64-core/N64System/Enhancement/Enhancement.cpp +++ b/Source/Project64-core/N64System/Enhancement/Enhancement.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include const char * CEnhancement::CheatIdent = "Cheat"; const char * CEnhancement::EnhancementIdent = "Enhancement"; diff --git a/Source/Project64-core/N64System/Enhancement/EnhancementFile.h b/Source/Project64-core/N64System/Enhancement/EnhancementFile.h index 8c72fbc4f..80eb5d98b 100644 --- a/Source/Project64-core/N64System/Enhancement/EnhancementFile.h +++ b/Source/Project64-core/N64System/Enhancement/EnhancementFile.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/Enhancement/Enhancements.cpp b/Source/Project64-core/N64System/Enhancement/Enhancements.cpp index f0c527464..918c00983 100644 --- a/Source/Project64-core/N64System/Enhancement/Enhancements.cpp +++ b/Source/Project64-core/N64System/Enhancement/Enhancements.cpp @@ -2,9 +2,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/FramePerSecondClass.cpp b/Source/Project64-core/N64System/FramePerSecond.cpp similarity index 96% rename from Source/Project64-core/N64System/FramePerSecondClass.cpp rename to Source/Project64-core/N64System/FramePerSecond.cpp index 6a94c3778..4c7e06841 100644 --- a/Source/Project64-core/N64System/FramePerSecondClass.cpp +++ b/Source/Project64-core/N64System/FramePerSecond.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "FramePerSecondClass.h" +#include "FramePerSecond.h" #include CFramePerSecond::CFramePerSecond() : diff --git a/Source/Project64-core/N64System/FramePerSecondClass.h b/Source/Project64-core/N64System/FramePerSecond.h similarity index 100% rename from Source/Project64-core/N64System/FramePerSecondClass.h rename to Source/Project64-core/N64System/FramePerSecond.h diff --git a/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp index 62dd2ca61..950649cb5 100644 --- a/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp @@ -2,11 +2,11 @@ #include "InterpreterCPU.h" #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp index a0e00c1a9..db91b1b83 100644 --- a/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/Interpreter/InterpreterOps.h b/Source/Project64-core/N64System/Interpreter/InterpreterOps.h index 246ae7f1b..133ce9c6c 100644 --- a/Source/Project64-core/N64System/Interpreter/InterpreterOps.h +++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include class R4300iOp : diff --git a/Source/Project64-core/N64System/Mips/Audio.cpp b/Source/Project64-core/N64System/Mips/Audio.cpp index b7c8daa9b..14be8ef05 100644 --- a/Source/Project64-core/N64System/Mips/Audio.cpp +++ b/Source/Project64-core/N64System/Mips/Audio.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include -#include +#include CAudio::CAudio() { diff --git a/Source/Project64-core/N64System/Mips/Disk.cpp b/Source/Project64-core/N64System/Mips/Disk.cpp index ad1d5fdf7..d3d45a089 100644 --- a/Source/Project64-core/N64System/Mips/Disk.cpp +++ b/Source/Project64-core/N64System/Mips/Disk.cpp @@ -1,10 +1,10 @@ // Based from MAME's N64DD driver code by Happy_ #include "stdafx.h" #include "Disk.h" -#include -#include +#include +#include #include -#include +#include #include #ifdef _WIN32 diff --git a/Source/Project64-core/N64System/Mips/Dma.cpp b/Source/Project64-core/N64System/Mips/Dma.cpp index ce6c588e7..720bb98fe 100644 --- a/Source/Project64-core/N64System/Mips/Dma.cpp +++ b/Source/Project64-core/N64System/Mips/Dma.cpp @@ -3,12 +3,12 @@ #include #include -#include +#include #include -#include +#include #include -#include -#include +#include +#include CDMA::CDMA(CFlashram & FlashRam, CSram & Sram) : m_FlashRam(FlashRam), diff --git a/Source/Project64-core/N64System/Mips/Eeprom.cpp b/Source/Project64-core/N64System/Mips/Eeprom.cpp index a595e9754..08034572a 100644 --- a/Source/Project64-core/N64System/Mips/Eeprom.cpp +++ b/Source/Project64-core/N64System/Mips/Eeprom.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include -#include +#include #include CEeprom::CEeprom(bool ReadOnly) : diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp index 5de4a6239..cc1c967e3 100755 --- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp +++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/Mips/OpcodeName.cpp b/Source/Project64-core/N64System/Mips/OpcodeName.cpp index 8ab35a948..96d63fd37 100644 --- a/Source/Project64-core/N64System/Mips/OpcodeName.cpp +++ b/Source/Project64-core/N64System/Mips/OpcodeName.cpp @@ -2,7 +2,7 @@ #include #include #include "OpCode.h" -#include +#include #define FPR_Type(Reg) (Reg) == R4300i_COP1_S ? "S" : (Reg) == R4300i_COP1_D ? "D" :\ (Reg) == R4300i_COP1_W ? "W" : "L" diff --git a/Source/Project64-core/N64System/Mips/PifRam.cpp b/Source/Project64-core/N64System/Mips/PifRam.cpp index 698dd40f9..7987d02d9 100644 --- a/Source/Project64-core/N64System/Mips/PifRam.cpp +++ b/Source/Project64-core/N64System/Mips/PifRam.cpp @@ -4,9 +4,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/Mips/RegisterClass.cpp b/Source/Project64-core/N64System/Mips/Register.cpp similarity index 96% rename from Source/Project64-core/N64System/Mips/RegisterClass.cpp rename to Source/Project64-core/N64System/Mips/Register.cpp index c14ca9f7f..36efb5f0b 100644 --- a/Source/Project64-core/N64System/Mips/RegisterClass.cpp +++ b/Source/Project64-core/N64System/Mips/Register.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include -#include +#include +#include #include #include diff --git a/Source/Project64-core/N64System/Mips/RegisterClass.h b/Source/Project64-core/N64System/Mips/Register.h similarity index 100% rename from Source/Project64-core/N64System/Mips/RegisterClass.h rename to Source/Project64-core/N64System/Mips/Register.h diff --git a/Source/Project64-core/N64System/Mips/Rumblepak.cpp b/Source/Project64-core/N64System/Mips/Rumblepak.cpp index ed612d6fb..40d2f7ef9 100644 --- a/Source/Project64-core/N64System/Mips/Rumblepak.cpp +++ b/Source/Project64-core/N64System/Mips/Rumblepak.cpp @@ -2,7 +2,7 @@ #include "Rumblepak.h" #include -#include +#include #include void Rumblepak::ReadFrom(uint32_t address, uint8_t * data) diff --git a/Source/Project64-core/N64System/Mips/SystemEvents.cpp b/Source/Project64-core/N64System/Mips/SystemEvents.cpp index 7a2aa1b13..1a4d8fa84 100644 --- a/Source/Project64-core/N64System/Mips/SystemEvents.cpp +++ b/Source/Project64-core/N64System/Mips/SystemEvents.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include -#include +#include const char * SystemEventName(SystemEvent event) { diff --git a/Source/Project64-core/N64System/Mips/SystemTiming.cpp b/Source/Project64-core/N64System/Mips/SystemTiming.cpp index a8b723716..7744cc35e 100644 --- a/Source/Project64-core/N64System/Mips/SystemTiming.cpp +++ b/Source/Project64-core/N64System/Mips/SystemTiming.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include #include -#include +#include #include -#include +#include #include CSystemTimer::CSystemTimer(CRegisters &Reg, int32_t & NextTimer) : diff --git a/Source/Project64-core/N64System/Mips/SystemTiming.h b/Source/Project64-core/N64System/Mips/SystemTiming.h index 3c8aefd43..c8a6aa3b4 100644 --- a/Source/Project64-core/N64System/Mips/SystemTiming.h +++ b/Source/Project64-core/N64System/Mips/SystemTiming.h @@ -1,8 +1,8 @@ #pragma once -#include +#include #include -#include +#include #include class CSystemTimer @@ -37,21 +37,20 @@ public: int64_t CyclesToTimer; }; -public: CSystemTimer(CRegisters &Reg, int32_t & NextTimer); - void SetTimer(TimerType Type, uint32_t Cycles, bool bRelative); + void SetTimer(TimerType Type, uint32_t Cycles, bool bRelative); uint32_t GetTimer(TimerType Type); - void StopTimer(TimerType Type); - void UpdateTimers(); - void TimerDone(); - void Reset(); - void UpdateCompareTimer(); - bool SaveAllowed(); + void StopTimer(TimerType Type); + void UpdateTimers(); + void TimerDone(); + void Reset(); + void UpdateCompareTimer(); + bool SaveAllowed(); - void SaveData(zipFile & file) const; - void SaveData(CFile & file) const; - void LoadData(zipFile & file); - void LoadData(CFile & file); + void SaveData(zipFile & file) const; + void SaveData(CFile & file) const; + void LoadData(zipFile & file); + void LoadData(CFile & file); void RecordDifference(CLog &LogFile, const CSystemTimer& rSystemTimer); diff --git a/Source/Project64-core/N64System/Mips/TLBclass.cpp b/Source/Project64-core/N64System/Mips/TLB.cpp similarity index 96% rename from Source/Project64-core/N64System/Mips/TLBclass.cpp rename to Source/Project64-core/N64System/Mips/TLB.cpp index fec218c96..230535837 100644 --- a/Source/Project64-core/N64System/Mips/TLBclass.cpp +++ b/Source/Project64-core/N64System/Mips/TLB.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "TLBClass.h" +#include "TLB.h" #include -#include +#include CTLB::CTLB(CTLB_CB * CallBack) : m_CB(CallBack) diff --git a/Source/Project64-core/N64System/Mips/TLBClass.h b/Source/Project64-core/N64System/Mips/TLB.h similarity index 93% rename from Source/Project64-core/N64System/Mips/TLBClass.h rename to Source/Project64-core/N64System/Mips/TLB.h index e4f0b3dda..c265a1bf7 100644 --- a/Source/Project64-core/N64System/Mips/TLBClass.h +++ b/Source/Project64-core/N64System/Mips/TLB.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class CDebugTlb; diff --git a/Source/Project64-core/N64System/N64DiskClass.cpp b/Source/Project64-core/N64System/N64Disk.cpp similarity index 99% rename from Source/Project64-core/N64System/N64DiskClass.cpp rename to Source/Project64-core/N64System/N64Disk.cpp index 46c72b729..7f4fb0d0a 100644 --- a/Source/Project64-core/N64System/N64DiskClass.cpp +++ b/Source/Project64-core/N64System/N64Disk.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "N64DiskClass.h" +#include "N64Disk.h" #include "SystemGlobals.h" #include #include #include -#include +#include #include CN64Disk::CN64Disk() : diff --git a/Source/Project64-core/N64System/N64DiskClass.h b/Source/Project64-core/N64System/N64Disk.h similarity index 100% rename from Source/Project64-core/N64System/N64DiskClass.h rename to Source/Project64-core/N64System/N64Disk.h diff --git a/Source/Project64-core/N64System/N64RomClass.cpp b/Source/Project64-core/N64System/N64Rom.cpp similarity index 99% rename from Source/Project64-core/N64System/N64RomClass.cpp rename to Source/Project64-core/N64System/N64Rom.cpp index 4eb800231..ea01fc745 100644 --- a/Source/Project64-core/N64System/N64RomClass.cpp +++ b/Source/Project64-core/N64System/N64Rom.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "N64RomClass.h" +#include "N64Rom.h" #include "SystemGlobals.h" #include #include #include #include -#include +#include #include #ifdef _WIN32 diff --git a/Source/Project64-core/N64System/N64RomClass.h b/Source/Project64-core/N64System/N64Rom.h similarity index 100% rename from Source/Project64-core/N64System/N64RomClass.h rename to Source/Project64-core/N64System/N64Rom.h diff --git a/Source/Project64-core/N64System/N64Class.cpp b/Source/Project64-core/N64System/N64System.cpp similarity index 99% rename from Source/Project64-core/N64System/N64Class.cpp rename to Source/Project64-core/N64System/N64System.cpp index 52e9d4d01..298583093 100644 --- a/Source/Project64-core/N64System/N64Class.cpp +++ b/Source/Project64-core/N64System/N64System.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "N64Class.h" +#include "N64SYstem.h" #include #include #include @@ -8,9 +8,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/N64Class.h b/Source/Project64-core/N64System/N64System.h similarity index 93% rename from Source/Project64-core/N64System/N64Class.h rename to Source/Project64-core/N64System/N64System.h index 68645102d..9e2c8eaa3 100644 --- a/Source/Project64-core/N64System/N64Class.h +++ b/Source/Project64-core/N64System/N64System.h @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -15,9 +15,9 @@ #include #include -#include "Mips/TLBClass.h" -#include "FramePerSecondClass.h" -#include "SpeedLimiterClass.h" +#include "Mips/TLB.h" +#include "FramePerSecond.h" +#include "SpeedLimiter.h" typedef std::list EVENT_LIST; diff --git a/Source/Project64-core/N64System/ProfilingClass.cpp b/Source/Project64-core/N64System/Profiling.cpp similarity index 93% rename from Source/Project64-core/N64System/ProfilingClass.cpp rename to Source/Project64-core/N64System/Profiling.cpp index 41cfc0fc9..8a3f8370d 100644 --- a/Source/Project64-core/N64System/ProfilingClass.cpp +++ b/Source/Project64-core/N64System/Profiling.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include -#include -#include +#include +#include enum { MAX_FRAMES = 13 }; diff --git a/Source/Project64-core/N64System/ProfilingClass.h b/Source/Project64-core/N64System/Profiling.h similarity index 100% rename from Source/Project64-core/N64System/ProfilingClass.h rename to Source/Project64-core/N64System/Profiling.h diff --git a/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp b/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp index c5643c23b..fd60c8ea5 100644 --- a/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp +++ b/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include bool DelaySlotEffectsCompare(uint32_t PC, uint32_t Reg1, uint32_t Reg2); diff --git a/Source/Project64-core/N64System/Recompiler/CodeSection.cpp b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp index 90e7018f3..3f3e66d56 100644 --- a/Source/Project64-core/N64System/Recompiler/CodeSection.cpp +++ b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp b/Source/Project64-core/N64System/Recompiler/FunctionMap.cpp similarity index 89% rename from Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp rename to Source/Project64-core/N64System/Recompiler/FunctionMap.cpp index 87788ce65..0f442a1b0 100644 --- a/Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp +++ b/Source/Project64-core/N64System/Recompiler/FunctionMap.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include +#include #include -#include +#include CFunctionMap::CFunctionMap() : -m_JumpTable(nullptr), -m_FunctionTable(nullptr) + m_JumpTable(nullptr), + m_FunctionTable(nullptr) { } diff --git a/Source/Project64-core/N64System/Recompiler/FunctionMapClass.h b/Source/Project64-core/N64System/Recompiler/FunctionMap.h similarity index 100% rename from Source/Project64-core/N64System/Recompiler/FunctionMapClass.h rename to Source/Project64-core/N64System/Recompiler/FunctionMap.h diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp b/Source/Project64-core/N64System/Recompiler/Recompiler.cpp similarity index 99% rename from Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp rename to Source/Project64-core/N64System/Recompiler/Recompiler.cpp index 826225ca4..dcf3b97d0 100644 --- a/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp +++ b/Source/Project64-core/N64System/Recompiler/Recompiler.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include +#include #include #include -#include +#include #include #include diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerClass.h b/Source/Project64-core/N64System/Recompiler/Recompiler.h similarity index 92% rename from Source/Project64-core/N64System/Recompiler/RecompilerClass.h rename to Source/Project64-core/N64System/Recompiler/Recompiler.h index b6449f172..27ea1a1a0 100644 --- a/Source/Project64-core/N64System/Recompiler/RecompilerClass.h +++ b/Source/Project64-core/N64System/Recompiler/Recompiler.h @@ -1,10 +1,10 @@ #pragma once -#include +#include #include -#include +#include #include -#include +#include #include #include diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp index 628988e85..99ad857f8 100644 --- a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp +++ b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include -#include +#include #include CRecompMemory::CRecompMemory() : diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp index 19236277b..2b5d458e6 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp +++ b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp @@ -8,14 +8,14 @@ #include #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h index 69734b6ae..f84e36361 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h +++ b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h @@ -1,7 +1,7 @@ #pragma once #if defined(__i386__) || defined(_M_IX86) -#include +#include #include #include #include diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.cpp index a84f57230..fa8da8640 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.cpp +++ b/Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.cpp @@ -2,8 +2,8 @@ #if defined(__i386__) || defined(_M_IX86) #include -#include -#include +#include +#include #include #include @@ -16,7 +16,7 @@ uint32_t CX86RegInfo::m_fpuControl = 0; const char *Format_Name[] = { "Unknown", "dword", "qword", "float", "double" }; CX86RegInfo::CX86RegInfo() : -m_Stack_TopPos(0) + m_Stack_TopPos(0) { for (int32_t i = 0; i < 32; i++) { diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.h b/Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.h index f1472cf49..3f7e15d04 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.h +++ b/Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.h @@ -3,7 +3,7 @@ #if defined(__i386__) || defined(_M_IX86) #include #include -#include +#include #include class CX86RegInfo : diff --git a/Source/Project64-core/N64System/SpeedLimiterClass.cpp b/Source/Project64-core/N64System/SpeedLimiter.cpp similarity index 97% rename from Source/Project64-core/N64System/SpeedLimiterClass.cpp rename to Source/Project64-core/N64System/SpeedLimiter.cpp index a5b90f64e..06e8b013f 100644 --- a/Source/Project64-core/N64System/SpeedLimiterClass.cpp +++ b/Source/Project64-core/N64System/SpeedLimiter.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "Project64-core/N64System/SpeedLimiterClass.h" +#include "Project64-core/N64System/SpeedLimiter.h" #include diff --git a/Source/Project64-core/N64System/SpeedLimiterClass.h b/Source/Project64-core/N64System/SpeedLimiter.h similarity index 100% rename from Source/Project64-core/N64System/SpeedLimiterClass.h rename to Source/Project64-core/N64System/SpeedLimiter.h diff --git a/Source/Project64-core/Plugin.h b/Source/Project64-core/Plugin.h index f27d35836..a5c932c1b 100644 --- a/Source/Project64-core/Plugin.h +++ b/Source/Project64-core/Plugin.h @@ -1,12 +1,8 @@ #pragma once -//Plugin controller -#include - -//Base Plugin class, all plugin derive from this, handles core functions +#include #include - -#include "Plugins/GFXPlugin.h" +#include #include -#include "Plugins/ControllerPlugin.h" -#include "Plugins/RSPPlugin.h" +#include +#include diff --git a/Source/Project64-core/Plugins/AudioPlugin.cpp b/Source/Project64-core/Plugins/AudioPlugin.cpp index 3d55f6466..01016e09a 100644 --- a/Source/Project64-core/Plugins/AudioPlugin.cpp +++ b/Source/Project64-core/Plugins/AudioPlugin.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #ifdef _WIN32 #include diff --git a/Source/Project64-core/Plugins/ControllerPlugin.cpp b/Source/Project64-core/Plugins/ControllerPlugin.cpp index 012f696e5..ff18eac89 100644 --- a/Source/Project64-core/Plugins/ControllerPlugin.cpp +++ b/Source/Project64-core/Plugins/ControllerPlugin.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include -#include -#include +#include +#include #include "ControllerPlugin.h" CControl_Plugin::CControl_Plugin(void) : diff --git a/Source/Project64-core/Plugins/GFXPlugin.cpp b/Source/Project64-core/Plugins/GFXPlugin.cpp index f221f0914..a7c30154b 100644 --- a/Source/Project64-core/Plugins/GFXPlugin.cpp +++ b/Source/Project64-core/Plugins/GFXPlugin.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include "GFXPlugin.h" CGfxPlugin::CGfxPlugin() : diff --git a/Source/Project64-core/Plugins/PluginClass.cpp b/Source/Project64-core/Plugins/Plugin.cpp similarity index 97% rename from Source/Project64-core/Plugins/PluginClass.cpp rename to Source/Project64-core/Plugins/Plugin.cpp index 9480daf6f..d2a5d2fa3 100644 --- a/Source/Project64-core/Plugins/PluginClass.cpp +++ b/Source/Project64-core/Plugins/Plugin.cpp @@ -1,20 +1,20 @@ #include "stdafx.h" #include -#include -#include +#include +#include #include CPlugins::CPlugins(SettingID PluginDirSetting, bool SyncPlugins) : -m_MainWindow(nullptr), -m_SyncWindow(nullptr), -m_PluginDirSetting(PluginDirSetting), -m_PluginDir(g_Settings->LoadStringVal(PluginDirSetting)), -m_Gfx(nullptr), -m_Audio(nullptr), -m_RSP(nullptr), -m_Control(nullptr), -m_initilized(false), -m_SyncPlugins(SyncPlugins) + m_MainWindow(nullptr), + m_SyncWindow(nullptr), + m_PluginDirSetting(PluginDirSetting), + m_PluginDir(g_Settings->LoadStringVal(PluginDirSetting)), + m_Gfx(nullptr), + m_Audio(nullptr), + m_RSP(nullptr), + m_Control(nullptr), + m_initilized(false), + m_SyncPlugins(SyncPlugins) { CreatePlugins(); g_Settings->RegisterChangeCB(Plugin_RSP_Current, this, (CSettings::SettingChangedFunc)PluginChanged); diff --git a/Source/Project64-core/Plugins/PluginClass.h b/Source/Project64-core/Plugins/Plugin.h similarity index 100% rename from Source/Project64-core/Plugins/PluginClass.h rename to Source/Project64-core/Plugins/Plugin.h diff --git a/Source/Project64-core/Plugins/PluginBase.h b/Source/Project64-core/Plugins/PluginBase.h index 4fdde80c5..27aba4d43 100644 --- a/Source/Project64-core/Plugins/PluginBase.h +++ b/Source/Project64-core/Plugins/PluginBase.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #if defined(_WIN32) diff --git a/Source/Project64-core/Plugins/RSPPlugin.cpp b/Source/Project64-core/Plugins/RSPPlugin.cpp index 3027791a4..8adb242d6 100644 --- a/Source/Project64-core/Plugins/RSPPlugin.cpp +++ b/Source/Project64-core/Plugins/RSPPlugin.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "RSPPlugin.h" #include "GFXPlugin.h" #include diff --git a/Source/Project64-core/Project64-core.vcxproj b/Source/Project64-core/Project64-core.vcxproj index c548379b3..108b4ff60 100644 --- a/Source/Project64-core/Project64-core.vcxproj +++ b/Source/Project64-core/Project64-core.vcxproj @@ -43,13 +43,13 @@ - + - + @@ -63,26 +63,26 @@ - + - + - - - - + + + + - + - + @@ -90,13 +90,13 @@ - + + - @@ -139,12 +139,12 @@ - + - + @@ -159,19 +159,19 @@ - + - + - - - + + + - + @@ -180,7 +180,7 @@ - + @@ -194,15 +194,15 @@ - + + - @@ -247,8 +247,4 @@ {1968162c-0793-491d-91a1-81645a24d399} - - - - \ No newline at end of file diff --git a/Source/Project64-core/Project64-core.vcxproj.filters b/Source/Project64-core/Project64-core.vcxproj.filters index 991016f51..1800e122d 100644 --- a/Source/Project64-core/Project64-core.vcxproj.filters +++ b/Source/Project64-core/Project64-core.vcxproj.filters @@ -189,7 +189,7 @@ Source Files\Plugins - + Source Files\Plugins @@ -198,19 +198,16 @@ Source Files\N64 System - + Source Files\N64 System - + Source Files\N64 System - + Source Files\N64 System - - Source Files\N64 System - - + Source Files\N64 System @@ -225,13 +222,13 @@ Source Files\N64 System\Recompiler - + Source Files\N64 System\Recompiler Source Files\N64 System\Recompiler - + Source Files\N64 System\Recompiler @@ -264,7 +261,7 @@ Source Files\N64 System\Mips - + Source Files\N64 System\Mips @@ -279,7 +276,7 @@ Source Files\N64 System\Mips - + Source Files\N64 System\Mips @@ -291,13 +288,13 @@ Source Files\N64 System\Interpreter - + Source Files\Multilanguage Source Files\N64 System\Mips - + Source Files\N64 System @@ -359,7 +356,7 @@ Header Files - + Header Files\Multilanguage @@ -425,7 +422,7 @@ Header Files - + Header Files\Plugins @@ -485,19 +482,19 @@ Header Files\Settings - + Header Files\N64 System - + Header Files\N64 System - + Header Files\N64 System Header Files\N64 System - + Header Files\N64 System @@ -515,7 +512,7 @@ Header Files\N64 System\Recompiler - + Header Files\N64 System\Recompiler @@ -566,7 +563,7 @@ Header Files\N64 System\Mips - + Header Files\N64 System\Mips @@ -581,7 +578,7 @@ Header Files\N64 System\Mips - + Header Files\N64 System\Mips @@ -596,8 +593,8 @@ Header Files\N64 System\Interpreter - - Header Files + + Header Files\N64 System Header Files @@ -608,7 +605,7 @@ Header Files\N64 System\Mips - + Header Files\N64 System @@ -672,8 +669,4 @@ Header Files\N64 System\Enhancement - - - - \ No newline at end of file diff --git a/Source/Project64-core/RomList/RomList.cpp b/Source/Project64-core/RomList/RomList.cpp index f4f885e3c..cd07ebeba 100644 --- a/Source/Project64-core/RomList/RomList.cpp +++ b/Source/Project64-core/RomList/RomList.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "RomList.h" #include -#include -#include +#include +#include #ifdef _WIN32 #include diff --git a/Source/Project64-core/RomList/RomList.h b/Source/Project64-core/RomList/RomList.h index b31414c72..5b62815f5 100644 --- a/Source/Project64-core/RomList/RomList.h +++ b/Source/Project64-core/RomList/RomList.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include #include #include diff --git a/Source/Project64-core/Settings/GameSettings.cpp b/Source/Project64-core/Settings/GameSettings.cpp index ea4872a8f..e11ba5864 100644 --- a/Source/Project64-core/Settings/GameSettings.cpp +++ b/Source/Project64-core/Settings/GameSettings.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include -#include +#include #include bool CGameSettings::m_UseHleGfx = true; diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Application.h b/Source/Project64-core/Settings/SettingType/SettingsType-Application.h index 3d912652c..0728e7b60 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Application.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Application.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include class CSettingTypeApplication : diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h index 650aa5b28..3d948ac1f 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include class CSettingTypeRomDatabase : diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp index 05c7c3390..4a007c40a 100644 --- a/Source/Project64-video/Main.cpp +++ b/Source/Project64-video/Main.cpp @@ -15,7 +15,7 @@ #include "Gfx_1.3.h" #include "Version.h" #include -#include +#include #include #include #include diff --git a/Source/Project64-video/trace.cpp b/Source/Project64-video/trace.cpp index e277dc41d..61bd61af0 100644 --- a/Source/Project64-video/trace.cpp +++ b/Source/Project64-video/trace.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #ifdef ANDROID #include diff --git a/Source/Project64/N64System.h b/Source/Project64/N64System.h index f575e0577..b6b1b7a64 100644 --- a/Source/Project64/N64System.h +++ b/Source/Project64/N64System.h @@ -8,13 +8,13 @@ #include "UserInterface.h" #include -#include +#include // General MIPS information -#include -#include +#include +#include #include #include -#include +#include #include diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index d41d6a15a..27ad3e527 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -59,7 +59,7 @@ Create - + @@ -89,12 +89,12 @@ - + - - + + @@ -131,7 +131,7 @@ - + @@ -164,13 +164,13 @@ - + - + diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters index 560a0ede5..d4e2bf511 100644 --- a/Source/Project64/Project64.vcxproj.filters +++ b/Source/Project64/Project64.vcxproj.filters @@ -96,9 +96,6 @@ Source Files - - Source Files\User Interface Source - Source Files\User Interface Source @@ -108,15 +105,9 @@ Source Files\User Interface Source - - Source Files\User Interface Source - Source Files\User Interface Source - - Source Files\User Interface Source - Source Files\User Interface Source @@ -126,9 +117,6 @@ Source Files\Settings Files - - Source Files\User Interface Source - Source Files\Settings Files @@ -255,14 +243,23 @@ Source Files\User Interface Source\Settings Source + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + Resource Files - - Header Files\User Interface Headers - Header Files\User Interface Headers @@ -272,9 +269,6 @@ Header Files\User Interface Headers - - Header Files\User Interface Headers - Header Files\User Interface Headers @@ -344,9 +338,6 @@ Header Files - - Header Files\User Interface Headers - Header Files\Settings @@ -494,6 +485,15 @@ Header Files\User Interface Headers\Settings Header + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + diff --git a/Source/Project64/Support.h b/Source/Project64/Support.h index 02b2af543..7e90eb0b2 100644 --- a/Source/Project64/Support.h +++ b/Source/Project64/Support.h @@ -5,9 +5,9 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include diff --git a/Source/Project64/UserInterface.h b/Source/Project64/UserInterface.h index bc23f520c..0b82bbcaa 100644 --- a/Source/Project64/UserInterface.h +++ b/Source/Project64/UserInterface.h @@ -10,11 +10,11 @@ #include "UserInterface/MenuShortCuts.h" #include "UserInterface/RomBrowser.h" #include "UserInterface/MainWindow.h" -#include "UserInterface/MenuClass.h" +#include "UserInterface/MenuItem.h" #include "UserInterface/MainMenu.h" #include "UserInterface/Notification.h" -#include +#include #include "UserInterface/resource.h" #include "UserInterface/SettingsConfig.h" -#include "UserInterface/CheatClassUI.h" +#include "UserInterface/CheatUI.h" #include "UserInterface/SupportWindow.h" diff --git a/Source/Project64/UserInterface/CheatClassUI.cpp b/Source/Project64/UserInterface/CheatUI.cpp similarity index 100% rename from Source/Project64/UserInterface/CheatClassUI.cpp rename to Source/Project64/UserInterface/CheatUI.cpp diff --git a/Source/Project64/UserInterface/CheatClassUI.h b/Source/Project64/UserInterface/CheatUI.h similarity index 100% rename from Source/Project64/UserInterface/CheatClassUI.h rename to Source/Project64/UserInterface/CheatUI.h diff --git a/Source/Project64/UserInterface/Debugger/Breakpoints.cpp b/Source/Project64/UserInterface/Debugger/Breakpoints.cpp index caaf3a0ca..cbe5c9b1f 100644 --- a/Source/Project64/UserInterface/Debugger/Breakpoints.cpp +++ b/Source/Project64/UserInterface/Debugger/Breakpoints.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "Breakpoints.h" -#include +#include #include #include -#include +#include CBreakpoints::CBreakpoints() : m_bHaveRegBP(false), diff --git a/Source/Project64/UserInterface/Debugger/DebugMMU.cpp b/Source/Project64/UserInterface/Debugger/DebugMMU.cpp index 4b51860aa..a5ddf2908 100644 --- a/Source/Project64/UserInterface/Debugger/DebugMMU.cpp +++ b/Source/Project64/UserInterface/Debugger/DebugMMU.cpp @@ -2,7 +2,7 @@ #include "DebugMMU.h" #include -#include +#include #define PJMEM_CARTROM 1 diff --git a/Source/Project64/UserInterface/MainMenu.cpp b/Source/Project64/UserInterface/MainMenu.cpp index d7ff15272..a497a2f95 100644 --- a/Source/Project64/UserInterface/MainMenu.cpp +++ b/Source/Project64/UserInterface/MainMenu.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "RomInformationClass.h" +#include "RomInformation.h" #include "Debugger/Breakpoints.h" #include "Debugger/ScriptSystem.h" #include "DiscordRPC.h" -#include +#include #include #include #include diff --git a/Source/Project64/UserInterface/MainWindow.cpp b/Source/Project64/UserInterface/MainWindow.cpp index 31614873c..63b906ec2 100644 --- a/Source/Project64/UserInterface/MainWindow.cpp +++ b/Source/Project64/UserInterface/MainWindow.cpp @@ -1,11 +1,10 @@ #include "stdafx.h" -#include "RomInformationClass.h" +#include "RomInformation.h" #include - #include #include #include -#include +#include #include "DiscordRPC.h" void EnterLogOptions(HWND hwndOwner); diff --git a/Source/Project64/UserInterface/MainWindow.h b/Source/Project64/UserInterface/MainWindow.h index ce8fd58e5..f6584aab3 100644 --- a/Source/Project64/UserInterface/MainWindow.h +++ b/Source/Project64/UserInterface/MainWindow.h @@ -2,8 +2,8 @@ #include "../Settings/GuiSettings.h" #include -#include -#include +#include +#include #include #include diff --git a/Source/Project64/UserInterface/MenuClass.cpp b/Source/Project64/UserInterface/MenuItem.cpp similarity index 100% rename from Source/Project64/UserInterface/MenuClass.cpp rename to Source/Project64/UserInterface/MenuItem.cpp diff --git a/Source/Project64/UserInterface/MenuClass.h b/Source/Project64/UserInterface/MenuItem.h similarity index 100% rename from Source/Project64/UserInterface/MenuClass.h rename to Source/Project64/UserInterface/MenuItem.h diff --git a/Source/Project64/UserInterface/RomBrowserClass.cpp b/Source/Project64/UserInterface/RomBrowser.cpp similarity index 100% rename from Source/Project64/UserInterface/RomBrowserClass.cpp rename to Source/Project64/UserInterface/RomBrowser.cpp diff --git a/Source/Project64/UserInterface/RomInformationClass.cpp b/Source/Project64/UserInterface/RomInformation.cpp similarity index 99% rename from Source/Project64/UserInterface/RomInformationClass.cpp rename to Source/Project64/UserInterface/RomInformation.cpp index 66c16a43e..009b99e88 100644 --- a/Source/Project64/UserInterface/RomInformationClass.cpp +++ b/Source/Project64/UserInterface/RomInformation.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "RomInformationClass.h" -#include +#include "RomInformation.h" +#include RomInformation::RomInformation(const char * RomFile) : m_DeleteRomInfo(true), diff --git a/Source/Project64/UserInterface/RomInformationClass.h b/Source/Project64/UserInterface/RomInformation.h similarity index 100% rename from Source/Project64/UserInterface/RomInformationClass.h rename to Source/Project64/UserInterface/RomInformation.h diff --git a/Source/RSP/Profiling.cpp b/Source/RSP/Profiling.cpp index ffc5650b7..c5b57faa1 100644 --- a/Source/RSP/Profiling.cpp +++ b/Source/RSP/Profiling.cpp @@ -6,8 +6,8 @@ extern "C" { } #pragma warning(disable:4786) #include -#include -#include +#include +#include #include #include diff --git a/Source/RSP/log.cpp b/Source/RSP/log.cpp index 9d7f12ce4..21696255a 100644 --- a/Source/RSP/log.cpp +++ b/Source/RSP/log.cpp @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include #include extern "C" { diff --git a/Source/UpdateVersion/UpdateVersion.cpp b/Source/UpdateVersion/UpdateVersion.cpp index f951aae50..36e72e874 100644 --- a/Source/UpdateVersion/UpdateVersion.cpp +++ b/Source/UpdateVersion/UpdateVersion.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include int main()