summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-08 22:46:48 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-08 22:46:48 +0300
commit6d4da51f0fdcecc2d4398f60dbca43f499fdbe16 (patch)
treec71c7c6e49ed36a55c6b6a2b1ba70073300634dd /src/gui/widgets/tabs
parent4125ac707288a244a7175b755d74dd963e762f56 (diff)
downloadplus-6d4da51f0fdcecc2d4398f60dbca43f499fdbe16.tar.gz
plus-6d4da51f0fdcecc2d4398f60dbca43f499fdbe16.tar.bz2
plus-6d4da51f0fdcecc2d4398f60dbca43f499fdbe16.tar.xz
plus-6d4da51f0fdcecc2d4398f60dbca43f499fdbe16.zip
Fix code style in gui.
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r--src/gui/widgets/tabs/setup_joystick.cpp4
-rw-r--r--src/gui/widgets/tabs/setup_relations.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index 4d2845656..eb7e163f0 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -78,8 +78,8 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
}
else
{
- unsigned sel = config.getIntValue("selectedJoystick");
- if (sel >= mNamesModel->size())
+ unsigned int sel = config.getIntValue("selectedJoystick");
+ if (sel >= static_cast<unsigned int>(mNamesModel->size()))
sel = 0;
mNamesDropDown->setSelected(sel);
}
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 77a758cb4..613e2c7f0 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -134,7 +134,8 @@ public:
mWidgets.push_back(widget);
DropDown *const choicebox = new DropDown(this, mListModel);
- choicebox->setSelected(player_relations.getRelation(name));
+ choicebox->setSelected(static_cast<int>(
+ player_relations.getRelation(name)));
mWidgets.push_back(choicebox);
}