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

Remove Disable copy constructor comments

This commit is contained in:
zilmar 2021-04-13 09:37:11 +09:30
parent cf58754414
commit 662637460e
66 changed files with 294 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Android/Bridge/JavaBridge.h
View File

@ -30,9 +30,9 @@ public:
void EmulationStopped(void); void EmulationStopped(void);
private: private:
JavaBridge(void); // Disable default constructor JavaBridge(void);
JavaBridge(const JavaBridge&); // Disable copy constructor JavaBridge(const JavaBridge&);
JavaBridge& operator=(const JavaBridge&); // Disable assignment JavaBridge& operator=(const JavaBridge&);
JavaVM* m_vm; JavaVM* m_vm;
jclass m_GalleryActivityClass; jclass m_GalleryActivityClass;

4
Source/Android/Bridge/NotificationClass.h
View File

@ -34,8 +34,8 @@ public:
void ChangeFullScreen(void) const; void ChangeFullScreen(void) const;
private: private:
CNotificationImp(const CNotificationImp&); // Disable copy constructor CNotificationImp(const CNotificationImp&);
CNotificationImp& operator=(const CNotificationImp&); // Disable assignment CNotificationImp& operator=(const CNotificationImp&);
mutable time_t m_NextMsg; mutable time_t m_NextMsg;
}; };

6
Source/Android/Bridge/SyncBridge.h
View File

@ -16,9 +16,9 @@ public:
void SwapWindow(); void SwapWindow();
private: private:
SyncBridge(void); // Disable default constructor SyncBridge(void);
SyncBridge(const SyncBridge&); // Disable copy constructor SyncBridge(const SyncBridge&);
SyncBridge& operator=(const SyncBridge&); // Disable assignment SyncBridge& operator=(const SyncBridge&);
JavaBridge * m_JavaBridge; JavaBridge * m_JavaBridge;
}; };

6
Source/Android/PluginRSP/hle.h
View File

@ -95,9 +95,9 @@ public:
void hle_execute(void); void hle_execute(void);
private: private:
CHle(void); // Disable default constructor CHle(void);
CHle(const CHle&); // Disable copy constructor CHle(const CHle&);
CHle& operator=(const CHle&); // Disable assignment CHle& operator=(const CHle&);
bool is_task(void); bool is_task(void);
bool try_fast_audio_dispatching(void); bool try_fast_audio_dispatching(void);

5
Source/Common/CriticalSection.h
View File

@ -10,8 +10,9 @@ public:
void leave(void); void leave(void);
private: private:
CriticalSection(const CriticalSection&); // Disable copy constructor CriticalSection(const CriticalSection&);
CriticalSection& operator=(const CriticalSection&); // Disable assignment CriticalSection& operator=(const CriticalSection&);
void * m_cs; void * m_cs;
}; };

4
Source/Common/FileClass.h
View File

@ -75,6 +75,6 @@ public:
virtual bool SetEndOfFile(); virtual bool SetEndOfFile();
private: private:
CFile(const CFile&); // Disable copy constructor CFile(const CFile&);
CFile& operator=(const CFile&); // Disable assignment CFile& operator=(const CFile&);
}; };

4
Source/Common/LogClass.h
View File

@ -36,8 +36,8 @@ public:
inline const std::string & FileName(void) const { return m_FileName; } inline const std::string & FileName(void) const { return m_FileName; }
private: private:
CLog(const CLog&); // Disable copy constructor CLog(const CLog&);
CLog& operator=(const CLog&); // Disable assignment CLog& operator=(const CLog&);
CFile m_hLogFile; CFile m_hLogFile;
bool m_FlushOnWrite; bool m_FlushOnWrite;

4
Source/Common/SyncEvent.h
View File

@ -15,8 +15,8 @@ public:
void * GetHandle(); void * GetHandle();
protected: protected:
SyncEvent(const SyncEvent&); // Disable copy constructor SyncEvent(const SyncEvent&);
SyncEvent& operator=(const SyncEvent&); // Disable assignment SyncEvent& operator=(const SyncEvent&);
void * m_Event; void * m_Event;
#ifndef _WIN32 #ifndef _WIN32

6
Source/Common/Thread.h
View File

@ -21,9 +21,9 @@ public:
static uint32_t GetCurrentThreadId(void); static uint32_t GetCurrentThreadId(void);
private: private:
CThread(void); // Disable default constructor CThread(void);
CThread(const CThread&); // Disable copy constructor CThread(const CThread&);
CThread& operator=(const CThread&); // Disable assignment CThread& operator=(const CThread&);
static void * ThreadWrapper (CThread * _this); static void * ThreadWrapper (CThread * _this);

6
Source/Common/Util.h
View File

@ -13,7 +13,7 @@ public:
static bool TerminatedExistingExe(); static bool TerminatedExistingExe();
private: private:
pjutil(void); // Disable default constructor pjutil(void);
pjutil(const pjutil&); // Disable copy constructor pjutil(const pjutil&);
pjutil& operator=(const pjutil&); // Disable assignment pjutil& operator=(const pjutil&);
}; };

32
Source/Project64-core/3rdParty/7zip.h vendored
View File

@ -35,25 +35,19 @@ public:
void SetNotificationCallback(LP7ZNOTIFICATION NotfyFnc, void * CBInfo); void SetNotificationCallback(LP7ZNOTIFICATION NotfyFnc, void * CBInfo);
private: private:
C7zip(void); // Disable default constructor C7zip(void);
C7zip(const C7zip&); // Disable copy constructor C7zip(const C7zip&);
C7zip& operator=(const C7zip&); // Disable assignment C7zip& operator=(const C7zip&);
/*typedef struct _CFileInStream CSzArEx * m_db;
{ CFileInStream m_archiveStream;
ISzInStream InStream; CLookToRead m_archiveLookStream;
FILE *File; ISzAlloc m_allocImp;
} CFileInStream; ISzAlloc m_allocTempImp;
*/ int m_FileSize;
CSzArEx * m_db; char m_FileName[260];
CFileInStream m_archiveStream; int m_CurrentFile;
CLookToRead m_archiveLookStream; bool m_Opened;
ISzAlloc m_allocImp;
ISzAlloc m_allocTempImp;
int m_FileSize;
char m_FileName[260];
int m_CurrentFile;
bool m_Opened;
//Used for extraction //Used for extraction
UInt32 m_blockIndex; // it can have any value before first call (if outBuffer = 0) UInt32 m_blockIndex; // it can have any value before first call (if outBuffer = 0)
@ -71,5 +65,5 @@ private:
static void NotfyCallbackDefault(const char * /*Status*/, void * /*CBInfo*/) { } static void NotfyCallbackDefault(const char * /*Status*/, void * /*CBInfo*/) { }
LP7ZNOTIFICATION m_NotfyCallback; LP7ZNOTIFICATION m_NotfyCallback;
void * m_NotfyCallbackInfo; void * m_NotfyCallbackInfo;
}; };

4
Source/Project64-core/Multilanguage/LanguageClass.h
View File

