summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-20 13:21:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-20 13:21:46 +0300
commit24d07de2f6aaab6d7c957f059f17dfed78cb8365 (patch)
treeb4f73b46d8e9772941ddb720b4c1f5d1f6ee4998
parentc0de07eba43c8943eeecef04224016da8580d069 (diff)
downloadmanaverse-24d07de2f6aaab6d7c957f059f17dfed78cb8365.tar.gz
manaverse-24d07de2f6aaab6d7c957f059f17dfed78cb8365.tar.bz2
manaverse-24d07de2f6aaab6d7c957f059f17dfed78cb8365.tar.xz
manaverse-24d07de2f6aaab6d7c957f059f17dfed78cb8365.zip
Improve userpalette.
-rw-r--r--src/gui/userpalette.cpp11
-rw-r--r--src/gui/userpalette.h2
2 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 74d47203f..d6fb35192 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -234,8 +234,10 @@ UserPalette::~UserPalette()
}
}
-void UserPalette::setColor(const int type, const int r,
- const int g, const int b)
+void UserPalette::setColor(const int type,
+ const int r,
+ const int g,
+ const int b)
{
Color &color = mColors[type].color;
color.r = r;
@@ -311,7 +313,7 @@ void UserPalette::rollback()
}
}
-int UserPalette::getColorTypeAt(int i)
+int UserPalette::getColorTypeAt(const int i)
{
if (i < 0 || i >= getNumberOfElements())
return BEING;
@@ -319,7 +321,8 @@ int UserPalette::getColorTypeAt(int i)
return mColors[i].type;
}
-void UserPalette::addColor(const unsigned type, const unsigned rgb,
+void UserPalette::addColor(const unsigned type,
+ const unsigned rgb,
Palette::GradientType grad,
const std::string &text,
int delay)
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 7bab5bed9..da8252340 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -186,7 +186,7 @@ class UserPalette final : public Palette, public ListModel
*
* @return the color type of the color with the given index
*/
- int getColorTypeAt(int i) A_WARN_UNUSED;
+ int getColorTypeAt(const int i) A_WARN_UNUSED;
private:
/**