From 84b2dc5cc85721570aa7aafdd9e3e96f0f04a025 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sat, 31 Mar 2018 12:52:08 +0200 Subject: MOHAWK: Fix some clang-tidy warnings --- engines/mohawk/cursors.h | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'engines/mohawk/cursors.h') diff --git a/engines/mohawk/cursors.h b/engines/mohawk/cursors.h index d0d38c9b46..ff5db5b59c 100644 --- a/engines/mohawk/cursors.h +++ b/engines/mohawk/cursors.h @@ -72,11 +72,11 @@ protected: // Uses standard tCUR resources class DefaultCursorManager : public CursorManager { public: - DefaultCursorManager(MohawkEngine *vm, uint32 tag = ID_TCUR) : _vm(vm), _tag(tag) {} - ~DefaultCursorManager() {} + explicit DefaultCursorManager(MohawkEngine *vm, uint32 tag = ID_TCUR) : _vm(vm), _tag(tag) {} + ~DefaultCursorManager() override {} - void setCursor(uint16 id); - bool hasSource() const { return true; } + void setCursor(uint16 id) override; + bool hasSource() const override { return true; } private: MohawkEngine *_vm; @@ -110,14 +110,14 @@ class MohawkEngine_Myst; // Uses WDIB + CLRC resources class MystCursorManager : public CursorManager { public: - MystCursorManager(MohawkEngine_Myst *vm); - ~MystCursorManager(); + explicit MystCursorManager(MohawkEngine_Myst *vm); + ~MystCursorManager() override; - void showCursor(); - void hideCursor(); - void setCursor(uint16 id); - void setDefaultCursor(); - bool hasSource() const { return true; } + void showCursor() override; + void hideCursor() override; + void setCursor(uint16 id) override; + void setDefaultCursor() override; + bool hasSource() const override { return true; } private: MohawkEngine_Myst *_vm; @@ -128,11 +128,11 @@ private: // The cursor manager for NE EXE's class NECursorManager : public CursorManager { public: - NECursorManager(const Common::String &appName); - ~NECursorManager(); + explicit NECursorManager(const Common::String &appName); + ~NECursorManager() override; - void setCursor(uint16 id); - bool hasSource() const { return _exe != 0; } + void setCursor(uint16 id) override; + bool hasSource() const override { return _exe != nullptr; } private: Common::NEResources *_exe; @@ -141,11 +141,11 @@ private: // The cursor manager for Mac applications class MacCursorManager : public CursorManager { public: - MacCursorManager(const Common::String &appName); - ~MacCursorManager(); + explicit MacCursorManager(const Common::String &appName); + ~MacCursorManager() override; - void setCursor(uint16 id); - bool hasSource() const { return _resFork != 0; } + void setCursor(uint16 id) override; + bool hasSource() const override { return _resFork != nullptr; } private: Common::MacResManager *_resFork; @@ -156,11 +156,11 @@ private: class LivingBooksCursorManager_v2 : public CursorManager { public: LivingBooksCursorManager_v2(); - ~LivingBooksCursorManager_v2(); + ~LivingBooksCursorManager_v2() override; - void setCursor(uint16 id); - void setCursor(const Common::String &name); - bool hasSource() const { return _sysArchive != 0; } + void setCursor(uint16 id) override; + void setCursor(const Common::String &name) override; + bool hasSource() const override { return _sysArchive != nullptr; } private: MohawkArchive *_sysArchive; @@ -169,11 +169,11 @@ private: // The cursor manager for PE EXE's class PECursorManager : public CursorManager { public: - PECursorManager(const Common::String &appName); - ~PECursorManager(); + explicit PECursorManager(const Common::String &appName); + ~PECursorManager() override; - void setCursor(uint16 id); - bool hasSource() const { return !_cursors.empty(); } + void setCursor(uint16 id) override; + bool hasSource() const override { return !_cursors.empty(); } private: struct CursorItem { -- cgit v1.2.3