@ -31,8 +31,8 @@ public:
bool IsLanguageLoaded(void) const { return m_LanguageLoaded; } bool IsLanguageLoaded(void) const { return m_LanguageLoaded; }
private: private:
CLanguage(const CLanguage&); // Disable copy constructor CLanguage(const CLanguage&);
CLanguage& operator=(const CLanguage&); // Disable assignment CLanguage& operator=(const CLanguage&);
static void StaticResetStrings(CLanguage * _this) static void StaticResetStrings(CLanguage * _this)
{ {

4
Source/Project64-core/N64System/FramePerSecondClass.h
View File

@ -15,8 +15,8 @@ public:
void DisplayViCounter(int32_t FrameRateWhole, uint32_t FrameRateFraction); void DisplayViCounter(int32_t FrameRateWhole, uint32_t FrameRateFraction);
private: private:
CFramePerSecond(const CFramePerSecond&); // Disable copy constructor CFramePerSecond(const CFramePerSecond&);
CFramePerSecond& operator=(const CFramePerSecond&); // Disable assignment CFramePerSecond& operator=(const CFramePerSecond&);
static void FrameRateTypeChanged(CFramePerSecond * _this); static void FrameRateTypeChanged(CFramePerSecond * _this);
static void ScreenHertzChanged(CFramePerSecond * _this); static void ScreenHertzChanged(CFramePerSecond * _this);

6
Source/Project64-core/N64System/Interpreter/InterpreterCPU.h
View File

@ -12,9 +12,9 @@ public:
static void InPermLoop(); static void InPermLoop();
private: private:
CInterpreterCPU(); // Disable default constructor CInterpreterCPU();
CInterpreterCPU(const CInterpreterCPU&); // Disable copy constructor CInterpreterCPU(const CInterpreterCPU&);
CInterpreterCPU& operator=(const CInterpreterCPU&); // Disable assignment CInterpreterCPU& operator=(const CInterpreterCPU&);
static R4300iOp::Func * m_R4300i_Opcode; static R4300iOp::Func * m_R4300i_Opcode;
}; };

4
Source/Project64-core/N64System/Mips/Audio.h
View File

@ -21,8 +21,8 @@ public:
void SetFrequency ( uint32_t Dacrate, uint32_t System ); void SetFrequency ( uint32_t Dacrate, uint32_t System );
private: private:
CAudio(const CAudio&); // Disable copy constructor CAudio(const CAudio&);
CAudio& operator=(const CAudio&); // Disable assignment CAudio& operator=(const CAudio&);
uint32_t m_SecondBuff; uint32_t m_SecondBuff;
uint32_t m_Status; uint32_t m_Status;

4
Source/Project64-core/N64System/Mips/Dma.h
View File

@ -18,8 +18,8 @@ protected:
CDMA(CFlashram & FlashRam, CSram & Sram); CDMA(CFlashram & FlashRam, CSram & Sram);
private: private:
CDMA(const CDMA&); // Disable copy constructor CDMA(const CDMA&);
CDMA& operator=(const CDMA&); // Disable assignment CDMA& operator=(const CDMA&);
CFlashram & m_FlashRam; CFlashram & m_FlashRam;
CSram & m_Sram; CSram & m_Sram;

6
Source/Project64-core/N64System/Mips/Eeprom.h
View File

@ -11,9 +11,9 @@ public:
void EepromCommand(uint8_t * Command); void EepromCommand(uint8_t * Command);
private: private:
CEeprom(void); // Disable default constructor CEeprom(void);
CEeprom(const CEeprom&); // Disable copy constructor CEeprom(const CEeprom&);
CEeprom& operator=(const CEeprom&); // Disable assignment CEeprom& operator=(const CEeprom&);
void ProcessingError(uint8_t * Command); void ProcessingError(uint8_t * Command);
void LoadEeprom(); void LoadEeprom();

6
Source/Project64-core/N64System/Mips/FlashRam.h
View File

@ -23,9 +23,9 @@ public:
void WriteToFlashCommand(uint32_t Value); void WriteToFlashCommand(uint32_t Value);
private: private:
CFlashram(void); // Disable default constructor CFlashram(void);
CFlashram(const CFlashram&); // Disable copy constructor CFlashram(const CFlashram&);
CFlashram& operator=(const CFlashram&); // Disable assignment CFlashram& operator=(const CFlashram&);
bool LoadFlashram(); bool LoadFlashram();

6
Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
View File

@ -105,9 +105,9 @@ public:
const char * LabelName(uint32_t Address) const; const char * LabelName(uint32_t Address) const;
private: private:
CMipsMemoryVM(); // Disable default constructor CMipsMemoryVM();
CMipsMemoryVM(const CMipsMemoryVM&); // Disable copy constructor CMipsMemoryVM(const CMipsMemoryVM&);
CMipsMemoryVM& operator=(const CMipsMemoryVM&); // Disable assignment CMipsMemoryVM& operator=(const CMipsMemoryVM&);
#if defined(__i386__) || defined(_M_IX86) #if defined(__i386__) || defined(_M_IX86)
friend class CX86RecompilerOps; friend class CX86RecompilerOps;

4
Source/Project64-core/N64System/Mips/Mempak.h
View File

@ -11,8 +11,8 @@ public:
static uint8_t CalculateCrc(uint8_t * DataToCrc); static uint8_t CalculateCrc(uint8_t * DataToCrc);
private: private:
CMempak(const CMempak&); // Disable copy constructor CMempak(const CMempak&);
CMempak& operator=(const CMempak&); // Disable assignment CMempak& operator=(const CMempak&);
void LoadMempak(int32_t Control, bool Create); void LoadMempak(int32_t Control, bool Create);
void Format(int32_t Control); void Format(int32_t Control);

6
Source/Project64-core/N64System/Mips/PifRam.h
View File

@ -24,9 +24,9 @@ protected:
uint8_t m_PifRam[0x40]; uint8_t m_PifRam[0x40];
private: private:
CPifRam(); // Disable default constructor CPifRam();
CPifRam(const CPifRam&); // Disable copy constructor CPifRam(const CPifRam&);
CPifRam& operator=(const CPifRam&); // Disable assignment CPifRam& operator=(const CPifRam&);
enum { CHALLENGE_LENGTH = 0x20 }; enum { CHALLENGE_LENGTH = 0x20 };
void ProcessControllerCommand(int32_t Control, uint8_t * Command); void ProcessControllerCommand(int32_t Control, uint8_t * Command);

72
Source/Project64-core/N64System/Mips/RegisterClass.h
View File

