[Libreoffice-commits] core.git: include/vcl

[Noel Grandin]

 include/vcl/keycod.hxx   |    7 ++++++-
 include/vcl/keycodes.hxx |   11 +++++++++--
 include/vcl/vclenum.hxx  |   17 -----------------
 3 files changed, 15 insertions(+), 20 deletions(-)

New commits:
commit 8c1140e6230d14604f17030e22986e338510174c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Sep 12 10:32:31 2017 +0200

    move the key related types to keycod.hxx
    
    so we have all the related definitions in the same header file
    
    Change-Id: I8032c2ae36bc9dd860069b3dafd69207d5636501
    Reviewed-on: https://gerrit.libreoffice.org/42187
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 06843738eee1..405fbd5cd936 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -23,10 +23,15 @@
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/keycodes.hxx>
-#include <vcl/vclenum.hxx>
 
 namespace vcl { class Window; }
 
+enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE,
+                   SAVEAS, PRINT, CLOSE, QUIT,
+                   CUT, COPY, PASTE, UNDO,
+                   REDO, DELETE, REPEAT, FIND,
+                   FINDBACKWARD, PROPERTIES, FRONT };
+
 namespace vcl
 {
 
diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx
index cc7d51ec30b8..8e31c4fe1f2b 100644
--- a/include/vcl/keycodes.hxx
+++ b/include/vcl/keycodes.hxx
@@ -20,12 +20,19 @@
 #ifndef INCLUDED_VCL_KEYCODES_HXX
 #define INCLUDED_VCL_KEYCODES_HXX
 
-#include <vcl/vclenum.hxx>
-#undef DELETE
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
 #include <o3tl/typed_flags_set.hxx>
 
+#define KEY_CODE_MASK       ((sal_uInt16)0x0FFF)
+
+// Modifier keys
+#define KEY_SHIFT           ((sal_uInt16)0x1000)
+#define KEY_MOD1            ((sal_uInt16)0x2000)
+#define KEY_MOD2            ((sal_uInt16)0x4000)
+#define KEY_MOD3            ((sal_uInt16)0x8000)
+#define KEY_MODIFIERS_MASK  ((sal_uInt16)0xF000)
+
 // Key groups
 #define KEYGROUP_NUM    ((sal_uInt16)css::awt::KeyGroup::NUM)
 #define KEYGROUP_ALPHA  ((sal_uInt16)css::awt::KeyGroup::ALPHA)
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 02c49e2c87d7..e31c7cc70e50 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -25,12 +25,6 @@
 
 enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_SEC_CS };
 
-enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE,
-                   SAVEAS, PRINT, CLOSE, QUIT,
-                   CUT, COPY, PASTE, UNDO,
-                   REDO, DELETE, REPEAT, FIND,
-                   FINDBACKWARD, PROPERTIES, FRONT };
-
 enum class MenuItemType { DONTKNOW, STRING, IMAGE, STRINGIMAGE, SEPARATOR };
 
 enum class MenuItemBits : sal_Int16
@@ -124,17 +118,6 @@ namespace o3tl
     template<> struct typed_flags<WindowBorderStyle> : is_typed_flags<WindowBorderStyle, 0x3033> {};
 }
 
-#define KEY_CODE_MASK       ((sal_uInt16)0x0FFF)
-
-// Modifier keys
-#define KEY_SHIFT           ((sal_uInt16)0x1000)
-#define KEY_MOD1            ((sal_uInt16)0x2000)
-#define KEY_MOD2            ((sal_uInt16)0x4000)
-#define KEY_MOD3            ((sal_uInt16)0x8000)
-#define KEY_MODIFIERS_MASK  ((sal_uInt16)0xF000)
-
-
-
 enum class ExtTimeFieldFormat
 {
     Short24H, Long24H