From b06ec302d1051843228464656d3021aeec45eb07 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 11 Sep 2014 13:00:40 -0400 Subject: [PATCH] Remove some unnecessary semicolons --- Source/Core/Common/BreakPoints.h | 2 +- Source/Core/Common/NandPaths.cpp | 2 +- Source/Core/Core/BootManager.h | 2 +- Source/Core/Core/CoreTiming.h | 2 +- Source/Core/Core/GeckoCodeConfig.cpp | 2 +- Source/Core/Core/GeckoCodeConfig.h | 2 +- Source/Core/Core/HW/EXI_Device.cpp | 2 +- Source/Core/Core/HW/GPFifo.h | 2 +- Source/Core/Core/HW/Memmap.h | 2 +- Source/Core/Core/HW/SI.h | 2 +- Source/Core/Core/HW/SI_Device.cpp | 2 +- Source/Core/Core/HW/VideoInterface.h | 2 +- Source/Core/Core/HW/WiimoteReal/IOdarwin.mm | 2 +- Source/Core/Core/HW/WiimoteReal/WiimoteReal.h | 2 +- Source/Core/Core/Movie.h | 2 +- Source/Core/Core/NetPlayClient.h | 2 +- Source/Core/Core/NetPlayProto.h | 2 +- Source/Core/Core/ec_wii.h | 2 +- Source/Core/DiscIO/NANDContentLoader.h | 2 +- Source/Core/VideoCommon/BPFunctions.h | 2 +- Source/Core/VideoCommon/Debugger.h | 4 ++-- Source/Core/VideoCommon/HiresTextures.h | 2 +- Source/Core/VideoCommon/VertexLoaderManager.h | 2 +- Source/Core/VideoCommon/VertexManagerBase.h | 4 ++-- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Source/Core/Common/BreakPoints.h b/Source/Core/Common/BreakPoints.h index 006898cd3d..99ea0809ca 100644 --- a/Source/Core/Common/BreakPoints.h +++ b/Source/Core/Common/BreakPoints.h @@ -96,5 +96,5 @@ public: TMemCheck *GetMemCheck(u32 address); void Remove(u32 _Address); - void Clear() { m_MemChecks.clear(); }; + void Clear() { m_MemChecks.clear(); } }; diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp index 0a394cb113..7428ff2449 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -104,4 +104,4 @@ void ReadReplacements(replace_v& replacements) replacements.push_back(std::make_pair(letter, replacement)); } -}; +} diff --git a/Source/Core/Core/BootManager.h b/Source/Core/Core/BootManager.h index 20dd85f8ab..1506c6d6be 100644 --- a/Source/Core/Core/BootManager.h +++ b/Source/Core/Core/BootManager.h @@ -13,4 +13,4 @@ namespace BootManager bool BootCore(const std::string& _rFilename); void Stop(); -}; +} diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h index a87d645802..1de5b92cec 100644 --- a/Source/Core/Core/CoreTiming.h +++ b/Source/Core/Core/CoreTiming.h @@ -84,4 +84,4 @@ void ForceExceptionCheck(int cycles); extern int slicelength; -}; // end of namespace +} // end of namespace diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp index 8e677ccdee..60c38c5e1a 100644 --- a/Source/Core/Core/GeckoCodeConfig.cpp +++ b/Source/Core/Core/GeckoCodeConfig.cpp @@ -149,4 +149,4 @@ void SaveCodes(IniFile& inifile, const std::vector& gcodes) inifile.SetLines("Gecko_Enabled", enabledLines); } -}; +} diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h index e3e0538a91..2d38d9470e 100644 --- a/Source/Core/Core/GeckoCodeConfig.h +++ b/Source/Core/Core/GeckoCodeConfig.h @@ -15,4 +15,4 @@ namespace Gecko void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector& gcodes); void SaveCodes(IniFile& inifile, const std::vector& gcodes); -}; +} diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI_Device.cpp index dbd2807112..ccc1fbb968 100644 --- a/Source/Core/Core/HW/EXI_Device.cpp +++ b/Source/Core/Core/HW/EXI_Device.cpp @@ -59,7 +59,7 @@ void IEXIDevice::DMARead(u32 _uAddr, u32 _uSize) TransferByte(uByte); Memory::Write_U8(uByte, _uAddr++); } -}; +} // --- class CEXIDummy --- diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h index 466fd18e88..608c079c50 100644 --- a/Source/Core/Core/HW/GPFifo.h +++ b/Source/Core/Core/HW/GPFifo.h @@ -43,4 +43,4 @@ void FastWrite8(const u8 _iValue); void FastWrite16(const u16 _iValue); void FastWrite32(const u32 _iValue); void FastWrite64(const u64 _iValue); -}; +} diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h index f8fb9eb606..0973166ca9 100644 --- a/Source/Core/Core/HW/Memmap.h +++ b/Source/Core/Core/HW/Memmap.h @@ -141,4 +141,4 @@ u32 TranslateAddress(u32 _Address, XCheckTLBFlag _Flag); void InvalidateTLBEntry(u32 _Address); extern u32 pagetable_base; extern u32 pagetable_hashmask; -}; +} diff --git a/Source/Core/Core/HW/SI.h b/Source/Core/Core/HW/SI.h index 4379f767ac..7a3170a9a2 100644 --- a/Source/Core/Core/HW/SI.h +++ b/Source/Core/Core/HW/SI.h @@ -37,4 +37,4 @@ void ChangeDevice(SIDevices device, int channel); int GetTicksToNextSIPoll(); -}; // end of namespace SerialInterface +} // end of namespace SerialInterface diff --git a/Source/Core/Core/HW/SI_Device.cpp b/Source/Core/Core/HW/SI_Device.cpp index 9423cadb36..42747686a6 100644 --- a/Source/Core/Core/HW/SI_Device.cpp +++ b/Source/Core/Core/HW/SI_Device.cpp @@ -37,7 +37,7 @@ int ISIDevice::RunBuffer(u8* _pBuffer, int _iLength) DEBUG_LOG(SERIALINTERFACE, "%s", temp.c_str()); #endif return 0; -}; +} // Stub class for saying nothing is attached, and not having to deal with null pointers :) diff --git a/Source/Core/Core/HW/VideoInterface.h b/Source/Core/Core/HW/VideoInterface.h index 0ee68ce9eb..daf068f3fc 100644 --- a/Source/Core/Core/HW/VideoInterface.h +++ b/Source/Core/Core/HW/VideoInterface.h @@ -355,4 +355,4 @@ union UVIHorizontalStepping unsigned int GetTicksPerFrame(); int GetNumFields(); -}; +} diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm index 1cce25c00f..06a566fa5a 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm @@ -328,4 +328,4 @@ int Wiimote::IOWrite(const unsigned char *buf, size_t len) return 0; } -}; +} diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index ff8ec6be05..1cd34b5e8d 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -181,4 +181,4 @@ void ChangeWiimoteSource(unsigned int index, int source); bool IsValidBluetoothName(const std::string& name); bool IsBalanceBoardName(const std::string& name); -}; // WiimoteReal +} // WiimoteReal diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index 278a5eb456..3bad2e1483 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -179,4 +179,4 @@ typedef void(*ManipFunction)(GCPadStatus*, int); void SetInputManip(ManipFunction); void CallInputManip(GCPadStatus* PadStatus, int controllerID); -}; +} diff --git a/Source/Core/Core/NetPlayClient.h b/Source/Core/Core/NetPlayClient.h index 006c9df375..dc268088db 100644 --- a/Source/Core/Core/NetPlayClient.h +++ b/Source/Core/Core/NetPlayClient.h @@ -32,7 +32,7 @@ public: class NetPlayUI { public: - virtual ~NetPlayUI() {}; + virtual ~NetPlayUI() {} virtual void BootGame(const std::string& filename) = 0; virtual void StopGame() = 0; diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index 5913b7a48d..ae16243475 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -76,4 +76,4 @@ enum namespace NetPlay { bool IsNetPlayRunning(); -}; +} diff --git a/Source/Core/Core/ec_wii.h b/Source/Core/Core/ec_wii.h index c51c1b32af..51176f93b5 100644 --- a/Source/Core/Core/ec_wii.h +++ b/Source/Core/Core/ec_wii.h @@ -41,7 +41,7 @@ public: u32 getNgId() {return Common::swap32(BootMiiKeysBin.ng_id);} u32 getNgKeyId() {return Common::swap32(BootMiiKeysBin.ng_key_id);} const u8* getNgPriv() {return BootMiiKeysBin.ng_priv;} - const u8* getNgSig() {return BootMiiKeysBin.ng_sig;}; + const u8* getNgSig() {return BootMiiKeysBin.ng_sig;} private: void InitDefaults(); diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h index 6f67de9ec6..40fc9aeb04 100644 --- a/Source/Core/DiscIO/NANDContentLoader.h +++ b/Source/Core/DiscIO/NANDContentLoader.h @@ -76,7 +76,7 @@ public: bool RemoveTitle(u64 _titleID); private: - CNANDContentManager() {}; + CNANDContentManager() {} ~CNANDContentManager(); static CNANDContentManager m_Instance; diff --git a/Source/Core/VideoCommon/BPFunctions.h b/Source/Core/VideoCommon/BPFunctions.h index 4a3b25c9de..ff7e928f8a 100644 --- a/Source/Core/VideoCommon/BPFunctions.h +++ b/Source/Core/VideoCommon/BPFunctions.h @@ -30,4 +30,4 @@ void CopyEFB(u32 dstAddr, const EFBRectangle& srcRect, void ClearScreen(const EFBRectangle &rc); void OnPixelFormatChange(); void SetInterlacingMode(const BPCmd &bp); -}; +} diff --git a/Source/Core/VideoCommon/Debugger.h b/Source/Core/VideoCommon/Debugger.h index 894921c744..e7f864652a 100644 --- a/Source/Core/VideoCommon/Debugger.h +++ b/Source/Core/VideoCommon/Debugger.h @@ -12,8 +12,8 @@ public: virtual ~GFXDebuggerBase() {} // if paused, debugging functions can be enabled - virtual void OnPause() {}; - virtual void OnContinue() {}; + virtual void OnPause() {} + virtual void OnContinue() {} void DumpPixelShader(const std::string& path); void DumpVertexShader(const std::string& path); diff --git a/Source/Core/VideoCommon/HiresTextures.h b/Source/Core/VideoCommon/HiresTextures.h index 78b9b14e74..5df71f0fa7 100644 --- a/Source/Core/VideoCommon/HiresTextures.h +++ b/Source/Core/VideoCommon/HiresTextures.h @@ -15,4 +15,4 @@ void Init(const std::string& gameCode); bool HiresTexExists(const std::string& filename); PC_TexFormat GetHiresTex(const std::string& fileName, unsigned int* pWidth, unsigned int* pHeight, unsigned int* required_size, int texformat, unsigned int data_size, u8* data); -}; +} diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h index 4177140da8..32a64b6cd8 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.h +++ b/Source/Core/VideoCommon/VertexLoaderManager.h @@ -24,6 +24,6 @@ namespace VertexLoaderManager void AppendListToString(std::string *dest); NativeVertexFormat* GetCurrentVertexFormat(); -}; +} void RecomputeCachedArraybases(); diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h index c9ee61b777..7852e61f34 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.h +++ b/Source/Core/VideoCommon/VertexManagerBase.h @@ -43,8 +43,8 @@ public: virtual ::NativeVertexFormat* CreateNativeVertexFormat() = 0; static void DoState(PointerWrap& p); - virtual void CreateDeviceObjects(){}; - virtual void DestroyDeviceObjects(){}; + virtual void CreateDeviceObjects(){} + virtual void DestroyDeviceObjects(){} protected: virtual void vDoState(PointerWrap& p) { }