diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-09 15:43:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-09 18:44:03 +0300 |
| commit | e5726a11424ebd48f12d76149ec7e5e2b6278bdd (patch) | |
| tree | bdcb9987f4109513a99f3a46e01687babc94a243 /src/gui | |
| parent | b4bdf86b6dd57045bd2d80cfcd5e0a428a5054b3 (diff) | |
| download | ManaVerse-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.gz ManaVerse-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.bz2 ManaVerse-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.xz ManaVerse-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.zip | |
Fix code style.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/avatarlistbox.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/charcreatedialog.h | 3 | ||||
| -rw-r--r-- | src/gui/windows/connectiondialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/connectiondialog.h | 2 | ||||
| -rw-r--r-- | src/gui/windows/itemamountwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/serverdialog.cpp | 3 |
6 files changed, 13 insertions, 3 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index ecb92f876..a84ac7c6d 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -245,6 +245,8 @@ void AvatarListBox::draw(Graphics *graphics) text.append(" \u2642 "); break; default: + case GENDER_UNSPECIFIED: + case GENDER_OTHER: break; } } @@ -264,6 +266,8 @@ void AvatarListBox::draw(Graphics *graphics) a->getAdditionString().c_str())); break; default: + case GENDER_UNSPECIFIED: + case GENDER_OTHER: break; } } diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 652254776..e0a188303 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -23,13 +23,14 @@ #ifndef GUI_WINDOWS_CHARCREATEDIALOG_H #define GUI_WINDOWS_CHARCREATEDIALOG_H -#include "being/being.h" +#include "being/gender.h" #include "gui/widgets/window.h" #include "listeners/actionlistener.h" #include "listeners/keylistener.h" +class Being; class Button; class CharSelectDialog; class Label; diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp index 730c4782a..fece71b0a 100644 --- a/src/gui/windows/connectiondialog.cpp +++ b/src/gui/windows/connectiondialog.cpp @@ -29,6 +29,8 @@ #include "utils/gettext.h" +#include "client.h" + #include "debug.h" extern bool mStatsReUpdated; diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h index 5b10cdfc1..959b23e69 100644 --- a/src/gui/windows/connectiondialog.h +++ b/src/gui/windows/connectiondialog.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_CONNECTIONDIALOG_H #define GUI_WINDOWS_CONNECTIONDIALOG_H -#include "client.h" +#include "state.h" #include "gui/widgets/window.h" diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 92ceeae76..080e44850 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -51,6 +51,8 @@ #include "utils/delete2.h" #include "utils/gettext.h" +#include <cmath> + #include "debug.h" void ItemAmountWindow::finish(const Item *const item, diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 2b890a7af..547d3ba81 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -698,7 +698,8 @@ void ServerDialog::loadCustomServers() server.onlineListUrl = config.getValue(onlineListUrlKey, ""); server.hostname = config.getValue(hostKey, ""); server.type = ServerInfo::parseType(config.getValue(typeKey, "")); - server.persistentIp = config.getValue(persistentIpKey, 0) ? true : false; + server.persistentIp = config.getValue( + persistentIpKey, 0) ? true : false; const int defaultPort = defaultPortForServerType(server.type); server.port = static_cast<uint16_t>( |