@ -34,9 +34,9 @@ public:
uint32_t & FAKE_CAUSE_REGISTER; uint32_t & FAKE_CAUSE_REGISTER;
private: private:
CP0registers(); // Disable default constructor CP0registers();
CP0registers(const CP0registers&); // Disable copy constructor CP0registers(const CP0registers&);
CP0registers& operator=(const CP0registers&); // Disable assignment CP0registers& operator=(const CP0registers&);
}; };
//CPO register flags //CPO register flags
@ -130,9 +130,9 @@ public:
uint32_t & RDRAM_DEVICE_MANUF_REG; uint32_t & RDRAM_DEVICE_MANUF_REG;
private: private:
Rdram_InterfaceReg(); // Disable default constructor Rdram_InterfaceReg();
Rdram_InterfaceReg(const Rdram_InterfaceReg&); // Disable copy constructor Rdram_InterfaceReg(const Rdram_InterfaceReg&);
Rdram_InterfaceReg& operator=(const Rdram_InterfaceReg&); // Disable assignment Rdram_InterfaceReg& operator=(const Rdram_InterfaceReg&);
}; };
//Mips interface registers //Mips interface registers
@ -150,9 +150,9 @@ public:
uint32_t & MI_INTR_MASK_REG; uint32_t & MI_INTR_MASK_REG;
private: private:
Mips_InterfaceReg(); // Disable default constructor Mips_InterfaceReg();
Mips_InterfaceReg(const Mips_InterfaceReg&); // Disable copy constructor Mips_InterfaceReg(const Mips_InterfaceReg&);
Mips_InterfaceReg& operator=(const Mips_InterfaceReg&); // Disable assignment Mips_InterfaceReg& operator=(const Mips_InterfaceReg&);
}; };
//Mips interface flags //Mips interface flags
@ -232,9 +232,9 @@ public:
uint32_t & VI_Y_SCALE_REG; uint32_t & VI_Y_SCALE_REG;
private: private:
Video_InterfaceReg(); // Disable default constructor Video_InterfaceReg();
Video_InterfaceReg(const Video_InterfaceReg&); // Disable copy constructor Video_InterfaceReg(const Video_InterfaceReg&);
Video_InterfaceReg& operator=(const Video_InterfaceReg&); // Disable assignment Video_InterfaceReg& operator=(const Video_InterfaceReg&);
}; };
//Display Processor Control Registers //Display Processor Control Registers
@ -254,9 +254,9 @@ public:
uint32_t & DPC_TMEM_REG; uint32_t & DPC_TMEM_REG;
private: private:
DisplayControlReg(); // Disable default constructor DisplayControlReg();
DisplayControlReg(const DisplayControlReg&); // Disable copy constructor DisplayControlReg(const DisplayControlReg&);
DisplayControlReg& operator=(const DisplayControlReg&); // Disable assignment DisplayControlReg& operator=(const DisplayControlReg&);
}; };
enum enum
@ -302,9 +302,9 @@ public:
uint32_t & AI_BITRATE_REG; uint32_t & AI_BITRATE_REG;
private: private:
AudioInterfaceReg(); // Disable default constructor AudioInterfaceReg();
AudioInterfaceReg(const AudioInterfaceReg&); // Disable copy constructor AudioInterfaceReg(const AudioInterfaceReg&);
AudioInterfaceReg& operator=(const AudioInterfaceReg&); // Disable assignment AudioInterfaceReg& operator=(const AudioInterfaceReg&);
}; };
enum enum
@ -338,9 +338,9 @@ public:
uint32_t & PI_BSD_DOM2_RLS_REG; uint32_t & PI_BSD_DOM2_RLS_REG;
private: private:
PeripheralInterfaceReg(); // Disable default constructor PeripheralInterfaceReg();
PeripheralInterfaceReg(const PeripheralInterfaceReg&); // Disable copy constructor PeripheralInterfaceReg(const PeripheralInterfaceReg&);
PeripheralInterfaceReg& operator=(const PeripheralInterfaceReg&); // Disable assignment PeripheralInterfaceReg& operator=(const PeripheralInterfaceReg&);
}; };
class RDRAMInt_InterfaceReg class RDRAMInt_InterfaceReg
@ -360,9 +360,9 @@ public:
uint32_t & RI_WERROR_REG; uint32_t & RI_WERROR_REG;
private: private:
RDRAMInt_InterfaceReg(); // Disable default constructor RDRAMInt_InterfaceReg();
RDRAMInt_InterfaceReg(const RDRAMInt_InterfaceReg&); // Disable copy constructor RDRAMInt_InterfaceReg(const RDRAMInt_InterfaceReg&);
RDRAMInt_InterfaceReg& operator=(const RDRAMInt_InterfaceReg&); // Disable assignment RDRAMInt_InterfaceReg& operator=(const RDRAMInt_InterfaceReg&);
}; };
//Signal Processor Interface; //Signal Processor Interface;
@ -384,9 +384,9 @@ public:
uint32_t & SP_IBIST_REG; uint32_t & SP_IBIST_REG;
private: private:
SigProcessor_InterfaceReg(); // Disable default constructor SigProcessor_InterfaceReg();
SigProcessor_InterfaceReg(const SigProcessor_InterfaceReg&); // Disable copy constructor SigProcessor_InterfaceReg(const SigProcessor_InterfaceReg&);
SigProcessor_InterfaceReg& operator=(const SigProcessor_InterfaceReg&); // Disable assignment SigProcessor_InterfaceReg& operator=(const SigProcessor_InterfaceReg&);
}; };
//Signal Processor interface flags //Signal Processor interface flags
@ -458,9 +458,9 @@ public:
uint32_t & SI_STATUS_REG; uint32_t & SI_STATUS_REG;
private: private:
Serial_InterfaceReg(); // Disable default constructor Serial_InterfaceReg();
Serial_InterfaceReg(const Serial_InterfaceReg&); // Disable copy constructor Serial_InterfaceReg(const Serial_InterfaceReg&);
Serial_InterfaceReg& operator=(const Serial_InterfaceReg&); // Disable assignment Serial_InterfaceReg& operator=(const Serial_InterfaceReg&);
}; };
//Serial Interface flags //Serial Interface flags
@ -503,9 +503,9 @@ public:
uint32_t & ASIC_TEST_PIN_SEL; uint32_t & ASIC_TEST_PIN_SEL;
private: private:
Disk_InterfaceReg(); // Disable default constructor Disk_InterfaceReg();
Disk_InterfaceReg(const Disk_InterfaceReg&); // Disable copy constructor Disk_InterfaceReg(const Disk_InterfaceReg&);
Disk_InterfaceReg& operator=(const Disk_InterfaceReg&); // Disable assignment Disk_InterfaceReg& operator=(const Disk_InterfaceReg&);
}; };
//Disk Interface Flags //Disk Interface Flags
@ -632,9 +632,9 @@ public:
void SetAsCurrentSystem(); void SetAsCurrentSystem();
private: private:
CRegisters(); // Disable default constructor CRegisters();
CRegisters(const CRegisters&); // Disable copy constructor CRegisters(const CRegisters&);
CRegisters& operator=(const CRegisters&); // Disable assignment CRegisters& operator=(const CRegisters&);
bool m_FirstInterupt; bool m_FirstInterupt;
CN64System * m_System; CN64System * m_System;

6
Source/Project64-core/N64System/Mips/Sram.h
View File

@ -10,9 +10,9 @@ public:
void DmaToSram(uint8_t * Source, int32_t StartOffset, uint32_t len); void DmaToSram(uint8_t * Source, int32_t StartOffset, uint32_t len);
private: private:
CSram(void); // Disable default constructor CSram(void);
CSram(const CSram&); // Disable copy constructor CSram(const CSram&);
CSram& operator=(const CSram&); // Disable assignment CSram& operator=(const CSram&);
bool LoadSram(); bool LoadSram();

6
Source/Project64-core/N64System/Mips/SystemEvents.h
View File

@ -71,9 +71,9 @@ public:
} }
private: private:
CSystemEvents(); // Disable default constructor CSystemEvents();
CSystemEvents(const CSystemEvents&); // Disable copy constructor CSystemEvents(const CSystemEvents&);
CSystemEvents& operator=(const CSystemEvents&); // Disable assignment CSystemEvents& operator=(const CSystemEvents&);
void ChangePluginFunc(); void ChangePluginFunc();

20
Source/Project64-core/N64System/Mips/SystemTiming.h
View File

@ -61,17 +61,17 @@ public:
bool operator != (const CSystemTimer& rSystemTimer) const; bool operator != (const CSystemTimer& rSystemTimer) const;
private: private:
CSystemTimer(void); // Disable default constructor CSystemTimer(void);
CSystemTimer(const CSystemTimer&); // Disable copy constructor CSystemTimer(const CSystemTimer&);
CSystemTimer& operator=(const CSystemTimer&); // Disable assignment CSystemTimer& operator=(const CSystemTimer&);
TIMER_DETAILS m_TimerDetatils[MaxTimer];
int32_t m_LastUpdate; //Timer at last update
int32_t & m_NextTimer;
TimerType m_Current;
bool m_inFixTimer;
CRegisters & m_Reg;
void SetCompareTimer(); void SetCompareTimer();
void FixTimers(); void FixTimers();
TIMER_DETAILS m_TimerDetatils[MaxTimer];
int32_t m_LastUpdate;
int32_t & m_NextTimer;
TimerType m_Current;
bool m_inFixTimer;
CRegisters & m_Reg;
}; };

6
Source/Project64-core/N64System/Mips/TLBClass.h
View File

@ -134,9 +134,9 @@ private:
void SetupTLB_Entry(int32_t index, bool Random); void SetupTLB_Entry(int32_t index, bool Random);
private: private:
CTLB(); // Disable default constructor CTLB();
CTLB(const CTLB&); // Disable copy constructor CTLB(const CTLB&);
CTLB& operator=(const CTLB&); // Disable assignment CTLB& operator=(const CTLB&);
}; };
#pragma warning(pop) #pragma warning(pop)

4
Source/Project64-core/N64System/ProfilingClass.h
View File

@ -20,8 +20,8 @@ public:
void ResetTimers(void); void ResetTimers(void);
private: private:
CProfiling(const CProfiling&); // Disable copy constructor CProfiling(const CProfiling&);
CProfiling& operator=(const CProfiling&); // Disable assignment CProfiling& operator=(const CProfiling&);
uint32_t m_CurrentDisplayCount; uint32_t m_CurrentDisplayCount;
PROFILE_TIMERS m_CurrentTimerType; PROFILE_TIMERS m_CurrentTimerType;

