diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-01 16:49:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-07 11:20:43 +0200 |
| commit | 8aa3cb98adb8675ff3f09d2c1da35d2423e57493 (patch) | |
| tree | 3e7f2df75f1176a64034be8c7de592dc92996054 /include/vcl | |
| parent | fa52e2090651fc2b2f3ba77b8f0af196d705730f (diff) | |
fdo#84938: convert VCL_INPUT_ #defines to 'enum class'
Change-Id: I155e45f58974a2b946c4a7703b350bcbfbad342e
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/apptypes.hxx | 25 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 2 |
2 files changed, 18 insertions, 9 deletions
diff --git a/include/vcl/apptypes.hxx b/include/vcl/apptypes.hxx index bc0307cf8d86..adc1b88f6d52 100644 --- a/include/vcl/apptypes.hxx +++ b/include/vcl/apptypes.hxx @@ -22,6 +22,7 @@ #include <vcl/dllapi.h> #include <tools/rtti.hxx> +#include <o3tl/typed_flags_set.hxx> #define EXC_RSCNOTLOADED ((sal_uInt16)0x0100) #define EXC_SYSTEM ((sal_uInt16)0x0300) @@ -31,14 +32,22 @@ #define EXC_MAJORTYPE ((sal_uInt16)0xFF00) #define EXC_MINORTYPE ((sal_uInt16)0x00FF) -#define VCL_INPUT_MOUSE 0x0001 -#define VCL_INPUT_KEYBOARD 0x0002 -#define VCL_INPUT_PAINT 0x0004 -#define VCL_INPUT_TIMER 0x0008 -#define VCL_INPUT_OTHER 0x0010 -#define VCL_INPUT_APPEVENT 0x0020 -#define VCL_INPUT_MOUSEANDKEYBOARD (VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD) -#define VCL_INPUT_ANY (VCL_INPUT_MOUSEANDKEYBOARD | VCL_INPUT_PAINT | VCL_INPUT_TIMER | VCL_INPUT_OTHER | VCL_INPUT_APPEVENT) +enum class VclInputFlags { + NONE = 0x0000, + MOUSE = 0x0001, + KEYBOARD = 0x0002, + PAINT = 0x0004, + TIMER = 0x0008, + OTHER = 0x0010, + APPEVENT = 0x0020, +}; +namespace o3tl +{ + template<> struct typed_flags<VclInputFlags> : is_typed_flags<VclInputFlags, 0x003f> {}; +} + +#define VCL_INPUT_MOUSEANDKEYBOARD (VclInputFlags::MOUSE | VclInputFlags::KEYBOARD) +#define VCL_INPUT_ANY (VCL_INPUT_MOUSEANDKEYBOARD | VclInputFlags::PAINT | VclInputFlags::TIMER | VclInputFlags::OTHER | VclInputFlags::APPEVENT) #endif // INCLUDED_VCL_APPTYPES_HXX diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 227f68340907..089c4846fe5e 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -649,7 +649,7 @@ public: @see GetLastInputInterval */ - static bool AnyInput( sal_uInt16 nType = VCL_INPUT_ANY ); + static bool AnyInput( VclInputFlags nType = VCL_INPUT_ANY ); /** The interval from the last time that input was received. |