[freetype2-demos] master 7a77d81 1/4: [ftinspect] Make `MainGUI' and `Engine' classes more symmetric.

[Werner LEMBERG]

branch: master
commit 7a77d8172e7854300010d182871edf9f1c74da42
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [ftinspect] Make `MainGUI' and `Engine' classes more symmetric.
    
    Also avoid `const' issues.
    
    * src/ftinspect.h (Engine): Add `gui' field.
    Updated.
    (MainGUI): Don't use `const' for `engine'.
    Updated.
    
    * src/ftinspect.cpp (Engine::Engine, Engine::update): Updated.
    (MainGUI::update, main): Updated.
---
 ChangeLog         |   14 ++++++++++++++
 src/ftinspect.cpp |   52 +++++++++++++++++++++++++++-------------------------
 src/ftinspect.h   |   10 ++++++----
 3 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30d3011..e71acea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-05-05  Werner Lemberg  <address@hidden>
+
+       [ftinspect] Make `MainGUI' and `Engine' classes more symmetric.
+
+       Also avoid `const' issues.
+
+       * src/ftinspect.h (Engine): Add `gui' field.
+       Updated.
+       (MainGUI): Don't use `const' for `engine'.
+       Updated.
+
+       * src/ftinspect.cpp (Engine::Engine, Engine::update): Updated.
+       (MainGUI::update, main): Updated.
+
 2016-05-04  Werner Lemberg  <address@hidden>
 
        [ftinspect] Add buttons for instances.
diff --git a/src/ftinspect.cpp b/src/ftinspect.cpp
index 90f252d..f79c892 100644
--- a/src/ftinspect.cpp
+++ b/src/ftinspect.cpp
@@ -36,8 +36,10 @@ faceRequester(FTC_FaceID faceID,
 }
 
 
-Engine::Engine(MainGUI& gui)
+Engine::Engine(MainGUI* g)
 {
+  gui = g;
+
   FT_Error error;
 
   error = FT_Init_FreeType(&library);
@@ -47,7 +49,7 @@ Engine::Engine(MainGUI& gui)
   }
 
   error = FTC_Manager_New(library, 0, 0, 0,
-                          faceRequester, &gui, &cacheManager);
+                          faceRequester, gui, &cacheManager);
   if (error)
   {
     // XXX error handling
@@ -65,7 +67,7 @@ Engine::Engine(MainGUI& gui)
     // XXX error handling
   }
 
-  update(gui);
+  update();
 }
 
 
@@ -77,37 +79,37 @@ Engine::~Engine()
 
 
 void
-Engine::update(MainGUI& gui)
+Engine::update()
 {
-  dpi = gui.dpiSpinBox->value();
-  zoom = gui.zoomSpinBox->value();
+  dpi = gui->dpiSpinBox->value();
+  zoom = gui->zoomSpinBox->value();
 
-  if (gui.unitsComboBox->currentIndex() == MainGUI::Units_px)
+  if (gui->unitsComboBox->currentIndex() == MainGUI::Units_px)
   {
-    pointSize = gui.sizeDoubleSpinBox->value();
+    pointSize = gui->sizeDoubleSpinBox->value();
     pixelSize = pointSize * dpi / 72.0;
   }
   else
   {
-    pixelSize = gui.sizeDoubleSpinBox->value();
+    pixelSize = gui->sizeDoubleSpinBox->value();
     pointSize = pixelSize * 72.0 / dpi;
   }
 
-  doHorizontalHinting = gui.horizontalHintingCheckBox->isChecked();
-  doVerticalHinting = gui.verticalHintingCheckBox->isChecked();
-  doBlueZoneHinting = gui.blueZoneHintingCheckBox->isChecked();
-  showSegments = gui.segmentDrawingCheckBox->isChecked();
-  doWarping = gui.warpingCheckBox->isChecked();
+  doHorizontalHinting = gui->horizontalHintingCheckBox->isChecked();
+  doVerticalHinting = gui->verticalHintingCheckBox->isChecked();
+  doBlueZoneHinting = gui->blueZoneHintingCheckBox->isChecked();
+  showSegments = gui->segmentDrawingCheckBox->isChecked();
+  doWarping = gui->warpingCheckBox->isChecked();
 
-  showBitmap = gui.showBitmapCheckBox->isChecked();
-  showPoints = gui.showPointsCheckBox->isChecked();
+  showBitmap = gui->showBitmapCheckBox->isChecked();
+  showPoints = gui->showPointsCheckBox->isChecked();
   if (showPoints)
-    showPointIndices = gui.showPointIndicesCheckBox->isChecked();
+    showPointIndices = gui->showPointIndicesCheckBox->isChecked();
   else
     showPointIndices = false;
-  showOutlines = gui.showOutlinesCheckBox->isChecked();
+  showOutlines = gui->showOutlinesCheckBox->isChecked();
 
-  gamma = gui.gammaSlider->value();
+  gamma = gui->gammaSlider->value();
 }
 
 
@@ -132,7 +134,7 @@ MainGUI::~MainGUI()
 
 
 void
-MainGUI::update(const Engine* e)
+MainGUI::update(Engine* e)
 {
   engine = e;
 }
@@ -368,8 +370,8 @@ MainGUI::checkCurrentInstanceIndex()
     if (currentFaceIndex < 0)
       numInstances = 0;
     else
-      numInstances = fonts[currentFontIndex].
-                       numInstancesList[currentFaceIndex];
+      numInstances = fonts[currentFontIndex]
+                       .numInstancesList[currentFaceIndex];
   }
 
   if (numInstances < 2)
@@ -455,8 +457,8 @@ MainGUI::previousInstance()
 void
 MainGUI::nextInstance()
 {
-  int numInstances = fonts[currentFontIndex].
-                       numInstancesList[currentFaceIndex];
+  int numInstances = fonts[currentFontIndex]
+                       .numInstancesList[currentFaceIndex];
 
   if (currentInstanceIndex < numInstances - 1)
   {
@@ -931,7 +933,7 @@ main(int argc,
   app.setOrganizationDomain("freetype.org");
 
   MainGUI gui;
-  Engine engine(gui);
+  Engine engine(&gui);
 
   gui.update(&engine);
 
diff --git a/src/ftinspect.h b/src/ftinspect.h
index 4e4ebed..216b0bb 100644
--- a/src/ftinspect.h
+++ b/src/ftinspect.h
@@ -62,14 +62,16 @@ struct FaceID
 class Engine
 {
 public:
-  Engine(MainGUI&);
+  Engine(MainGUI*);
   ~Engine();
 
-  void update(MainGUI&);
+  void update();
 
   friend class MainGUI;
 
 private:
+  MainGUI* gui;
+
   FT_Library library;
   FTC_Manager cacheManager;
   FTC_ImageCache imageCache;
@@ -128,7 +130,7 @@ public:
   MainGUI();
   ~MainGUI();
 
-  void update(const Engine*);
+  void update(Engine*);
 
   friend class Engine;
   friend FT_Error faceRequester(FTC_FaceID,
@@ -158,7 +160,7 @@ private slots:
   void previousInstance();
 
 private:
-  const Engine* engine;
+  Engine* engine;
 
   QList<Font> fonts;
   int currentFontIndex;