6
Source/Project64-core/N64System/Recompiler/CodeBlock.h
View File

@ -32,9 +32,9 @@ public:
uint32_t NextTest(); uint32_t NextTest();
private: private:
CCodeBlock(); // Disable default constructor CCodeBlock();
CCodeBlock(const CCodeBlock&); // Disable copy constructor CCodeBlock(const CCodeBlock&);
CCodeBlock& operator=(const CCodeBlock&); // Disable assignment CCodeBlock& operator=(const CCodeBlock&);
bool AnalyseBlock(); bool AnalyseBlock();

6
Source/Project64-core/N64System/Recompiler/CodeSection.h
View File

@ -52,9 +52,9 @@ public:
CJumpInfo m_Cont; CJumpInfo m_Cont;
private: private:
CCodeSection(void); // Disable default constructor CCodeSection(void);
CCodeSection(const CCodeSection&); // Disable copy constructor CCodeSection(const CCodeSection&);
CCodeSection& operator=(const CCodeSection&); // Disable assignment CCodeSection& operator=(const CCodeSection&);
void UnlinkParent(CCodeSection * Parent, bool ContinueSection); void UnlinkParent(CCodeSection * Parent, bool ContinueSection);
void InheritConstants(); void InheritConstants();

20
Source/Project64-core/N64System/Recompiler/FunctionInfo.h
View File

@ -23,23 +23,19 @@ public:
uint64_t* MemLocation(int32_t i) { return m_MemLocation[i]; } uint64_t* MemLocation(int32_t i) { return m_MemLocation[i]; }
private: private:
CCompiledFunc(void); // Disable default constructor CCompiledFunc(void);
CCompiledFunc(const CCompiledFunc&); // Disable copy constructor CCompiledFunc(const CCompiledFunc&);
CCompiledFunc& operator=(const CCompiledFunc&); // Disable assignment CCompiledFunc& operator=(const CCompiledFunc&);
//Information uint32_t m_EnterPC;
uint32_t m_EnterPC; // The Entry PC uint32_t m_MinPC;
uint32_t m_MinPC; // The Lowest PC in the function uint32_t m_MaxPC;
uint32_t m_MaxPC; // The Highest PC in the function uint8_t * m_FunctionEnd;
uint8_t * m_FunctionEnd; // Where the code bytes end
MD5Digest m_Hash; MD5Digest m_Hash;
//From querying the recompiler get information about the function Func m_Function;
Func m_Function;
CCompiledFunc* m_Next; CCompiledFunc* m_Next;
//Validation
uint64_t m_MemContents[2], * m_MemLocation[2]; uint64_t m_MemContents[2], * m_MemLocation[2];
}; };

6
Source/Project64-core/N64System/Recompiler/LoopAnalysis.h
View File

@ -16,9 +16,9 @@ public:
bool SetupRegisterForLoop(); bool SetupRegisterForLoop();
private: private:
LoopAnalysis(); // Disable default constructor LoopAnalysis();
LoopAnalysis(const LoopAnalysis&); // Disable copy constructor LoopAnalysis(const LoopAnalysis&);
LoopAnalysis& operator=(const LoopAnalysis&); // Disable assignment LoopAnalysis& operator=(const LoopAnalysis&);
bool SetupEnterSection(CCodeSection * Section, bool & bChanged, bool & bSkipedSection); bool SetupEnterSection(CCodeSection * Section, bool & bChanged, bool & bSkipedSection);
bool CheckLoopRegisterUsage(CCodeSection * Section); bool CheckLoopRegisterUsage(CCodeSection * Section);

6
Source/Project64-core/N64System/Recompiler/RecompilerClass.h
View File

@ -51,9 +51,9 @@ public:
uint32_t& MemoryStackPos() { return m_MemoryStack; } uint32_t& MemoryStackPos() { return m_MemoryStack; }
private: private:
CRecompiler(); // Disable default constructor CRecompiler();
CRecompiler(const CRecompiler&); // Disable copy constructor CRecompiler(const CRecompiler&);
CRecompiler& operator=(const CRecompiler&); // Disable assignment CRecompiler& operator=(const CRecompiler&);
CCompiledFunc * CompileCode(); CCompiledFunc * CompileCode();

4
Source/Project64-core/N64System/Recompiler/RecompilerMemory.h
View File

@ -16,8 +16,8 @@ public:
uint8_t** RecompPos() { return &m_RecompPos; } uint8_t** RecompPos() { return &m_RecompPos; }
private: private:
CRecompMemory(const CRecompMemory&); // Disable copy constructor CRecompMemory(const CRecompMemory&);
CRecompMemory& operator=(const CRecompMemory&); // Disable assignment CRecompMemory& operator=(const CRecompMemory&);
uint8_t * m_RecompCode; uint8_t * m_RecompCode;
uint32_t m_RecompSize; uint32_t m_RecompSize;

4
Source/Project64-core/N64System/SpeedLimiterClass.h
View File

@ -23,8 +23,8 @@ public:
int GetBaseSpeed(void) const; int GetBaseSpeed(void) const;
private: private:
CSpeedLimiter(const CSpeedLimiter&); // Disable copy constructor CSpeedLimiter(const CSpeedLimiter&);
CSpeedLimiter& operator=(const CSpeedLimiter&); // Disable assignment CSpeedLimiter& operator=(const CSpeedLimiter&);
void FixSpeedRatio(); void FixSpeedRatio();

7
Source/Project64-core/Plugins/AudioPlugin.h
View File

@ -15,8 +15,8 @@ public:
void(CALL *ProcessAList)(void); void(CALL *ProcessAList)(void);
private: private:
CAudioPlugin(const CAudioPlugin&); // Disable copy constructor CAudioPlugin(const CAudioPlugin&);
CAudioPlugin& operator=(const CAudioPlugin&); // Disable assignment CAudioPlugin& operator=(const CAudioPlugin&);
virtual int32_t GetDefaultSettingStartRange() const { return FirstAudioDefaultSet; } virtual int32_t GetDefaultSettingStartRange() const { return FirstAudioDefaultSet; }
virtual int32_t GetSettingStartRange() const { return FirstAudioSettings; } virtual int32_t GetSettingStartRange() const { return FirstAudioSettings; }
@ -27,9 +27,8 @@ private:
bool LoadFunctions(void); bool LoadFunctions(void);
void UnloadPluginDetails(void); void UnloadPluginDetails(void);
void(CALL *AiUpdate) (int32_t Wait); void(CALL *AiUpdate) (int32_t Wait);
void(CALL *AiDacrateChanged)(SYSTEM_TYPE Type); void(CALL *AiDacrateChanged)(SYSTEM_TYPE Type);
// Function used in a thread for using audio
static void AudioThread(CAudioPlugin * _this); static void AudioThread(CAudioPlugin * _this);
}; };

27
Source/Project64-core/Plugins/ControllerPlugin.h
View File

