summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-01-24 19:51:16 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-01-26 22:38:41 +0100
commitbd7ad9aedd87c857477bbfcf7653af91a80f4df6 (patch)
tree6e0c678f37ebf7b0c020ec95773c79c552834140 /src/resources
parent20c224aacc6b9669828f3c7e7b2c19b9b95d90ff (diff)
downloadmana-client-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.gz
mana-client-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.bz2
mana-client-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.xz
mana-client-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.zip
Removed 'inline' keyword where it's not of any value
Members that are implemented inline are already inline, there is no need to mark them as such. Made two inline members of OpenGLGraphics private since because they are marked as inline, they can't be used from other classes. Reviewed-by: Erik Schilling
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/userpalette.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/userpalette.h b/src/resources/userpalette.h
index 1dd5cf6a..9856fd96 100644
--- a/src/resources/userpalette.h
+++ b/src/resources/userpalette.h
@@ -67,7 +67,7 @@ class UserPalette : public Palette, public gcn::ListModel
*
* @return the requested committed color
*/
- inline const gcn::Color &getCommittedColor(int type)
+ const gcn::Color &getCommittedColor(int type)
{
return mColors[type].committedColor;
}
@@ -79,7 +79,7 @@ class UserPalette : public Palette, public gcn::ListModel
*
* @return the requested test color
*/
- inline const gcn::Color &getTestColor(int type)
+ const gcn::Color &getTestColor(int type)
{
return mColors[type].testColor;
}
@@ -90,7 +90,7 @@ class UserPalette : public Palette, public gcn::ListModel
* @param type the color type requested
* @param color the color that should be tested
*/
- inline void setTestColor(int type, gcn::Color color)
+ void setTestColor(int type, gcn::Color color)
{
mColors[type].testColor = color;
}
@@ -123,7 +123,7 @@ class UserPalette : public Palette, public gcn::ListModel
*
* @return the number of colors known
*/
- inline int getNumberOfElements() { return mColors.size(); }
+ int getNumberOfElements() { return mColors.size(); }
/**
* Returns the name of the ith color.
@@ -137,7 +137,7 @@ class UserPalette : public Palette, public gcn::ListModel
/**
* Commit the colors
*/
- inline void commit()
+ void commit()
{
commit(false);
}