diff options
Diffstat (limited to 'backends/keymapper')
-rw-r--r-- | backends/keymapper/action.cpp | 5 | ||||
-rw-r--r-- | backends/keymapper/action.h | 12 | ||||
-rw-r--r-- | backends/keymapper/hardware-key.h | 12 | ||||
-rw-r--r-- | backends/keymapper/keymap.cpp | 5 | ||||
-rw-r--r-- | backends/keymapper/keymap.h | 12 | ||||
-rw-r--r-- | backends/keymapper/keymapper.cpp | 6 | ||||
-rw-r--r-- | backends/keymapper/keymapper.h | 12 | ||||
-rw-r--r-- | backends/keymapper/remap-dialog.cpp | 5 | ||||
-rw-r--r-- | backends/keymapper/remap-dialog.h | 8 | ||||
-rw-r--r-- | backends/keymapper/types.h | 12 |
10 files changed, 73 insertions, 16 deletions
diff --git a/backends/keymapper/action.cpp b/backends/keymapper/action.cpp index 8b2490861e..ec2acb31b3 100644 --- a/backends/keymapper/action.cpp +++ b/backends/keymapper/action.cpp @@ -24,6 +24,9 @@ */ #include "backends/keymapper/action.h" + +#ifdef ENABLE_KEYMAPPER + #include "backends/keymapper/keymap.h" namespace Common { @@ -51,3 +54,5 @@ const HardwareKey *Action::getMappedKey() const { } } // end of namespace Common + +#endif // #ifdef ENABLE_KEYMAPPER diff --git a/backends/keymapper/action.h b/backends/keymapper/action.h index ef47930a71..abf0fa0459 100644 --- a/backends/keymapper/action.h +++ b/backends/keymapper/action.h @@ -23,8 +23,12 @@ * */ -#ifndef COMMON_ACTION -#define COMMON_ACTION +#ifndef COMMON_ACTION_H +#define COMMON_ACTION_H + +#include "common/scummsys.h" + +#ifdef ENABLE_KEYMAPPER #include "backends/keymapper/types.h" #include "common/events.h" @@ -113,4 +117,6 @@ struct ActionPriorityComp : public BinaryFunction<Action, Action, bool> { } // end of namespace Common -#endif +#endif // #ifdef ENABLE_KEYMAPPER + +#endif // #ifndef COMMON_ACTION_H diff --git a/backends/keymapper/hardware-key.h b/backends/keymapper/hardware-key.h index 082ecfc944..55cdf3089c 100644 --- a/backends/keymapper/hardware-key.h +++ b/backends/keymapper/hardware-key.h @@ -23,8 +23,12 @@ * */ -#ifndef COMMON_HARDWAREKEY -#define COMMON_HARDWAREKEY +#ifndef COMMON_HARDWARE_KEY_H +#define COMMON_HARDWARE_KEY_H + +#include "common/scummsys.h" + +#ifdef ENABLE_KEYMAPPER #include "backends/keymapper/types.h" @@ -125,4 +129,6 @@ private: } // end of namespace Common -#endif +#endif // #ifdef ENABLE_KEYMAPPER + +#endif // #ifndef COMMON_HARDWARE_KEY_H diff --git a/backends/keymapper/keymap.cpp b/backends/keymapper/keymap.cpp index ee07e36485..c2da8334f9 100644 --- a/backends/keymapper/keymap.cpp +++ b/backends/keymapper/keymap.cpp @@ -24,6 +24,9 @@ */ #include "backends/keymapper/keymap.h" + +#ifdef ENABLE_KEYMAPPER + #include "backends/keymapper/hardware-key.h" #define KEYMAP_KEY_PREFIX "keymap_" @@ -297,3 +300,5 @@ Action *Keymap::getParentMappedAction(KeyState key) { } } // end of namespace Common + +#endif // #ifdef ENABLE_KEYMAPPER diff --git a/backends/keymapper/keymap.h b/backends/keymapper/keymap.h index 438660fd4b..ae8748c37d 100644 --- a/backends/keymapper/keymap.h +++ b/backends/keymapper/keymap.h @@ -23,8 +23,12 @@ * */ -#ifndef COMMON_KEYMAP -#define COMMON_KEYMAP +#ifndef COMMON_KEYMAP_H +#define COMMON_KEYMAP_H + +#include "common/scummsys.h" + +#ifdef ENABLE_KEYMAPPER #include "common/config-manager.h" #include "common/func.h" @@ -145,4 +149,6 @@ private: } // end of namespace Common -#endif +#endif // #ifdef ENABLE_KEYMAPPER + +#endif // #ifndef COMMON_KEYMAP_H diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 5c79d445cb..c64732a618 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -24,7 +24,11 @@ */ #include "backends/keymapper/keymapper.h" + +#ifdef ENABLE_KEYMAPPER + #include "common/config-manager.h" + namespace Common { void Keymapper::Domain::addKeymap(Keymap *map) { @@ -217,3 +221,5 @@ const HardwareKey *Keymapper::getHardwareKey(const KeyState& key) { } } // end of namespace Common + +#endif // #ifdef ENABLE_KEYMAPPER diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index a13cebe39a..74a9432ef7 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -23,8 +23,12 @@ * */ -#ifndef COMMON_KEYMAPPER -#define COMMON_KEYMAPPER +#ifndef COMMON_KEYMAPPER_H +#define COMMON_KEYMAPPER_H + +#include "common/scummsys.h" + +#ifdef ENABLE_KEYMAPPER #include "common/events.h" #include "common/list.h" @@ -201,4 +205,6 @@ private: } // end of namespace Common -#endif +#endif // #ifdef ENABLE_KEYMAPPER + +#endif // #ifndef COMMON_KEYMAPPER_H diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index 1998fa813e..a3c010d28b 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -23,6 +23,9 @@ */ #include "backends/keymapper/remap-dialog.h" + +#ifdef ENABLE_KEYMAPPER + #include "gui/eval.h" #include "gui/newgui.h" #include "gui/PopUpWidget.h" @@ -327,3 +330,5 @@ void RemapDialog::refreshKeymap() { } // end of namespace Common + +#endif // #ifdef ENABLE_KEYMAPPER diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h index f9396e3b45..bff85027c8 100644 --- a/backends/keymapper/remap-dialog.h +++ b/backends/keymapper/remap-dialog.h @@ -25,6 +25,10 @@ #ifndef REMAP_DIALOG_H #define REMAP_DIALOG_H +#include "common/scummsys.h" + +#ifdef ENABLE_KEYMAPPER + #include "backends/keymapper/keymapper.h" #include "gui/dialog.h" @@ -89,4 +93,6 @@ protected: } // end of namespace Common -#endif +#endif // #ifdef ENABLE_KEYMAPPER + +#endif // #ifndef REMAP_DIALOG_H diff --git a/backends/keymapper/types.h b/backends/keymapper/types.h index 8031ab5e38..7ad4c0e538 100644 --- a/backends/keymapper/types.h +++ b/backends/keymapper/types.h @@ -23,8 +23,12 @@ * */ -#ifndef COMMON_TYPES -#define COMMON_TYPES +#ifndef COMMON_TYPES_H +#define COMMON_TYPES_H + +#include "common/scummsys.h" + +#ifdef ENABLE_KEYMAPPER namespace Common { @@ -68,4 +72,6 @@ enum ActionType { } // end of namespace Common -#endif +#endif // #ifdef ENABLE_KEYMAPPER + +#endif // #ifndef COMMON_TYPES_H |