diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-14 20:05:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-14 20:05:49 +0300 |
| commit | 46454b631d5fd78e07bb292328526639539b7ce3 (patch) | |
| tree | a26f228526e760bed88701e09c473cc13e85562a | |
| parent | 366ec0909c764257a19fcbcc17cfb3948c85e0a5 (diff) | |
| download | plus-46454b631d5fd78e07bb292328526639539b7ce3.tar.gz plus-46454b631d5fd78e07bb292328526639539b7ce3.tar.bz2 plus-46454b631d5fd78e07bb292328526639539b7ce3.tar.xz plus-46454b631d5fd78e07bb292328526639539b7ce3.zip | |
Move netconsts.h into const directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/client.cpp | 3 | ||||
| -rw-r--r-- | src/const/net/net.h (renamed from src/net/netconsts.h) | 6 | ||||
| -rw-r--r-- | src/defaults.cpp | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 47a15746c..2638c9f08 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -557,7 +557,7 @@ SET(SRCS net/npchandler.h net/net.cpp net/net.h - net/netconsts.h + const/net/net.h net/partyhandler.h enums/net/partyshare.h enums/net/servertype.h diff --git a/src/Makefile.am b/src/Makefile.am index eb452277d..930f1916c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1216,7 +1216,7 @@ manaplus_SOURCES += main.cpp \ net/messageout.h \ net/net.cpp \ net/net.h \ - net/netconsts.h \ + const/net/net.h \ net/npchandler.h \ net/partyhandler.h \ net/pethandler.h \ diff --git a/src/client.cpp b/src/client.cpp index d97ae9742..c61d9ef2d 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -43,6 +43,8 @@ #include "being/playerinfo.h" #include "being/playerrelations.h" +#include "const/net/net.h" + #include "input/inputmanager.h" #include "input/joystick.h" #include "input/keyboardconfig.h" @@ -84,7 +86,6 @@ #include "net/ipc.h" #include "net/loginhandler.h" #include "net/net.h" -#include "net/netconsts.h" #include "net/updatetypeoperators.h" #include "net/packetlimiter.h" #include "net/partyhandler.h" diff --git a/src/net/netconsts.h b/src/const/net/net.h index 50b2349be..a0bc58eee 100644 --- a/src/net/netconsts.h +++ b/src/const/net/net.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NET_NETCONSTS_H -#define NET_NETCONSTS_H +#ifndef CONST_NET_NET_H +#define CONST_NET_NET_H #if defined(__GXX_EXPERIMENTAL_CXX0X__) #include <cstdint> @@ -33,4 +33,4 @@ static const uint16_t DEFAULT_PORT = 6901; static const uint16_t DEFAULT_PORT = 6900; #endif -#endif // NET_NETCONSTS_H +#endif // CONST_NET_NET_H diff --git a/src/defaults.cpp b/src/defaults.cpp index 2dce71236..2324ee6fd 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -34,7 +34,7 @@ #include "render/graphics.h" -#include "net/netconsts.h" +#include "const/net/net.h" #ifndef USE_SDL2 #include <SDL_keyboard.h> |