diff options
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 }; |