aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2010-10-13 20:04:50 +0000
committerJohannes Schickel2010-10-13 20:04:50 +0000
commitbc2781fdb39b5c7db7154c8dd90538974907508d (patch)
treebdfd45bb16c7797ae0dd91aa05511c8d8c04b38c /engines
parentbbbfdad4581ce1aab757f1af6e663f9851543baa (diff)
downloadscummvm-rg350-bc2781fdb39b5c7db7154c8dd90538974907508d.tar.gz
scummvm-rg350-bc2781fdb39b5c7db7154c8dd90538974907508d.tar.bz2
scummvm-rg350-bc2781fdb39b5c7db7154c8dd90538974907508d.zip
SWORD25: Semi-colon cleanup.
svn-id: r53446
Diffstat (limited to 'engines')
-rw-r--r--engines/sword25/gfx/animationdescription.h2
-rw-r--r--engines/sword25/gfx/graphicengine_script.cpp2
-rw-r--r--engines/sword25/gfx/image/image.h2
-rw-r--r--engines/sword25/gfx/renderobject.h2
-rw-r--r--engines/sword25/input/inputengine.h2
-rw-r--r--engines/sword25/input/inputengine_script.cpp2
-rw-r--r--engines/sword25/kernel/filesystemutil.h2
-rw-r--r--engines/sword25/kernel/kernel.h2
-rw-r--r--engines/sword25/kernel/persistable.h2
-rw-r--r--engines/sword25/kernel/resmanager.h2
-rw-r--r--engines/sword25/kernel/resource.h2
-rw-r--r--engines/sword25/kernel/service.h4
-rw-r--r--engines/sword25/kernel/window.h2
-rw-r--r--engines/sword25/math/vertex.h2
-rw-r--r--engines/sword25/math/walkregion.cpp2
-rw-r--r--engines/sword25/script/script.h4
-rw-r--r--engines/sword25/sfx/soundengine.h2
17 files changed, 19 insertions, 19 deletions
diff --git a/engines/sword25/gfx/animationdescription.h b/engines/sword25/gfx/animationdescription.h
index a52f5d3f68..88cbb23503 100644
--- a/engines/sword25/gfx/animationdescription.h
+++ b/engines/sword25/gfx/animationdescription.h
@@ -50,7 +50,7 @@ protected:
_scalingAllowed(true),
_alphaAllowed(true),
_colorModulationAllowed(true)
- {};
+ {}
public:
struct Frame {
diff --git a/engines/sword25/gfx/graphicengine_script.cpp b/engines/sword25/gfx/graphicengine_script.cpp
index 0f85f08d5b..ee50f03636 100644
--- a/engines/sword25/gfx/graphicengine_script.cpp
+++ b/engines/sword25/gfx/graphicengine_script.cpp
@@ -70,7 +70,7 @@ namespace {
class ActionCallback : public LuaCallback {
public:
- ActionCallback(lua_State *L) : LuaCallback(L) {};
+ ActionCallback(lua_State *L) : LuaCallback(L) {}
Common::String Action;
diff --git a/engines/sword25/gfx/image/image.h b/engines/sword25/gfx/image/image.h
index bc0ff20d77..5ac6d1ac25 100644
--- a/engines/sword25/gfx/image/image.h
+++ b/engines/sword25/gfx/image/image.h
@@ -51,7 +51,7 @@ namespace Sword25 {
class Image {
public:
- virtual ~Image() {};
+ virtual ~Image() {}
// Enums
/**
diff --git a/engines/sword25/gfx/renderobject.h b/engines/sword25/gfx/renderobject.h
index c090ad75c9..9d11c46b80 100644
--- a/engines/sword25/gfx/renderobject.h
+++ b/engines/sword25/gfx/renderobject.h
@@ -352,7 +352,7 @@ public:
*/
void forceRefresh() {
_refreshForced = true;
- };
+ }
/**
@brief Gibt das Handle des Objekte zurück.
*/
diff --git a/engines/sword25/input/inputengine.h b/engines/sword25/input/inputengine.h
index 540817b5ce..59ce8fedc4 100644
--- a/engines/sword25/input/inputengine.h
+++ b/engines/sword25/input/inputengine.h
@@ -58,7 +58,7 @@ namespace Sword25 {
class InputEngine : public Service, public Persistable {
public:
InputEngine(Kernel *pKernel);
- ~InputEngine() {};
+ ~InputEngine() {}
// NOTE: These codes are registered in inputengine_script.cpp
// Any changes to these enums must also adjust the above file.
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp
index bb48a7ade9..25c1c8716b 100644
--- a/engines/sword25/input/inputengine_script.cpp
+++ b/engines/sword25/input/inputengine_script.cpp
@@ -63,7 +63,7 @@ static void TheCommandCallback(int Command);
namespace {
class CharacterCallbackClass : public LuaCallback {
public:
- CharacterCallbackClass(lua_State *L) : LuaCallback(L) {};
+ CharacterCallbackClass(lua_State *L) : LuaCallback(L) {}
Common::String Character;
diff --git a/engines/sword25/kernel/filesystemutil.h b/engines/sword25/kernel/filesystemutil.h
index 13762a29ee..ef66585ff8 100644
--- a/engines/sword25/kernel/filesystemutil.h
+++ b/engines/sword25/kernel/filesystemutil.h
@@ -62,7 +62,7 @@ namespace Sword25 {
class FileSystemUtil {
public:
static FileSystemUtil &GetInstance();
- virtual ~FileSystemUtil() {};
+ virtual ~FileSystemUtil() {}
/**
* This function returns the name of the directory in which all user data is to be stored.
diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h
index a06a59311b..aaf4d2bb16 100644
--- a/engines/sword25/kernel/kernel.h
+++ b/engines/sword25/kernel/kernel.h
@@ -342,7 +342,7 @@ public:
this->SuperclassIdentifier = SuperclassIdentifier_;
this->ServiceIdentifier = ServiceIdentifier_;
this->CreateMethod = CreateMethod_;
- };
+ }
Common::String SuperclassIdentifier;
Common::String ServiceIdentifier;
diff --git a/engines/sword25/kernel/persistable.h b/engines/sword25/kernel/persistable.h
index fc314688d5..25cf70fda0 100644
--- a/engines/sword25/kernel/persistable.h
+++ b/engines/sword25/kernel/persistable.h
@@ -42,7 +42,7 @@ class InputPersistenceBlock;
class Persistable {
public:
- virtual ~Persistable() {};
+ virtual ~Persistable() {}
virtual bool persist(OutputPersistenceBlock &writer) = 0;
virtual bool unpersist(InputPersistenceBlock &reader) = 0;
diff --git a/engines/sword25/kernel/resmanager.h b/engines/sword25/kernel/resmanager.h
index 578f121fec..940a04147b 100644
--- a/engines/sword25/kernel/resmanager.h
+++ b/engines/sword25/kernel/resmanager.h
@@ -136,7 +136,7 @@ private:
m_KernelPtr(pKernel),
m_MaxMemoryUsage(100000000),
m_LogCacheMiss(false)
- {};
+ {}
virtual ~ResourceManager();
enum {
diff --git a/engines/sword25/kernel/resource.h b/engines/sword25/kernel/resource.h
index 2a4d197138..6d77c3dd6e 100644
--- a/engines/sword25/kernel/resource.h
+++ b/engines/sword25/kernel/resource.h
@@ -103,7 +103,7 @@ public:
}
protected:
- virtual ~Resource() {};
+ virtual ~Resource() {}
private:
Common::String _fileName; ///< The absolute filename
diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h
index addcf50a08..ef8858bb7d 100644
--- a/engines/sword25/kernel/service.h
+++ b/engines/sword25/kernel/service.h
@@ -60,14 +60,14 @@ private:
Kernel *_pKernel;
protected:
- Service(Kernel *pKernel) : _pKernel(pKernel) {};
+ Service(Kernel *pKernel) : _pKernel(pKernel) {}
Kernel *GetKernel() const {
return _pKernel;
}
public:
- virtual ~Service() {};
+ virtual ~Service() {}
};
} // End of namespace Sword25
diff --git a/engines/sword25/kernel/window.h b/engines/sword25/kernel/window.h
index aee23087cb..3efdb89093 100644
--- a/engines/sword25/kernel/window.h
+++ b/engines/sword25/kernel/window.h
@@ -63,7 +63,7 @@ protected:
bool _CloseWanted;
public:
- virtual ~Window() {};
+ virtual ~Window() {}
/**
* Returns the visibility of the window.
diff --git a/engines/sword25/math/vertex.h b/engines/sword25/math/vertex.h
index 24cd11a4e8..18ea4c082c 100644
--- a/engines/sword25/math/vertex.h
+++ b/engines/sword25/math/vertex.h
@@ -79,7 +79,7 @@ namespace Sword25 {
*/
class Vertex {
public:
- Vertex() : x(0), y(0) {};
+ Vertex() : x(0), y(0) {}
Vertex(int x_, int y_) {
this->x = x_;
this->y = y_;
diff --git a/engines/sword25/math/walkregion.cpp b/engines/sword25/math/walkregion.cpp
index 7cdd8c64c5..d47ed3d11f 100644
--- a/engines/sword25/math/walkregion.cpp
+++ b/engines/sword25/math/walkregion.cpp
@@ -95,7 +95,7 @@ struct DijkstraNode {
typedef Container::iterator Iter;
typedef Container::const_iterator ConstIter;
- DijkstraNode() : cost(Infinity), chosen(false) {};
+ DijkstraNode() : cost(Infinity), chosen(false) {}
ConstIter parentIter;
int cost;
bool chosen;
diff --git a/engines/sword25/script/script.h b/engines/sword25/script/script.h
index 2f72cf0cc8..9ca146026e 100644
--- a/engines/sword25/script/script.h
+++ b/engines/sword25/script/script.h
@@ -49,8 +49,8 @@ class BS_InputPersistenceBlock;
class ScriptEngine : public Service, public Persistable {
public:
- ScriptEngine(Kernel *KernelPtr) : Service(KernelPtr) {};
- virtual ~ScriptEngine() {};
+ ScriptEngine(Kernel *KernelPtr) : Service(KernelPtr) {}
+ virtual ~ScriptEngine() {}
// -----------------------------------------------------------------------------
// This method must be implemented by the script engine
diff --git a/engines/sword25/sfx/soundengine.h b/engines/sword25/sfx/soundengine.h
index 81383b12cb..b8c10cc293 100644
--- a/engines/sword25/sfx/soundengine.h
+++ b/engines/sword25/sfx/soundengine.h
@@ -88,7 +88,7 @@ public:
typedef void (*DynamicSoundReadCallback)(void *UserData, void *Data, uint DataLength);
SoundEngine(Kernel *pKernel);
- ~SoundEngine() {};
+ ~SoundEngine() {}
/**
* Initialises the sound engine