diff options
author | Ira Rice <irarice@gmail.com> | 2009-01-15 11:06:32 -0700 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-01-15 11:06:32 -0700 |
commit | 10a9dbacd9334caede10f1b21d42cdf7e1efcd03 (patch) | |
tree | def2baead68de5a9ccc842e25b3cdcfe9a638c9b /src/resources/image.h | |
parent | e7f4e78f76972ca3882b9d2763ae9cab31675d3a (diff) | |
download | mana-client-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.gz mana-client-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.bz2 mana-client-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.xz mana-client-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.zip |
Style cleanups throughout most of the code. Splitting function type from
the function names should no longer be around.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/resources/image.h')
-rw-r--r-- | src/resources/image.h | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/src/resources/image.h b/src/resources/image.h index 6eb33ed9..a2e52d3d 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -55,8 +55,7 @@ class Image : public Resource /** * Destructor. */ - virtual - ~Image(); + virtual ~Image(); /** * Loads an image from a buffer in memory. @@ -89,21 +88,17 @@ class Image : public Resource /** * Frees the resources created by SDL. */ - virtual void - unload(); + virtual void unload(); /** * Returns the width of the image. */ - virtual int - getWidth() const { return mBounds.w; } - + virtual int getWidth() const { return mBounds.w; } /** * Returns the height of the image. */ - virtual int - getHeight() const { return mBounds.h; } + virtual int getHeight() const { return mBounds.h; } /** * Creates a new image with the desired clipping rectangle. @@ -111,20 +106,17 @@ class Image : public Resource * @return <code>NULL</code> if creation failed and a valid * object otherwise. */ - virtual Image* - getSubImage(int x, int y, int width, int height); + virtual Image* getSubImage(int x, int y, int width, int height); /** * Sets the alpha value of this image. */ - void - setAlpha(float alpha); + void setAlpha(float alpha); /** * Returns the alpha value of this image. */ - float - getAlpha(); + float getAlpha(); #ifdef USE_OPENGL /** @@ -134,7 +126,6 @@ class Image : public Resource static void setLoadAsOpenGL(bool useOpenGL); #endif - protected: /** * Constructor. @@ -146,8 +137,7 @@ class Image : public Resource /** * Returns the first power of two equal or bigger than the input. */ - static int - powerOfTwo(int input); + static int powerOfTwo(int input); #endif Image(SDL_Surface *image); @@ -193,8 +183,7 @@ class SubImage : public Image * @return <code>NULL</code> if creation failed and a valid * image otherwise. */ - Image* - getSubImage(int x, int y, int width, int height); + Image* getSubImage(int x, int y, int width, int height); private: Image *mParent; |