[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] gsoc-2022-chariri-2 83fa0c8 22/30: [ftinspect] Add `ov
From: |
Werner Lemberg |
Subject: |
[freetype2-demos] gsoc-2022-chariri-2 83fa0c8 22/30: [ftinspect] Add `override` modifiers to all overriding functions. |
Date: |
Mon, 11 Jul 2022 07:17:40 -0400 (EDT) |
branch: gsoc-2022-chariri-2
commit 83fa0c80c778ac5899867b5e52ff198a344380f2
Author: Charlie Jiang <w@chariri.moe>
Commit: Charlie Jiang <w@chariri.moe>
[ftinspect] Add `override` modifiers to all overriding functions.
* src/ftinspect/**: As descibed above.
---
src/ftinspect/engine/engine.cpp | 12 ++++++------
src/ftinspect/engine/fontfilemanager.hpp | 2 +-
src/ftinspect/maingui.hpp | 8 ++++----
src/ftinspect/models/ttsettingscomboboxmodel.hpp | 10 +++++-----
src/ftinspect/panels/settingpanel.hpp | 2 +-
src/ftinspect/panels/singular.hpp | 10 +++++-----
src/ftinspect/rendering/glyphbitmap.hpp | 6 +++---
src/ftinspect/rendering/glyphoutline.cpp | 8 ++++----
src/ftinspect/rendering/glyphoutline.hpp | 4 ++--
src/ftinspect/rendering/glyphpointnumbers.hpp | 4 ++--
src/ftinspect/rendering/glyphpoints.hpp | 4 ++--
src/ftinspect/rendering/grid.hpp | 4 ++--
src/ftinspect/widgets/customwidgets.hpp | 10 +++++-----
src/ftinspect/widgets/glyphindexselector.hpp | 2 +-
14 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/ftinspect/engine/engine.cpp b/src/ftinspect/engine/engine.cpp
index c2e0a5d..552b0a8 100644
--- a/src/ftinspect/engine/engine.cpp
+++ b/src/ftinspect/engine/engine.cpp
@@ -28,12 +28,12 @@ FaceID::FaceID()
}
-FaceID::FaceID(int fontIdx,
- long faceIdx,
- int namedInstanceIdx)
-: fontIndex(fontIdx),
- faceIndex(faceIdx),
- namedInstanceIndex(namedInstanceIdx)
+FaceID::FaceID(int fontIndex,
+ long faceIndex,
+ int namedInstanceIndex)
+: fontIndex(fontIndex),
+ faceIndex(faceIndex),
+ namedInstanceIndex(namedInstanceIndex)
{
// empty
}
diff --git a/src/ftinspect/engine/fontfilemanager.hpp
b/src/ftinspect/engine/fontfilemanager.hpp
index d1fe2af..6f5e69a 100644
--- a/src/ftinspect/engine/fontfilemanager.hpp
+++ b/src/ftinspect/engine/fontfilemanager.hpp
@@ -20,7 +20,7 @@ class FontFileManager
Q_OBJECT
public:
FontFileManager();
- virtual ~FontFileManager() = default;
+ ~FontFileManager() override = default;
int size();
void append(QStringList newFileNames);
diff --git a/src/ftinspect/maingui.hpp b/src/ftinspect/maingui.hpp
index 0e1126a..5e9f9e7 100644
--- a/src/ftinspect/maingui.hpp
+++ b/src/ftinspect/maingui.hpp
@@ -50,7 +50,7 @@ class MainGUI
public:
MainGUI(Engine* engine);
- ~MainGUI();
+ ~MainGUI() override;
void setDefaults();
@@ -61,9 +61,9 @@ public:
FT_Face*);
protected:
- void closeEvent(QCloseEvent*);
- void dragEnterEvent(QDragEnterEvent* event);
- void dropEvent(QDropEvent* event);
+ void closeEvent(QCloseEvent*) override;
+ void dragEnterEvent(QDragEnterEvent* event) override;
+ void dropEvent(QDropEvent* event) override;
private slots:
void about();
diff --git a/src/ftinspect/models/ttsettingscomboboxmodel.hpp
b/src/ftinspect/models/ttsettingscomboboxmodel.hpp
index c5a72fe..0669583 100644
--- a/src/ftinspect/models/ttsettingscomboboxmodel.hpp
+++ b/src/ftinspect/models/ttsettingscomboboxmodel.hpp
@@ -26,12 +26,12 @@ public:
};
explicit HintingModeComboBoxModel(QObject* parent);
- virtual ~HintingModeComboBoxModel() = default;
+ ~HintingModeComboBoxModel() override = default;
- int rowCount(const QModelIndex& parent) const;
+ int rowCount(const QModelIndex& parent) const override;
QVariant data(const QModelIndex& index,
- int role) const;
- Qt::ItemFlags flags(const QModelIndex& index) const;
+ int role) const override;
+ Qt::ItemFlags flags(const QModelIndex& index) const override;
int indexToTTInterpreterVersion(int index) const;
int indexToCFFMode(int index) const;
@@ -83,7 +83,7 @@ public:
};
explicit SimpleComboBoxModel(QObject* parent);
- virtual ~SimpleComboBoxModel() = default;
+ ~SimpleComboBoxModel() override = default;
int rowCount(const QModelIndex& parent) const;
QVariant data(const QModelIndex& index,
diff --git a/src/ftinspect/panels/settingpanel.hpp
b/src/ftinspect/panels/settingpanel.hpp
index 562af3f..c237295 100644
--- a/src/ftinspect/panels/settingpanel.hpp
+++ b/src/ftinspect/panels/settingpanel.hpp
@@ -20,7 +20,7 @@ class SettingPanel
Q_OBJECT
public:
SettingPanel(QWidget* parent, Engine* engine);
- ~SettingPanel() = default;
+ ~SettingPanel() override = default;
void syncSettings();
diff --git a/src/ftinspect/panels/singular.hpp
b/src/ftinspect/panels/singular.hpp
index e1b1c80..3b99122 100644
--- a/src/ftinspect/panels/singular.hpp
+++ b/src/ftinspect/panels/singular.hpp
@@ -35,12 +35,12 @@ class SingularTab
Q_OBJECT
public:
SingularTab(QWidget* parent, Engine* engine);
- virtual ~SingularTab();
+ ~SingularTab() override;
- void repaint();
- void reloadFont();
- void syncSettings();
- void setDefaults();
+ void repaint() override;
+ void reloadFont() override;
+ void syncSettings() override;
+ void setDefaults() override;
private slots:
void setGlyphIndex(int);
diff --git a/src/ftinspect/rendering/glyphbitmap.hpp
b/src/ftinspect/rendering/glyphbitmap.hpp
index 092dccc..79b8d70 100644
--- a/src/ftinspect/rendering/glyphbitmap.hpp
+++ b/src/ftinspect/rendering/glyphbitmap.hpp
@@ -22,11 +22,11 @@ public:
FT_Pixel_Mode pixelMode,
const QVector<QRgb>& monoColorTable,
const QVector<QRgb>& grayColorTable);
- ~GlyphBitmap();
- QRectF boundingRect() const;
+ ~GlyphBitmap() override;
+ QRectF boundingRect() const override;
void paint(QPainter* painter,
const QStyleOptionGraphicsItem* option,
- QWidget* widget);
+ QWidget* widget) override;
private:
FT_Outline transformed_;
diff --git a/src/ftinspect/rendering/glyphoutline.cpp
b/src/ftinspect/rendering/glyphoutline.cpp
index ad5d25c..4047227 100644
--- a/src/ftinspect/rendering/glyphoutline.cpp
+++ b/src/ftinspect/rendering/glyphoutline.cpp
@@ -87,10 +87,10 @@ static FT_Outline_Funcs outlineFuncs =
} // extern "C"
-GlyphOutline::GlyphOutline(const QPen& outlineP,
- FT_Outline* outln)
-: outlinePen_(outlineP),
- outline_(outln)
+GlyphOutline::GlyphOutline(const QPen& pen,
+ FT_Outline* outline)
+: outlinePen_(pen),
+ outline_(outline)
{
FT_BBox cbox;
diff --git a/src/ftinspect/rendering/glyphoutline.hpp
b/src/ftinspect/rendering/glyphoutline.hpp
index fa448f5..ec7cf61 100644
--- a/src/ftinspect/rendering/glyphoutline.hpp
+++ b/src/ftinspect/rendering/glyphoutline.hpp
@@ -19,10 +19,10 @@ class GlyphOutline
public:
GlyphOutline(const QPen& pen,
FT_Outline* outline);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
void paint(QPainter* painter,
const QStyleOptionGraphicsItem* option,
- QWidget* widget);
+ QWidget* widget) override;
private:
QPen outlinePen_;
diff --git a/src/ftinspect/rendering/glyphpointnumbers.hpp
b/src/ftinspect/rendering/glyphpointnumbers.hpp
index 61feaf0..3002647 100644
--- a/src/ftinspect/rendering/glyphpointnumbers.hpp
+++ b/src/ftinspect/rendering/glyphpointnumbers.hpp
@@ -20,10 +20,10 @@ public:
GlyphPointNumbers(const QPen& onPen,
const QPen& offPen,
FT_Outline* outline);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
void paint(QPainter* painter,
const QStyleOptionGraphicsItem* option,
- QWidget* widget);
+ QWidget* widget) override;
private:
QPen onPen_;
diff --git a/src/ftinspect/rendering/glyphpoints.hpp
b/src/ftinspect/rendering/glyphpoints.hpp
index d964826..be3b5a4 100644
--- a/src/ftinspect/rendering/glyphpoints.hpp
+++ b/src/ftinspect/rendering/glyphpoints.hpp
@@ -20,10 +20,10 @@ public:
GlyphPoints(const QPen& onPen,
const QPen& offPen,
FT_Outline* outline);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
void paint(QPainter* painter,
const QStyleOptionGraphicsItem* option,
- QWidget* widget);
+ QWidget* widget) override;
private:
QPen onPen_;
diff --git a/src/ftinspect/rendering/grid.hpp b/src/ftinspect/rendering/grid.hpp
index dd4d6c4..2786b45 100644
--- a/src/ftinspect/rendering/grid.hpp
+++ b/src/ftinspect/rendering/grid.hpp
@@ -15,10 +15,10 @@ public:
Grid(QGraphicsView* parentView,
const QPen& gridPen,
const QPen& axisPen);
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
void paint(QPainter* painter,
const QStyleOptionGraphicsItem* option,
- QWidget* widget);
+ QWidget* widget) override;
void updateRect(); // there's no signal/slots for QGraphicsItem.
diff --git a/src/ftinspect/widgets/customwidgets.hpp
b/src/ftinspect/widgets/customwidgets.hpp
index 87296b8..63f4b8b 100644
--- a/src/ftinspect/widgets/customwidgets.hpp
+++ b/src/ftinspect/widgets/customwidgets.hpp
@@ -31,10 +31,10 @@ signals:
void ctrlWheelEvent(QWheelEvent* event);
protected:
- void wheelEvent(QWheelEvent* event);
- void resizeEvent(QResizeEvent* event);
+ void wheelEvent(QWheelEvent* event) override;
+ void resizeEvent(QResizeEvent* event) override;
void scrollContentsBy(int dx,
- int dy);
+ int dy) override;
private:
QPointF lastBottomLeftPoint_;
@@ -50,8 +50,8 @@ class ZoomSpinBox
public:
ZoomSpinBox(QWidget* parent);
- void stepBy(int val);
- int valueFromText(const QString& text) const;
+ void stepBy(int val) override;
+ int valueFromText(const QString& text) const override;
};
diff --git a/src/ftinspect/widgets/glyphindexselector.hpp
b/src/ftinspect/widgets/glyphindexselector.hpp
index 4c02d55..ddd5ecf 100644
--- a/src/ftinspect/widgets/glyphindexselector.hpp
+++ b/src/ftinspect/widgets/glyphindexselector.hpp
@@ -17,7 +17,7 @@ class GlyphIndexSelector
Q_OBJECT
public:
GlyphIndexSelector(QWidget* parent);
- virtual ~GlyphIndexSelector() = default;
+ ~GlyphIndexSelector() override = default;
void setMin(int min);
void setMax(int max);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] gsoc-2022-chariri-2 83fa0c8 22/30: [ftinspect] Add `override` modifiers to all overriding functions.,
Werner Lemberg <=