summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-31 20:50:50 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-31 20:50:50 +0300
commitcd5cd6387c8a62f90a8f44c3657812f3e9a4cab9 (patch)
tree46f34660dcf1004d4135a895c74090565be70e17
parentf8d9c685da7cf91310c6824b1bb9eb6940c37e54 (diff)
downloadmv-cd5cd6387c8a62f90a8f44c3657812f3e9a4cab9.tar.gz
mv-cd5cd6387c8a62f90a8f44c3657812f3e9a4cab9.tar.bz2
mv-cd5cd6387c8a62f90a8f44c3657812f3e9a4cab9.tar.xz
mv-cd5cd6387c8a62f90a8f44c3657812f3e9a4cab9.zip
Move inputcondition into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/input/inputcondition.h (renamed from src/input/inputcondition.h)6
-rw-r--r--src/input/inputactionmap.h3
4 files changed, 7 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index df056585f..d036d542d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -970,7 +970,7 @@ SET(SRCS
input/inputactionoperators.cpp
input/inputactionoperators.h
input/inputactionsortfunctor.h
- input/inputcondition.h
+ enums/input/inputcondition.h
input/inputfunction.h
input/inputitem.h
input/inputmanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a5f0383c..050888e8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -500,7 +500,7 @@ SRC += events/actionevent.h \
input/inputactionoperators.cpp \
input/inputactionoperators.h \
input/inputactionsortfunctor.h \
- input/inputcondition.h \
+ enums/input/inputcondition.h \
input/inputfunction.h \
input/inputitem.h \
input/inputmanager.cpp \
diff --git a/src/input/inputcondition.h b/src/enums/input/inputcondition.h
index 0f6e4cb6d..148497551 100644
--- a/src/input/inputcondition.h
+++ b/src/enums/input/inputcondition.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INPUT_INPUTCONDITION_H
-#define INPUT_INPUTCONDITION_H
+#ifndef ENUMS_INPUT_INPUTCONDITION_H
+#define ENUMS_INPUT_INPUTCONDITION_H
namespace InputCondition
{
@@ -56,4 +56,4 @@ namespace InputCondition
};
} // namespace InputCondition
-#endif // INPUT_INPUTCONDITION_H
+#endif // ENUMS_INPUT_INPUTCONDITION_H
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index e08885edb..f76265d98 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -35,8 +35,9 @@
#include "actions/target.h"
#include "actions/windows.h"
+#include "enums/input/inputcondition.h"
+
#include "input/inputactiondata.h"
-#include "input/inputcondition.h"
#include "input/inputmanager.h"
#include "localconsts.h"