[freetype2-demos] master 4b437c6 07/13: [ftinspect] Make color tables and settings more readable.

[Werner LEMBERG]

branch: master
commit 4b437c65174d125f8c3f1ddef196ec139002ae9b
Author: Philipp Kerling <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [ftinspect] Make color tables and settings more readable.
    
    * src/ftinspect.cpp (MainGUI::setGraphicsDefaults): Use Qt
    constants and `qRgba'.
---
 ChangeLog         |  7 +++++++
 src/ftinspect.cpp | 19 ++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e587be0..d4a36b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-05-11  Philipp Kerling  <address@hidden>
 
+       [ftinspect] Make color tables and settings more readable.
+
+       * src/ftinspect.cpp (MainGUI::setGraphicsDefaults): Use Qt
+       constants and `qRgba'.
+
+2017-05-11  Philipp Kerling  <address@hidden>
+
        [ftinspect] Use symbolic constant for TrueType interpreter v40.
 
        v40 is implemented meanwhile.
diff --git a/src/ftinspect.cpp b/src/ftinspect.cpp
index 607fffd..cf7dc72 100644
--- a/src/ftinspect.cpp
+++ b/src/ftinspect.cpp
@@ -1857,28 +1857,25 @@ MainGUI::setGraphicsDefaults()
 {
   // color tables (with suitable opacity values) for converting
   // FreeType's pixmaps to something Qt understands
-  monoColorTable.append(0x00FFFFFF);
-  monoColorTable.append(0xFF000000);
+  monoColorTable.append(QColor(Qt::transparent).rgba());
+  monoColorTable.append(QColor(Qt::black).rgba());
 
   for (int i = 0xFF; i >= 0; i--)
-    grayColorTable.append((0xFF - i) << 24
-                          | i << 16
-                          | i << 8
-                          | i);
+    grayColorTable.append(qRgba(i, i, i, 0xFF - i));
 
   // XXX make this user-configurable
 
-  axisPen.setColor(QColor(0, 0, 0, 255));        // black
+  axisPen.setColor(Qt::black);
   axisPen.setWidth(0);
   blueZonePen.setColor(QColor(64, 64, 255, 64)); // light blue
   blueZonePen.setWidth(0);
-  gridPen.setColor(QColor(192, 192, 192, 255));  // gray
+  gridPen.setColor(Qt::lightGray);
   gridPen.setWidth(0);
-  offPen.setColor(QColor(0, 128, 0, 255));       // dark green
+  offPen.setColor(Qt::darkGreen);
   offPen.setWidth(3);
-  onPen.setColor(QColor(255, 0, 0, 255));        // red
+  onPen.setColor(Qt::red);
   onPen.setWidth(3);
-  outlinePen.setColor(QColor(255, 0, 0, 255));   // red
+  outlinePen.setColor(Qt::red);
   outlinePen.setWidth(0);
   segmentPen.setColor(QColor(64, 255, 128, 64)); // light green
   segmentPen.setWidth(0);