diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-15 22:40:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-15 22:40:40 +0300 |
| commit | b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe (patch) | |
| tree | 279df324772bbd8e69aed934940cd4aa8da58999 /src/resources | |
| parent | bc5f2bc679b7af67e652fad23f4132e212c78845 (diff) | |
| download | manaplus-b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe.tar.gz manaplus-b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe.tar.bz2 manaplus-b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe.tar.xz manaplus-b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe.zip | |
Fix code style.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/atlas/atlasmanager.h | 6 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/resources/atlas/atlasmanager.h b/src/resources/atlas/atlasmanager.h index 1e5de93b9..4db0d1e4e 100644 --- a/src/resources/atlas/atlasmanager.h +++ b/src/resources/atlas/atlasmanager.h @@ -23,13 +23,13 @@ #ifdef USE_OPENGL -#include "resources/image/image.h" - #include "utils/stringvector.h" +#include "localconsts.h" + class AtlasResource; +class Image; -struct AtlasItem; struct TextureAtlas; class AtlasManager final diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index cdbc7f5cd..98c9baab5 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -22,8 +22,6 @@ #include "resources/resourcemanager/resourcemanager.h" -#include "configuration.h" - #ifdef USE_OPENGL #include "resources/image/image.h" #endif // USE_OPENGL @@ -37,6 +35,7 @@ #include "utils/cast.h" #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/stringutils.h" #if !defined(DEBUG_DUMP_LEAKS) && !defined(UNITTESTS) #include "resources/resourcetypes.h" |