diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-02-07 16:18:13 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-02-07 16:18:13 +0300 |
commit | 9fe21fcd8883b37bdc30224822e6e42afb35b8f0 (patch) | |
tree | 798117abd4dc7e610997d59d530a96ddc1509f53 /src/gui/windows/equipmentwindow.cpp | |
parent | 4429cb14e9e187edef27aba692a4266733f79c17 (diff) | |
download | mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.gz mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.bz2 mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.xz mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.zip |
Replace most static_cast<Type> to shorter versions from defines.
Diffstat (limited to 'src/gui/windows/equipmentwindow.cpp')
-rw-r--r-- | src/gui/windows/equipmentwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index a32f80c3e..ddde610eb 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -713,7 +713,7 @@ void EquipmentWindow::loadSlot(const XmlNodePtr slotNode, const int imageIndex = XML::getProperty(slotNode, "image", -1); Image *image = nullptr; - if (imageIndex >= 0 && imageIndex < static_cast<signed>(imageset->size())) + if (imageIndex >= 0 && imageIndex < CAST_S32(imageset->size())) image = imageset->get(imageIndex); std::vector<EquipmentBox*> &boxes = mPages[page]->boxes; @@ -786,7 +786,7 @@ void EquipmentWindow::addBox(const int idx, int x, int y, const int imageIndex) Image *image = nullptr; if (mImageSet && imageIndex >= 0 && imageIndex - < static_cast<signed>(mImageSet->size())) + < CAST_S32(mImageSet->size())) { image = mImageSet->get(imageIndex); } @@ -826,5 +826,5 @@ int EquipmentWindow::addPage(const std::string &name) boxes.push_back(nullptr); mTabs->addButton(name, name, false); - return static_cast<int>(mPages.size()) - 1; + return CAST_S32(mPages.size()) - 1; } |