[freetype2-demos] master 46d30df 1/5: [ftinspect] Better intertwine `Engine' and `MainGUI'.

[Werner LEMBERG]

branch: master
commit 46d30df75c0588322ba560e47d496c6580eb3a35
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [ftinspect] Better intertwine `Engine' and `MainGUI'.
    
    * src/ftinspect.cpp (MainGUI::update): New method.
    (main): Use it.
    
    * src/ftinspect.h (Engine): Make it a friend of `MainGUI'.
    (MainGUI): New member `engine'.
    Updated.
---
 ChangeLog         |   11 +++++++++++
 src/ftinspect.cpp |    9 +++++++++
 src/ftinspect.h   |    6 ++++++
 3 files changed, 26 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d056be7..df5187f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2016-05-04  Werner Lemberg  <address@hidden>
 
+       [ftinspect] Better intertwine `Engine' and `MainGUI'.
+
+       * src/ftinspect.cpp (MainGUI::update): New method.
+       (main): Use it.
+
+       * src/ftinspect.h (Engine): Make it a friend of `MainGUI'.
+       (MainGUI): New member `engine'.
+       Updated.
+
+2016-05-04  Werner Lemberg  <address@hidden>
+
        * src/ftinspect.cpp (MainGUI::loadFonts): Improve logic.
 
 2016-05-04  Werner Lemberg  <address@hidden>
diff --git a/src/ftinspect.cpp b/src/ftinspect.cpp
index c150606..3711adc 100644
--- a/src/ftinspect.cpp
+++ b/src/ftinspect.cpp
@@ -115,6 +115,13 @@ MainGUI::~MainGUI()
 }
 
 
+void
+MainGUI::update(const Engine& e)
+{
+  engine = e;
+}
+
+
 // overloading
 
 void
@@ -824,6 +831,8 @@ main(int argc,
   MainGUI gui;
 
   engine.update(gui);
+  gui.update(engine);
+
   gui.show();
 
   return app.exec();
diff --git a/src/ftinspect.h b/src/ftinspect.h
index f5e3999..f4027c2 100644
--- a/src/ftinspect.h
+++ b/src/ftinspect.h
@@ -57,6 +57,8 @@ public:
 
   void update(const MainGUI&);
 
+  friend class MainGUI;
+
 private:
   FT_Library library;
   FTC_Manager cacheManager;
@@ -116,6 +118,8 @@ public:
   MainGUI();
   ~MainGUI();
 
+  void update(const Engine&);
+
   friend class Engine;
 
 protected:
@@ -137,6 +141,8 @@ private slots:
   void previousFont();
 
 private:
+  Engine engine;
+
   QStringList fontFileNames;
   int currentFontFileIndex;