diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-13 12:20:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-13 12:20:19 +0300 |
| commit | f0b7627b7d88c1d5bb484961377114b210c8dd53 (patch) | |
| tree | a978c3b8eca88759fa71b5fc34112f4bea9bbcec /src/gui/widgets | |
| parent | d9be27bba8941260500066cdd43ebb016356bc67 (diff) | |
| download | manaverse-f0b7627b7d88c1d5bb484961377114b210c8dd53.tar.gz manaverse-f0b7627b7d88c1d5bb484961377114b210c8dd53.tar.bz2 manaverse-f0b7627b7d88c1d5bb484961377114b210c8dd53.tar.xz manaverse-f0b7627b7d88c1d5bb484961377114b210c8dd53.zip | |
Fix code style.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/itemlinkhandler.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/listbox.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/passwordfield.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index e5c6c06b3..50e99a24c 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -111,9 +111,9 @@ void ItemLinkHandler::handleLink(const std::string &link, MouseEvent *event) splitToIntVector(str, link, ','); if (str.empty()) return; - int color = 1; + unsigned char color = 1; if (str.size() > 1) - color = str[1]; + color = static_cast<unsigned char>(str[1]); const int id = str[0]; if (id > 0) { diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 68b50c458..5a8cc26e8 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -366,7 +366,7 @@ int ListBox::getSelectionByMouse(const int y) const { if (y < mPadding) return -1; - return (y - mPadding) / getRowHeight(); + return static_cast<unsigned int>(y - mPadding) / getRowHeight(); } void ListBox::setSelected(const int selected) diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h index f72350763..4c05afd40 100644 --- a/src/gui/widgets/passwordfield.h +++ b/src/gui/widgets/passwordfield.h @@ -47,7 +47,7 @@ class PasswordField final : public TextField void draw(Graphics *graphics) override final; protected: - int mPasswordChar; + char mPasswordChar; }; #endif // GUI_WIDGETS_PASSWORDFIELD_H |