freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] gsoc-2022-chariri-2 7d9311e 25/30: [ftinspect] Remove


From: Werner Lemberg
Subject: [freetype2-demos] gsoc-2022-chariri-2 7d9311e 25/30: [ftinspect] Remove `syncSettings` and `setDefaults` from `AbstractTab`.
Date: Mon, 11 Jul 2022 07:17:41 -0400 (EDT)

branch: gsoc-2022-chariri-2
commit 7d9311e9737127e6c59ad49408968bc70b50bb9f
Author: Charlie Jiang <w@chariri.moe>
Commit: Charlie Jiang <w@chariri.moe>

    [ftinspect] Remove `syncSettings` and `setDefaults` from `AbstractTab`.
    
    It's unnecessary to call `syncSettings` and `setDefaults` from `MainGUI`.
    The tabs themselves are responsible for managing these.
    
    * src/ftinspect/maingui.cpp: Remove invocation of `syncSettings` and
      `setDefaults`
    
    * src/ftinspect/panels/abstracttab.hpp: As described.
    
    * src/ftinspect/panels/continuous.cpp, src/ftinspect/panels/continuous.hpp:
      Remove the two functions.
    
    * src/ftinspect/panels/singular.cpp, src/ftinspect/panels/singular.cpp:
      Make the two functions not `override` and `private`.
---
 src/ftinspect/maingui.cpp            |  5 +----
 src/ftinspect/panels/abstracttab.hpp |  4 +---
 src/ftinspect/panels/continuous.cpp  | 12 ------------
 src/ftinspect/panels/continuous.hpp  |  2 --
 src/ftinspect/panels/singular.cpp    |  1 +
 src/ftinspect/panels/singular.hpp    |  4 ++--
 6 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/ftinspect/maingui.cpp b/src/ftinspect/maingui.cpp
index 2c78245..ab825ad 100644
--- a/src/ftinspect/maingui.cpp
+++ b/src/ftinspect/maingui.cpp
@@ -255,7 +255,6 @@ void
 MainGUI::syncSettings()
 {
   settingPanel_->syncSettings();
-  tabs_[tabWidget_->currentIndex()]->syncSettings();
 }
 
 
@@ -588,9 +587,7 @@ MainGUI::setDefaults()
   currentFontIndex_ = 0;
   currentFaceIndex_ = 0;
   currentNamedInstanceIndex_ = 0;
-
-  for (auto tab : tabs_)
-    tab->setDefaults();
+  
   checkCurrentFontIndex();
   checkCurrentFaceIndex();
   checkCurrentNamedInstanceIndex();
diff --git a/src/ftinspect/panels/abstracttab.hpp 
b/src/ftinspect/panels/abstracttab.hpp
index 6af6afa..bd27f8d 100644
--- a/src/ftinspect/panels/abstracttab.hpp
+++ b/src/ftinspect/panels/abstracttab.hpp
@@ -11,9 +11,7 @@ class AbstractTab
 {
 public:
   virtual ~AbstractTab() = default; // must be `virtual` for `dynamic_cast`
-
-  virtual void syncSettings() = 0;
-  virtual void setDefaults() = 0;
+  
   virtual void repaintGlyph() = 0;
   virtual void reloadFont() = 0;
 };
diff --git a/src/ftinspect/panels/continuous.cpp 
b/src/ftinspect/panels/continuous.cpp
index d24ff87..452b690 100644
--- a/src/ftinspect/panels/continuous.cpp
+++ b/src/ftinspect/panels/continuous.cpp
@@ -36,12 +36,6 @@ ContinuousTab::reloadFont()
 }
 
 
-void
-ContinuousTab::syncSettings()
-{
-}
-
-
 void
 ContinuousTab::changeTab()
 {
@@ -108,12 +102,6 @@ ContinuousTab::createConnections()
 }
 
 
-void
-ContinuousTab::setDefaults()
-{
-}
-
-
 void
 ContinuousTab::updateCurrentSubTab()
 {
diff --git a/src/ftinspect/panels/continuous.hpp 
b/src/ftinspect/panels/continuous.hpp
index e13e76d..cf6b2f5 100644
--- a/src/ftinspect/panels/continuous.hpp
+++ b/src/ftinspect/panels/continuous.hpp
@@ -31,8 +31,6 @@ public:
 
   void repaintGlyph() override;
   void reloadFont() override;
-  void syncSettings() override;
-  void setDefaults() override;
 
   // Info about current font (glyph count, charmaps...) is flowed to subtab
   // via `updateCurrentSubTab`.
diff --git a/src/ftinspect/panels/singular.cpp 
b/src/ftinspect/panels/singular.cpp
index bf7dcc4..db2bc1f 100644
--- a/src/ftinspect/panels/singular.cpp
+++ b/src/ftinspect/panels/singular.cpp
@@ -16,6 +16,7 @@ SingularTab::SingularTab(QWidget* parent, Engine* engine)
   createConnections();
 
   currentGlyphIndex_ = 0;
+  setDefaults();
   checkShowPoints();
 }
 
diff --git a/src/ftinspect/panels/singular.hpp 
b/src/ftinspect/panels/singular.hpp
index 88481f8..fd68fcb 100644
--- a/src/ftinspect/panels/singular.hpp
+++ b/src/ftinspect/panels/singular.hpp
@@ -41,8 +41,6 @@ public:
 
   void repaintGlyph() override;
   void reloadFont() override;
-  void syncSettings() override;
-  void setDefaults() override;
 
 private slots:
   void setGlyphIndex(int);
@@ -97,6 +95,8 @@ private:
   void createConnections();
   
   void updateGrid();
+  void syncSettings();
+  void setDefaults();
 };
 
 // end of singular.hpp



reply via email to

[Prev in Thread] Current Thread [Next in Thread]