diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-08-03 03:20:07 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-08-03 03:20:07 +0300 |
commit | 4546f29469d01fcbb5a030c4cf1746b786b495da (patch) | |
tree | 1c993be9c3c4cbde0c48fda8c2ee0d07a9863e3b /src/gui/shortcut | |
parent | a06b27bdd35ee48a1e26aa3be53af6d1063a5d4c (diff) | |
download | manaplus-4546f29469d01fcbb5a030c4cf1746b786b495da.tar.gz manaplus-4546f29469d01fcbb5a030c4cf1746b786b495da.tar.bz2 manaplus-4546f29469d01fcbb5a030c4cf1746b786b495da.tar.xz manaplus-4546f29469d01fcbb5a030c4cf1746b786b495da.zip |
Fix signed / unsigned comparision issue in old gcc.
Diffstat (limited to 'src/gui/shortcut')
-rw-r--r-- | src/gui/shortcut/itemshortcut.cpp | 6 | ||||
-rw-r--r-- | src/gui/shortcut/itemshortcut.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/shortcut/itemshortcut.cpp b/src/gui/shortcut/itemshortcut.cpp index d4e96a3e2..f3457547b 100644 --- a/src/gui/shortcut/itemshortcut.cpp +++ b/src/gui/shortcut/itemshortcut.cpp @@ -41,13 +41,13 @@ ItemShortcut *itemShortcut[SHORTCUT_TABS]; -ItemShortcut::ItemShortcut(const int number) : +ItemShortcut::ItemShortcut(const size_t number) : mItems(), mItemColors(), mItemData(), + mNumber(number), mItemSelected(-1), - mItemColorSelected(ItemColor_one), - mNumber(number) + mItemColorSelected(ItemColor_one) { load(); } diff --git a/src/gui/shortcut/itemshortcut.h b/src/gui/shortcut/itemshortcut.h index a2107207d..7f351cabc 100644 --- a/src/gui/shortcut/itemshortcut.h +++ b/src/gui/shortcut/itemshortcut.h @@ -31,7 +31,7 @@ const unsigned int SHORTCUT_ITEMS = 20; const unsigned int SHORTCUT_TABS = 5; -const unsigned int SHORTCUT_AUTO_TAB = 4; +const size_t SHORTCUT_AUTO_TAB = 4; class Item; @@ -44,7 +44,7 @@ class ItemShortcut final /** * Constructor. */ - explicit ItemShortcut(const int number); + explicit ItemShortcut(const size_t number); A_DELETE_COPY(ItemShortcut) @@ -172,9 +172,9 @@ class ItemShortcut final int mItems[SHORTCUT_ITEMS]; /**< The items. */ ItemColor mItemColors[SHORTCUT_ITEMS]; /**< The item colors. */ std::string mItemData[SHORTCUT_ITEMS]; + size_t mNumber; int mItemSelected; ItemColor mItemColorSelected; - int mNumber; }; extern ItemShortcut *itemShortcut[SHORTCUT_TABS]; |