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);
private:
JavaBridge(void); // Disable default constructor
JavaBridge(const JavaBridge&); // Disable copy constructor
JavaBridge& operator=(const JavaBridge&); // Disable assignment
JavaBridge(void);
JavaBridge(const JavaBridge&);
JavaBridge& operator=(const JavaBridge&);
JavaVM* m_vm;
jclass m_GalleryActivityClass;

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

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

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

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

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

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

5
Source/Common/CriticalSection.h
View File

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

4
Source/Common/FileClass.h
View File

@ -75,6 +75,6 @@ public:
virtual bool SetEndOfFile();
private:
CFile(const CFile&); // Disable copy constructor
CFile& operator=(const CFile&); // Disable assignment
CFile(const CFile&);
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; }
private:
CLog(const CLog&); // Disable copy constructor
CLog& operator=(const CLog&); // Disable assignment
CLog(const CLog&);
CLog& operator=(const CLog&);
CFile m_hLogFile;
bool m_FlushOnWrite;

4
Source/Common/SyncEvent.h
View File

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

6
Source/Common/Thread.h
View File

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

6
Source/Common/Util.h
View File

@ -13,7 +13,7 @@ public:
static bool TerminatedExistingExe();
private:
pjutil(void); // Disable default constructor
pjutil(const pjutil&); // Disable copy constructor
pjutil& operator=(const pjutil&); // Disable assignment
pjutil(void);
pjutil(const pjutil&);
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);
private:
C7zip(void); // Disable default constructor
C7zip(const C7zip&); // Disable copy constructor
C7zip& operator=(const C7zip&); // Disable assignment
C7zip(void);
C7zip(const C7zip&);
C7zip& operator=(const C7zip&);
/*typedef struct _CFileInStream
{
ISzInStream InStream;
FILE *File;
} CFileInStream;
*/
CSzArEx * m_db;
CFileInStream m_archiveStream;
CLookToRead m_archiveLookStream;
ISzAlloc m_allocImp;
ISzAlloc m_allocTempImp;
int m_FileSize;
char m_FileName[260];
int m_CurrentFile;
bool m_Opened;
CSzArEx * m_db;
CFileInStream m_archiveStream;
CLookToRead m_archiveLookStream;
ISzAlloc m_allocImp;
ISzAlloc m_allocTempImp;
int m_FileSize;
char m_FileName[260];
int m_CurrentFile;
bool m_Opened;
//Used for extraction
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*/) { }
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; }
private:
CLanguage(const CLanguage&); // Disable copy constructor
CLanguage& operator=(const CLanguage&); // Disable assignment
CLanguage(const CLanguage&);
CLanguage& operator=(const CLanguage&);
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);
private:
CFramePerSecond(const CFramePerSecond&); // Disable copy constructor
CFramePerSecond& operator=(const CFramePerSecond&); // Disable assignment
CFramePerSecond(const CFramePerSecond&);
CFramePerSecond& operator=(const CFramePerSecond&);
static void FrameRateTypeChanged(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();
private:
CInterpreterCPU(); // Disable default constructor
CInterpreterCPU(const CInterpreterCPU&); // Disable copy constructor
CInterpreterCPU& operator=(const CInterpreterCPU&); // Disable assignment
CInterpreterCPU();
CInterpreterCPU(const CInterpreterCPU&);
CInterpreterCPU& operator=(const CInterpreterCPU&);
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 );
private:
CAudio(const CAudio&); // Disable copy constructor
CAudio& operator=(const CAudio&); // Disable assignment
CAudio(const CAudio&);
CAudio& operator=(const CAudio&);
uint32_t m_SecondBuff;
uint32_t m_Status;

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

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

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

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

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

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

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

