summaryrefslogtreecommitdiff
path: root/src/gui/windowmenu.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/windowmenu.cpp
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmv-311c175f3184103950c72bc5c775174597430b83.tar.gz
mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2
mv-311c175f3184103950c72bc5c775174597430b83.tar.xz
mv-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/windowmenu.cpp')
-rw-r--r--src/gui/windowmenu.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 73a40531a..477aa719d 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -222,7 +222,7 @@ WindowMenu::~WindowMenu()
delete (*it).second;
}
mButtonNames.clear();
- FOR_EACH (std::vector <Button*>::iterator, it, mButtons)
+ FOR_EACH (STD_VECTOR <Button*>::iterator, it, mButtons)
{
Button *const btn = *it;
if (btn == nullptr)
@@ -362,10 +362,10 @@ void WindowMenu::updateButtons()
{
int x = mPadding;
int h = 0;
- FOR_EACH (std::vector <Button*>::const_iterator, it, mButtons)
+ FOR_EACH (STD_VECTOR <Button*>::const_iterator, it, mButtons)
safeRemove(*it);
const int pad2 = 2 * mPadding;
- FOR_EACH (std::vector <Button*>::iterator, it, mButtons)
+ FOR_EACH (STD_VECTOR <Button*>::iterator, it, mButtons)
{
Button *const btn = *it;
if (btn == nullptr)
@@ -439,7 +439,7 @@ void WindowMenu::loadButtons()
void WindowMenu::saveButtons() const
{
int i = 0;
- FOR_EACH (std::vector <Button*>::const_iterator, it, mButtons)
+ FOR_EACH (STD_VECTOR <Button*>::const_iterator, it, mButtons)
{
const Button *const btn = *it;
if ((btn != nullptr) && btn->mVisible == Visible_false)