From c08c64a1fa6c7198817af294329230951f282c7c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 14 Dec 2015 18:30:58 +0300
Subject: Move emoteshortcutconsts.h into const directory.

---
 src/CMakeLists.txt               |  2 +-
 src/Makefile.am                  |  2 +-
 src/const/emoteshortcut.h        | 26 ++++++++++++++++++++++++++
 src/emoteshortcut.h              |  2 +-
 src/emoteshortcutconsts.h        | 26 --------------------------
 src/gui/windows/outfitwindow.cpp |  3 ++-
 6 files changed, 31 insertions(+), 30 deletions(-)
 create mode 100644 src/const/emoteshortcut.h
 delete mode 100644 src/emoteshortcutconsts.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 791d7d650..f5434822f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -900,7 +900,7 @@ SET(SRCS
     effectmanager.h
     emoteshortcut.cpp
     emoteshortcut.h
-    emoteshortcutconsts.h
+    const/emoteshortcut.h
     equipment.h
     eventsmanager.cpp
     eventsmanager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c84c15f8..1fe9b4f89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -790,7 +790,7 @@ manaplus_SOURCES += main.cpp \
 	      effectmanager.h \
 	      emoteshortcut.cpp \
 	      emoteshortcut.h \
-	      emoteshortcutconsts.h \
+	      const/emoteshortcut.h \
 	      equipment.h \
 	      listeners/actorspritelistener.h \
 	      listeners/arrowslistener.cpp \
diff --git a/src/const/emoteshortcut.h b/src/const/emoteshortcut.h
new file mode 100644
index 000000000..6fe583aa8
--- /dev/null
+++ b/src/const/emoteshortcut.h
@@ -0,0 +1,26 @@
+/*
+ *  The ManaPlus Client
+ *  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 CONST_EMOTESHORTCUT_H
+#define CONST_EMOTESHORTCUT_H
+
+static const int SHORTCUT_EMOTES = 48;
+
+#endif  // CONST_EMOTESHORTCUT_H
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h
index 5dcdab357..8cd3a7ded 100644
--- a/src/emoteshortcut.h
+++ b/src/emoteshortcut.h
@@ -22,7 +22,7 @@
 #ifndef EMOTESHORTCUT_H
 #define EMOTESHORTCUT_H
 
-#include "emoteshortcutconsts.h"
+#include "const/emoteshortcut.h"
 
 #include "localconsts.h"
 
diff --git a/src/emoteshortcutconsts.h b/src/emoteshortcutconsts.h
deleted file mode 100644
index f4f6498b9..000000000
--- a/src/emoteshortcutconsts.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  The ManaPlus Client
- *  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 EMOTESHORTCUTCONSTS_H
-#define EMOTESHORTCUTCONSTS_H
-
-static const int SHORTCUT_EMOTES = 48;
-
-#endif  // EMOTESHORTCUTCONSTS_H
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index 1cf89cb42..0ad1afc38 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -24,12 +24,13 @@
 
 #include "configuration.h"
 #include "dragdrop.h"
-#include "emoteshortcutconsts.h"
 #include "game.h"
 #include "inventory.h"
 
 #include "being/playerinfo.h"
 
+#include "const/emoteshortcut.h"
+
 #include "input/inputactionoperators.h"
 #include "input/inputmanager.h"
 
-- 
cgit v1.2.3-60-g2f50