diff options
-rw-r--r-- | backends/fs/amigaos4/amigaos4-fs.h | 8 | ||||
-rw-r--r-- | backends/fs/ps2/ps2-fs.h | 2 | ||||
-rw-r--r-- | backends/fs/psp/psp-fs-factory.h | 2 | ||||
-rw-r--r-- | backends/platform/dc/dc-fs.cpp | 6 | ||||
-rw-r--r-- | devtools/create_project/create_project.h | 2 | ||||
-rw-r--r-- | devtools/sci/musicplayer.cpp | 2 | ||||
-rw-r--r-- | engines/agi/sound_2gs.h | 2 | ||||
-rw-r--r-- | engines/sword25/gfx/renderobject.h | 2 | ||||
-rw-r--r-- | engines/toon/character.h | 2 | ||||
-rw-r--r-- | engines/tsage/core.h | 2 | ||||
-rw-r--r-- | engines/tsage/sound.h | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/backends/fs/amigaos4/amigaos4-fs.h b/backends/fs/amigaos4/amigaos4-fs.h index 4e231330f0..c5ca61476f 100644 --- a/backends/fs/amigaos4/amigaos4-fs.h +++ b/backends/fs/amigaos4/amigaos4-fs.h @@ -91,10 +91,10 @@ public: virtual ~AmigaOSFilesystemNode(); virtual bool exists() const; - virtual Common::String getDisplayName() const { return _sDisplayName; }; - virtual Common::String getName() const { return _sDisplayName; }; - virtual Common::String getPath() const { return _sPath; }; - virtual bool isDirectory() const { return _bIsDirectory; }; + virtual Common::String getDisplayName() const { return _sDisplayName; } + virtual Common::String getName() const { return _sDisplayName; } + virtual Common::String getPath() const { return _sPath; } + virtual bool isDirectory() const { return _bIsDirectory; } virtual bool isReadable() const; virtual bool isWritable() const; diff --git a/backends/fs/ps2/ps2-fs.h b/backends/fs/ps2/ps2-fs.h index 9323715c7f..df78f9f68a 100644 --- a/backends/fs/ps2/ps2-fs.h +++ b/backends/fs/ps2/ps2-fs.h @@ -96,7 +96,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - int getDev() { return 0; }; + int getDev() { return 0; } }; #endif diff --git a/backends/fs/psp/psp-fs-factory.h b/backends/fs/psp/psp-fs-factory.h index aeaa9d6a87..d57c8fb655 100644 --- a/backends/fs/psp/psp-fs-factory.h +++ b/backends/fs/psp/psp-fs-factory.h @@ -37,7 +37,7 @@ public: virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const; protected: - PSPFilesystemFactory() {}; + PSPFilesystemFactory() {} private: friend class Common::Singleton<SingletonBaseType>; diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp index f30c9c56d1..36f5a1465c 100644 --- a/backends/platform/dc/dc-fs.cpp +++ b/backends/platform/dc/dc-fs.cpp @@ -39,7 +39,7 @@ protected: Common::String _path; public: - RoninCDFileNode(const Common::String &path) : _path(path) {}; + RoninCDFileNode(const Common::String &path) : _path(path) {} virtual bool exists() const { return true; } virtual Common::String getName() const { return lastPathComponent(_path, '/'); } @@ -61,7 +61,7 @@ public: /* A directory */ class RoninCDDirectoryNode : public RoninCDFileNode { public: - RoninCDDirectoryNode(const Common::String &path) : RoninCDFileNode(path) {}; + RoninCDDirectoryNode(const Common::String &path) : RoninCDFileNode(path) {} virtual bool isDirectory() const { return true; } virtual AbstractFSNode *getChild(const Common::String &n) const; @@ -72,7 +72,7 @@ public: /* A file/directory which does not exist */ class RoninCDNonexistingNode : public RoninCDFileNode { public: - RoninCDNonexistingNode(const Common::String &path) : RoninCDFileNode(path) {}; + RoninCDNonexistingNode(const Common::String &path) : RoninCDFileNode(path) {} virtual bool exists() const { return false; } virtual bool isReadable() const { return false; } diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index 55e04be4ec..8719143f4a 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -371,7 +371,7 @@ protected: * * @param output File stream to write to. */ - virtual void writeReferences(const BuildSetup &, std::ofstream &) {}; + virtual void writeReferences(const BuildSetup &, std::ofstream &) {} /** * Get the file extension for project files diff --git a/devtools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp index d225195f71..25f2d684a8 100644 --- a/devtools/sci/musicplayer.cpp +++ b/devtools/sci/musicplayer.cpp @@ -90,7 +90,7 @@ int main(int argc, char** argv) { return 2; } sfx_song_set_status(&sound, DUMMY_SOUND_HANDLE, SOUND_STATUS_PLAYING); - while (sfx_poll(&sound, &dummy1, &dummy2) != SI_FINISHED) {}; + while (sfx_poll(&sound, &dummy1, &dummy2) != SI_FINISHED) {} } sfx_exit(&sound); scir_free_resource_manager(resmgr); diff --git a/engines/agi/sound_2gs.h b/engines/agi/sound_2gs.h index 89ffc3fe11..404f4a47a1 100644 --- a/engines/agi/sound_2gs.h +++ b/engines/agi/sound_2gs.h @@ -247,7 +247,7 @@ private: void midiNoteOff(int channel, int note, int velocity); void midiNoteOn(int channel, int note, int velocity); double midiKeyToFreq(int key, double finetune); - IIgsInstrumentHeader* getInstrument(uint8 program) { return &_instruments[_progToInst->map(program)]; }; + IIgsInstrumentHeader* getInstrument(uint8 program) { return &_instruments[_progToInst->map(program)]; } IIgsGenerator* allocateGenerator() { IIgsGenerator* g = &_generators[_nextGen++]; _nextGen %= 16; return g; } bool _disableMidi; ///< Disable MIDI if loading instruments fail diff --git a/engines/sword25/gfx/renderobject.h b/engines/sword25/gfx/renderobject.h index 0b54ccc24b..f963ccaeb3 100644 --- a/engines/sword25/gfx/renderobject.h +++ b/engines/sword25/gfx/renderobject.h @@ -402,7 +402,7 @@ protected: @return Gibt false zurück, falls das Rendern fehlgeschlagen ist. @remark */ - virtual bool doRender() = 0; // { return true; }; + virtual bool doRender() = 0; // { return true; } // RenderObject-Baum Variablen // --------------------------- diff --git a/engines/toon/character.h b/engines/toon/character.h index de58a41e43..d06a6c060c 100644 --- a/engines/toon/character.h +++ b/engines/toon/character.h @@ -96,7 +96,7 @@ public: virtual void updateTimers(int32 relativeAdd); virtual void setTalking(bool talking) { _isTalking = talking; } virtual bool isTalking() { return _isTalking; } - virtual void resetScale() { }; + virtual void resetScale() {} virtual void plotPath(Graphics::Surface& surface); int32 getFacingFromDirection(int32 dx, int32 dy); diff --git a/engines/tsage/core.h b/engines/tsage/core.h index 8a2e733549..d55352319f 100644 --- a/engines/tsage/core.h +++ b/engines/tsage/core.h @@ -129,7 +129,7 @@ public: virtual void dispatch(); virtual void setAction(Action *action) { setAction(action, NULL); } virtual void setAction(Action *action, EventHandler *endHandler, ...); - virtual void destroy() {}; + virtual void destroy() {} }; class Action : public EventHandler { diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h index c7b07e2cc3..77d1f3d3ac 100644 --- a/engines/tsage/sound.h +++ b/engines/tsage/sound.h @@ -87,7 +87,7 @@ public: int _driverResID; public: SoundDriver(); - virtual ~SoundDriver() {}; + virtual ~SoundDriver() {} const Common::String &getShortDriverDescription() { return _shortDescription; } const Common::String &getLongDriverDescription() { return _longDescription; } |