summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-02 09:44:00 +0200
committerNoel Grandin <noel@peralex.com>2016-09-05 08:21:46 +0200
commit933c0679d64a5585ebfd233180a1a818b493eec5 (patch)
tree579f2e3683c219cfe3da7f5ebb90c24d475b570f /include
parent65ca57a447bae97714b1b32aa2df5705215a95ad (diff)
convert HatchStyle to scoped enum
Change-Id: Ibef51ae5ae135ae584791959ec3f7bf78c50e2a8
Diffstat (limited to 'include')
-rw-r--r--include/vcl/vclenum.hxx15
1 files changed, 5 insertions, 10 deletions
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index a6931b354d4e..dc3e8d772755 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -45,17 +45,12 @@ enum GradientStyle
GradientStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
};
-// to avoid conflicts with enum's declared otherwise
-#define HATCH_SINGLE HatchStyle_SINGLE
-#define HATCH_DOUBLE HatchStyle_DOUBLE
-#define HATCH_TRIPLE HatchStyle_TRIPLE
-
-enum HatchStyle
+enum class HatchStyle
{
- HATCH_SINGLE = 0,
- HATCH_DOUBLE = 1,
- HATCH_TRIPLE = 2,
- HatchStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
+ Single = 0,
+ Double = 1,
+ Triple = 2,
+ FORCE_EQUAL_SIZE = SAL_MAX_ENUM
};
enum class LineStyle