AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtPlatformSupport: Remove virtual from declarations with override.

Browse Source 
Change-Id: If94207596411680dfc2dbe33f298dc48fd5b7cc0
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Friedemann Kleint 2016-01-20 09:57:41 +01:00
parent 26379d0320
commit acb2e873f0
5 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/gui/text/qfontengine_ft_p.h
View File

@ -189,65 +189,65 @@ private:
mutable int fast_glyph_count; mutable int fast_glyph_count;
}; };
virtual QFontEngine::FaceId faceId() const Q_DECL_OVERRIDE; QFontEngine::FaceId faceId() const Q_DECL_OVERRIDE;
virtual QFontEngine::Properties properties() const Q_DECL_OVERRIDE; QFontEngine::Properties properties() const Q_DECL_OVERRIDE;
virtual QFixed emSquareSize() const Q_DECL_OVERRIDE; QFixed emSquareSize() const Q_DECL_OVERRIDE;
virtual bool supportsSubPixelPositions() const Q_DECL_OVERRIDE bool supportsSubPixelPositions() const Q_DECL_OVERRIDE
{ {
return default_hint_style == HintLight || return default_hint_style == HintLight ||
default_hint_style == HintNone; default_hint_style == HintNone;
} }
virtual bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE; bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE;
virtual int synthesized() const Q_DECL_OVERRIDE; int synthesized() const Q_DECL_OVERRIDE;
virtual QFixed ascent() const Q_DECL_OVERRIDE; QFixed ascent() const Q_DECL_OVERRIDE;
virtual QFixed descent() const Q_DECL_OVERRIDE; QFixed descent() const Q_DECL_OVERRIDE;
virtual QFixed leading() const Q_DECL_OVERRIDE; QFixed leading() const Q_DECL_OVERRIDE;
virtual QFixed xHeight() const Q_DECL_OVERRIDE; QFixed xHeight() const Q_DECL_OVERRIDE;
virtual QFixed averageCharWidth() const Q_DECL_OVERRIDE; QFixed averageCharWidth() const Q_DECL_OVERRIDE;
virtual qreal maxCharWidth() const Q_DECL_OVERRIDE; qreal maxCharWidth() const Q_DECL_OVERRIDE;
virtual QFixed lineThickness() const Q_DECL_OVERRIDE; QFixed lineThickness() const Q_DECL_OVERRIDE;
virtual QFixed underlinePosition() const Q_DECL_OVERRIDE; QFixed underlinePosition() const Q_DECL_OVERRIDE;
virtual glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE; glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
void doKerning(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE; void doKerning(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE;
virtual void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE; void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE;
virtual bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE; bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE;
virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
virtual void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs,
QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE; glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
virtual glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE; glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE;
virtual glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix) Q_DECL_OVERRIDE; glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix) Q_DECL_OVERRIDE;
virtual void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
virtual QImage alphaMapForGlyph(glyph_t g) Q_DECL_OVERRIDE { return alphaMapForGlyph(g, 0); } QImage alphaMapForGlyph(glyph_t g) Q_DECL_OVERRIDE { return alphaMapForGlyph(g, 0); }
virtual QImage alphaMapForGlyph(glyph_t, QFixed) Q_DECL_OVERRIDE; QImage alphaMapForGlyph(glyph_t, QFixed) Q_DECL_OVERRIDE;
QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
virtual glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, glyph_metrics_t alphaMapBoundingBox(glyph_t glyph,
QFixed subPixelPosition, QFixed subPixelPosition,
const QTransform &matrix, const QTransform &matrix,
QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE; QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE;
virtual QImage *lockedAlphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, QImage *lockedAlphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition,
GlyphFormat neededFormat, const QTransform &t, GlyphFormat neededFormat, const QTransform &t,
QPoint *offset) Q_DECL_OVERRIDE; QPoint *offset) Q_DECL_OVERRIDE;
virtual bool hasInternalCaching() const Q_DECL_OVERRIDE { return cacheEnabled; } bool hasInternalCaching() const Q_DECL_OVERRIDE { return cacheEnabled; }
virtual void unlockAlphaMapForGlyph() Q_DECL_OVERRIDE; void unlockAlphaMapForGlyph() Q_DECL_OVERRIDE;
virtual void removeGlyphFromCache(glyph_t glyph) Q_DECL_OVERRIDE; void removeGlyphFromCache(glyph_t glyph) Q_DECL_OVERRIDE;
virtual int glyphMargin(QFontEngine::GlyphFormat /* format */) Q_DECL_OVERRIDE { return 0; } int glyphMargin(QFontEngine::GlyphFormat /* format */) Q_DECL_OVERRIDE { return 0; }
virtual int glyphCount() const Q_DECL_OVERRIDE; int glyphCount() const Q_DECL_OVERRIDE;
enum Scaling { enum Scaling {
Scaled, Scaled,
@ -277,12 +277,12 @@ private:
bool init(FaceId faceId, bool antialias, GlyphFormat format, bool init(FaceId faceId, bool antialias, GlyphFormat format,
QFreetypeFace *freetypeFace); QFreetypeFace *freetypeFace);
virtual int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) Q_DECL_OVERRIDE; int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) Q_DECL_OVERRIDE;
void setQtDefaultHintStyle(QFont::HintingPreference hintingPreference); void setQtDefaultHintStyle(QFont::HintingPreference hintingPreference);
virtual void setDefaultHintStyle(HintStyle style) Q_DECL_OVERRIDE; void setDefaultHintStyle(HintStyle style) Q_DECL_OVERRIDE;
virtual QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE; QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
bool initFromFontEngine(const QFontEngineFT *fontEngine); bool initFromFontEngine(const QFontEngineFT *fontEngine);
HintStyle defaultHintStyle() const { return default_hint_style; } HintStyle defaultHintStyle() const { return default_hint_style; }