@ -105,9 +105,9 @@ public:
const char * LabelName(uint32_t Address) const;
private:
CMipsMemoryVM(); // Disable default constructor
CMipsMemoryVM(const CMipsMemoryVM&); // Disable copy constructor
CMipsMemoryVM& operator=(const CMipsMemoryVM&); // Disable assignment
CMipsMemoryVM();
CMipsMemoryVM(const CMipsMemoryVM&);
CMipsMemoryVM& operator=(const CMipsMemoryVM&);
#if defined(__i386__) || defined(_M_IX86)
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);
private:
CMempak(const CMempak&); // Disable copy constructor
CMempak& operator=(const CMempak&); // Disable assignment
CMempak(const CMempak&);
CMempak& operator=(const CMempak&);
void LoadMempak(int32_t Control, bool Create);
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];
private:
CPifRam(); // Disable default constructor
CPifRam(const CPifRam&); // Disable copy constructor
CPifRam& operator=(const CPifRam&); // Disable assignment
CPifRam();
CPifRam(const CPifRam&);
CPifRam& operator=(const CPifRam&);
enum { CHALLENGE_LENGTH = 0x20 };
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;
private:
CP0registers(); // Disable default constructor
CP0registers(const CP0registers&); // Disable copy constructor
CP0registers& operator=(const CP0registers&); // Disable assignment
CP0registers();
CP0registers(const CP0registers&);
CP0registers& operator=(const CP0registers&);
};
//CPO register flags
@ -130,9 +130,9 @@ public:
uint32_t & RDRAM_DEVICE_MANUF_REG;
private:
Rdram_InterfaceReg(); // Disable default constructor
Rdram_InterfaceReg(const Rdram_InterfaceReg&); // Disable copy constructor
Rdram_InterfaceReg& operator=(const Rdram_InterfaceReg&); // Disable assignment
Rdram_InterfaceReg();
Rdram_InterfaceReg(const Rdram_InterfaceReg&);
Rdram_InterfaceReg& operator=(const Rdram_InterfaceReg&);
};
//Mips interface registers
@ -150,9 +150,9 @@ public:
uint32_t & MI_INTR_MASK_REG;
private:
Mips_InterfaceReg(); // Disable default constructor
Mips_InterfaceReg(const Mips_InterfaceReg&); // Disable copy constructor
Mips_InterfaceReg& operator=(const Mips_InterfaceReg&); // Disable assignment
Mips_InterfaceReg();
Mips_InterfaceReg(const Mips_InterfaceReg&);
Mips_InterfaceReg& operator=(const Mips_InterfaceReg&);
};
//Mips interface flags
@ -232,9 +232,9 @@ public:
uint32_t & VI_Y_SCALE_REG;
private:
Video_InterfaceReg(); // Disable default constructor
Video_InterfaceReg(const Video_InterfaceReg&); // Disable copy constructor
Video_InterfaceReg& operator=(const Video_InterfaceReg&); // Disable assignment
Video_InterfaceReg();
Video_InterfaceReg(const Video_InterfaceReg&);
Video_InterfaceReg& operator=(const Video_InterfaceReg&);
};
//Display Processor Control Registers
@ -254,9 +254,9 @@ public:
uint32_t & DPC_TMEM_REG;
private:
DisplayControlReg(); // Disable default constructor
DisplayControlReg(const DisplayControlReg&); // Disable copy constructor
DisplayControlReg& operator=(const DisplayControlReg&); // Disable assignment
DisplayControlReg();
DisplayControlReg(const DisplayControlReg&);
DisplayControlReg& operator=(const DisplayControlReg&);
};
enum
@ -302,9 +302,9 @@ public:
uint32_t & AI_BITRATE_REG;
private:
AudioInterfaceReg(); // Disable default constructor
AudioInterfaceReg(const AudioInterfaceReg&); // Disable copy constructor
AudioInterfaceReg& operator=(const AudioInterfaceReg&); // Disable assignment
AudioInterfaceReg();
AudioInterfaceReg(const AudioInterfaceReg&);
AudioInterfaceReg& operator=(const AudioInterfaceReg&);
};
enum
@ -338,9 +338,9 @@ public:
uint32_t & PI_BSD_DOM2_RLS_REG;
private:
PeripheralInterfaceReg(); // Disable default constructor
PeripheralInterfaceReg(const PeripheralInterfaceReg&); // Disable copy constructor
PeripheralInterfaceReg& operator=(const PeripheralInterfaceReg&); // Disable assignment
PeripheralInterfaceReg();
PeripheralInterfaceReg(const PeripheralInterfaceReg&);
PeripheralInterfaceReg& operator=(const PeripheralInterfaceReg&);
};
class RDRAMInt_InterfaceReg
@ -360,9 +360,9 @@ public:
uint32_t & RI_WERROR_REG;
private:
RDRAMInt_InterfaceReg(); // Disable default constructor
RDRAMInt_InterfaceReg(const RDRAMInt_InterfaceReg&); // Disable copy constructor
RDRAMInt_InterfaceReg& operator=(const RDRAMInt_InterfaceReg&); // Disable assignment
RDRAMInt_InterfaceReg();
RDRAMInt_InterfaceReg(const RDRAMInt_InterfaceReg&);
RDRAMInt_InterfaceReg& operator=(const RDRAMInt_InterfaceReg&);
};
//Signal Processor Interface;
@ -384,9 +384,9 @@ public:
uint32_t & SP_IBIST_REG;
private:
SigProcessor_InterfaceReg(); // Disable default constructor
SigProcessor_InterfaceReg(const SigProcessor_InterfaceReg&); // Disable copy constructor
SigProcessor_InterfaceReg& operator=(const SigProcessor_InterfaceReg&); // Disable assignment
SigProcessor_InterfaceReg();
SigProcessor_InterfaceReg(const SigProcessor_InterfaceReg&);
SigProcessor_InterfaceReg& operator=(const SigProcessor_InterfaceReg&);
};
//Signal Processor interface flags
@ -458,9 +458,9 @@ public:
uint32_t & SI_STATUS_REG;
private:
Serial_InterfaceReg(); // Disable default constructor
Serial_InterfaceReg(const Serial_InterfaceReg&); // Disable copy constructor
Serial_InterfaceReg& operator=(const Serial_InterfaceReg&); // Disable assignment
Serial_InterfaceReg();
Serial_InterfaceReg(const Serial_InterfaceReg&);
Serial_InterfaceReg& operator=(const Serial_InterfaceReg&);
};
//Serial Interface flags
@ -503,9 +503,9 @@ public:
uint32_t & ASIC_TEST_PIN_SEL;
private:
Disk_InterfaceReg(); // Disable default constructor
Disk_InterfaceReg(const Disk_InterfaceReg&); // Disable copy constructor
Disk_InterfaceReg& operator=(const Disk_InterfaceReg&); // Disable assignment
Disk_InterfaceReg();
Disk_InterfaceReg(const Disk_InterfaceReg&);
Disk_InterfaceReg& operator=(const Disk_InterfaceReg&);
};
//Disk Interface Flags
@ -632,9 +632,9 @@ public:
void SetAsCurrentSystem();
private:
CRegisters(); // Disable default constructor
CRegisters(const CRegisters&); // Disable copy constructor
CRegisters& operator=(const CRegisters&); // Disable assignment
CRegisters();
CRegisters(const CRegisters&);
CRegisters& operator=(const CRegisters&);
bool m_FirstInterupt;
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);
private:
CSram(void); // Disable default constructor
CSram(const CSram&); // Disable copy constructor
CSram& operator=(const CSram&); // Disable assignment
CSram(void);
CSram(const CSram&);
CSram& operator=(const CSram&);
bool LoadSram();

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

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

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

