diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-11-09 16:21:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-11-09 16:21:59 +0300 |
| commit | a360f4e0af9df1d5276f977d68ac2f357b14ffae (patch) | |
| tree | ec13f49e5a4ee16dbdb5fbd69ce53d3c60969a06 /src/gui | |
| parent | 2541754f6c607acfd1304af38280b534f7a8e0d7 (diff) | |
| download | manaplus-a360f4e0af9df1d5276f977d68ac2f357b14ffae.tar.gz manaplus-a360f4e0af9df1d5276f977d68ac2f357b14ffae.tar.bz2 manaplus-a360f4e0af9df1d5276f977d68ac2f357b14ffae.tar.xz manaplus-a360f4e0af9df1d5276f977d68ac2f357b14ffae.zip | |
Fix code style.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/palette.h | 6 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 2 | ||||
| -rw-r--r-- | src/gui/whoisonline.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windowmenu.cpp | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h index e36f59aae..1918a27ac 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -67,7 +67,8 @@ class Palette * * @return the requested color or Palette::BLACK */ - const gcn::Color &getCharColor(const signed char c, bool &valid) A_WARN_UNUSED; + const gcn::Color &getCharColor(const signed char c, + bool &valid) A_WARN_UNUSED; int getIdByChar(const signed char c, bool &valid) A_WARN_UNUSED; @@ -80,7 +81,8 @@ class Palette * * @return the requested color */ - inline const gcn::Color &getColor(int type, int alpha = 255) A_WARN_UNUSED + inline const gcn::Color &getColor(int type, + int alpha = 255) A_WARN_UNUSED { if (type >= static_cast<signed>(mColors.size()) || type < 0) { diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 476640c46..eb2d51c56 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -108,6 +108,7 @@ class ModeListModel final : public gcn::ListModel StringVect mVideoModes; }; +#ifndef ANDROID static bool modeSorter(std::string mode1, std::string mode2); static bool modeSorter(std::string mode1, std::string mode2) @@ -129,6 +130,7 @@ static bool modeSorter(std::string mode1, std::string mode2) return false; } +#endif ModeListModel::ModeListModel() { diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index fa3980024..4dd1df2b6 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -62,7 +62,6 @@ #undef malloc #endif - class NameFunctuator final { public: diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 1b86b5dc9..6d66a1b63 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -89,7 +89,7 @@ WindowMenu::WindowMenu(const Widget2 *const widget) : addButton(":-)", _("Smilies"), x, h, Input::KEY_WINDOW_EMOTE_SHORTCUT, emoteShortcutWindow); addButton(N_("CH"), _("Chat"), x, h, - Input::KEY_WINDOW_CHAT, minimap, + Input::KEY_WINDOW_CHAT, chatWindow, #ifdef ANDROID true); #else |