summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.h9
-rw-r--r--src/resources/imageset.h3
-rw-r--r--src/resources/iteminfo.h17
-rw-r--r--src/resources/music.h6
-rw-r--r--src/resources/resource.h6
-rw-r--r--src/resources/soundeffect.h6
-rw-r--r--src/resources/spritedef.h6
-rw-r--r--src/resources/userpalette.h6
8 files changed, 4 insertions, 55 deletions
diff --git a/src/resources/image.h b/src/resources/image.h
index 9fdc0997..5b361e1a 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -53,9 +53,6 @@ class Image : public Resource
#endif
public:
- /**
- * Destructor.
- */
virtual ~Image();
/**
@@ -274,9 +271,6 @@ class Image : public Resource
class SubImage : public Image
{
public:
- /**
- * Constructor.
- */
SubImage(Image *parent, SDL_Surface *image,
int x, int y, int width, int height);
#ifdef USE_OPENGL
@@ -284,9 +278,6 @@ class SubImage : public Image
int width, int height, int texWidth, int textHeight);
#endif
- /**
- * Destructor.
- */
~SubImage();
/**
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 3289788f..7d2ce1f2 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -39,9 +39,6 @@ class ImageSet : public Resource
*/
ImageSet(Image *img, int w, int h, int margin = 0, int spacing = 0);
- /**
- * Destructor.
- */
~ImageSet();
/**
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 50633f71..7b9e7287 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -76,9 +76,6 @@ class ItemInfo
friend class ManaServ::ManaServItemDB;
public:
- /**
- * Constructor.
- */
ItemInfo():
mType(ITEM_UNUSABLE),
mWeight(0),
@@ -219,16 +216,13 @@ class TaItemInfo: public ItemInfo
friend class TaItemDB;
public:
- /**
- * Constructor.
- */
- TaItemInfo():ItemInfo()
+ TaItemInfo() : ItemInfo()
{}
// Declare TmwAthena Specific item info here
};
-}; // namespace TmwAthena
+} // namespace TmwAthena
namespace ManaServ {
@@ -239,16 +233,13 @@ namespace ManaServ {
class ManaServItemInfo: public ItemInfo
{
public:
- /**
- * Constructor.
- */
- ManaServItemInfo():ItemInfo()
+ ManaServItemInfo() : ItemInfo()
{}
// Declare Manaserv Specific item info here
};
-}; // namespace ManaServ
+} // namespace ManaServ
#endif
diff --git a/src/resources/music.h b/src/resources/music.h
index c0cf5abe..2556c1ee 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -36,9 +36,6 @@
class Music : public Resource
{
public:
- /**
- * Destructor.
- */
virtual ~Music();
/**
@@ -68,9 +65,6 @@ class Music : public Resource
virtual void stop();
protected:
- /**
- * Constructor.
- */
Music(Mix_Chunk *music);
//Mix_Music *music;
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 28f390b5..69fa5dc9 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -33,9 +33,6 @@ class Resource
friend class ResourceManager;
public:
- /**
- * Constructor
- */
Resource(): mRefCount(0) {}
/**
@@ -59,9 +56,6 @@ class Resource
{ return mIdPath; }
protected:
- /**
- * Destructor.
- */
virtual ~Resource();
private:
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index e7c832f4..bc499a96 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -36,9 +36,6 @@
class SoundEffect : public Resource
{
public:
- /**
- * Destructor.
- */
virtual ~SoundEffect();
/**
@@ -64,9 +61,6 @@ class SoundEffect : public Resource
virtual bool play(int loops, int volume);
protected:
- /**
- * Constructor.
- */
SoundEffect(Mix_Chunk *soundEffect): mChunk(soundEffect) {}
Mix_Chunk *mChunk;
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 18a70c9b..cef158fa 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -113,14 +113,8 @@ class SpriteDef : public Resource
makeSpriteDirection(const std::string &direction);
private:
- /**
- * Constructor.
- */
SpriteDef() {}
- /**
- * Destructor.
- */
~SpriteDef();
/**
diff --git a/src/resources/userpalette.h b/src/resources/userpalette.h
index be02db10..01f66ca7 100644
--- a/src/resources/userpalette.h
+++ b/src/resources/userpalette.h
@@ -56,14 +56,8 @@ class UserPalette : public Palette, public gcn::ListModel
USER_COLOR_LAST
};
- /**
- * Constructor
- */
UserPalette();
- /**
- * Destructor
- */
~UserPalette();
/**