@ -61,17 +61,17 @@ public:
bool operator != (const CSystemTimer& rSystemTimer) const;
private:
CSystemTimer(void); // Disable default constructor
CSystemTimer(const CSystemTimer&); // Disable copy constructor
CSystemTimer& operator=(const CSystemTimer&); // Disable assignment
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;
CSystemTimer(void);
CSystemTimer(const CSystemTimer&);
CSystemTimer& operator=(const CSystemTimer&);
void SetCompareTimer();
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);
private:
CTLB(); // Disable default constructor
CTLB(const CTLB&); // Disable copy constructor
CTLB& operator=(const CTLB&); // Disable assignment
CTLB();
CTLB(const CTLB&);
CTLB& operator=(const CTLB&);
};
#pragma warning(pop)

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

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

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

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

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

@ -52,9 +52,9 @@ public:
CJumpInfo m_Cont;
private:
CCodeSection(void); // Disable default constructor
CCodeSection(const CCodeSection&); // Disable copy constructor
CCodeSection& operator=(const CCodeSection&); // Disable assignment
CCodeSection(void);
CCodeSection(const CCodeSection&);
CCodeSection& operator=(const CCodeSection&);
void UnlinkParent(CCodeSection * Parent, bool ContinueSection);
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]; }
private:
CCompiledFunc(void); // Disable default constructor
CCompiledFunc(const CCompiledFunc&); // Disable copy constructor
CCompiledFunc& operator=(const CCompiledFunc&); // Disable assignment
CCompiledFunc(void);
CCompiledFunc(const CCompiledFunc&);
CCompiledFunc& operator=(const CCompiledFunc&);
//Information
uint32_t m_EnterPC; // The Entry PC
uint32_t m_MinPC; // The Lowest PC in the function
uint32_t m_MaxPC; // The Highest PC in the function
uint8_t * m_FunctionEnd; // Where the code bytes end
uint32_t m_EnterPC;
uint32_t m_MinPC;
uint32_t m_MaxPC;
uint8_t * m_FunctionEnd;
MD5Digest m_Hash;
//From querying the recompiler get information about the function
Func m_Function;
Func m_Function;
CCompiledFunc* m_Next;
//Validation
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();
private:
LoopAnalysis(); // Disable default constructor
LoopAnalysis(const LoopAnalysis&); // Disable copy constructor
LoopAnalysis& operator=(const LoopAnalysis&); // Disable assignment
LoopAnalysis();
LoopAnalysis(const LoopAnalysis&);
LoopAnalysis& operator=(const LoopAnalysis&);
bool SetupEnterSection(CCodeSection * Section, bool & bChanged, bool & bSkipedSection);
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; }
private:
CRecompiler(); // Disable default constructor
CRecompiler(const CRecompiler&); // Disable copy constructor
CRecompiler& operator=(const CRecompiler&); // Disable assignment
CRecompiler();
CRecompiler(const CRecompiler&);
CRecompiler& operator=(const CRecompiler&);
CCompiledFunc * CompileCode();

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

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

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

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

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

