From b0666acdae84d8b4e1f76cdf84191173c667bff4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 29 Jun 2015 14:30:34 +0300
Subject: Move itemsoundevent.h into enums directory.
---
src/CMakeLists.txt | 2 +-
src/Makefile.am | 2 +-
src/enums/resources/itemsoundevent.h | 46 ++++++++++++++++++++++++++++++++++++
src/itemsoundmanager.h | 2 +-
src/resources/itemsoundevent.h | 46 ------------------------------------
src/resources/soundinfo.h | 2 +-
6 files changed, 50 insertions(+), 50 deletions(-)
create mode 100644 src/enums/resources/itemsoundevent.h
delete mode 100644 src/resources/itemsoundevent.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b14c381de..c95768b4b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -641,7 +641,7 @@ SET(SRCS
resources/iteminfo.h
resources/iteminfo.cpp
resources/itemslot.h
- resources/itemsoundevent.h
+ enums/resources/itemsoundevent.h
resources/itemtype.h
resources/itemtypemap.h
resources/itemtypemapdata.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c587b3d5..19f777fd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -785,7 +785,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/iteminfo.h \
resources/iteminfo.cpp \
resources/itemslot.h \
- resources/itemsoundevent.h \
+ enums/resources/itemsoundevent.h \
resources/itemtype.h \
resources/itemtypemap.h \
resources/itemtypemapdata.h \
diff --git a/src/enums/resources/itemsoundevent.h b/src/enums/resources/itemsoundevent.h
new file mode 100644
index 000000000..5b9a4157b
--- /dev/null
+++ b/src/enums/resources/itemsoundevent.h
@@ -0,0 +1,46 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2013-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_RESOURCES_ITEMSOUNDEVENT_H
+#define ENUMS_RESOURCES_ITEMSOUNDEVENT_H
+
+namespace ItemSoundEvent
+{
+ enum Type
+ {
+ HIT = 0,
+ MISS,
+ HURT,
+ DIE,
+ MOVE,
+ SIT,
+ SITTOP,
+ SPAWN,
+ DROP,
+ PICKUP,
+ TAKE, // take from container
+ PUT, // put into container
+ EQUIP,
+ UNEQUIP,
+ USE
+ };
+} // namespace ItemSoundEvent
+
+#endif // ENUMS_RESOURCES_ITEMSOUNDEVENT_H
diff --git a/src/itemsoundmanager.h b/src/itemsoundmanager.h
index a7bb8a01d..9317d6680 100644
--- a/src/itemsoundmanager.h
+++ b/src/itemsoundmanager.h
@@ -21,7 +21,7 @@
#ifndef ITEMSOUNDMANAGER_H
#define ITEMSOUNDMANAGER_H
-#include "resources/itemsoundevent.h"
+#include "enums/resources/itemsoundevent.h"
#include "localconsts.h"
diff --git a/src/resources/itemsoundevent.h b/src/resources/itemsoundevent.h
deleted file mode 100644
index 0f3b36b94..000000000
--- a/src/resources/itemsoundevent.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2013-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 RESOURCES_ITEMSOUNDEVENT_H
-#define RESOURCES_ITEMSOUNDEVENT_H
-
-namespace ItemSoundEvent
-{
- enum Type
- {
- HIT = 0,
- MISS,
- HURT,
- DIE,
- MOVE,
- SIT,
- SITTOP,
- SPAWN,
- DROP,
- PICKUP,
- TAKE, // take from container
- PUT, // put into container
- EQUIP,
- UNEQUIP,
- USE
- };
-} // namespace ItemSoundEvent
-
-#endif // RESOURCES_ITEMSOUNDEVENT_H
diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h
index 15a9dd030..80aef407c 100644
--- a/src/resources/soundinfo.h
+++ b/src/resources/soundinfo.h
@@ -21,7 +21,7 @@
#ifndef RESOURCES_SOUNDINFO_H
#define RESOURCES_SOUNDINFO_H
-#include "resources/itemsoundevent.h"
+#include "enums/resources/itemsoundevent.h"
#include <map>
#include <string>
--
cgit v1.2.3-70-g09d2