@ -70,16 +70,16 @@ public:
inline uint32_t Buttons(void) const { return m_Buttons.Value; } inline uint32_t Buttons(void) const { return m_Buttons.Value; }
inline PluginType Plugin(void) const { return static_cast<PluginType>(m_PlugType); } inline PluginType Plugin(void) const { return static_cast<PluginType>(m_PlugType); }
private: private:
friend class CControl_Plugin; //controller plugin class has full access friend class CControl_Plugin;
int32_t & m_Present; int32_t & m_Present;
int32_t & m_RawData; int32_t & m_RawData;
int32_t & m_PlugType; int32_t & m_PlugType;
BUTTONS m_Buttons; BUTTONS m_Buttons;
CCONTROL(void); // Disable default constructor CCONTROL(void);
CCONTROL(const CCONTROL&); // Disable copy constructor CCONTROL(const CCONTROL&);
CCONTROL& operator=(const CCONTROL&); // Disable assignment CCONTROL& operator=(const CCONTROL&);
}; };
class CControl_Plugin : public CPlugin class CControl_Plugin : public CPlugin
@ -92,19 +92,19 @@ public:
void SetControl(CControl_Plugin const * const Plugin); void SetControl(CControl_Plugin const * const Plugin);
void UpdateKeys(void); void UpdateKeys(void);
void(CALL *WM_KeyDown) (uint32_t wParam, uint32_t lParam); void(CALL *WM_KeyDown) (uint32_t wParam, uint32_t lParam);
void(CALL *WM_KeyUp) (uint32_t wParam, uint32_t lParam); void(CALL *WM_KeyUp) (uint32_t wParam, uint32_t lParam);
void(CALL *RumbleCommand) (int32_t Control, int32_t bRumble); void(CALL *RumbleCommand) (int32_t Control, int32_t bRumble);
void(CALL *GetKeys) (int32_t Control, BUTTONS * Keys); void(CALL *GetKeys) (int32_t Control, BUTTONS * Keys);
void(CALL *ReadController) (int32_t Control, uint8_t * Command); void(CALL *ReadController) (int32_t Control, uint8_t * Command);
void(CALL *ControllerCommand) (int32_t Control, uint8_t * Command); void(CALL *ControllerCommand) (int32_t Control, uint8_t * Command);
inline CCONTROL const * Controller(int32_t control) { return m_Controllers[control]; } inline CCONTROL const * Controller(int32_t control) { return m_Controllers[control]; }
inline CONTROL * PluginControllers(void) { return m_PluginControllers; } inline CONTROL * PluginControllers(void) { return m_PluginControllers; }
private: private:
CControl_Plugin(const CControl_Plugin&); // Disable copy constructor CControl_Plugin(const CControl_Plugin&);
CControl_Plugin& operator=(const CControl_Plugin&); // Disable assignment CControl_Plugin& operator=(const CControl_Plugin&);
virtual int32_t GetDefaultSettingStartRange() const { return FirstCtrlDefaultSet; } virtual int32_t GetDefaultSettingStartRange() const { return FirstCtrlDefaultSet; }
virtual int32_t GetSettingStartRange() const { return FirstCtrlSettings; } virtual int32_t GetSettingStartRange() const { return FirstCtrlSettings; }
@ -112,9 +112,8 @@ private:
bool LoadFunctions(void); bool LoadFunctions(void);
void UnloadPluginDetails(void); void UnloadPluginDetails(void);
bool m_AllocatedControllers; bool m_AllocatedControllers;
// What the different controls are set up as
CONTROL m_PluginControllers[4]; CONTROL m_PluginControllers[4];
CCONTROL * m_Controllers[4]; CCONTROL * m_Controllers[4];
}; };

4
Source/Project64-core/Plugins/GFXPlugin.h
View File

@ -70,8 +70,8 @@ public:
void ProcessMenuItem(int32_t id); void ProcessMenuItem(int32_t id);
private: private:
CGfxPlugin(const CGfxPlugin&); // Disable copy constructor CGfxPlugin(const CGfxPlugin&);
CGfxPlugin& operator=(const CGfxPlugin&); // Disable assignment CGfxPlugin& operator=(const CGfxPlugin&);
virtual int32_t GetDefaultSettingStartRange() const { return FirstGfxDefaultSet; } virtual int32_t GetDefaultSettingStartRange() const { return FirstGfxDefaultSet; }
virtual int32_t GetSettingStartRange() const { return FirstGfxSettings; } virtual int32_t GetSettingStartRange() const { return FirstGfxSettings; }

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

@ -143,9 +143,9 @@ public:
inline bool initilized(void) const { return m_initilized; } inline bool initilized(void) const { return m_initilized; }
private: private:
CPlugins(void); // Disable default constructor CPlugins(void);
CPlugins(const CPlugins&); // Disable copy constructor CPlugins(const CPlugins&);
CPlugins& operator=(const CPlugins&); // Disable assignment CPlugins& operator=(const CPlugins&);
void DestroyGfxPlugin(void); void DestroyGfxPlugin(void);
void DestroyAudioPlugin(void); void DestroyAudioPlugin(void);

4
Source/Project64-core/Plugins/RSPPlugin.h
View File

@ -49,8 +49,8 @@ public:
void ProcessMenuItem(int32_t id); void ProcessMenuItem(int32_t id);
private: private:
CRSP_Plugin(const CRSP_Plugin&); // Disable copy constructor CRSP_Plugin(const CRSP_Plugin&);
CRSP_Plugin& operator=(const CRSP_Plugin&); // Disable assignment CRSP_Plugin& operator=(const CRSP_Plugin&);
PLUGIN_TYPE type() { return PLUGIN_TYPE_RSP; } PLUGIN_TYPE type() { return PLUGIN_TYPE_RSP; }
virtual int32_t GetDefaultSettingStartRange() const { return FirstRSPDefaultSet; } virtual int32_t GetDefaultSettingStartRange() const { return FirstRSPDefaultSet; }

4
Source/Project64-core/Settings/SettingType/SettingsType-Application.h
View File

@ -59,6 +59,6 @@ protected:
virtual const char * SectionName(void) const; virtual const char * SectionName(void) const;
private: private:
CSettingTypeApplication(const CSettingTypeApplication&); // Disable copy constructor CSettingTypeApplication(const CSettingTypeApplication&);
CSettingTypeApplication& operator=(const CSettingTypeApplication&); // Disable assignment CSettingTypeApplication& operator=(const CSettingTypeApplication&);
}; };

6
Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h
View File

@ -32,7 +32,7 @@ public:
virtual void Delete(uint32_t Index); virtual void Delete(uint32_t Index);
private: private:
CSettingTypeApplicationIndex(void); // Disable default constructor CSettingTypeApplicationIndex(void);
CSettingTypeApplicationIndex(const CSettingTypeApplicationIndex&); // Disable copy constructor CSettingTypeApplicationIndex(const CSettingTypeApplicationIndex&);
CSettingTypeApplicationIndex& operator=(const CSettingTypeApplicationIndex&); // Disable assignment CSettingTypeApplicationIndex& operator=(const CSettingTypeApplicationIndex&);
}; };

6
Source/Project64-core/Settings/SettingType/SettingsType-ApplicationPath.h
View File

@ -13,9 +13,9 @@ public:
virtual bool Load ( int32_t Index, stdstr & Value ) const; virtual bool Load ( int32_t Index, stdstr & Value ) const;
private: private:
CSettingTypeApplicationPath(void); // Disable default constructor CSettingTypeApplicationPath(void);
CSettingTypeApplicationPath(const CSettingTypeApplicationPath&); // Disable copy constructor CSettingTypeApplicationPath(const CSettingTypeApplicationPath&);
CSettingTypeApplicationPath& operator=(const CSettingTypeApplicationPath&); // Disable assignment CSettingTypeApplicationPath& operator=(const CSettingTypeApplicationPath&);
CSettingTypeApplicationPath(const char * Section, const char * Name, const char * DefaultValue ); CSettingTypeApplicationPath(const char * Section, const char * Name, const char * DefaultValue );
CSettingTypeApplicationPath(const char * Section, const char * Name, bool DefaultValue ); CSettingTypeApplicationPath(const char * Section, const char * Name, bool DefaultValue );

6
Source/Project64-core/Settings/SettingType/SettingsType-GameSetting.h
View File

@ -46,7 +46,7 @@ protected:
virtual const char * SectionName(void) const; virtual const char * SectionName(void) const;
private: private:
CSettingTypeGame(void); // Disable default constructor CSettingTypeGame(void);
CSettingTypeGame(const CSettingTypeGame&); // Disable copy constructor CSettingTypeGame(const CSettingTypeGame&);
CSettingTypeGame& operator=(const CSettingTypeGame&); // Disable assignment CSettingTypeGame& operator=(const CSettingTypeGame&);
}; };

6
Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.h
View File