@ -15,8 +15,8 @@ public:
void(CALL *ProcessAList)(void);
private:
CAudioPlugin(const CAudioPlugin&); // Disable copy constructor
CAudioPlugin& operator=(const CAudioPlugin&); // Disable assignment
CAudioPlugin(const CAudioPlugin&);
CAudioPlugin& operator=(const CAudioPlugin&);
virtual int32_t GetDefaultSettingStartRange() const { return FirstAudioDefaultSet; }
virtual int32_t GetSettingStartRange() const { return FirstAudioSettings; }
@ -27,9 +27,8 @@ private:
bool LoadFunctions(void);
void UnloadPluginDetails(void);
void(CALL *AiUpdate) (int32_t Wait);
void(CALL *AiUpdate) (int32_t Wait);
void(CALL *AiDacrateChanged)(SYSTEM_TYPE Type);
// Function used in a thread for using audio
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 PluginType Plugin(void) const { return static_cast<PluginType>(m_PlugType); }
private:
friend class CControl_Plugin; //controller plugin class has full access
friend class CControl_Plugin;
int32_t & m_Present;
int32_t & m_RawData;
int32_t & m_PlugType;
BUTTONS m_Buttons;
CCONTROL(void); // Disable default constructor
CCONTROL(const CCONTROL&); // Disable copy constructor
CCONTROL& operator=(const CCONTROL&); // Disable assignment
CCONTROL(void);
CCONTROL(const CCONTROL&);
CCONTROL& operator=(const CCONTROL&);
};
class CControl_Plugin : public CPlugin
@ -92,19 +92,19 @@ public:
void SetControl(CControl_Plugin const * const Plugin);
void UpdateKeys(void);
void(CALL *WM_KeyDown) (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 *GetKeys) (int32_t Control, BUTTONS * Keys);
void(CALL *ReadController) (int32_t Control, uint8_t * Command);
void(CALL *ControllerCommand) (int32_t Control, uint8_t * Command);
void(CALL *WM_KeyDown) (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 *GetKeys) (int32_t Control, BUTTONS * Keys);
void(CALL *ReadController) (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 CONTROL * PluginControllers(void) { return m_PluginControllers; }
private:
CControl_Plugin(const CControl_Plugin&); // Disable copy constructor
CControl_Plugin& operator=(const CControl_Plugin&); // Disable assignment
CControl_Plugin(const CControl_Plugin&);
CControl_Plugin& operator=(const CControl_Plugin&);
virtual int32_t GetDefaultSettingStartRange() const { return FirstCtrlDefaultSet; }
virtual int32_t GetSettingStartRange() const { return FirstCtrlSettings; }
@ -112,9 +112,8 @@ private:
bool LoadFunctions(void);
void UnloadPluginDetails(void);
bool m_AllocatedControllers;
bool m_AllocatedControllers;
// What the different controls are set up as
CONTROL m_PluginControllers[4];
CCONTROL * m_Controllers[4];
};

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

