From 553abfdfa9e00e78cf4da893acb97062b47b9e24 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 8 Aug 2017 00:48:12 +0300 Subject: Move constants from itemshortcut.h into const directory. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/const/itemshortcut.h | 30 ++++++++++++++++++++++++++++++ src/gui/shortcut/itemshortcut.h | 6 ++---- 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 src/const/itemshortcut.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e4bee33a8..1c680d668 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1078,6 +1078,7 @@ SET(SRCS gamemodifiers.cpp gamemodifiers.h const/equipment.h + const/itemshortcut.h const/spells.h const/utils/timer.h const/utils/utf8.h diff --git a/src/Makefile.am b/src/Makefile.am index fd9cc531f..42342a576 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -672,6 +672,7 @@ BASE_SRC += events/actionevent.h \ eventsmanager.cpp \ eventsmanager.h \ const/equipment.h \ + const/itemshortcut.h \ const/spells.h \ const/utils/timer.h \ const/utils/utf8.h \ diff --git a/src/const/itemshortcut.h b/src/const/itemshortcut.h new file mode 100644 index 000000000..002181657 --- /dev/null +++ b/src/const/itemshortcut.h @@ -0,0 +1,30 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2017 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 . + */ + +#ifndef CONST_ITEMSHORTCUT_H +#define CONST_ITEMSHORTCUT_H + +#include "localconsts.h" + +const unsigned int SHORTCUT_ITEMS = 20; +const unsigned int SHORTCUT_TABS = 5; +const size_t SHORTCUT_AUTO_TAB = 4; + +#endif // CONST_ITEMSHORTCUT_H diff --git a/src/gui/shortcut/itemshortcut.h b/src/gui/shortcut/itemshortcut.h index 15324d30c..8aa7a9efc 100644 --- a/src/gui/shortcut/itemshortcut.h +++ b/src/gui/shortcut/itemshortcut.h @@ -23,16 +23,14 @@ #ifndef GUI_SHORTCUT_ITEMSHORTCUT_H #define GUI_SHORTCUT_ITEMSHORTCUT_H +#include "const/itemshortcut.h" + #include "enums/simpletypes/itemcolor.h" #include #include "localconsts.h" -const unsigned int SHORTCUT_ITEMS = 20; -const unsigned int SHORTCUT_TABS = 5; -const size_t SHORTCUT_AUTO_TAB = 4; - class Item; /** -- cgit v1.2.3-60-g2f50