diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-19 01:18:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-20 00:49:07 +0300 |
| commit | 26f9aad24bc50d4e9fd161d185df049c9e7a62cf (patch) | |
| tree | d8fd87aef6395b5a4704e9570fcbcddcc8ccca83 /src/utils | |
| parent | 50b5afdb7e68cdec8f77020b578dc3f6874933bb (diff) | |
| download | manaplus-26f9aad24bc50d4e9fd161d185df049c9e7a62cf.tar.gz manaplus-26f9aad24bc50d4e9fd161d185df049c9e7a62cf.tar.bz2 manaplus-26f9aad24bc50d4e9fd161d185df049c9e7a62cf.tar.xz manaplus-26f9aad24bc50d4e9fd161d185df049c9e7a62cf.zip | |
improve includes.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/files.cpp | 1 | ||||
| -rw-r--r-- | src/utils/paths.cpp | 2 | ||||
| -rw-r--r-- | src/utils/sdlpixel.h | 6 | ||||
| -rw-r--r-- | src/utils/translation/poparser.cpp | 2 | ||||
| -rw-r--r-- | src/utils/translation/poparser.h | 4 | ||||
| -rw-r--r-- | src/utils/xml.h | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/src/utils/files.cpp b/src/utils/files.cpp index 24ec9366e..11ac222f5 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -24,7 +24,6 @@ #include "resources/resourcemanager.h" #endif -#include "utils/mkdir.h" #include "utils/physfstools.h" #include "localconsts.h" diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index a3f61bde3..96cd0ed29 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -28,7 +28,9 @@ #include "utils/physfstools.h" #include "utils/stringutils.h" +#ifdef USE_X11 #include "resources/resourcemanager.h" +#endif #ifdef __native_client__ #include <limits.h> diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h index 2a26f28a1..692615688 100644 --- a/src/utils/sdlpixel.h +++ b/src/utils/sdlpixel.h @@ -61,8 +61,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef UTILS_SDLPIXEL_HPP -#define UTILS_SDLPIXEL_HPP +#ifndef UTILS_SDLPIXEL_H +#define UTILS_SDLPIXEL_H #include "SDL.h" #include "gui/base/color.hpp" @@ -229,4 +229,4 @@ inline void SDLputPixelAlpha(SDL_Surface* surface, int x, int y, SDL_UnlockSurface(surface); } -#endif // UTILS_SDLPIXEL_HPP +#endif // UTILS_SDLPIXEL_H diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp index f0ab95005..c105bf0da 100644 --- a/src/utils/translation/poparser.cpp +++ b/src/utils/translation/poparser.cpp @@ -24,6 +24,8 @@ #include "utils/stringutils.h" +#include "utils/translation/podict.h" + #include "logger.h" #include "debug.h" diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h index 08a6ac7b1..41598442b 100644 --- a/src/utils/translation/poparser.h +++ b/src/utils/translation/poparser.h @@ -21,13 +21,13 @@ #ifndef UTILS_TRANSLATION_POPARSER_H #define UTILS_TRANSLATION_POPARSER_H -#include "utils/translation/podict.h" - #include "localconsts.h" #include <sstream> #include <string> +class PoDict; + class PoParser final { public: diff --git a/src/utils/xml.h b/src/utils/xml.h index 48d60cda7..d8a281045 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -23,8 +23,8 @@ #ifndef UTILS_XML_H #define UTILS_XML_H -#include <libxml/xmlwriter.h> #include <libxml/tree.h> +#include <libxml/xmlwriter.h> #include <string> |