@ -70,8 +70,8 @@ public:
void ProcessMenuItem(int32_t id);
private:
CGfxPlugin(const CGfxPlugin&); // Disable copy constructor
CGfxPlugin& operator=(const CGfxPlugin&); // Disable assignment
CGfxPlugin(const CGfxPlugin&);
CGfxPlugin& operator=(const CGfxPlugin&);
virtual int32_t GetDefaultSettingStartRange() const { return FirstGfxDefaultSet; }
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; }
private:
CPlugins(void); // Disable default constructor
CPlugins(const CPlugins&); // Disable copy constructor
CPlugins& operator=(const CPlugins&); // Disable assignment
CPlugins(void);
CPlugins(const CPlugins&);
CPlugins& operator=(const CPlugins&);
void DestroyGfxPlugin(void);
void DestroyAudioPlugin(void);

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

@ -49,8 +49,8 @@ public:
void ProcessMenuItem(int32_t id);
private:
CRSP_Plugin(const CRSP_Plugin&); // Disable copy constructor
CRSP_Plugin& operator=(const CRSP_Plugin&); // Disable assignment
CRSP_Plugin(const CRSP_Plugin&);
CRSP_Plugin& operator=(const CRSP_Plugin&);
PLUGIN_TYPE type() { return PLUGIN_TYPE_RSP; }
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;
private:
CSettingTypeApplication(const CSettingTypeApplication&); // Disable copy constructor
CSettingTypeApplication& operator=(const CSettingTypeApplication&); // Disable assignment
CSettingTypeApplication(const CSettingTypeApplication&);
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);
private:
CSettingTypeApplicationIndex(void); // Disable default constructor
CSettingTypeApplicationIndex(const CSettingTypeApplicationIndex&); // Disable copy constructor
CSettingTypeApplicationIndex& operator=(const CSettingTypeApplicationIndex&); // Disable assignment
CSettingTypeApplicationIndex(void);
CSettingTypeApplicationIndex(const CSettingTypeApplicationIndex&);
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;
private:
CSettingTypeApplicationPath(void); // Disable default constructor
CSettingTypeApplicationPath(const CSettingTypeApplicationPath&); // Disable copy constructor
CSettingTypeApplicationPath& operator=(const CSettingTypeApplicationPath&); // Disable assignment
CSettingTypeApplicationPath(void);
CSettingTypeApplicationPath(const CSettingTypeApplicationPath&);
CSettingTypeApplicationPath& operator=(const CSettingTypeApplicationPath&);
CSettingTypeApplicationPath(const char * Section, const char * Name, const char * 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;
private:
CSettingTypeGame(void); // Disable default constructor
CSettingTypeGame(const CSettingTypeGame&); // Disable copy constructor
CSettingTypeGame& operator=(const CSettingTypeGame&); // Disable assignment
CSettingTypeGame(void);
CSettingTypeGame(const CSettingTypeGame&);
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 );
private:
CSettingTypeGameIndex(void); // Disable default constructor
CSettingTypeGameIndex(const CSettingTypeGameIndex&); // Disable copy constructor
CSettingTypeGameIndex& operator=(const CSettingTypeGameIndex&); // Disable assignment
CSettingTypeGameIndex(void);
CSettingTypeGameIndex(const CSettingTypeGameIndex&);
CSettingTypeGameIndex& operator=(const CSettingTypeGameIndex&);
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 );
private:
CSettingTypeRDBCpuType(void); // Disable default constructor
CSettingTypeRDBCpuType(const CSettingTypeRDBCpuType&); // Disable copy constructor
CSettingTypeRDBCpuType& operator=(const CSettingTypeRDBCpuType&); // Disable assignment
CSettingTypeRDBCpuType(void);
CSettingTypeRDBCpuType(const CSettingTypeRDBCpuType&);
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 );
private:
CSettingTypeRDBOnOff(void); // Disable default constructor
CSettingTypeRDBOnOff(const CSettingTypeRDBOnOff&); // Disable copy constructor
CSettingTypeRDBOnOff& operator=(const CSettingTypeRDBOnOff&); // Disable assignment
CSettingTypeRDBOnOff(void);
CSettingTypeRDBOnOff(const CSettingTypeRDBOnOff&);
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 );
private:
CSettingTypeRDBRDRamSize(void); // Disable default constructor
CSettingTypeRDBRDRamSize(const CSettingTypeRDBRDRamSize&); // Disable copy constructor
CSettingTypeRDBRDRamSize& operator=(const CSettingTypeRDBRDRamSize&); // Disable assignment
CSettingTypeRDBRDRamSize(void);
CSettingTypeRDBRDRamSize(const CSettingTypeRDBRDRamSize&);
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 );
private:
CSettingTypeRDBSaveChip(void); // Disable default constructor
CSettingTypeRDBSaveChip(const CSettingTypeRDBSaveChip&); // Disable copy constructor
CSettingTypeRDBSaveChip& operator=(const CSettingTypeRDBSaveChip&); // Disable assignment
CSettingTypeRDBSaveChip(void);
CSettingTypeRDBSaveChip(const CSettingTypeRDBSaveChip&);
CSettingTypeRDBSaveChip& operator=(const CSettingTypeRDBSaveChip&);
};

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

