From 7e0a97d2521b9ce57003176e82a0b5564aa003c2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 17 Jul 2012 23:26:59 +0300 Subject: Fix more code style and additional warnings. --- src/gui/widgets/dropshortcutcontainer.cpp | 4 ++-- src/gui/widgets/itemshortcutcontainer.cpp | 7 ++++--- src/gui/widgets/setupitem.cpp | 2 +- src/gui/widgets/textfield.cpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index d6d31871b..fca1af17f 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -185,7 +185,7 @@ void DropShortcutContainer::mouseDragged(gcn::MouseEvent &event) return; const int itemId = dropShortcut->getItem(index); - const int itemColor = dropShortcut->getItemColor(index); + const unsigned char itemColor = dropShortcut->getItemColor(index); if (itemId < 0) return; @@ -288,7 +288,7 @@ void DropShortcutContainer::mouseMoved(gcn::MouseEvent &event) return; const int itemId = dropShortcut->getItem(index); - const int itemColor = dropShortcut->getItemColor(index); + const unsigned char itemColor = dropShortcut->getItemColor(index); if (itemId < 0) return; diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 714435d21..735cea43d 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -140,7 +140,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics) g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT); const int itemId = itemShortcut[mNumber]->getItem(i); - const int itemColor = itemShortcut[mNumber]->getItemColor(i); + const unsigned char itemColor = itemShortcut[mNumber]->getItemColor(i); if (itemId < 0) continue; @@ -245,7 +245,8 @@ void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event) return; const int itemId = itemShortcut[mNumber]->getItem(index); - const int itemColor = itemShortcut[mNumber]->getItemColor(index); + const unsigned char itemColor = itemShortcut[mNumber]-> + getItemColor(index); if (itemId < 0) return; @@ -365,7 +366,7 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event) return; const int itemId = itemShortcut[mNumber]->getItem(index); - const int itemColor = itemShortcut[mNumber]->getItemColor(index); + const unsigned char itemColor = itemShortcut[mNumber]->getItemColor(index); if (itemId < 0) return; diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 7f539d79f..bbc809747 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -848,7 +848,7 @@ void SetupItemSlider2::action(const gcn::ActionEvent &event A_UNUSED) void SetupItemSlider2::updateLabel() { - int val = mSlider->getValue() - mMin; + int val = static_cast(mSlider->getValue()) - mMin; if (val < 0) val = 0; else if (val >= static_cast(mValues->size())) diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 8f543e3bf..3d106f9a2 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -174,7 +174,7 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent) if ((val >= '0' && val <= '9') || (val == '-' && !mCaretPosition)) { char buf[2]; - buf[0] = val; + buf[0] = static_cast(val); buf[1] = 0; mText.insert(mCaretPosition, std::string(buf)); mCaretPosition += 1; -- cgit v1.2.3-70-g09d2