diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-18 22:13:37 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-18 22:13:37 +0200 |
| commit | f4792bc06f21335fc2d1171d937ea7645ca0c253 (patch) | |
| tree | c7b11cf81f254f5b9ed2f5dbfe127649abc7545a /src/gui/widgets | |
| parent | f98d003e354a1792117b7cbc771d1dd91475a156 (diff) | |
| download | mv-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.gz mv-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.bz2 mv-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.xz mv-f4792bc06f21335fc2d1171d937ea7645ca0c253.zip | |
Fix most conversions except manaserv net code and some other code.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/tabbedarea.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index f6762a5cb..683b02fe6 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -162,7 +162,8 @@ void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event) return; // const unsigned char emoteId = emoteShortcut->getEmote(index); - const unsigned char emoteId = index + 1; + const unsigned char emoteId + = static_cast<unsigned char>(index + 1); if (emoteId) { diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 67882deca..7da6f9398 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -156,7 +156,7 @@ void TabbedArea::removeTab(Tab *tab) } if (tabIndexToBeSelected >= static_cast<signed>(mTabs.size())) - tabIndexToBeSelected = mTabs.size() - 1; + tabIndexToBeSelected = static_cast<int>(mTabs.size()) - 1; if (tabIndexToBeSelected < -1) tabIndexToBeSelected = -1; |