Bulk conversion of ::sizeHintEvent(const ftk::SizeHintEvent& event) to ::getSizeHint(). These are all ripe for a refactor to create a ToucanWidget class which removes the redunancy of such instance functions

leighsmith · leighsmith · commit 5bfbe815a24e · 2026-06-30T15:14:24.000-04:00
diff --git a/lib/toucanView/BackgroundTool.cpp b/lib/toucanView/BackgroundTool.cpp
@@ -125,10 +125,9 @@ namespace toucan
         _scrollWidget->setGeometry(value);
     }
 
-    void BackgroundTool::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I BackgroundTool::getSizeHint() const
     {
-        IToolWidget::sizeHintEvent(event);
-        _setSizeHint(_scrollWidget->getSizeHint());
+        return _scrollWidget->getSizeHint();
     }
 
     void BackgroundTool::_widgetUpdate()
diff --git a/lib/toucanView/BackgroundTool.h b/lib/toucanView/BackgroundTool.h
@@ -36,7 +36,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         void _widgetUpdate();
diff --git a/lib/toucanView/CompareTool.cpp b/lib/toucanView/CompareTool.cpp
@@ -78,10 +78,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void CompareWidget::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I CompareWidget::getSizeHint() const
     {
-        IWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void CompareTool::_init(
@@ -209,10 +208,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void CompareTool::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I CompareTool::getSizeHint() const
     {
-        IToolWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void CompareTool::_widgetUpdate()
diff --git a/lib/toucanView/CompareTool.h b/lib/toucanView/CompareTool.h
@@ -43,7 +43,7 @@ namespace toucan
         void setBCallback(const std::function<void(bool)>&);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         bool _current = false;
@@ -73,7 +73,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I CompareTool::getSizeHint() const override;
 
     private:
         void _widgetUpdate();
diff --git a/lib/toucanView/DetailsTool.cpp b/lib/toucanView/DetailsTool.cpp
@@ -115,10 +115,9 @@ namespace toucan
         _bellows->setGeometry(value);
     }
 
-    void DetailsWidget::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I DetailsWidget::getSizeHint() const
     {
-        IWidget::sizeHintEvent(event);
-        _setSizeHint(_bellows->isVisible(false) ? _bellows->getSizeHint() : ftk::Size2I());
+        return _bellows->isVisible(false) ? _bellows->getSizeHint() : ftk::Size2I();
     }
 
     void DetailsWidget::_textUpdate()
@@ -345,9 +344,8 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void DetailsTool::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I DetailsTool::getSizeHint() const
     {
-        IToolWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 }
diff --git a/lib/toucanView/DetailsTool.h b/lib/toucanView/DetailsTool.h
@@ -55,7 +55,7 @@ namespace toucan
         void setSearch(const std::string&);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         void _textUpdate();
@@ -96,7 +96,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         std::shared_ptr<ftk::VerticalLayout> _layout;
diff --git a/lib/toucanView/ExportTool.cpp b/lib/toucanView/ExportTool.cpp
@@ -91,10 +91,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void ExportWidget::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I ExportWidget::getSizeHint() const
     {
-        IWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void ExportWidget::_initSettings(
@@ -551,9 +550,8 @@ namespace toucan
         _scrollWidget->setGeometry(value);
     }
 
-    void ExportTool::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I ExportTool::getSizeHint() const
     {
-        IToolWidget::sizeHintEvent(event);
-        _setSizeHint(_scrollWidget->getSizeHint());
+        return _scrollWidget->getSizeHint();
     }
 }
diff --git a/lib/toucanView/ExportTool.h b/lib/toucanView/ExportTool.h
@@ -46,7 +46,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         struct SettingsValues
@@ -134,7 +134,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         std::shared_ptr<ftk::ScrollWidget> _scrollWidget;
diff --git a/lib/toucanView/FileTab.cpp b/lib/toucanView/FileTab.cpp
@@ -51,9 +51,8 @@ namespace toucan
         _hudWidget->setGeometry(value);
     }
 
-    void FileTab::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I FileTab::getSizeHint() const
     {
-        ftk::IWidget::sizeHintEvent(event);
-        _setSizeHint(_viewport->getSizeHint());
+        return _viewport->getSizeHint();
     }
 }