@ -4,31 +4,31 @@ class CSettingTypeRDBYesNo :
public CSettingTypeRomDatabase
{
public:
CSettingTypeRDBYesNo(const char * Name, SettingID DefaultSetting );
CSettingTypeRDBYesNo(const char * Name, uint32_t DefaultValue );
CSettingTypeRDBYesNo(const char * Name, SettingID DefaultSetting);
CSettingTypeRDBYesNo(const char * Name, uint32_t DefaultValue);
~CSettingTypeRDBYesNo();
//return the values
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, std::string & 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, std::string & Value) const;
//return the default values
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, std::string & 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, std::string & Value) const;
//Update the settings
virtual void Save (uint32_t Index, bool 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 char * Value );
virtual void Save (uint32_t Index, bool 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 char * Value);
// Delete the setting
virtual void Delete (uint32_t Index );
private:
CSettingTypeRDBYesNo(void); // Disable default constructor
CSettingTypeRDBYesNo(const CSettingTypeRDBYesNo&); // Disable copy constructor
CSettingTypeRDBYesNo& operator=(const CSettingTypeRDBYesNo&); // Disable assignment
CSettingTypeRDBYesNo(void);
CSettingTypeRDBYesNo(const CSettingTypeRDBYesNo&);
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();
bool IndexBasedSetting ( void ) const { return false; }
SettingType GetSettingType ( void ) const { return SettingType_RelativePath; }
bool IsSettingSet(void) const { return false; }
bool IndexBasedSetting (void) const { return false; }
SettingType GetSettingType (void) const { return SettingType_RelativePath; }
bool IsSettingSet (void) const { return false; }
//return the values
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, std::string & Value ) const;
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, std::string & Value) const;
//return the default values
void LoadDefault (uint32_t Index, bool & 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, bool & Value) const;
void LoadDefault (uint32_t Index, uint32_t & Value) const;
void LoadDefault (uint32_t Index, std::string & Value) const;
//Update the settings
void Save (uint32_t Index, bool Value );
void Save (uint32_t Index, uint32_t Value );
void Save (uint32_t Index, const std::string & Value );
void Save (uint32_t Index, const char * Value );
void Save (uint32_t Index, bool Value);
void Save (uint32_t Index, uint32_t Value);
void Save (uint32_t Index, const std::string & Value);
void Save (uint32_t Index, const char * Value);
// Delete the setting
void Delete (uint32_t Index );
private:
CSettingTypeRelativePath(void); // Disable default constructor
CSettingTypeRelativePath(const CSettingTypeRelativePath&); // Disable copy constructor
CSettingTypeRelativePath& operator=(const CSettingTypeRelativePath&); // Disable assignment
CSettingTypeRelativePath(void);
CSettingTypeRelativePath(const CSettingTypeRelativePath&);
CSettingTypeRelativePath& operator=(const CSettingTypeRelativePath&);
static void RefreshSettings(void * _this);
void BuildPath ( void );

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

