diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-14 18:30:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-14 19:52:14 +0300 |
| commit | c08c64a1fa6c7198817af294329230951f282c7c (patch) | |
| tree | 2883813ad2435821b2e8127940225392385f9a9f | |
| parent | 24ec5d49e0f4e642578f5acaf8765b352353d572 (diff) | |
| download | plus-c08c64a1fa6c7198817af294329230951f282c7c.tar.gz plus-c08c64a1fa6c7198817af294329230951f282c7c.tar.bz2 plus-c08c64a1fa6c7198817af294329230951f282c7c.tar.xz plus-c08c64a1fa6c7198817af294329230951f282c7c.zip | |
Move emoteshortcutconsts.h into const directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/const/emoteshortcut.h (renamed from src/emoteshortcutconsts.h) | 6 | ||||
| -rw-r--r-- | src/emoteshortcut.h | 2 | ||||
| -rw-r--r-- | src/gui/windows/outfitwindow.cpp | 3 |
5 files changed, 8 insertions, 7 deletions
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/emoteshortcutconsts.h b/src/const/emoteshortcut.h index f4f6498b9..6fe583aa8 100644 --- a/src/emoteshortcutconsts.h +++ b/src/const/emoteshortcut.h @@ -18,9 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EMOTESHORTCUTCONSTS_H -#define EMOTESHORTCUTCONSTS_H +#ifndef CONST_EMOTESHORTCUT_H +#define CONST_EMOTESHORTCUT_H static const int SHORTCUT_EMOTES = 48; -#endif // EMOTESHORTCUTCONSTS_H +#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/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" |