@ -33,9 +33,9 @@ public:
virtual void Delete (uint32_t Index ); virtual void Delete (uint32_t Index );
private: private:
CSettingTypeGameIndex(void); // Disable default constructor CSettingTypeGameIndex(void);
CSettingTypeGameIndex(const CSettingTypeGameIndex&); // Disable copy constructor CSettingTypeGameIndex(const CSettingTypeGameIndex&);
CSettingTypeGameIndex& operator=(const CSettingTypeGameIndex&); // Disable assignment CSettingTypeGameIndex& operator=(const CSettingTypeGameIndex&);
std::string m_PreIndex, m_PostIndex; std::string m_PreIndex, m_PostIndex;
}; };

6
Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.h
View File

@ -28,7 +28,7 @@ public:
virtual void Delete (uint32_t Index ); virtual void Delete (uint32_t Index );
private: private:
CSettingTypeRDBCpuType(void); // Disable default constructor CSettingTypeRDBCpuType(void);
CSettingTypeRDBCpuType(const CSettingTypeRDBCpuType&); // Disable copy constructor CSettingTypeRDBCpuType(const CSettingTypeRDBCpuType&);
CSettingTypeRDBCpuType& operator=(const CSettingTypeRDBCpuType&); // Disable assignment CSettingTypeRDBCpuType& operator=(const CSettingTypeRDBCpuType&);
}; };

6
Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.h
View File

@ -28,7 +28,7 @@ public:
virtual void Delete (uint32_t Index ); virtual void Delete (uint32_t Index );
private: private:
CSettingTypeRDBOnOff(void); // Disable default constructor CSettingTypeRDBOnOff(void);
CSettingTypeRDBOnOff(const CSettingTypeRDBOnOff&); // Disable copy constructor CSettingTypeRDBOnOff(const CSettingTypeRDBOnOff&);
CSettingTypeRDBOnOff& operator=(const CSettingTypeRDBOnOff&); // Disable assignment CSettingTypeRDBOnOff& operator=(const CSettingTypeRDBOnOff&);
}; };

6
Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.h
View File

@ -28,7 +28,7 @@ public:
virtual void Delete (uint32_t Index ); virtual void Delete (uint32_t Index );
private: private:
CSettingTypeRDBRDRamSize(void); // Disable default constructor CSettingTypeRDBRDRamSize(void);
CSettingTypeRDBRDRamSize(const CSettingTypeRDBRDRamSize&); // Disable copy constructor CSettingTypeRDBRDRamSize(const CSettingTypeRDBRDRamSize&);
CSettingTypeRDBRDRamSize& operator=(const CSettingTypeRDBRDRamSize&); // Disable assignment CSettingTypeRDBRDRamSize& operator=(const CSettingTypeRDBRDRamSize&);
}; };

6
Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.h
View File

@ -28,7 +28,7 @@ public:
virtual void Delete (uint32_t Index ); virtual void Delete (uint32_t Index );
private: private:
CSettingTypeRDBSaveChip(void); // Disable default constructor CSettingTypeRDBSaveChip(void);
CSettingTypeRDBSaveChip(const CSettingTypeRDBSaveChip&); // Disable copy constructor CSettingTypeRDBSaveChip(const CSettingTypeRDBSaveChip&);
CSettingTypeRDBSaveChip& operator=(const CSettingTypeRDBSaveChip&); // Disable assignment CSettingTypeRDBSaveChip& operator=(const CSettingTypeRDBSaveChip&);
}; };

30
Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.h
View File

@ -4,31 +4,31 @@ class CSettingTypeRDBYesNo :
public CSettingTypeRomDatabase public CSettingTypeRomDatabase
{ {
public: public:
CSettingTypeRDBYesNo(const char * Name, SettingID DefaultSetting ); CSettingTypeRDBYesNo(const char * Name, SettingID DefaultSetting);
CSettingTypeRDBYesNo(const char * Name, uint32_t DefaultValue ); CSettingTypeRDBYesNo(const char * Name, uint32_t DefaultValue);
~CSettingTypeRDBYesNo(); ~CSettingTypeRDBYesNo();
//return the values //return the values
virtual bool Load (uint32_t Index, bool & Value ) const; virtual bool Load (uint32_t Index, bool & Value) const;
virtual bool Load (uint32_t Index, uint32_t & Value ) const; virtual bool Load (uint32_t Index, uint32_t & Value) const;
virtual bool Load (uint32_t Index, std::string & Value ) const; virtual bool Load (uint32_t Index, std::string & Value) const;
//return the default values //return the default values
virtual void LoadDefault (uint32_t Index, bool & Value ) const; virtual void LoadDefault (uint32_t Index, bool & Value) const;
virtual void LoadDefault (uint32_t Index, uint32_t & Value ) const; virtual void LoadDefault (uint32_t Index, uint32_t & Value) const;
virtual void LoadDefault (uint32_t Index, std::string & Value ) const; virtual void LoadDefault (uint32_t Index, std::string & Value) const;
//Update the settings //Update the settings
virtual void Save (uint32_t Index, bool Value ); virtual void Save (uint32_t Index, bool Value);
virtual void Save (uint32_t Index, uint32_t Value ); virtual void Save (uint32_t Index, uint32_t Value);
virtual void Save (uint32_t Index, const std::string & Value ); virtual void Save (uint32_t Index, const std::string & Value);
virtual void Save (uint32_t Index, const char * Value ); virtual void Save (uint32_t Index, const char * Value);
// Delete the setting // Delete the setting
virtual void Delete (uint32_t Index ); virtual void Delete (uint32_t Index );
private: private:
CSettingTypeRDBYesNo(void); // Disable default constructor CSettingTypeRDBYesNo(void);
CSettingTypeRDBYesNo(const CSettingTypeRDBYesNo&); // Disable copy constructor CSettingTypeRDBYesNo(const CSettingTypeRDBYesNo&);
CSettingTypeRDBYesNo& operator=(const CSettingTypeRDBYesNo&); // Disable assignment CSettingTypeRDBYesNo& operator=(const CSettingTypeRDBYesNo&);
}; };

32
Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.h
View File

@ -9,33 +9,33 @@ public:
CSettingTypeRelativePath(const char * Directory, const char * FileName); CSettingTypeRelativePath(const char * Directory, const char * FileName);
~CSettingTypeRelativePath(); ~CSettingTypeRelativePath();
bool IndexBasedSetting ( void ) const { return false; } bool IndexBasedSetting (void) const { return false; }
SettingType GetSettingType ( void ) const { return SettingType_RelativePath; } SettingType GetSettingType (void) const { return SettingType_RelativePath; }
bool IsSettingSet(void) const { return false; } bool IsSettingSet (void) const { return false; }
//return the values //return the values
bool Load (uint32_t /*Index*/, bool & /*Value*/ ) const { return false; }; bool Load (uint32_t /*Index*/, bool & /*Value*/) const { return false; };
bool Load (uint32_t /*Index*/, uint32_t & /*Value*/ ) const { return false; }; bool Load (uint32_t /*Index*/, uint32_t & /*Value*/) const { return false; };
bool Load (uint32_t Index, std::string & Value ) const; bool Load (uint32_t Index, std::string & Value) const;
//return the default values //return the default values
void LoadDefault (uint32_t Index, bool & Value ) const; void LoadDefault (uint32_t Index, bool & Value) const;
void LoadDefault (uint32_t Index, uint32_t & Value ) const; void LoadDefault (uint32_t Index, uint32_t & Value) const;
void LoadDefault (uint32_t Index, std::string & Value ) const; void LoadDefault (uint32_t Index, std::string & Value) const;
//Update the settings //Update the settings
void Save (uint32_t Index, bool Value ); void Save (uint32_t Index, bool Value);
void Save (uint32_t Index, uint32_t Value ); void Save (uint32_t Index, uint32_t Value);
void Save (uint32_t Index, const std::string & Value ); void Save (uint32_t Index, const std::string & Value);
void Save (uint32_t Index, const char * Value ); void Save (uint32_t Index, const char * Value);
// Delete the setting // Delete the setting
void Delete (uint32_t Index ); void Delete (uint32_t Index );
private: private:
CSettingTypeRelativePath(void); // Disable default constructor CSettingTypeRelativePath(void);
CSettingTypeRelativePath(const CSettingTypeRelativePath&); // Disable copy constructor CSettingTypeRelativePath(const CSettingTypeRelativePath&);
CSettingTypeRelativePath& operator=(const CSettingTypeRelativePath&); // Disable assignment CSettingTypeRelativePath& operator=(const CSettingTypeRelativePath&);
static void RefreshSettings(void * _this); static void RefreshSettings(void * _this);
void BuildPath ( void ); void BuildPath ( void );

