From f6c21e002bfd04484bf7fc0d4071117dddf1d682 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 30 Jul 2017 15:56:12 -0400 Subject: [PATCH] General: Remove unnecessary semicolons --- Source/Core/Common/TraversalClient.h | 2 +- Source/Core/Core/HW/WiimoteReal/IOLinux.h | 3 +-- Source/Core/Core/HW/WiimoteReal/IOWin.cpp | 2 +- Source/Core/Core/HW/WiimoteReal/IOdarwin.h | 2 +- Source/Core/Core/HW/WiimoteReal/IOhidapi.h | 2 +- Source/Core/Core/PowerPC/JitCommon/JitBase.h | 2 +- Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.h | 2 +- Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.h | 2 +- Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.h | 2 +- Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.h | 2 +- Source/Core/DolphinQt2/WiiUpdate.cpp | 2 +- Source/Core/DolphinQt2/WiiUpdate.h | 2 +- Source/Core/DolphinWX/Debugger/DSPRegisterView.h | 2 +- Source/Core/DolphinWX/Debugger/WatchView.h | 2 +- Source/Core/DolphinWX/Frame.h | 2 +- Source/Core/DolphinWX/ISOProperties/ISOProperties.h | 2 +- Source/Core/DolphinWX/MemcardManager.h | 2 +- Source/Core/VideoBackends/Software/SWRenderer.h | 3 +-- Source/Core/VideoBackends/Software/SWmain.cpp | 4 ++-- 19 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h index 6316705889..82a7d71c8e 100644 --- a/Source/Core/Common/TraversalClient.h +++ b/Source/Core/Common/TraversalClient.h @@ -13,7 +13,7 @@ class TraversalClientClient { public: - virtual ~TraversalClientClient(){}; + virtual ~TraversalClientClient() = default; virtual void OnTraversalStateChanged() = 0; virtual void OnConnectReady(ENetAddress addr) = 0; virtual void OnConnectFailed(u8 reason) = 0; diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.h b/Source/Core/Core/HW/WiimoteReal/IOLinux.h index 83929e6095..cd9bde8066 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOLinux.h +++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.h @@ -46,8 +46,7 @@ public: ~WiimoteScannerLinux() override; bool IsReady() const override; void FindWiimotes(std::vector&, Wiimote*&) override; - void Update() override{}; // not needed on Linux - + void Update() override {} // not needed on Linux private: int m_device_id; int m_device_sock; diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index d28153e42a..86e8a8c100 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -996,4 +996,4 @@ bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi) return false; } -}; +} diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.h b/Source/Core/Core/HW/WiimoteReal/IOdarwin.h index a0149d5212..93a53dfe50 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.h +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.h @@ -16,7 +16,7 @@ public: ~WiimoteScannerDarwin() override = default; bool IsReady() const override; void FindWiimotes(std::vector&, Wiimote*&) override; - void Update() override{}; // not needed + void Update() override {} // not needed }; } diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h index 9bc6f8a187..3383afbd6f 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h +++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h @@ -37,7 +37,7 @@ public: ~WiimoteScannerHidapi(); bool IsReady() const override; void FindWiimotes(std::vector&, Wiimote*&) override; - void Update() override{}; // not needed for hidapi + void Update() override {} // not needed for hidapi }; } diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h index f82c4bab57..d0cbf16879 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h @@ -116,7 +116,7 @@ public: JitBase(); ~JitBase() override; - static const u8* Dispatch() { return g_jit->GetBlockCache()->Dispatch(); }; + static const u8* Dispatch() { return g_jit->GetBlockCache()->Dispatch(); } virtual JitBaseBlockCache* GetBlockCache() = 0; virtual void Jit(u32 em_address) = 0; diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.h b/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.h index 461a2598b1..d79757d28e 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.h +++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.h @@ -11,7 +11,7 @@ namespace Config { template struct ConfigInfo; -}; +} class GraphicsBool : public QCheckBox { diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.h b/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.h index 31f5e7e1fe..a0aa525fee 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.h +++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.h @@ -10,7 +10,7 @@ namespace Config { template struct ConfigInfo; -}; +} class GraphicsChoice : public QComboBox { diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.h b/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.h index 3fd54dd664..9bd63d73bb 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.h +++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.h @@ -10,7 +10,7 @@ namespace Config { template struct ConfigInfo; -}; +} class GraphicsSlider : public QSlider { diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.h b/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.h index fb4be9bf60..668043da91 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.h +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.h @@ -12,7 +12,7 @@ class MappingWidget; namespace ControllerEmu { class NumericSetting; -}; +} class MappingNumeric : public QSpinBox { diff --git a/Source/Core/DolphinQt2/WiiUpdate.cpp b/Source/Core/DolphinQt2/WiiUpdate.cpp index de91fc0e32..86200b21d1 100644 --- a/Source/Core/DolphinQt2/WiiUpdate.cpp +++ b/Source/Core/DolphinQt2/WiiUpdate.cpp @@ -116,4 +116,4 @@ void PerformOnlineUpdate(const std::string& region, QWidget* parent) break; } } -}; // namespace WiiUpdate +} // namespace WiiUpdate diff --git a/Source/Core/DolphinQt2/WiiUpdate.h b/Source/Core/DolphinQt2/WiiUpdate.h index ea7428ebc2..19b7b8f463 100644 --- a/Source/Core/DolphinQt2/WiiUpdate.h +++ b/Source/Core/DolphinQt2/WiiUpdate.h @@ -11,4 +11,4 @@ class QWidget; namespace WiiUpdate { void PerformOnlineUpdate(const std::string& region, QWidget* parent = nullptr); -}; // namespace WiiUpdate +} // namespace WiiUpdate diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h index 2d1354b5e9..c01951955c 100644 --- a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h +++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h @@ -27,7 +27,7 @@ private: std::array m_CachedRegs{}; std::array m_CachedRegHasChanged{}; - DECLARE_NO_COPY_CLASS(CDSPRegTable); + DECLARE_NO_COPY_CLASS(CDSPRegTable) }; class DSPRegisterView final : public wxGrid diff --git a/Source/Core/DolphinWX/Debugger/WatchView.h b/Source/Core/DolphinWX/Debugger/WatchView.h index 624526fe19..ee9ad2d41a 100644 --- a/Source/Core/DolphinWX/Debugger/WatchView.h +++ b/Source/Core/DolphinWX/Debugger/WatchView.h @@ -30,7 +30,7 @@ private: std::array m_CachedWatch; std::array m_CachedWatchHasChanged; - DECLARE_NO_COPY_CLASS(CWatchTable); + DECLARE_NO_COPY_CLASS(CWatchTable) }; class CWatchView : public wxGrid diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index 918447e513..8884630398 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -366,5 +366,5 @@ private: bool InitControllers(); // Event table - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/Source/Core/DolphinWX/ISOProperties/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties/ISOProperties.h index b3c6f15b00..773341a3ac 100644 --- a/Source/Core/DolphinWX/ISOProperties/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties/ISOProperties.h @@ -59,7 +59,7 @@ public: virtual ~CISOProperties(); private: - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() std::unique_ptr m_open_iso; diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index 358f34a19e..c40ae8288e 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -26,7 +26,7 @@ public: ~CMemcardManager(); private: - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() std::array page; int itemsPerPage; diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h index ac96725253..b19b9841fd 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.h +++ b/Source/Core/VideoBackends/Software/SWRenderer.h @@ -26,8 +26,7 @@ public: void RenderText(const std::string& pstr, int left, int top, u32 color) override; u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override; - void PokeEFB(EFBAccessType type, const EfbPokeData* points, size_t num_points) override{}; - + void PokeEFB(EFBAccessType type, const EfbPokeData* points, size_t num_points) override {} u16 BBoxRead(int index) override; void BBoxWrite(int index, u16 value) override; diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 5319ccecd6..9c822ca34c 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -40,9 +40,9 @@ public: { memset(EfbInterface::perf_values, 0, sizeof(EfbInterface::perf_values)); } - u32 GetQueryResult(PerfQueryType type) override { return EfbInterface::perf_values[type]; }; + u32 GetQueryResult(PerfQueryType type) override { return EfbInterface::perf_values[type]; } void FlushResults() override {} - bool IsFlushed() const override { return true; }; + bool IsFlushed() const override { return true; } }; class TextureCache : public TextureCacheBase