diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-01-29 21:30:57 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-01-29 21:30:57 +0300 |
commit | 478b08e4104e21d4c4e76b76534d3f177df94209 (patch) | |
tree | 9f4a45a150eac1ee96ff5695c5863a794649cbeb /src/utils | |
parent | 366d596688506c70cbc510392be7f1224e585185 (diff) | |
download | manaverse-478b08e4104e21d4c4e76b76534d3f177df94209.tar.gz manaverse-478b08e4104e21d4c4e76b76534d3f177df94209.tar.bz2 manaverse-478b08e4104e21d4c4e76b76534d3f177df94209.tar.xz manaverse-478b08e4104e21d4c4e76b76534d3f177df94209.zip |
Fix code style.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/files.cpp | 2 | ||||
-rw-r--r-- | src/utils/stringutils.cpp | 2 | ||||
-rw-r--r-- | src/utils/xml/pugixml.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/utils/files.cpp b/src/utils/files.cpp index 0a3f3eb92..6408a8061 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -70,7 +70,7 @@ void Files::extractLocale() resourceManager->removeFromSearchPath(fileName2); remove(fileName2.c_str()); } -#endif // ANDROID +#endif // ANDROID #if defined(ANDROID) || defined(__native_client__) diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index dadfd35f5..03f33688c 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -970,8 +970,6 @@ std::string timeDiffToString(int timeDiff) return str; } -#include "logger.h" - #ifndef DYECMD void replaceItemLinks(std::string &msg) { diff --git a/src/utils/xml/pugixml.h b/src/utils/xml/pugixml.h index 69864959d..ed4456bb7 100644 --- a/src/utils/xml/pugixml.h +++ b/src/utils/xml/pugixml.h @@ -148,7 +148,8 @@ namespace XML } // namespace XML #define for_each_xml_child_node(var, parent) \ - for (pugi::xml_node var = parent.first_child(); var; var = var.next_sibling()) + for (pugi::xml_node var = parent.first_child(); \ + var; var = var.next_sibling()) #endif // ENABLE_PUGIXML #endif // UTILS_XML_PUGIXML_H |