summaryrefslogtreecommitdiff
path: root/src/gui/palette.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-25 23:42:57 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-25 23:42:57 +0100
commitcd20fb3432498b8871401bdd65a143197e2a6538 (patch)
tree1edd3e20e3501de5315fa5bfc46b8673ad40d5dd /src/gui/palette.h
parent4ba8c80791c15c144d66e6a9b23e878d3313fa26 (diff)
downloadmana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.gz
mana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.bz2
mana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.xz
mana-cd20fb3432498b8871401bdd65a143197e2a6538.zip
A host of code style fixes
Mostly putting & and * in the right place and making some getters const.
Diffstat (limited to 'src/gui/palette.h')
-rw-r--r--src/gui/palette.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 1a466ed4..fab8cd09 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -122,7 +122,7 @@ class Palette : public gcn::ListModel
*
* @return the requested color or Palette::BLACK
*/
- const gcn::Color& getColor(char c, bool &valid);
+ const gcn::Color &getColor(char c, bool &valid);
/**
* Gets the color associated with the type. Sets the alpha channel
@@ -133,7 +133,7 @@ class Palette : public gcn::ListModel
*
* @return the requested color
*/
- inline const gcn::Color& getColor(ColorType type, int alpha = 255)
+ inline const gcn::Color &getColor(ColorType type, int alpha = 255)
{
gcn::Color* col = &mColVector[type].color;
col->a = alpha;
@@ -147,7 +147,7 @@ class Palette : public gcn::ListModel
*
* @return the requested committed color
*/
- inline const gcn::Color& getCommittedColor(ColorType type)
+ inline const gcn::Color &getCommittedColor(ColorType type)
{
return mColVector[type].committedColor;
}
@@ -159,7 +159,7 @@ class Palette : public gcn::ListModel
*
* @return the requested test color
*/
- inline const gcn::Color& getTestColor(ColorType type)
+ inline const gcn::Color &getTestColor(ColorType type)
{
return mColVector[type].testColor;
}
@@ -342,7 +342,7 @@ class Palette : public gcn::ListModel
*
* @return the transformed string
*/
- static std::string getConfigName(const std::string& typeName);
+ static std::string getConfigName(const std::string &typeName);
};
extern Palette *guiPalette;