6
src/platformsupport/fbconvenience/qfbbackingstore_p.h
View File

@ -60,10 +60,10 @@ public:
QFbBackingStore(QWindow *window); QFbBackingStore(QWindow *window);
~QFbBackingStore(); ~QFbBackingStore();
virtual QPaintDevice *paintDevice() Q_DECL_OVERRIDE { return &mImage; } QPaintDevice *paintDevice() Q_DECL_OVERRIDE { return &mImage; }
virtual void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE; void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
virtual void resize(const QSize &size, const QRegion &region) Q_DECL_OVERRIDE; void resize(const QSize &size, const QRegion &region) Q_DECL_OVERRIDE;
const QImage image(); const QImage image();

2
src/platformsupport/linuxaccessibility/bridge_p.h
View File

@ -66,7 +66,7 @@ public:
virtual ~QSpiAccessibleBridge(); virtual ~QSpiAccessibleBridge();
virtual void notifyAccessibilityUpdate(QAccessibleEvent *event) Q_DECL_OVERRIDE; void notifyAccessibilityUpdate(QAccessibleEvent *event) Q_DECL_OVERRIDE;
QDBusConnection dBusConnection() const; QDBusConnection dBusConnection() const;
public Q_SLOTS: public Q_SLOTS:

4
src/platformsupport/services/genericunix/qgenericunixservices_p.h
View File

@ -57,8 +57,8 @@ public:
QByteArray desktopEnvironment() const Q_DECL_OVERRIDE; QByteArray desktopEnvironment() const Q_DECL_OVERRIDE;
virtual bool openUrl(const QUrl &url) Q_DECL_OVERRIDE; bool openUrl(const QUrl &url) Q_DECL_OVERRIDE;
virtual bool openDocument(const QUrl &url) Q_DECL_OVERRIDE; bool openDocument(const QUrl &url) Q_DECL_OVERRIDE;
private: private:
QString m_webBrowser; QString m_webBrowser;

14
src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
View File

@ -75,8 +75,8 @@ public:
static QPlatformTheme *createUnixTheme(const QString &name); static QPlatformTheme *createUnixTheme(const QString &name);
static QStringList themeNames(); static QStringList themeNames();
virtual const QFont *font(Font type) const Q_DECL_OVERRIDE; const QFont *font(Font type) const Q_DECL_OVERRIDE;
virtual QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
static QStringList xdgIconThemePaths(); static QStringList xdgIconThemePaths();
#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
@ -96,11 +96,11 @@ public:
QKdeTheme(const QStringList& kdeDirs, int kdeVersion); QKdeTheme(const QStringList& kdeDirs, int kdeVersion);
static QPlatformTheme *createKdeTheme(); static QPlatformTheme *createKdeTheme();
virtual QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
virtual const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE;
virtual const QFont *font(Font type) const Q_DECL_OVERRIDE; const QFont *font(Font type) const Q_DECL_OVERRIDE;
#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
#endif #endif
@ -116,8 +116,8 @@ class QGnomeTheme : public QPlatformTheme
Q_DECLARE_PRIVATE(QGnomeTheme) Q_DECLARE_PRIVATE(QGnomeTheme)
public: public:
QGnomeTheme(); QGnomeTheme();
virtual QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
virtual const QFont *font(Font type) const Q_DECL_OVERRIDE; const QFont *font(Font type) const Q_DECL_OVERRIDE;
QString standardButtonText(int button) const Q_DECL_OVERRIDE; QString standardButtonText(int button) const Q_DECL_OVERRIDE;
virtual QString gtkFontName() const; virtual QString gtkFontName() const;