diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-06 15:30:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-06 15:30:44 +0300 |
| commit | b3fb470b1c14f2ca7832531df1f99c9fd730c317 (patch) | |
| tree | 915c969d56c40f02f778b865341cf0a4bf03c682 | |
| parent | 5b0506f5c2c43b155ad18eb346bf381b447f1281 (diff) | |
| download | mv-b3fb470b1c14f2ca7832531df1f99c9fd730c317.tar.gz mv-b3fb470b1c14f2ca7832531df1f99c9fd730c317.tar.bz2 mv-b3fb470b1c14f2ca7832531df1f99c9fd730c317.tar.xz mv-b3fb470b1c14f2ca7832531df1f99c9fd730c317.zip | |
Move state.h into enums directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/being/playerinfo.h | 3 | ||||
| -rw-r--r-- | src/client.h | 2 | ||||
| -rw-r--r-- | src/enums/state.h (renamed from src/state.h) | 6 | ||||
| -rw-r--r-- | src/gui/windows/connectiondialog.h | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 42d34a1b4..752bc9fe6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1054,7 +1054,7 @@ SET(SRCS soundmanager.cpp soundmanager.h sprite.h - state.h + enums/state.h statuseffect.cpp statuseffect.h render/surfacegraphics.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 6052be132..82d94ac2d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1174,7 +1174,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ soundmanager.cpp \ soundmanager.h \ sprite.h \ - state.h \ + enums/state.h \ statuseffect.cpp \ statuseffect.h \ render/surfacegraphics.cpp \ diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h index a2a2255c4..298005ed5 100644 --- a/src/being/playerinfo.h +++ b/src/being/playerinfo.h @@ -24,7 +24,8 @@ #include "equipment.h" #include "guildpositionflags.h" -#include "state.h" + +#include "enums/state.h" #include <map> diff --git a/src/client.h b/src/client.h index b6e92fa90..29dca9ad7 100644 --- a/src/client.h +++ b/src/client.h @@ -23,7 +23,7 @@ #ifndef CLIENT_H #define CLIENT_H -#include "state.h" +#include "enums/state.h" #include "listeners/actionlistener.h" #include "listeners/configlistener.h" diff --git a/src/state.h b/src/enums/state.h index 63d3df6d2..ed16cf4f2 100644 --- a/src/state.h +++ b/src/enums/state.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef STATE_H -#define STATE_H +#ifndef ENUMS_STATE_H +#define ENUMS_STATE_H /** * All client states. @@ -68,4 +68,4 @@ enum State STATE_AUTORECONNECT_SERVER = 1000 }; -#endif // STATE_H +#endif // ENUMS_STATE_H diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h index c1a3ece72..39c802c3a 100644 --- a/src/gui/windows/connectiondialog.h +++ b/src/gui/windows/connectiondialog.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_CONNECTIONDIALOG_H #define GUI_WINDOWS_CONNECTIONDIALOG_H -#include "state.h" +#include "enums/state.h" #include "gui/widgets/window.h" |