diff options
Diffstat (limited to 'src/gui/shortcut')
| -rw-r--r-- | src/gui/shortcut/emoteshortcut.cpp | 8 | ||||
| -rw-r--r-- | src/gui/shortcut/itemshortcut.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/shortcut/emoteshortcut.cpp b/src/gui/shortcut/emoteshortcut.cpp index 1079076f6..c49dc2ab8 100644 --- a/src/gui/shortcut/emoteshortcut.cpp +++ b/src/gui/shortcut/emoteshortcut.cpp @@ -46,14 +46,14 @@ EmoteShortcut::~EmoteShortcut() void EmoteShortcut::load() { for (unsigned char i = 0, j = 0, - sz = static_cast<unsigned char>(EmoteDB::getLast()); + sz = CAST_U8(EmoteDB::getLast()); i <= sz && j < SHORTCUT_EMOTES; i++) { const EmoteSprite *const sprite = EmoteDB::getSprite(i, true); if (sprite) { - mEmotes[j] = static_cast<unsigned char>(i + 1); + mEmotes[j] = CAST_U8(i + 1); j ++; } } @@ -64,9 +64,9 @@ void EmoteShortcut::save() const for (int i = 0; i < SHORTCUT_EMOTES; i++) { const unsigned char emoteId = mEmotes[i] ? mEmotes[i] - : static_cast<unsigned char>(0); + : CAST_U8(0); serverConfig.setValue("emoteshortcut" + toString(i), - static_cast<unsigned int>(emoteId)); + CAST_U32(emoteId)); } } diff --git a/src/gui/shortcut/itemshortcut.cpp b/src/gui/shortcut/itemshortcut.cpp index 7166fddf5..4349f1c44 100644 --- a/src/gui/shortcut/itemshortcut.cpp +++ b/src/gui/shortcut/itemshortcut.cpp @@ -226,8 +226,8 @@ void ItemShortcut::setItem(const int index, void ItemShortcut::swap(const int index1, const int index2) { if (index1 < 0 || index2 < 0 - || static_cast<unsigned int>(index1) >= SHORTCUT_ITEMS - || static_cast<unsigned int>(index2) >= SHORTCUT_ITEMS) + || CAST_U32(index1) >= SHORTCUT_ITEMS + || CAST_U32(index2) >= SHORTCUT_ITEMS) { return; } |