summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-02 22:15:31 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-02 22:15:31 +0300
commitb78aea0038ae7ace1bac5d829aaa09d46f85315a (patch)
tree07f28916053a2bc9973e376197b66b5ff44a8e1e /src
parent4b7b44daf2bd8833b422699c8de79778392b2a56 (diff)
downloadmanaverse-b78aea0038ae7ace1bac5d829aaa09d46f85315a.tar.gz
manaverse-b78aea0038ae7ace1bac5d829aaa09d46f85315a.tar.bz2
manaverse-b78aea0038ae7ace1bac5d829aaa09d46f85315a.tar.xz
manaverse-b78aea0038ae7ace1bac5d829aaa09d46f85315a.zip
fix code style.
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/emotepage.cpp2
-rw-r--r--src/gui/widgets/emotepage.h2
-rw-r--r--src/resources/dye_unittest.cc2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 8fd9a3cbb..0ab05b6e3 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -64,7 +64,7 @@ void EmotePage::draw(gcn::Graphics *graphics)
unsigned int x = 0;
unsigned int y = 0;
- FOR_EACH(std::vector<Image*>::const_iterator, it, images)
+ FOR_EACH (std::vector<Image*>::const_iterator, it, images)
{
const Image *const image = *it;
if (image)
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index 7fc399ead..0c2582318 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -33,7 +33,7 @@ class EmotePage final : public gcn::Widget,
public gcn::MouseListener
{
public:
- EmotePage(const Widget2 *const widget);
+ explicit EmotePage(const Widget2 *const widget);
A_DELETE_COPY(EmotePage)
diff --git a/src/resources/dye_unittest.cc b/src/resources/dye_unittest.cc
index 9752b0629..08120f641 100644
--- a/src/resources/dye_unittest.cc
+++ b/src/resources/dye_unittest.cc
@@ -116,7 +116,6 @@ TEST(Dye, replaceAOGLColor3)
}
-
TEST(Dye, replaceSColor1)
{
DyePalette palette("#00ff00,000011", 6);
@@ -163,7 +162,6 @@ TEST(Dye, replaceSColor3)
}
-
TEST(Dye, replaceAColor1)
{
DyePalette palette("#00ff0010,00001120", 8);