[freetype2-demos] master 57b0491 6/7: [ftinspect] Rename some enum values.

[Werner LEMBERG]

branch: master
commit 57b0491e08b9c0a00c2e941c84f6b401972748ea
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [ftinspect] Rename some enum values.
    
    * src/ftinspect.cpp, src/ftinspect.h: Updated.
---
 ChangeLog         |    6 ++++++
 src/ftinspect.cpp |   16 ++++++++--------
 src/ftinspect.h   |   12 ++++++------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 055c179..5c4d478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-05-01  Werner Lemberg  <address@hidden>
 
+       [ftinspect] Rename some enum values.
+
+       * src/ftinspect.cpp, src/ftinspect.h: Updated.
+
+2016-05-01  Werner Lemberg  <address@hidden>
+
        [ftinspect] Provide dummy default values for GUI initialization.
 
        * src/ftinspect.cpp (MainGUI::setDefaults): Set some values.
diff --git a/src/ftinspect.cpp b/src/ftinspect.cpp
index 8010ed5..4a6418b 100644
--- a/src/ftinspect.cpp
+++ b/src/ftinspect.cpp
@@ -170,11 +170,11 @@ MainGUI::createLayout()
                                    tr("Normal"));
   antiAliasingComboBox->insertItem(AntiAliasing_Slight,
                                    tr("Slight"));
-  antiAliasingComboBox->insertItem(AntiAliasing_LCD_RGB,
+  antiAliasingComboBox->insertItem(AntiAliasing_LCD,
                                    tr("LCD (RGB)"));
   antiAliasingComboBox->insertItem(AntiAliasing_LCD_BGR,
                                    tr("LCD (BGR)"));
-  antiAliasingComboBox->insertItem(AntiAliasing_LCD_Vertical_RGB,
+  antiAliasingComboBox->insertItem(AntiAliasing_LCD_Vertical,
                                    tr("LCD (vert. RGB)"));
   antiAliasingComboBox->insertItem(AntiAliasing_LCD_Vertical_BGR,
                                    tr("LCD (vert. BGR)"));
@@ -183,10 +183,10 @@ MainGUI::createLayout()
   lcdFilterLabel = new QLabel(tr("LCD Filter"));
   lcdFilterLabel->setAlignment(Qt::AlignRight);
   lcdFilterComboBox = new QComboBox;
-  lcdFilterComboBox->insertItem(LCD_Default, tr("Default"));
-  lcdFilterComboBox->insertItem(LCD_Light, tr("Light"));
-  lcdFilterComboBox->insertItem(LCD_None, tr("None"));
-  lcdFilterComboBox->insertItem(LCD_Legacy, tr("Legacy"));
+  lcdFilterComboBox->insertItem(LCDFilter_Default, tr("Default"));
+  lcdFilterComboBox->insertItem(LCDFilter_Light, tr("Light"));
+  lcdFilterComboBox->insertItem(LCDFilter_None, tr("None"));
+  lcdFilterComboBox->insertItem(LCDFilter_Legacy, tr("Legacy"));
   lcdFilterLabel->setBuddy(lcdFilterComboBox);
 
   int width;
@@ -448,8 +448,8 @@ MainGUI::setDefaults()
   // XXX only dummy values right now
 
   hintingModeComboBox->setCurrentIndex(HintingMode_TrueType_v35);
-  antiAliasingComboBox->setCurrentIndex(AntiAliasing_LCD_RGB);
-  lcdFilterComboBox->setCurrentIndex(LCD_Light);
+  antiAliasingComboBox->setCurrentIndex(AntiAliasing_LCD);
+  lcdFilterComboBox->setCurrentIndex(LCDFilter_Light);
 
   showBitmapsCheckBox->setChecked(true);
   showOutlinesCheckBox->setChecked(true);
diff --git a/src/ftinspect.h b/src/ftinspect.h
index 1154566..0cdf5c8 100644
--- a/src/ftinspect.h
+++ b/src/ftinspect.h
@@ -129,9 +129,9 @@ private:
     AntiAliasing_None,
     AntiAliasing_Normal,
     AntiAliasing_Slight,
-    AntiAliasing_LCD_RGB,
+    AntiAliasing_LCD,
     AntiAliasing_LCD_BGR,
-    AntiAliasing_LCD_Vertical_RGB,
+    AntiAliasing_LCD_Vertical,
     AntiAliasing_LCD_Vertical_BGR
   };
   enum HintingModes
@@ -145,10 +145,10 @@ private:
   };
   enum LCDFilter
   {
-    LCD_Default,
-    LCD_Light,
-    LCD_None,
-    LCD_Legacy
+    LCDFilter_Default,
+    LCDFilter_Light,
+    LCDFilter_None,
+    LCDFilter_Legacy
   };
 
   void createActions();