diff --git a/lib/toucanView/FileTab.h b/lib/toucanView/FileTab.h
@@ -35,7 +35,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         std::shared_ptr<Viewport> _viewport;
diff --git a/lib/toucanView/FileToolBar.cpp b/lib/toucanView/FileToolBar.cpp
@@ -65,10 +65,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void FileToolBar::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I FileToolBar::getSizeHint() const
     {
-        IWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void FileToolBar::_widgetUpdate()
diff --git a/lib/toucanView/FileToolBar.h b/lib/toucanView/FileToolBar.h
@@ -34,7 +34,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         void _widgetUpdate();
diff --git a/lib/toucanView/GraphTool.cpp b/lib/toucanView/GraphTool.cpp
@@ -253,9 +253,8 @@ namespace toucan
         _scrollWidget->setGeometry(value);
     }
 
-    void GraphTool::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I GraphTool::getSizeHint() const
     {
-        IToolWidget::sizeHintEvent(event);
-        _setSizeHint(_scrollWidget->getSizeHint());
+        return _scrollWidget->getSizeHint();
     }
 }
diff --git a/lib/toucanView/GraphTool.h b/lib/toucanView/GraphTool.h
@@ -35,7 +35,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
         void drawEvent(const ftk::Box2I&, const ftk::DrawEvent&) override;
 
     private:
diff --git a/lib/toucanView/InfoBar.cpp b/lib/toucanView/InfoBar.cpp
@@ -76,9 +76,8 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void InfoBar::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I InfoBar::getSizeHint() const
     {
-        IWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 }
diff --git a/lib/toucanView/InfoBar.h b/lib/toucanView/InfoBar.h
@@ -33,7 +33,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         std::shared_ptr<ftk::HorizontalLayout> _layout;
diff --git a/lib/toucanView/JSONTool.cpp b/lib/toucanView/JSONTool.cpp
@@ -81,10 +81,9 @@ namespace toucan
         _bellows->setGeometry(value);
     }
 
-    void JSONWidget::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I JSONWidget::getSizeHint() const
     {
-        IWidget::sizeHintEvent(event);
-        _setSizeHint(_bellows->getSizeHint());
+        return _bellows->getSizeHint();
     }
 
     void JSONWidget::_textUpdate()
@@ -238,9 +237,8 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void JSONTool::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I JSONTool::getSizeHint() const
     {
-        IToolWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 }
diff --git a/lib/toucanView/JSONTool.h b/lib/toucanView/JSONTool.h
@@ -45,7 +45,7 @@ namespace toucan
         void setSearch(const std::string&);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         void _textUpdate();
