summaryrefslogtreecommitdiff
path: root/src/gui/windows/npcdialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/gui/windows/npcdialog.cpp
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadplus-311c175f3184103950c72bc5c775174597430b83.tar.gz
plus-311c175f3184103950c72bc5c775174597430b83.tar.bz2
plus-311c175f3184103950c72bc5c775174597430b83.tar.xz
plus-311c175f3184103950c72bc5c775174597430b83.zip
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features.
Diffstat (limited to 'src/gui/windows/npcdialog.cpp')
-rw-r--r--src/gui/windows/npcdialog.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 25c1899a0..fb38dcc72 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -92,7 +92,7 @@
NpcDialog::DialogList NpcDialog::instances;
NpcDialogs NpcDialog::mNpcDialogs;
-typedef std::vector<Image *>::iterator ImageVectorIter;
+typedef STD_VECTOR<Image *>::iterator ImageVectorIter;
NpcDialog::NpcDialog(const BeingId npcId) :
// TRANSLATORS: npc dialog name
@@ -1275,7 +1275,7 @@ void NpcDialog::createSkinControls()
if (mDialogInfo == nullptr)
return;
- FOR_EACH (std::vector<NpcImageInfo*>::const_iterator,
+ FOR_EACH (STD_VECTOR<NpcImageInfo*>::const_iterator,
it,
mDialogInfo->menu.images)
{
@@ -1288,7 +1288,7 @@ void NpcDialog::createSkinControls()
mSkinContainer->add(icon);
}
}
- FOR_EACH (std::vector<NpcTextInfo*>::const_iterator,
+ FOR_EACH (STD_VECTOR<NpcTextInfo*>::const_iterator,
it,
mDialogInfo->menu.texts)
{
@@ -1314,7 +1314,7 @@ void NpcDialog::createSkinControls()
box->addRow(*it2);
}
}
- FOR_EACH (std::vector<NpcButtonInfo*>::const_iterator,
+ FOR_EACH (STD_VECTOR<NpcButtonInfo*>::const_iterator,
it,
mDialogInfo->menu.buttons)
{
@@ -1347,7 +1347,7 @@ std::string NpcDialog::complexItemToStr(const ComplexItem *const item)
std::string str;
if (item != nullptr)
{
- const std::vector<Item*> &items = item->getChilds();
+ const STD_VECTOR<Item*> &items = item->getChilds();
const size_t sz = items.size();
if (sz == 0u)
return str;