diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-13 18:40:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-13 18:40:11 +0300 |
| commit | 55b1de961489f99723288e162f9d3a062d593368 (patch) | |
| tree | 8e0420837f222828070fd7df010ede11c2ec90ed /src/gui/widgets | |
| parent | bcbcdde49b5ff85c5ff4b8356dad475698d28f4e (diff) | |
| download | manaverse-55b1de961489f99723288e162f9d3a062d593368.tar.gz manaverse-55b1de961489f99723288e162f9d3a062d593368.tar.bz2 manaverse-55b1de961489f99723288e162f9d3a062d593368.tar.xz manaverse-55b1de961489f99723288e162f9d3a062d593368.zip | |
Fix includes and update deheader ci script.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/desktop.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_video.cpp | 7 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/socialpartytab.h | 1 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/socialtabbase.h | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 5edc9384e..a6d83f4d5 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -24,6 +24,7 @@ #include "gui/widgets/browserbox.h" #include "itemcolormanager.h" +#include "main.h" #include "settings.h" #include "const/resources/item/cards.h" diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index d1a7822a1..253dd58ab 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -22,6 +22,7 @@ #include "gui/widgets/desktop.h" #include "configuration.h" +#include "main.h" #include "gui/skin.h" diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 63d956cf2..a6abf6b3b 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -46,14 +46,11 @@ #include "test/testmain.h" #endif // defined(USE_OPENGL) && !defined(ANDROID) && !defined(__APPLE__) - -#ifndef USE_OPENGL -#include "render/renderers.h" -#endif - #if defined(ANDROID) || defined(__APPLE__) || !defined(USE_OPENGL) #include "configuration.h" +#endif +#if defined(ANDROID) || defined(__APPLE__) #include "utils/stringutils.h" #endif diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index 79e7b93d5..d38328728 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -28,7 +28,6 @@ #include "being/localplayer.h" -#include "net/net.h" #include "net/partyhandler.h" #include "utils/delete2.h" diff --git a/src/gui/widgets/tabs/socialtabbase.h b/src/gui/widgets/tabs/socialtabbase.h index 81b4f8172..cc99dc4b9 100644 --- a/src/gui/widgets/tabs/socialtabbase.h +++ b/src/gui/widgets/tabs/socialtabbase.h @@ -23,8 +23,12 @@ #include "actormanager.h" +ACTORMANAGER_H + #include "enums/resources/map/mapitemtype.h" +ENUMS_RESOURCES_MAP_MAPITEMTYPE_H + #define addAvatars(mob, str, type) \ {\ ava = new Avatar(str);\ |