[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] gsoc-2022-chariri-2 c607201 23/30: [ftinspect] Resolve
From: |
Werner Lemberg |
Subject: |
[freetype2-demos] gsoc-2022-chariri-2 c607201 23/30: [ftinspect] Resolve naming confliction for `repaint` function. |
Date: |
Mon, 11 Jul 2022 07:17:40 -0400 (EDT) |
branch: gsoc-2022-chariri-2
commit c60720148142563b5be4b900aa218f48730aa711
Author: Charlie Jiang <w@chariri.moe>
Commit: Charlie Jiang <w@chariri.moe>
[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.
---
src/ftinspect/maingui.cpp | 2 +-
src/ftinspect/panels/abstracttab.hpp | 2 +-
src/ftinspect/panels/singular.cpp | 2 +-
src/ftinspect/panels/singular.hpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ftinspect/maingui.cpp b/src/ftinspect/maingui.cpp
index 54f5a36..e1fbf6f 100644
--- a/src/ftinspect/maingui.cpp
+++ b/src/ftinspect/maingui.cpp
@@ -238,7 +238,7 @@ void
MainGUI::repaintCurrentTab()
{
syncSettings();
- tabs_[tabWidget_->currentIndex()]->repaint();
+ tabs_[tabWidget_->currentIndex()]->repaintGlyph();
}
diff --git a/src/ftinspect/panels/abstracttab.hpp
b/src/ftinspect/panels/abstracttab.hpp
index 270e907..6af6afa 100644
--- a/src/ftinspect/panels/abstracttab.hpp
+++ b/src/ftinspect/panels/abstracttab.hpp
@@ -14,7 +14,7 @@ public:
virtual void syncSettings() = 0;
virtual void setDefaults() = 0;
- virtual void repaint() = 0;
+ virtual void repaintGlyph() = 0;
virtual void reloadFont() = 0;
};
diff --git a/src/ftinspect/panels/singular.cpp
b/src/ftinspect/panels/singular.cpp
index 6d95f75..bf09105 100644
--- a/src/ftinspect/panels/singular.cpp
+++ b/src/ftinspect/panels/singular.cpp
@@ -420,7 +420,7 @@ SingularTab::setGraphicsDefaults()
void
-SingularTab::repaint()
+SingularTab::repaintGlyph()
{
drawGlyph();
}
diff --git a/src/ftinspect/panels/singular.hpp
b/src/ftinspect/panels/singular.hpp
index 3b99122..88df922 100644
--- a/src/ftinspect/panels/singular.hpp
+++ b/src/ftinspect/panels/singular.hpp
@@ -37,7 +37,7 @@ public:
SingularTab(QWidget* parent, Engine* engine);
~SingularTab() override;
- void repaint() override;
+ void repaintGlyph() override;
void reloadFont() override;
void syncSettings() override;
void setDefaults() override;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] gsoc-2022-chariri-2 c607201 23/30: [ftinspect] Resolve naming confliction for `repaint` function.,
Werner Lemberg <=