[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 52c6c66 2/5: [ftinspect] Minor.
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master 52c6c66 2/5: [ftinspect] Minor. |
Date: |
Wed, 04 May 2016 19:33:05 +0000 |
branch: master
commit 52c6c66d5941e2c2e4d1c20841d2c6bc22d14593
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[ftinspect] Minor.
* src/ftinspect.h (Engine): Add destructor.
(MainGUI): Use point to `engine'.
* src/ftinspect.cpp (Engine::~Engine): Implement.
(MainGUI::update): Updated.
---
ChangeLog | 10 ++++++++++
src/ftinspect.cpp | 11 +++++++++--
src/ftinspect.h | 5 +++--
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index df5187f..0414cbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2016-05-04 Werner Lemberg <address@hidden>
+ [ftinspect] Minor.
+
+ * src/ftinspect.h (Engine): Add destructor.
+ (MainGUI): Use point to `engine'.
+
+ * src/ftinspect.cpp (Engine::~Engine): Implement.
+ (MainGUI::update): Updated.
+
+2016-05-04 Werner Lemberg <address@hidden>
+
[ftinspect] Better intertwine `Engine' and `MainGUI'.
* src/ftinspect.cpp (MainGUI::update): New method.
diff --git a/src/ftinspect.cpp b/src/ftinspect.cpp
index 3711adc..16a89ac 100644
--- a/src/ftinspect.cpp
+++ b/src/ftinspect.cpp
@@ -60,6 +60,13 @@ Engine::Engine()
}
+Engine::~Engine()
+{
+ FTC_Manager_Done(cacheManager);
+ FT_Done_FreeType(library);
+}
+
+
void
Engine::update(const MainGUI& gui)
{
@@ -116,7 +123,7 @@ MainGUI::~MainGUI()
void
-MainGUI::update(const Engine& e)
+MainGUI::update(const Engine* e)
{
engine = e;
}
@@ -831,7 +838,7 @@ main(int argc,
MainGUI gui;
engine.update(gui);
- gui.update(engine);
+ gui.update(&engine);
gui.show();
diff --git a/src/ftinspect.h b/src/ftinspect.h
index f4027c2..7f7ef70 100644
--- a/src/ftinspect.h
+++ b/src/ftinspect.h
@@ -54,6 +54,7 @@ class Engine
{
public:
Engine();
+ ~Engine();
void update(const MainGUI&);
@@ -118,7 +119,7 @@ public:
MainGUI();
~MainGUI();
- void update(const Engine&);
+ void update(const Engine*);
friend class Engine;
@@ -141,7 +142,7 @@ private slots:
void previousFont();
private:
- Engine engine;
+ const Engine* engine;
QStringList fontFileNames;
int currentFontFileIndex;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 52c6c66 2/5: [ftinspect] Minor.,
Werner LEMBERG <=