From 55514720a66f4881174dbcd2b36216ec6182363c Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 1 Mar 2014 21:16:01 -0400 Subject: [PATCH] Fixed some minor compiler warnings --- src/common/Data.h | 2 +- src/common/Vector.cpp | 2 +- src/common/b64.h | 2 +- src/common/utf8.h | 2 +- src/libraries/ddsparse/ddsparse.h | 2 +- src/modules/audio/Audio.h | 2 +- src/modules/font/Font.h | 2 +- src/modules/font/ImageRasterizer.h | 2 +- src/modules/font/Rasterizer.cpp | 2 +- src/modules/font/Rasterizer.h | 2 +- src/modules/font/freetype/TrueTypeRasterizer.cpp | 2 +- src/modules/graphics/opengl/Font.h | 2 +- src/modules/graphics/opengl/ParticleSystem.h | 2 +- src/modules/image/Image.h | 4 ++-- src/modules/mouse/Mouse.h | 2 +- src/modules/mouse/wrap_Cursor.cpp | 4 ++-- src/modules/physics/box2d/wrap_MotorJoint.cpp | 2 +- src/modules/sound/Decoder.h | 2 +- src/modules/sound/lullaby/FLACDecoder.cpp | 2 +- src/modules/sound/lullaby/GmeDecoder.cpp | 2 +- src/modules/system/wrap_System.cpp | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/common/Data.h b/src/common/Data.h index ea31e69e7..ffea71cf9 100644 --- a/src/common/Data.h +++ b/src/common/Data.h @@ -38,7 +38,7 @@ public: /** * Destructor. **/ - virtual ~Data() {}; + virtual ~Data() {} /** * Gets a pointer to the data. This pointer will obviously not diff --git a/src/common/Vector.cpp b/src/common/Vector.cpp index 8e0ae515b..c2d37869d 100644 --- a/src/common/Vector.cpp +++ b/src/common/Vector.cpp @@ -23,4 +23,4 @@ namespace love { // Implementation in header. -} \ No newline at end of file +} diff --git a/src/common/b64.h b/src/common/b64.h index 99685cdac..55fe47dea 100644 --- a/src/common/b64.h +++ b/src/common/b64.h @@ -38,4 +38,4 @@ char *b64_decode(const char *src, int slen, int &size); } // love -#endif // LOVE_B64_H \ No newline at end of file +#endif // LOVE_B64_H diff --git a/src/common/utf8.h b/src/common/utf8.h index 6f0d78ef1..9a2c51e9b 100644 --- a/src/common/utf8.h +++ b/src/common/utf8.h @@ -45,4 +45,4 @@ void replace_char(std::string &str, char find, char replace); } // love -#endif // LOVE_WINDOWS \ No newline at end of file +#endif // LOVE_WINDOWS diff --git a/src/libraries/ddsparse/ddsparse.h b/src/libraries/ddsparse/ddsparse.h index 82c2c41cc..6ab659347 100644 --- a/src/libraries/ddsparse/ddsparse.h +++ b/src/libraries/ddsparse/ddsparse.h @@ -60,7 +60,7 @@ struct Image const uint8_t *data; Image() : width(0), height(0), dataSize(0), data(0) - {}; + {} }; /** diff --git a/src/modules/audio/Audio.h b/src/modules/audio/Audio.h index b43391dbe..9a8ca863c 100644 --- a/src/modules/audio/Audio.h +++ b/src/modules/audio/Audio.h @@ -67,7 +67,7 @@ public: /** * Destructor. **/ - virtual ~Audio() {}; + virtual ~Audio() {} virtual Source *newSource(love::sound::Decoder *decoder) = 0; virtual Source *newSource(love::sound::SoundData *soundData) = 0; diff --git a/src/modules/font/Font.h b/src/modules/font/Font.h index dacde0348..a92b88efc 100644 --- a/src/modules/font/Font.h +++ b/src/modules/font/Font.h @@ -54,4 +54,4 @@ public: } // font } // love -#endif // LOVE_FONT_FONT_H \ No newline at end of file +#endif // LOVE_FONT_FONT_H diff --git a/src/modules/font/ImageRasterizer.h b/src/modules/font/ImageRasterizer.h index 5c7e9e8f6..482d442c6 100644 --- a/src/modules/font/ImageRasterizer.h +++ b/src/modules/font/ImageRasterizer.h @@ -79,4 +79,4 @@ private: } // font } // love -#endif // LOVE_FONT_IMAGE_RASTERIZER_H \ No newline at end of file +#endif // LOVE_FONT_IMAGE_RASTERIZER_H diff --git a/src/modules/font/Rasterizer.cpp b/src/modules/font/Rasterizer.cpp index 1454f2557..cec9f0bef 100644 --- a/src/modules/font/Rasterizer.cpp +++ b/src/modules/font/Rasterizer.cpp @@ -96,4 +96,4 @@ bool Rasterizer::hasGlyphs(const std::string &text) const } } // font -} // love \ No newline at end of file +} // love diff --git a/src/modules/font/Rasterizer.h b/src/modules/font/Rasterizer.h index a4cd6e5c9..ff1cd22e5 100644 --- a/src/modules/font/Rasterizer.h +++ b/src/modules/font/Rasterizer.h @@ -114,4 +114,4 @@ protected: } // font } // love -#endif // LOVE_FONT_RASTERIZER_H \ No newline at end of file +#endif // LOVE_FONT_RASTERIZER_H diff --git a/src/modules/font/freetype/TrueTypeRasterizer.cpp b/src/modules/font/freetype/TrueTypeRasterizer.cpp index 847793687..e09328f70 100644 --- a/src/modules/font/freetype/TrueTypeRasterizer.cpp +++ b/src/modules/font/freetype/TrueTypeRasterizer.cpp @@ -146,4 +146,4 @@ bool TrueTypeRasterizer::hasGlyph(uint32 glyph) const } // freetype } // font -} // love \ No newline at end of file +} // love diff --git a/src/modules/graphics/opengl/Font.h b/src/modules/graphics/opengl/Font.h index 791eee6f7..fee277452 100644 --- a/src/modules/graphics/opengl/Font.h +++ b/src/modules/graphics/opengl/Font.h @@ -175,7 +175,7 @@ private: return texture < other.texture; else return startvertex < other.startvertex; - }; + } }; bool initializeTexture(GLenum format); diff --git a/src/modules/graphics/opengl/ParticleSystem.h b/src/modules/graphics/opengl/ParticleSystem.h index 8b27192d6..272ab8303 100644 --- a/src/modules/graphics/opengl/ParticleSystem.h +++ b/src/modules/graphics/opengl/ParticleSystem.h @@ -65,7 +65,7 @@ public: INSERT_MODE_TOP, INSERT_MODE_BOTTOM, INSERT_MODE_RANDOM, - INSERT_MODE_MAX_ENUM, + INSERT_MODE_MAX_ENUM }; /** diff --git a/src/modules/image/Image.h b/src/modules/image/Image.h index b95024475..9a5d50794 100644 --- a/src/modules/image/Image.h +++ b/src/modules/image/Image.h @@ -47,7 +47,7 @@ public: /** * Destructor. **/ - virtual ~Image() {}; + virtual ~Image() {} /** * Creates new ImageData from FileData. @@ -93,4 +93,4 @@ public: } // image } // love -#endif // LOVE_IMAGE_IMAGE_H \ No newline at end of file +#endif // LOVE_IMAGE_IMAGE_H diff --git a/src/modules/mouse/Mouse.h b/src/modules/mouse/Mouse.h index 3a178fd4d..90d73d727 100644 --- a/src/modules/mouse/Mouse.h +++ b/src/modules/mouse/Mouse.h @@ -49,7 +49,7 @@ public: BUTTON_MAX_ENUM }; - virtual ~Mouse() {}; + virtual ~Mouse() {} virtual Cursor *newCursor(love::image::ImageData *data, int hotx, int hoty) = 0; virtual Cursor *getSystemCursor(Cursor::SystemCursor cursortype) = 0; diff --git a/src/modules/mouse/wrap_Cursor.cpp b/src/modules/mouse/wrap_Cursor.cpp index 9e0702937..bb245cfba 100644 --- a/src/modules/mouse/wrap_Cursor.cpp +++ b/src/modules/mouse/wrap_Cursor.cpp @@ -51,7 +51,7 @@ int w_Cursor_getType(lua_State *L) lua_pushstring(L, typestr); return 1; -}; +} static const luaL_Reg functions[] = { @@ -65,4 +65,4 @@ extern "C" int luaopen_cursor(lua_State *L) } } // mouse -} // love \ No newline at end of file +} // love diff --git a/src/modules/physics/box2d/wrap_MotorJoint.cpp b/src/modules/physics/box2d/wrap_MotorJoint.cpp index 7286d3504..b264e17a9 100644 --- a/src/modules/physics/box2d/wrap_MotorJoint.cpp +++ b/src/modules/physics/box2d/wrap_MotorJoint.cpp @@ -140,4 +140,4 @@ extern "C" int luaopen_motorjoint(lua_State *L) } // box2d } // phyics -} // love \ No newline at end of file +} // love diff --git a/src/modules/sound/Decoder.h b/src/modules/sound/Decoder.h index 3701c1e8f..50c522c1b 100644 --- a/src/modules/sound/Decoder.h +++ b/src/modules/sound/Decoder.h @@ -67,7 +67,7 @@ public: /** * Destructor. Should free internal buffer. **/ - virtual ~Decoder() {}; + virtual ~Decoder() {} /** * Decodes the next chunk of the music stream, this will usually be diff --git a/src/modules/sound/lullaby/FLACDecoder.cpp b/src/modules/sound/lullaby/FLACDecoder.cpp index 1fcd8245a..6762d9f7b 100644 --- a/src/modules/sound/lullaby/FLACDecoder.cpp +++ b/src/modules/sound/lullaby/FLACDecoder.cpp @@ -183,4 +183,4 @@ void FLACDecoder::error_callback(FLAC__StreamDecoderErrorStatus status) } // sound } // love -#endif // 0 \ No newline at end of file +#endif // 0 diff --git a/src/modules/sound/lullaby/GmeDecoder.cpp b/src/modules/sound/lullaby/GmeDecoder.cpp index aa48fc283..98d364829 100644 --- a/src/modules/sound/lullaby/GmeDecoder.cpp +++ b/src/modules/sound/lullaby/GmeDecoder.cpp @@ -146,4 +146,4 @@ int GmeDecoder::getBitDepth() const } // sound } // love -#endif // LOVE_SUPPORT_GME \ No newline at end of file +#endif // LOVE_SUPPORT_GME diff --git a/src/modules/system/wrap_System.cpp b/src/modules/system/wrap_System.cpp index c4df69f07..c17c29c3c 100644 --- a/src/modules/system/wrap_System.cpp +++ b/src/modules/system/wrap_System.cpp @@ -109,4 +109,4 @@ extern "C" int luaopen_love_system(lua_State *L) } } // system -} // love \ No newline at end of file +} // love