summaryrefslogtreecommitdiff
path: root/src/gui/palette.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/palette.h')
-rw-r--r--src/gui/palette.h38
1 files changed, 26 insertions, 12 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h
index e894ba74..b2994351 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -3,7 +3,7 @@
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
* Copyright (C) 2009 The Mana World Development Team
*
- * This file is part of Aethyra.
+ * This file is part of The Mana World.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -124,7 +124,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
@@ -135,7 +135,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;
@@ -149,8 +149,10 @@ class Palette : public gcn::ListModel
*
* @return the requested committed color
*/
- inline const gcn::Color& getCommittedColor(ColorType type)
- { return mColVector[type].committedColor; }
+ inline const gcn::Color &getCommittedColor(ColorType type)
+ {
+ return mColVector[type].committedColor;
+ }
/**
* Gets the test color associated with the specified type.
@@ -159,8 +161,10 @@ class Palette : public gcn::ListModel
*
* @return the requested test color
*/
- inline const gcn::Color& getTestColor(ColorType type)
- { return mColVector[type].testColor; }
+ inline const gcn::Color &getTestColor(ColorType type)
+ {
+ return mColVector[type].testColor;
+ }
/**
* Sets the test color associated with the specified type.
@@ -169,7 +173,9 @@ class Palette : public gcn::ListModel
* @param color the color that should be tested
*/
inline void setTestColor(ColorType type, gcn::Color color)
- { mColVector[type].testColor = color; }
+ {
+ mColVector[type].testColor = color;
+ }
/**
* Gets the GradientType associated with the specified type.
@@ -179,7 +185,9 @@ class Palette : public gcn::ListModel
* @return the gradient type of the color with the given index
*/
inline GradientType getGradientType(ColorType type)
- { return mColVector[type].grad; }
+ {
+ return mColVector[type].grad;
+ }
/**
* Get the character used by the specified color.
@@ -188,7 +196,10 @@ class Palette : public gcn::ListModel
*
* @return the color char of the color with the given index
*/
- inline char getColorChar(ColorType type) { return mColVector[type].ch; }
+ inline char getColorChar(ColorType type)
+ {
+ return mColVector[type].ch;
+ }
/**
* Sets the color for the specified type.
@@ -236,7 +247,10 @@ class Palette : public gcn::ListModel
/**
* Commit the colors
*/
- inline void commit() { commit(false); }
+ inline void commit()
+ {
+ commit(false);
+ }
/**
* Rollback the colors
@@ -331,7 +345,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;