6
Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h
View File

@ -63,9 +63,9 @@ protected:
static CIniFile * m_AudioIniFile; static CIniFile * m_AudioIniFile;
private: private:
CSettingTypeRomDatabase(); // Disable default constructor CSettingTypeRomDatabase();
CSettingTypeRomDatabase(const CSettingTypeRomDatabase&); // Disable copy constructor CSettingTypeRomDatabase(const CSettingTypeRomDatabase&);
CSettingTypeRomDatabase& operator=(const CSettingTypeRomDatabase&); // Disable assignment CSettingTypeRomDatabase& operator=(const CSettingTypeRomDatabase&);
bool Load(uint32_t & Value) const; bool Load(uint32_t & Value) const;
}; };

26
Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.h
View File

@ -14,28 +14,28 @@ public:
virtual bool IndexBasedSetting ( void ) const { return true; } virtual bool IndexBasedSetting ( void ) const { return true; }
//return the values //return the values
virtual bool Load (uint32_t Index, bool & Value ) const; virtual bool Load (uint32_t Index, bool & Value) const;
virtual bool Load (uint32_t Index, uint32_t & Value ) const; virtual bool Load (uint32_t Index, uint32_t & Value) const;
virtual bool Load (uint32_t Index, std::string & Value ) const; virtual bool Load (uint32_t Index, std::string & Value) const;
//return the default values //return the default values
virtual void LoadDefault (uint32_t Index, bool & Value ) const; virtual void LoadDefault (uint32_t Index, bool & Value) const;
virtual void LoadDefault (uint32_t Index, uint32_t & Value ) const; virtual void LoadDefault (uint32_t Index, uint32_t & Value) const;
virtual void LoadDefault (uint32_t Index, std::string & Value ) const; virtual void LoadDefault (uint32_t Index, std::string & Value) const;
//Update the settings //Update the settings
virtual void Save (uint32_t Index, bool Value ); virtual void Save (uint32_t Index, bool Value);
virtual void Save (uint32_t Index, uint32_t Value ); virtual void Save (uint32_t Index, uint32_t Value);
virtual void Save (uint32_t Index, const std::string & Value ); virtual void Save (uint32_t Index, const std::string & Value);
virtual void Save (uint32_t Index, const char * Value ); virtual void Save (uint32_t Index, const char * Value);
// Delete the setting // Delete the setting
virtual void Delete (uint32_t Index ); virtual void Delete (uint32_t Index );
private: private:
CSettingTypeRomDatabaseIndex(void); // Disable default constructor CSettingTypeRomDatabaseIndex(void);
CSettingTypeRomDatabaseIndex(const CSettingTypeRomDatabaseIndex&); // Disable copy constructor CSettingTypeRomDatabaseIndex(const CSettingTypeRomDatabaseIndex&);
CSettingTypeRomDatabaseIndex& operator=(const CSettingTypeRomDatabaseIndex&); // Disable assignment CSettingTypeRomDatabaseIndex& operator=(const CSettingTypeRomDatabaseIndex&);
std::string m_PreIndex, m_PostIndex; std::string m_PreIndex, m_PostIndex;
}; };

8
Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.h
View File

@ -13,7 +13,7 @@ public:
virtual ~CSettingTypeRomDatabaseSetting(); virtual ~CSettingTypeRomDatabaseSetting();
virtual SettingType GetSettingType ( void ) const { return SettingType_RdbSetting; } virtual SettingType GetSettingType ( void ) const { return SettingType_RdbSetting; }
private: private:
virtual const char * Section ( void ) const { return m_SectionIdent.c_str(); } virtual const char * Section ( void ) const { return m_SectionIdent.c_str(); }
@ -21,7 +21,7 @@ private:
stdstr m_SectionIdent; stdstr m_SectionIdent;
private: private:
CSettingTypeRomDatabaseSetting(void); // Disable default constructor CSettingTypeRomDatabaseSetting(void);
CSettingTypeRomDatabaseSetting(const CSettingTypeRomDatabaseSetting&); // Disable copy constructor CSettingTypeRomDatabaseSetting(const CSettingTypeRomDatabaseSetting&);
CSettingTypeRomDatabaseSetting& operator=(const CSettingTypeRomDatabaseSetting&); // Disable assignment CSettingTypeRomDatabaseSetting& operator=(const CSettingTypeRomDatabaseSetting&);
}; };

36
Source/Project64-core/Settings/SettingType/SettingsType-RomSetting.h
View File

@ -4,37 +4,37 @@ class CSettingTypeRomDatabase :
public CSettingType public CSettingType
{ {
public: public:
CSettingTypeRomDatabase(const char * Name, const char * DefaultValue ); CSettingTypeRomDatabase(const char * Name, const char * DefaultValue);
CSettingTypeRomDatabase(const char * Name, bool DefaultValue ); CSettingTypeRomDatabase(const char * Name, bool DefaultValue);
CSettingTypeRomDatabase(const char * Name, int32_t DefaultValue ); CSettingTypeRomDatabase(const char * Name, int32_t DefaultValue);
CSettingTypeRomDatabase(const char * Name, SettingID DefaultSetting ); CSettingTypeRomDatabase(const char * Name, SettingID DefaultSetting);
~CSettingTypeRomDatabase(); ~CSettingTypeRomDatabase();
virtual SettingLocation GetSettingsLocation ( void ) const { return SettingLocation_RomDatabase; } virtual SettingLocation GetSettingsLocation ( void ) const { return SettingLocation_RomDatabase; }
//return the values //return the values
virtual bool Load ( int32_t Index, bool & Value ) const; virtual bool Load (int32_t Index, bool & Value) const;
virtual bool Load ( int32_t Index, uint32_t & Value ) const; virtual bool Load (int32_t Index, uint32_t & Value) const;
virtual bool Load ( int32_t Index, stdstr & Value ) const; virtual bool Load (int32_t Index, stdstr & Value) const;
//Update the settings //Update the settings
virtual void Save ( int32_t Index, bool Value ); virtual void Save (int32_t Index, bool Value);
virtual void Save ( int32_t Index, uint32_t Value ); virtual void Save (int32_t Index, uint32_t Value);
virtual void Save ( int32_t Index, const stdstr & Value ); virtual void Save (int32_t Index, const stdstr & Value);
virtual void Save ( int32_t Index, const char * Value ); virtual void Save (int32_t Index, const char * Value);
static void Initilize ( void ); static void Initilize ( void );
private: private:
CSettingTypeRomDatabase(void); // Disable default constructor CSettingTypeRomDatabase(void);
CSettingTypeRomDatabase(const CSettingTypeRomDatabase&); // Disable copy constructor CSettingTypeRomDatabase(const CSettingTypeRomDatabase&);
CSettingTypeRomDatabase& operator=(const CSettingTypeRomDatabase&); // Disable assignment CSettingTypeRomDatabase& operator=(const CSettingTypeRomDatabase&);
const const char * m_KeyName; const const char * m_KeyName;
const const char * m_DefaultStr; const const char * m_DefaultStr;
const int32_t m_DefaultValue; const int32_t m_DefaultValue;
const SettingID m_DefaultSetting; const SettingID m_DefaultSetting;
static CIniFile * m_SettingsIniFile; static CIniFile * m_SettingsIniFile;
stdstr m_SectionIdent; stdstr m_SectionIdent;
}; };

6
Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.h
View File