@@ -78,7 +78,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         std::shared_ptr<File> _file;
diff --git a/lib/toucanView/LogTool.cpp b/lib/toucanView/LogTool.cpp
@@ -99,10 +99,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void LogTool::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I LogTool::getSizeHint() const
     {
-        IToolWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void LogTool::_textUpdate()
diff --git a/lib/toucanView/LogTool.h b/lib/toucanView/LogTool.h
@@ -33,7 +33,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         void _textUpdate();
diff --git a/lib/toucanView/MainWindow.cpp b/lib/toucanView/MainWindow.cpp
@@ -235,10 +235,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void MainWindow::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I MainWindow::getSizeHint() const
     {
-        ftk::Window::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void MainWindow::keyPressEvent(ftk::KeyEvent& event)
diff --git a/lib/toucanView/MainWindow.h b/lib/toucanView/MainWindow.h
@@ -45,7 +45,7 @@ namespace toucan
             const ftk::Size2I&);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
         void keyPressEvent(ftk::KeyEvent&) override;
         void keyReleaseEvent(ftk::KeyEvent&) override;
 
diff --git a/lib/toucanView/PlaybackBar.cpp b/lib/toucanView/PlaybackBar.cpp
@@ -154,10 +154,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void PlaybackBar::sizeHintEvent(const ftk::SizeHintEvent& event)
+    Size2I PlaybackBar::getSizeHint() const
     {
-        IWidget::sizeHintEvent(event);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void PlaybackBar::_timelineUpdate()
diff --git a/lib/toucanView/PlaybackBar.h b/lib/toucanView/PlaybackBar.h
@@ -34,7 +34,7 @@ namespace toucan
             const std::shared_ptr<IWidget>& parent = nullptr);
 
         void setGeometry(const ftk::Box2I&) override;
-        void sizeHintEvent(const ftk::SizeHintEvent&) override;
+        Size2I getSizeHint() const override;
 
     private:
         void _timelineUpdate();
diff --git a/lib/toucanView/TimeWidgets.cpp b/lib/toucanView/TimeWidgets.cpp
@@ -82,10 +82,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void FrameButtons::sizeHintEvent(const ftk::SizeHintEvent& value)
+    Size2I FrameButtons::getSizeHint() const
     {
-        IWidget::sizeHintEvent(value);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void PlaybackButtons::_init(
@@ -160,10 +159,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void PlaybackButtons::sizeHintEvent(const ftk::SizeHintEvent& value)
+    Size2I PlaybackButtons::getSizeHint() const
     {
-        IWidget::sizeHintEvent(value);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void PlaybackButtons::_playbackUpdate()
@@ -259,10 +257,9 @@ namespace toucan
         _layout->setGeometry(value);
     }
 
-    void TimeEdit::sizeHintEvent(const ftk::SizeHintEvent& value)
+    Size2I TimeEdit::getSizeHint() const
     {
-        IWidget::sizeHintEvent(value);
-        _setSizeHint(_layout->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void TimeEdit::keyPressEvent(ftk::KeyEvent& event)
@@ -384,10 +381,9 @@ namespace toucan
         _label->setGeometry(value);
     }
 
-    void TimeLabel::sizeHintEvent(const ftk::SizeHintEvent& value)
+    Size2I TimeLabel::getSizeHint() const
     {
-        IWidget::sizeHintEvent(value);
-        _setSizeHint(_label->getSizeHint());
+        return _layout->getSizeHint();
     }
 
     void TimeLabel::_timeUpdate()
diff --git a/lib/toucanView/TimeWidgets.h b/lib/toucanView/TimeWidgets.h
diff --git a/lib/toucanView/TimelineWidget.cpp b/lib/toucanView/TimelineWidget.cpp
diff --git a/lib/toucanView/TimelineWidget.h b/lib/toucanView/TimelineWidget.h
diff --git a/lib/toucanView/ToolBar.cpp b/lib/toucanView/ToolBar.cpp
diff --git a/lib/toucanView/ToolBar.h b/lib/toucanView/ToolBar.h
diff --git a/lib/toucanView/ViewToolBar.cpp b/lib/toucanView/ViewToolBar.cpp
diff --git a/lib/toucanView/ViewToolBar.h b/lib/toucanView/ViewToolBar.h
diff --git a/lib/toucanView/WindowToolBar.cpp b/lib/toucanView/WindowToolBar.cpp
diff --git a/lib/toucanView/WindowToolBar.h b/lib/toucanView/WindowToolBar.h

Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,9 @@ namespace toucan`
`125`	`125`	`_scrollWidget->setGeometry(value);`
`126`	`126`	`}`
`127`	`127`
`128`		`- void BackgroundTool::sizeHintEvent(const ftk::SizeHintEvent& event)`
	`128`	`+ Size2I BackgroundTool::getSizeHint() const`
`129`	`129`	`{`
`130`		`- IToolWidget::sizeHintEvent(event);`
`131`		`- _setSizeHint(_scrollWidget->getSizeHint());`
	`130`	`+ return _scrollWidget->getSizeHint();`
`132`	`131`	`}`
`133`	`132`
`134`	`133`	`void BackgroundTool::_widgetUpdate()`
Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,9 @@ namespace toucan`
`78`	`78`	`_layout->setGeometry(value);`
`79`	`79`	`}`
`80`	`80`
`81`		`- void CompareWidget::sizeHintEvent(const ftk::SizeHintEvent& event)`
	`81`	`+ Size2I CompareWidget::getSizeHint() const`
`82`	`82`	`{`
`83`		`- IWidget::sizeHintEvent(event);`
`84`		`- _setSizeHint(_layout->getSizeHint());`
	`83`	`+ return _layout->getSizeHint();`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`void CompareTool::_init(`
`@@ -209,10 +208,9 @@ namespace toucan`
`209`	`208`	`_layout->setGeometry(value);`
`210`	`209`	`}`
`211`	`210`
`212`		`- void CompareTool::sizeHintEvent(const ftk::SizeHintEvent& event)`
	`211`	`+ Size2I CompareTool::getSizeHint() const`
`213`	`212`	`{`
`214`		`- IToolWidget::sizeHintEvent(event);`
`215`		`- _setSizeHint(_layout->getSizeHint());`
	`213`	`+ return _layout->getSizeHint();`
`216`	`214`	`}`
`217`	`215`
`218`	`216`	`void CompareTool::_widgetUpdate()`
Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,9 @@ namespace toucan`
`115`	`115`	`_bellows->setGeometry(value);`
`116`	`116`	`}`
`117`	`117`
`118`		`- void DetailsWidget::sizeHintEvent(const ftk::SizeHintEvent& event)`
	`118`	`+ Size2I DetailsWidget::getSizeHint() const`
`119`	`119`	`{`
`120`		`- IWidget::sizeHintEvent(event);`
`121`		`- _setSizeHint(_bellows->isVisible(false) ? _bellows->getSizeHint() : ftk::Size2I());`
	`120`	`+ return _bellows->isVisible(false) ? _bellows->getSizeHint() : ftk::Size2I();`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`void DetailsWidget::_textUpdate()`
`@@ -345,9 +344,8 @@ namespace toucan`
`345`	`344`	`_layout->setGeometry(value);`
`346`	`345`	`}`
`347`	`346`
`348`		`- void DetailsTool::sizeHintEvent(const ftk::SizeHintEvent& event)`
	`347`	`+ Size2I DetailsTool::getSizeHint() const`
`349`	`348`	`{`
`350`		`- IToolWidget::sizeHintEvent(event);`
`351`		`- _setSizeHint(_layout->getSizeHint());`
	`349`	`+ return _layout->getSizeHint();`
`352`	`350`	`}`
`353`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,9 @@ namespace toucan`
`91`	`91`	`_layout->setGeometry(value);`
`92`	`92`	`}`
`93`	`93`
`94`		`- void ExportWidget::sizeHintEvent(const ftk::SizeHintEvent& event)`
	`94`	`+ Size2I ExportWidget::getSizeHint() const`
`95`	`95`	`{`
`96`		`- IWidget::sizeHintEvent(event);`
`97`		`- _setSizeHint(_layout->getSizeHint());`
	`96`	`+ return _layout->getSizeHint();`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`void ExportWidget::_initSettings(`
`@@ -551,9 +550,8 @@ namespace toucan`
`551`	`550`	`_scrollWidget->setGeometry(value);`
`552`	`551`	`}`
`553`	`552`
`554`		`- void ExportTool::sizeHintEvent(const ftk::SizeHintEvent& event)`
	`553`	`+ Size2I ExportTool::getSizeHint() const`
`555`	`554`	`{`
`556`		`- IToolWidget::sizeHintEvent(event);`
`557`		`- _setSizeHint(_scrollWidget->getSizeHint());`
	`555`	`+ return _scrollWidget->getSizeHint();`
`558`	`556`	`}`
`559`	`557`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,8 @@ namespace toucan`
`51`	`51`	`_hudWidget->setGeometry(value);`
`52`	`52`	`}`
`53`	`53`
`54`		`- void FileTab::sizeHintEvent(const ftk::SizeHintEvent& event)`
	`54`	`+ Size2I FileTab::getSizeHint() const`
`55`	`55`	`{`
`56`		`- ftk::IWidget::sizeHintEvent(event);`
`57`		`- _setSizeHint(_viewport->getSizeHint());`
	`56`	`+ return _viewport->getSizeHint();`
`58`	`57`	`}`
`59`	`58`	`}`