From f0b7627b7d88c1d5bb484961377114b210c8dd53 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 13 Jul 2014 12:20:19 +0300 Subject: Fix code style. --- src/gui/widgets/itemlinkhandler.cpp | 4 ++-- src/gui/widgets/listbox.cpp | 2 +- src/gui/widgets/passwordfield.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets') 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(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(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 -- cgit v1.2.3-70-g09d2