diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-02 08:36:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | 65ca57a447bae97714b1b32aa2df5705215a95ad (patch) | |
| tree | 9b62f8fb4a890d5fcba13abc446b3244e9c5232f /include | |
| parent | a881fd7e66294ada222e1d618a7d47a0549a2342 (diff) | |
convert LineStyle to scoped enum
Change-Id: I30cfa5a0649b806604c443f55683d1f2a430983d
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/lineinfo.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/vclenum.hxx | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index e36c1c0b4747..99dda6242cf8 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -53,7 +53,7 @@ struct ImplLineInfo class VCL_DLLPUBLIC LineInfo { public: - LineInfo( LineStyle eLineStyle = LINE_SOLID, long nWidth = 0L ); + LineInfo( LineStyle eLineStyle = LineStyle::Solid, long nWidth = 0L ); LineInfo( const LineInfo& rLineInfo ); LineInfo( LineInfo&& rLineInfo ); ~LineInfo(); diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 0934db7d539e..a6931b354d4e 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -58,17 +58,12 @@ enum HatchStyle HatchStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM }; -// to avoid conflicts with enum's declared otherwise -#define LINE_NONE LineStyle_NONE -#define LINE_SOLID LineStyle_SOLID -#define LINE_DASH LineStyle_DASH - -enum LineStyle +enum class LineStyle { - LINE_NONE = 0, - LINE_SOLID = 1, - LINE_DASH = 2, - LineStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM + NONE = 0, + Solid = 1, + Dash = 2, + FORCE_EQUAL_SIZE = SAL_MAX_ENUM }; enum class RasterOp { OverPaint, Xor, N0, N1, Invert }; |