[Git][freetype/freetype-demos][gsoc-2022-chariri] [ftinspect] Resolve naming confliction for `repaint` function.

[Charlie Jiang (@cqjjjzr)]

Charlie Jiang pushed to branch gsoc-2022-chariri at FreeType / FreeType Demo Programs

Commits:

• 3e66c56e
  by Charlie Jiang at 2022-07-08T08:42:29+08:00

  [ftinspect] Resolve naming confliction for `repaint` function.
  
  `repaint` function in `AbstractTab` class conflicts with `repaint` func in
  `QWidget`, so we rename it to `repaintGlyph`.
  
  src/ftinspect/**: As described.
  

4 changed files:

• src/ftinspect/maingui.cpp
• src/ftinspect/panels/abstracttab.hpp
• src/ftinspect/panels/singular.cpp
• src/ftinspect/panels/singular.hpp

Changes:

src/ftinspect/maingui.cpp

---

...	...	@@ -238,7 +238,7 @@ void
238	238	MainGUI::repaintCurrentTab()
239	239	{
240	240	syncSettings();
241		- tabs_[tabWidget_->currentIndex()]->repaint();
	241	+ tabs_[tabWidget_->currentIndex()]->repaintGlyph();
242	242	}
243	243
244	244

src/ftinspect/panels/abstracttab.hpp

---

...	...	@@ -14,7 +14,7 @@ public:
14	14
15	15	virtual void syncSettings() = 0;
16	16	virtual void setDefaults() = 0;
17		- virtual void repaint() = 0;
	17	+ virtual void repaintGlyph() = 0;
18	18	virtual void reloadFont() = 0;
19	19	};
20	20

src/ftinspect/panels/singular.cpp

---

...	...	@@ -420,7 +420,7 @@ SingularTab::setGraphicsDefaults()
420	420
421	421
422	422	void
423		-SingularTab::repaint()
	423	+SingularTab::repaintGlyph()
424	424	{
425	425	drawGlyph();
426	426	}

src/ftinspect/panels/singular.hpp

---

...	...	@@ -37,7 +37,7 @@ public:
37	37	SingularTab(QWidget* parent, Engine* engine);
38	38	~SingularTab() override;
39	39
40		- void repaint() override;
	40	+ void repaintGlyph() override;
41	41	void reloadFont() override;
42	42	void syncSettings() override;
43	43	void setDefaults() override;

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.