From 0fa972c8b0640aaa5f3f3503a59062948c6e330d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 6 Jan 2015 18:36:28 +0300
Subject: Move pikcup.h into enums directory.

---
 src/CMakeLists.txt       |  2 +-
 src/Makefile.am          |  2 +-
 src/being/localplayer.h  |  2 +-
 src/being/pickup.h       | 48 ------------------------------------------------
 src/enums/being/pickup.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 src/being/pickup.h
 create mode 100644 src/enums/being/pickup.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a4ac5159d..2e5bb343f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -929,7 +929,7 @@ SET(SRCS
     being/localplayer.h
     being/mercenaryinfo.h
     being/petinfo.h
-    being/pickup.h
+    enums/being/pickup.h
     logger.cpp
     logger.h
     main.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index eed8cadd1..74fa885bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1051,7 +1051,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      being/localplayer.h \
 	      being/mercenaryinfo.h \
 	      being/petinfo.h \
-	      being/pickup.h \
+	      enums/being/pickup.h \
 	      logger.cpp \
 	      logger.h \
 	      main.cpp \
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 60dc69410..bf342e8c3 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -25,7 +25,7 @@
 
 #include "being/being.h"
 
-#include "being/pickup.h"
+#include "enums/being/pickup.h"
 
 #include "gui/userpalette.h"
 
diff --git a/src/being/pickup.h b/src/being/pickup.h
deleted file mode 100644
index 371c04ba4..000000000
--- a/src/being/pickup.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2015  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef BEING_PICKUP_H
-#define BEING_PICKUP_H
-
-#include "localconsts.h"
-
-namespace Pickup
-{
-    /**
-     * Reasons an item can fail to be picked up.
-     */
-    enum Type
-    {
-        OKAY = 0,
-        UNKNOWN,
-        BAD_ITEM,
-        TOO_HEAVY,
-        TOO_FAR,
-        INV_FULL,
-        STACK_FULL,
-        DROP_STEAL,
-        MAX_AMOUNT,
-        STACK_AMOUNT
-    };
-}  // namespace Pickup
-
-#endif  // BEING_PICKUP_H
diff --git a/src/enums/being/pickup.h b/src/enums/being/pickup.h
new file mode 100644
index 000000000..198097824
--- /dev/null
+++ b/src/enums/being/pickup.h
@@ -0,0 +1,48 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ENUMS_BEING_PICKUP_H
+#define ENUMS_BEING_PICKUP_H
+
+#include "localconsts.h"
+
+namespace Pickup
+{
+    /**
+     * Reasons an item can fail to be picked up.
+     */
+    enum Type
+    {
+        OKAY = 0,
+        UNKNOWN,
+        BAD_ITEM,
+        TOO_HEAVY,
+        TOO_FAR,
+        INV_FULL,
+        STACK_FULL,
+        DROP_STEAL,
+        MAX_AMOUNT,
+        STACK_AMOUNT
+    };
+}  // namespace Pickup
+
+#endif  // ENUMS_BEING_PICKUP_H
-- 
cgit v1.2.3-70-g09d2