diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-26 00:10:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-26 13:53:30 +0300 |
| commit | 35d6f9c1086d84a479bab84f07f8c9dae266f4ca (patch) | |
| tree | 632b84779ac9b9ce20b60f99272f4a4c241b0b74 /src/gui | |
| parent | 6e71645ebfd4cf07d86bd913b0002a3a1a33c1a9 (diff) | |
| download | manaverse-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.gz manaverse-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.bz2 manaverse-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.xz manaverse-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.zip | |
Fix code style.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/beingpopup.cpp | 4 | ||||
| -rw-r--r-- | src/gui/theme.h | 3 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/itemlinkhandler.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/debugwindowtabs.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/widget.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/widget2.h | 2 |
7 files changed, 5 insertions, 12 deletions
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index fe70d9ad7..0dba7dca6 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -21,8 +21,6 @@ #include "gui/popups/beingpopup.h" -#include "statuseffect.h" - #include "being/being.h" #include "being/homunculusinfo.h" #include "being/petinfo.h" @@ -37,8 +35,6 @@ #include "resources/chatobject.h" -#include "resources/db/statuseffectdb.h" - #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/theme.h b/src/gui/theme.h index 9d7be649a..43d0c3308 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -30,12 +30,9 @@ #include "enums/gui/progresscolorid.h" #include "enums/gui/themecolorid.h" -#include "enums/render/rendertype.h" - #include "listeners/configlistener.h" #include "gui/palette.h" -#include "gui/rect.h" #include "utils/stringvector.h" diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 9c4eaf713..8b63c6096 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -49,8 +49,6 @@ #include "input/inputmanager.h" -#include "render/graphics.h" - #include "resources/map/map.h" #include "resources/map/mapitem.h" #include "resources/map/speciallayer.h" diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 80559b130..86d0a5eec 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/itemlinkhandler.h" -#include "logger.h" - #include "itemcolormanager.h" #include "gui/viewport.h" diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp index 6cf3540ab..bda8af76e 100644 --- a/src/gui/widgets/tabs/debugwindowtabs.cpp +++ b/src/gui/widgets/tabs/debugwindowtabs.cpp @@ -26,7 +26,7 @@ #include "being/localplayer.h" -#include "particle/particle.h" +#include "particle/particleengine.h" #include "gui/viewport.h" diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h index ed11955e5..d4b85e4b8 100644 --- a/src/gui/widgets/widget.h +++ b/src/gui/widgets/widget.h @@ -66,6 +66,8 @@ #include "enums/simpletypes/visible.h" +#include "gui/rect.h" + #include "gui/widgets/widget2.h" #include <list> diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h index 32e51d7c3..3367d8924 100644 --- a/src/gui/widgets/widget2.h +++ b/src/gui/widgets/widget2.h @@ -23,6 +23,8 @@ #include "const/gui/theme.h" +#include "enums/render/rendertype.h" + #include "gui/themecolorsidoperators.h" #include "gui/theme.h" |