From 9fe21fcd8883b37bdc30224822e6e42afb35b8f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Feb 2016 16:18:13 +0300 Subject: Replace most static_cast to shorter versions from defines. --- src/gui/windows/equipmentwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/windows/equipmentwindow.cpp') 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(imageset->size())) + if (imageIndex >= 0 && imageIndex < CAST_S32(imageset->size())) image = imageset->get(imageIndex); std::vector &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(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(mPages.size()) - 1; + return CAST_S32(mPages.size()) - 1; } -- cgit v1.2.3-60-g2f50