convert basebmp::Format to scoped enum

Change-Id: I6eb213d6dcf387936967271fba9e2de3879ef479

1 files changed, 21 insertions, 21 deletions

diff --git a/include/basebmp/scanlineformats.hxx b/include/basebmp/scanlineformats.hxx
index b1a54b46b320..ec246d2d1409 100644
--- a/include/basebmp/scanlineformats.hxx
+++ b/include/basebmp/scanlineformats.hxx
@@ -26,33 +26,33 @@
 
 namespace basebmp {
 
-enum Format
+enum class Format
 {
-    FORMAT_NONE,
-    FORMAT_ONE_BIT_MSB_GREY,
-    FORMAT_ONE_BIT_LSB_GREY,
-    FORMAT_ONE_BIT_MSB_PAL,
-    FORMAT_ONE_BIT_LSB_PAL,
-    FORMAT_FOUR_BIT_MSB_GREY,
-    FORMAT_FOUR_BIT_LSB_GREY,
-    FORMAT_FOUR_BIT_MSB_PAL,
-    FORMAT_FOUR_BIT_LSB_PAL,
-    FORMAT_EIGHT_BIT_PAL,
-    FORMAT_EIGHT_BIT_GREY,
-    FORMAT_SIXTEEN_BIT_LSB_TC_MASK,
-    FORMAT_SIXTEEN_BIT_MSB_TC_MASK,
-    FORMAT_TWENTYFOUR_BIT_TC_MASK,
+    NONE,
+    OneBitMsbGrey,
+    OneBitLsbGrey,
+    OneBitMsbPal,
+    OneBitLsbPal,
+    FourBitMsbGrey,
+    FourBitLsbGrey,
+    FourBitMsbPal,
+    FourBitLsbPal,
+    EightBitPal,
+    EightBitGrey,
+    SixteenBitLsbTcMask,
+    SixteenBitMsbTcMask,
+    TwentyFourBitTcMask,
     // CAIRO_FORMAT_RGB24, each pixel is a 32-bit quantity, with the upper 8
     // bits unused. Red, Green, and Blue are stored in the remaining 24 bits in
     // that order (below U is for unused)
-    FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX,
+    ThirtyTwoBitTcMaskBGRX,
     // The order of the channels code letters indicates the order of the
     // channel bytes in memory
-    FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
-    FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB,
-    FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR,
-    FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA,
-    FORMAT_MAX = FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA
+    ThirtyTwoBitTcMaskBGRA,
+    ThirtyTwoBitTcMaskARGB,
+    ThirtyTwoBitTcMaskABGR,
+    ThirtyTwoBitTcMaskRGBA,
+    LAST = ThirtyTwoBitTcMaskRGBA
 };
 
 const char *formatName(Format nScanlineFormat);