diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-06-29 19:05:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-06-29 20:53:56 +0300 |
commit | 864e023e0faeca5aa662023a54af7e4f9797fafa (patch) | |
tree | ae76f85900e16e2c15d82b661077a265ecdd2276 /src/utils | |
parent | 4c4d59b85e3b89812cede60dea8cf0d0185695ae (diff) | |
download | plus-864e023e0faeca5aa662023a54af7e4f9797fafa.tar.gz plus-864e023e0faeca5aa662023a54af7e4f9797fafa.tar.bz2 plus-864e023e0faeca5aa662023a54af7e4f9797fafa.tar.xz plus-864e023e0faeca5aa662023a54af7e4f9797fafa.zip |
Move foreach macroses into separate file.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/chatutils.cpp | 1 | ||||
-rw-r--r-- | src/utils/foreach.h | 36 | ||||
-rw-r--r-- | src/utils/stringutils.cpp | 5 | ||||
-rw-r--r-- | src/utils/translation/translationmanager.cpp | 2 |
4 files changed, 42 insertions, 2 deletions
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp index 53bb689a4..966e383bd 100644 --- a/src/utils/chatutils.cpp +++ b/src/utils/chatutils.cpp @@ -38,6 +38,7 @@ #include "net/tmwa/guildmanager.h" #endif // TMWA_SUPPORT +#include "utils/foreach.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/utils/foreach.h b/src/utils/foreach.h new file mode 100644 index 000000000..d3212795f --- /dev/null +++ b/src/utils/foreach.h @@ -0,0 +1,36 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef UTILS_FOREACH_H +#define UTILS_FOREACH_H + +#define FOR_EACH(type, iter, array) for (type iter = array.begin(), \ + iter##_fend = array.end(); iter != iter##_fend; ++ iter) + +#define FOR_EACHR(type, iter, array) for (type iter = array.rbegin(), \ + iter##_fend = array.rend(); iter != iter##_fend; ++ iter) + +#define FOR_EACHP(type, iter, array) for (type iter = array->begin(), \ + iter##_fend = array->end(); iter != iter##_fend; ++ iter) + +#define FOR_EACH_SAFE(type, iter, array) for (type iter = array.begin(); \ + iter != array.end(); ++ iter) + +#endif // UTILS_FOREACH_H diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 1f0888629..201ffc0c4 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -30,6 +30,9 @@ #include "resources/db/itemdb.h" #endif // DYECMD +#include "utils/gettext.h" +#include "utils/foreach.h" + #include <algorithm> #include <sstream> @@ -37,8 +40,6 @@ #include <sys/time.h> #endif // WIN32 -#include "utils/gettext.h" - #include "debug.h" std::string &trim(std::string &str) diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index aa0dd47da..72ca23c91 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -25,6 +25,8 @@ #include "utils/delete2.h" #include "utils/stringutils.h" +#include "utils/foreach.h" + #include "utils/translation/podict.h" #include "utils/translation/poparser.h" |