@ -63,9 +63,9 @@ protected:
static CIniFile * m_AudioIniFile;
private:
CSettingTypeRomDatabase(); // Disable default constructor
CSettingTypeRomDatabase(const CSettingTypeRomDatabase&); // Disable copy constructor
CSettingTypeRomDatabase& operator=(const CSettingTypeRomDatabase&); // Disable assignment
CSettingTypeRomDatabase();
CSettingTypeRomDatabase(const CSettingTypeRomDatabase&);
CSettingTypeRomDatabase& operator=(const CSettingTypeRomDatabase&);
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; }
//return the values
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, std::string & 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, std::string & Value) const;
//return the default values
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, std::string & 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, std::string & Value) const;
//Update the settings
virtual void Save (uint32_t Index, bool 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 char * Value );
virtual void Save (uint32_t Index, bool 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 char * Value);
// Delete the setting
virtual void Delete (uint32_t Index );
private:
CSettingTypeRomDatabaseIndex(void); // Disable default constructor
CSettingTypeRomDatabaseIndex(const CSettingTypeRomDatabaseIndex&); // Disable copy constructor
CSettingTypeRomDatabaseIndex& operator=(const CSettingTypeRomDatabaseIndex&); // Disable assignment
CSettingTypeRomDatabaseIndex(void);
CSettingTypeRomDatabaseIndex(const CSettingTypeRomDatabaseIndex&);
CSettingTypeRomDatabaseIndex& operator=(const CSettingTypeRomDatabaseIndex&);
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 SettingType GetSettingType ( void ) const { return SettingType_RdbSetting; }
virtual SettingType GetSettingType ( void ) const { return SettingType_RdbSetting; }
private:
virtual const char * Section ( void ) const { return m_SectionIdent.c_str(); }
@ -21,7 +21,7 @@ private:
stdstr m_SectionIdent;
private:
CSettingTypeRomDatabaseSetting(void); // Disable default constructor
CSettingTypeRomDatabaseSetting(const CSettingTypeRomDatabaseSetting&); // Disable copy constructor
CSettingTypeRomDatabaseSetting& operator=(const CSettingTypeRomDatabaseSetting&); // Disable assignment
CSettingTypeRomDatabaseSetting(void);
CSettingTypeRomDatabaseSetting(const CSettingTypeRomDatabaseSetting&);
CSettingTypeRomDatabaseSetting& operator=(const CSettingTypeRomDatabaseSetting&);
};

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

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

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

@ -33,9 +33,9 @@ public:
void Delete (uint32_t Index );
private:
CSettingTypeTempNumber(void); // Disable default constructor
CSettingTypeTempNumber(const CSettingTypeTempNumber&); // Disable copy constructor
CSettingTypeTempNumber& operator=(const CSettingTypeTempNumber&); // Disable assignment
CSettingTypeTempNumber(void);
CSettingTypeTempNumber(const CSettingTypeTempNumber&);
CSettingTypeTempNumber& operator=(const CSettingTypeTempNumber&);
uint32_t m_value;
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 );
private:
CSettingTypeTempString(void); // Disable default constructor
CSettingTypeTempString(const CSettingTypeTempString&); // Disable copy constructor
CSettingTypeTempString& operator=(const CSettingTypeTempString&); // Disable assignment
CSettingTypeTempString(void);
CSettingTypeTempString(const CSettingTypeTempString&);
CSettingTypeTempString& operator=(const CSettingTypeTempString&);
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)
{
HTREEITEM hItem = m_hCheatTree.GetChildItem(hParent);;
HTREEITEM hItem = m_hCheatTree.GetChildItem(hParent);
if (hItem == nullptr)
{
if (hParent == TVI_ROOT) { return; }

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

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

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

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

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

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

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

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

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

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

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

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

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

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