@ -35,9 +35,9 @@ public:
virtual void Delete(uint32_t Index); virtual void Delete(uint32_t Index);
private: private:
CSettingTypeSelectedDirectory(void); // Disable default constructor CSettingTypeSelectedDirectory(void);
CSettingTypeSelectedDirectory(const CSettingTypeSelectedDirectory&); // Disable copy constructor CSettingTypeSelectedDirectory(const CSettingTypeSelectedDirectory&);
CSettingTypeSelectedDirectory& operator=(const CSettingTypeSelectedDirectory&); // Disable assignment CSettingTypeSelectedDirectory& operator=(const CSettingTypeSelectedDirectory&);
static void DirectoryChanged(CSettingTypeSelectedDirectory * _this); static void DirectoryChanged(CSettingTypeSelectedDirectory * _this);

6
Source/Project64-core/Settings/SettingType/SettingsType-TempBool.h
View File

@ -35,9 +35,9 @@ public:
void Delete(uint32_t Index); void Delete(uint32_t Index);
private: private:
CSettingTypeTempBool(void); // Disable default constructor CSettingTypeTempBool(void);
CSettingTypeTempBool(const CSettingTypeTempBool&); // Disable copy constructor CSettingTypeTempBool(const CSettingTypeTempBool&);
CSettingTypeTempBool& operator=(const CSettingTypeTempBool&); // Disable assignment CSettingTypeTempBool& operator=(const CSettingTypeTempBool&);
bool m_value; bool m_value;
bool m_changed; bool m_changed;

6
Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.h
View File

@ -33,9 +33,9 @@ public:
void Delete (uint32_t Index ); void Delete (uint32_t Index );
private: private:
CSettingTypeTempNumber(void); // Disable default constructor CSettingTypeTempNumber(void);
CSettingTypeTempNumber(const CSettingTypeTempNumber&); // Disable copy constructor CSettingTypeTempNumber(const CSettingTypeTempNumber&);
CSettingTypeTempNumber& operator=(const CSettingTypeTempNumber&); // Disable assignment CSettingTypeTempNumber& operator=(const CSettingTypeTempNumber&);
uint32_t m_value; uint32_t m_value;
uint32_t m_initialValue; uint32_t m_initialValue;

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

@ -33,9 +33,9 @@ public:
void Delete (uint32_t Index ); void Delete (uint32_t Index );
private: private:
CSettingTypeTempString(void); // Disable default constructor CSettingTypeTempString(void);
CSettingTypeTempString(const CSettingTypeTempString&); // Disable copy constructor CSettingTypeTempString(const CSettingTypeTempString&);
CSettingTypeTempString& operator=(const CSettingTypeTempString&); // Disable assignment CSettingTypeTempString& operator=(const CSettingTypeTempString&);
std::string m_value; std::string m_value;
}; };

2
Source/Project64/UserInterface/CheatClassUI.cpp
View File

@ -462,7 +462,7 @@ void CCheatList::AddCodeLayers(LPARAM Enhancement, const std::wstring &Name, HTR
void CCheatList::ChangeChildrenStatus(HTREEITEM hParent, bool Checked) void CCheatList::ChangeChildrenStatus(HTREEITEM hParent, bool Checked)
{ {
HTREEITEM hItem = m_hCheatTree.GetChildItem(hParent);; HTREEITEM hItem = m_hCheatTree.GetChildItem(hParent);
if (hItem == nullptr) if (hItem == nullptr)
{ {
if (hParent == TVI_ROOT) { return; } if (hParent == TVI_ROOT) { return; }

6
Source/Project64/UserInterface/Debugger/Debugger-MemoryDump.h
View File

@ -10,9 +10,9 @@ public:
virtual ~CDumpMemory(void); virtual ~CDumpMemory(void);
private: private:
CDumpMemory(void); // Disable default constructor CDumpMemory(void);
CDumpMemory(const CDumpMemory&); // Disable copy constructor CDumpMemory(const CDumpMemory&);
CDumpMemory& operator=(const CDumpMemory&); // Disable assignment CDumpMemory& operator=(const CDumpMemory&);
enum DumpFormat enum DumpFormat
{ {

6
Source/Project64/UserInterface/Debugger/Debugger-MemorySearch.h
View File

@ -142,9 +142,9 @@ private:
ResultsListCtrl_Col_Previous ResultsListCtrl_Col_Previous
}; };
CDebugMemorySearch(void); // Disable default constructor CDebugMemorySearch(void);
CDebugMemorySearch(const CDebugMemorySearch&); // Disable copy constructor CDebugMemorySearch(const CDebugMemorySearch&);
CDebugMemorySearch& operator=(const CDebugMemorySearch&); // Disable assignment CDebugMemorySearch& operator=(const CDebugMemorySearch&);
static LRESULT CALLBACK HookProc(int nCode, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK HookProc(int nCode, WPARAM wParam, LPARAM lParam);
static CDebugMemorySearch* _this; static CDebugMemorySearch* _this;

4
Source/Project64/UserInterface/Debugger/Debugger-RegisterTabs.h
View File

@ -50,8 +50,8 @@ public:
void CopyAllRegisters(); void CopyAllRegisters();
private: private:
CRegisterTabs(const CRegisterTabs&); // Disable copy constructor CRegisterTabs(const CRegisterTabs&);
CRegisterTabs& operator=(const CRegisterTabs&); // Disable assignment CRegisterTabs& operator=(const CRegisterTabs&);
stdstr CopyTabRegisters(int id); stdstr CopyTabRegisters(int id);

4
Source/Project64/UserInterface/Debugger/debugger.h
View File

@ -90,8 +90,8 @@ protected:
void FrameDrawn(void); void FrameDrawn(void);
private: private:
CDebuggerUI(const CDebuggerUI&); // Disable copy constructor CDebuggerUI(const CDebuggerUI&);
CDebuggerUI& operator=(const CDebuggerUI&); // Disable assignment CDebuggerUI& operator=(const CDebuggerUI&);
CDumpMemory * m_MemoryDump; CDumpMemory * m_MemoryDump;
CDebugMemoryView * m_MemoryView; CDebugMemoryView * m_MemoryView;

6
Source/Project64/UserInterface/MainMenu.h
View File

@ -70,9 +70,9 @@ public:
void ResetAccelerators(void) { m_ResetAccelerators = true; } void ResetAccelerators(void) { m_ResetAccelerators = true; }
private: private:
CMainMenu(); // Disable default constructor CMainMenu();
CMainMenu(const CMainMenu&); // Disable copy constructor CMainMenu(const CMainMenu&);
CMainMenu& operator=(const CMainMenu&); // Disable assignment CMainMenu& operator=(const CMainMenu&);
void OnOpenRom(HWND hWnd); void OnOpenRom(HWND hWnd);
void OnOpenCombo(HWND hWnd); void OnOpenCombo(HWND hWnd);

4
Source/Project64/UserInterface/Notification.h
View File

@ -54,8 +54,8 @@ public:
void SetGfxPlugin(CGfxPlugin * Plugin); void SetGfxPlugin(CGfxPlugin * Plugin);
private: private:
CNotificationImp(const CNotificationImp&); // Disable copy constructor CNotificationImp(const CNotificationImp&);
CNotificationImp& operator=(const CNotificationImp&); // Disable assignment CNotificationImp& operator=(const CNotificationImp&);
CMainGui * m_hWnd; CMainGui * m_hWnd;
CGfxPlugin * m_gfxPlugin; CGfxPlugin * m_gfxPlugin;

6
Source/Project64/UserInterface/WTLControls/ModifiedComboBox.h
View File

@ -132,9 +132,9 @@ public:
} }
private: private:
CModifiedComboBoxT(void); // Disable default constructor CModifiedComboBoxT(void);
CModifiedComboBoxT(const CModifiedComboBoxT&); // Disable copy constructor CModifiedComboBoxT(const CModifiedComboBoxT&);
CModifiedComboBoxT& operator=(const CModifiedComboBoxT&); // Disable assignment CModifiedComboBoxT& operator=(const CModifiedComboBoxT&);
bool m_Changed; bool m_Changed;
bool m_Reset; bool m_Reset;