summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 17:24:20 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 17:24:20 +0300
commitb664e07438eaaafc5afc64ab47e5e30850fc1a03 (patch)
tree896c2f729b8c3a86f6a722f1808950d60e08f670
parent0ef9776040d63744fb17dbb33aac0cf98d812ec4 (diff)
downloadmanaverse-b664e07438eaaafc5afc64ab47e5e30850fc1a03.tar.gz
manaverse-b664e07438eaaafc5afc64ab47e5e30850fc1a03.tar.bz2
manaverse-b664e07438eaaafc5afc64ab47e5e30850fc1a03.tar.xz
manaverse-b664e07438eaaafc5afc64ab47e5e30850fc1a03.zip
Move partyshare.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/net/partyshare.h (renamed from src/net/partyshare.h)6
-rw-r--r--src/net/partyhandler.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d17da0ba..0ca1648ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -562,7 +562,7 @@ SET(SRCS
net/net.h
net/netconsts.h
net/partyhandler.h
- net/partyshare.h
+ enums/net/partyshare.h
net/pethandler.h
net/playerhandler.h
net/registrationoptions.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 921299b8f..f63ebdb90 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -692,7 +692,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
net/netconsts.h \
net/npchandler.h \
net/partyhandler.h \
- net/partyshare.h \
+ enums/net/partyshare.h \
net/pethandler.h \
net/playerhandler.h \
net/questhandler.h \
diff --git a/src/net/partyshare.h b/src/enums/net/partyshare.h
index 884bef516..ad07ecf72 100644
--- a/src/net/partyshare.h
+++ b/src/enums/net/partyshare.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NET_PARTYSHARE_H
-#define NET_PARTYSHARE_H
+#ifndef ENUMS_NET_PARTYSHARE_H
+#define ENUMS_NET_PARTYSHARE_H
namespace Net
{
@@ -37,4 +37,4 @@ namespace Net
}
} // namespace Net
-#endif // NET_PARTYSHARE_H
+#endif // ENUMS_NET_PARTYSHARE_H
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index b69120e59..4bd27d15b 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -25,9 +25,9 @@
#include "localconsts.h"
-#include "gui/widgets/tabs/chat/chattab.h"
+#include "enums/net/partyshare.h"
-#include "net/partyshare.h"
+#include "gui/widgets/tabs/chat/chattab.h"
#include <string>