Add missing Q_DECL_OVERRIDE in Cocoa specific header files
Change-Id: I91831390e9e0d97ab28f0e34ca0573fb2c84e954 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Gabriel de Dietrich
Gabriel de Dietrich
parent
235292710b
commit
02ea023521
@ -75,18 +75,18 @@ class QCoreTextFontDatabase : public QPlatformFontDatabase
|
||||
public:
|
||||
QCoreTextFontDatabase();
|
||||
~QCoreTextFontDatabase();
|
||||
void populateFontDatabase();
|
||||
void populateFontDatabase() Q_DECL_OVERRIDE;
|
||||
void populateFamily(const QString &familyName) Q_DECL_OVERRIDE;
|
||||
|
||||
QFontEngine *fontEngine(const QFontDef &fontDef, void *handle);
|
||||
QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference);
|
||||
QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const;
|
||||
QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName);
|
||||
void releaseHandle(void *handle);
|
||||
bool isPrivateFontFamily(const QString &family) const;
|
||||
QFont defaultFont() const;
|
||||
QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE;
|
||||
QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE;
|
||||
QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE;
|
||||
QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE;
|
||||
void releaseHandle(void *handle) Q_DECL_OVERRIDE;
|
||||
bool isPrivateFontFamily(const QString &family) const Q_DECL_OVERRIDE;
|
||||
QFont defaultFont() const Q_DECL_OVERRIDE;
|
||||
bool fontsAlwaysScalable() const Q_DECL_OVERRIDE;
|
||||
QList<int> standardSizes() const;
|
||||
QList<int> standardSizes() const Q_DECL_OVERRIDE;
|
||||
|
||||
// For iOS and OS X platform themes
|
||||
QFont *themeFont(QPlatformTheme::Font) const;
|
||||
|
||||
@ -64,48 +64,48 @@ public:
|
||||
QCoreTextFontEngine(CGFontRef font, const QFontDef &def);
|
||||
~QCoreTextFontEngine();
|
||||
|
||||
virtual glyph_t glyphIndex(uint ucs4) const;
|
||||
virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const;
|
||||
virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const;
|
||||
glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
|
||||
bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
|
||||
void recalcAdvances(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE;
|
||||
|
||||
virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs);
|
||||
virtual glyph_metrics_t boundingBox(glyph_t glyph);
|
||||
glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
|
||||
glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE;
|
||||
|
||||
virtual QFixed ascent() const;
|
||||
virtual QFixed descent() const;
|
||||
virtual QFixed leading() const;
|
||||
virtual QFixed xHeight() const;
|
||||
virtual qreal maxCharWidth() const;
|
||||
virtual QFixed averageCharWidth() const;
|
||||
QFixed ascent() const Q_DECL_OVERRIDE;
|
||||
QFixed descent() const Q_DECL_OVERRIDE;
|
||||
QFixed leading() const Q_DECL_OVERRIDE;
|
||||
QFixed xHeight() const Q_DECL_OVERRIDE;
|
||||
qreal maxCharWidth() const Q_DECL_OVERRIDE;
|
||||
QFixed averageCharWidth() const Q_DECL_OVERRIDE;
|
||||
|
||||
virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int numGlyphs,
|
||||
QPainterPath *path, QTextItem::RenderFlags);
|
||||
void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int numGlyphs,
|
||||
QPainterPath *path, QTextItem::RenderFlags) Q_DECL_OVERRIDE;
|
||||
|
||||
virtual bool canRender(const QChar *string, int len) const;
|
||||
bool canRender(const QChar *string, int len) const Q_DECL_OVERRIDE;
|
||||
|
||||
virtual int synthesized() const { return synthesisFlags; }
|
||||
virtual bool supportsSubPixelPositions() const { return true; }
|
||||
int synthesized() const Q_DECL_OVERRIDE { return synthesisFlags; }
|
||||
bool supportsSubPixelPositions() const Q_DECL_OVERRIDE { return true; }
|
||||
|
||||
void draw(CGContextRef ctx, qreal x, qreal y, const QTextItemInt &ti, int paintDeviceHeight);
|
||||
|
||||
virtual FaceId faceId() const;
|
||||
virtual bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const;
|
||||
virtual void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics);
|
||||
virtual QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition);
|
||||
virtual QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t);
|
||||
virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t);
|
||||
glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat);
|
||||
virtual QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t);
|
||||
virtual qreal minRightBearing() const;
|
||||
virtual qreal minLeftBearing() const;
|
||||
virtual QFixed emSquareSize() const;
|
||||
FaceId faceId() const Q_DECL_OVERRIDE;
|
||||
bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const Q_DECL_OVERRIDE;
|
||||
void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE;
|
||||
QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition) Q_DECL_OVERRIDE;
|
||||
QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
|
||||
QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
|
||||
glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) Q_DECL_OVERRIDE;
|
||||
QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
|
||||
qreal minRightBearing() const Q_DECL_OVERRIDE;
|
||||
qreal minLeftBearing() const Q_DECL_OVERRIDE;
|
||||
QFixed emSquareSize() const Q_DECL_OVERRIDE;
|
||||
|
||||
bool supportsTransformation(const QTransform &transform) const;
|
||||
bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE;
|
||||
|
||||
virtual QFontEngine *cloneWithSize(qreal pixelSize) const;
|
||||
virtual int glyphMargin(QFontEngine::GlyphFormat format) { Q_UNUSED(format); return 0; }
|
||||
QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
|
||||
int glyphMargin(QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE { Q_UNUSED(format); return 0; }
|
||||
|
||||
virtual QFontEngine::Properties properties() const;
|
||||
QFontEngine::Properties properties() const Q_DECL_OVERRIDE;
|
||||
|
||||
static bool supportsColorGlyphs()
|
||||
{
|
||||
|
||||
@ -73,7 +73,7 @@ void QCocoaCursor::setPos(const QPoint &position)
|
||||
pos.x = position.x();
|
||||
pos.y = position.y();
|
||||
|
||||
CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
|
||||
CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft);
|
||||
CGEventPost(kCGHIDEventTap, e);
|
||||
CFRelease(e);
|
||||
}
|
||||
|
||||
@ -50,20 +50,20 @@ public:
|
||||
QCocoaFileDialogHelper();
|
||||
virtual ~QCocoaFileDialogHelper();
|
||||
|
||||
void exec();
|
||||
void execModalForWindow(QWindow *parent);
|
||||
void exec() Q_DECL_OVERRIDE;
|
||||
void execModalForWindow(QWindow *parent) Q_DECL_OVERRIDE;
|
||||
|
||||
bool defaultNameFilterDisables() const;
|
||||
bool defaultNameFilterDisables() const Q_DECL_OVERRIDE;
|
||||
|
||||
bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent);
|
||||
void hide();
|
||||
bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) Q_DECL_OVERRIDE;
|
||||
void hide() Q_DECL_OVERRIDE;
|
||||
void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE;
|
||||
QUrl directory() const Q_DECL_OVERRIDE;
|
||||
void selectFile(const QUrl &filename) Q_DECL_OVERRIDE;
|
||||
QList<QUrl> selectedFiles() const Q_DECL_OVERRIDE;
|
||||
void setFilter();
|
||||
void selectNameFilter(const QString &filter);
|
||||
QString selectedNameFilter() const;
|
||||
void setFilter() Q_DECL_OVERRIDE;
|
||||
void selectNameFilter(const QString &filter) Q_DECL_OVERRIDE;
|
||||
QString selectedNameFilter() const Q_DECL_OVERRIDE;
|
||||
|
||||
public:
|
||||
bool showCocoaFilePanel(Qt::WindowModality windowModality, QWindow *parent);
|
||||
|
||||
@ -61,19 +61,19 @@ public:
|
||||
|
||||
// ----------------------------------------------------
|
||||
// Virtual methods overridden from QPlatformScreen
|
||||
QPixmap grabWindow(WId window, int x, int y, int width, int height) const;
|
||||
QRect geometry() const { return m_geometry; }
|
||||
QRect availableGeometry() const { return m_availableGeometry; }
|
||||
int depth() const { return m_depth; }
|
||||
QImage::Format format() const { return m_format; }
|
||||
qreal devicePixelRatio() const;
|
||||
QSizeF physicalSize() const { return m_physicalSize; }
|
||||
QDpi logicalDpi() const { return m_logicalDpi; }
|
||||
qreal refreshRate() const { return m_refreshRate; }
|
||||
QString name() const { return m_name; }
|
||||
QPlatformCursor *cursor() const { return m_cursor; }
|
||||
QWindow *topLevelAt(const QPoint &point) const;
|
||||
QList<QPlatformScreen *> virtualSiblings() const { return m_siblings; }
|
||||
QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE;
|
||||
QRect geometry() const Q_DECL_OVERRIDE { return m_geometry; }
|
||||
QRect availableGeometry() const Q_DECL_OVERRIDE { return m_availableGeometry; }
|
||||
int depth() const Q_DECL_OVERRIDE { return m_depth; }
|
||||
QImage::Format format() const Q_DECL_OVERRIDE { return m_format; }
|
||||
qreal devicePixelRatio() const Q_DECL_OVERRIDE;
|
||||
QSizeF physicalSize() const Q_DECL_OVERRIDE { return m_physicalSize; }
|
||||
QDpi logicalDpi() const Q_DECL_OVERRIDE { return m_logicalDpi; }
|
||||
qreal refreshRate() const Q_DECL_OVERRIDE { return m_refreshRate; }
|
||||
QString name() const Q_DECL_OVERRIDE { return m_name; }
|
||||
QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return m_cursor; }
|
||||
QWindow *topLevelAt(const QPoint &point) const Q_DECL_OVERRIDE;
|
||||
QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE { return m_siblings; }
|
||||
|
||||
// ----------------------------------------------------
|
||||
// Additional methods
|
||||
|
||||
@ -54,9 +54,9 @@ public:
|
||||
QCocoaNativeInterface();
|
||||
|
||||
#ifndef QT_NO_OPENGL
|
||||
void *nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context);
|
||||
void *nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context) Q_DECL_OVERRIDE;
|
||||
#endif
|
||||
void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window);
|
||||
void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) Q_DECL_OVERRIDE;
|
||||
|
||||
NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE;
|
||||
|
||||
|
||||
@ -46,25 +46,25 @@ public:
|
||||
QCocoaTheme();
|
||||
~QCocoaTheme();
|
||||
|
||||
virtual QPlatformMenuItem* createPlatformMenuItem() const;
|
||||
virtual QPlatformMenu* createPlatformMenu() const;
|
||||
virtual QPlatformMenuBar* createPlatformMenuBar() const;
|
||||
QPlatformMenuItem* createPlatformMenuItem() const Q_DECL_OVERRIDE;
|
||||
QPlatformMenu* createPlatformMenu() const Q_DECL_OVERRIDE;
|
||||
QPlatformMenuBar* createPlatformMenuBar() const Q_DECL_OVERRIDE;
|
||||
|
||||
#ifndef QT_NO_SYSTEMTRAYICON
|
||||
QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const;
|
||||
QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
|
||||
#endif
|
||||
|
||||
bool usePlatformNativeDialog(DialogType dialogType) const;
|
||||
QPlatformDialogHelper *createPlatformDialogHelper(DialogType dialogType) const;
|
||||
bool usePlatformNativeDialog(DialogType dialogType) const Q_DECL_OVERRIDE;
|
||||
QPlatformDialogHelper *createPlatformDialogHelper(DialogType dialogType) const Q_DECL_OVERRIDE;
|
||||
|
||||
const QPalette *palette(Palette type = SystemPalette) const;
|
||||
const QFont *font(Font type = SystemFont) const;
|
||||
QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const;
|
||||
const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE;
|
||||
const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE;
|
||||
QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const Q_DECL_OVERRIDE;
|
||||
QPixmap fileIconPixmap(const QFileInfo &fileInfo,
|
||||
const QSizeF &size,
|
||||
QPlatformTheme::IconOptions options = 0) const;
|
||||
QPlatformTheme::IconOptions options = 0) const Q_DECL_OVERRIDE;
|
||||
|
||||
QVariant themeHint(ThemeHint hint) const;
|
||||
QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
|
||||
QString standardButtonText(int button) const Q_DECL_OVERRIDE;
|
||||
|
||||
static const char *name;
|
||||
|
||||
@ -142,37 +142,37 @@ public:
|
||||
QCocoaWindow(QWindow *tlw);
|
||||
~QCocoaWindow();
|
||||
|
||||
void setGeometry(const QRect &rect);
|
||||
QRect geometry() const;
|
||||
void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
|
||||
QRect geometry() const Q_DECL_OVERRIDE;
|
||||
void setCocoaGeometry(const QRect &rect);
|
||||
void clipChildWindows();
|
||||
void clipWindow(const NSRect &clipRect);
|
||||
void show(bool becauseOfAncestor = false);
|
||||
void hide(bool becauseOfAncestor = false);
|
||||
void setVisible(bool visible);
|
||||
void setWindowFlags(Qt::WindowFlags flags);
|
||||
void setWindowState(Qt::WindowState state);
|
||||
void setWindowTitle(const QString &title);
|
||||
void setWindowFilePath(const QString &filePath);
|
||||
void setWindowIcon(const QIcon &icon);
|
||||
void setAlertState(bool enabled);
|
||||
bool isAlertState() const;
|
||||
void raise();
|
||||
void lower();
|
||||
bool isExposed() const;
|
||||
void setVisible(bool visible) Q_DECL_OVERRIDE;
|
||||
void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
|
||||
void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
|
||||
void setWindowTitle(const QString &title) Q_DECL_OVERRIDE;
|
||||
void setWindowFilePath(const QString &filePath) Q_DECL_OVERRIDE;
|
||||
void setWindowIcon(const QIcon &icon) Q_DECL_OVERRIDE;
|
||||
void setAlertState(bool enabled) Q_DECL_OVERRIDE;
|
||||
bool isAlertState() const Q_DECL_OVERRIDE;
|
||||
void raise() Q_DECL_OVERRIDE;
|
||||
void lower() Q_DECL_OVERRIDE;
|
||||
bool isExposed() const Q_DECL_OVERRIDE;
|
||||
bool isOpaque() const;
|
||||
void propagateSizeHints();
|
||||
void setOpacity(qreal level);
|
||||
void setMask(const QRegion ®ion);
|
||||
bool setKeyboardGrabEnabled(bool grab);
|
||||
bool setMouseGrabEnabled(bool grab);
|
||||
QMargins frameMargins() const;
|
||||
QSurfaceFormat format() const;
|
||||
void propagateSizeHints() Q_DECL_OVERRIDE;
|
||||
void setOpacity(qreal level) Q_DECL_OVERRIDE;
|
||||
void setMask(const QRegion ®ion) Q_DECL_OVERRIDE;
|
||||
bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE;
|
||||
bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE;
|
||||
QMargins frameMargins() const Q_DECL_OVERRIDE;
|
||||
QSurfaceFormat format() const Q_DECL_OVERRIDE;
|
||||
|
||||
void requestActivateWindow();
|
||||
void requestActivateWindow() Q_DECL_OVERRIDE;
|
||||
|
||||
WId winId() const;
|
||||
void setParent(const QPlatformWindow *window);
|
||||
WId winId() const Q_DECL_OVERRIDE;
|
||||
void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE;
|
||||
|
||||
NSView *contentView() const;
|
||||
void setContentView(NSView *contentView);
|
||||
@ -202,8 +202,8 @@ public:
|
||||
|
||||
bool setWindowModified(bool modified) Q_DECL_OVERRIDE;
|
||||
|
||||
void setFrameStrutEventsEnabled(bool enabled);
|
||||
bool frameStrutEventsEnabled() const
|
||||
void setFrameStrutEventsEnabled(bool enabled) Q_DECL_OVERRIDE;
|
||||
bool frameStrutEventsEnabled() const Q_DECL_OVERRIDE
|
||||
{ return m_frameStrutEventsEnabled; }
|
||||
|
||||
void setMenubar(QCocoaMenuBar *mb);
|
||||
@ -220,7 +220,7 @@ public:
|
||||
void applyContentBorderThickness(NSWindow *window);
|
||||
void updateNSToolbar();
|
||||
|
||||
qreal devicePixelRatio() const;
|
||||
qreal devicePixelRatio() const Q_DECL_OVERRIDE;
|
||||
bool isWindowExposable();
|
||||
void exposeWindow();
|
||||
void obscureWindow();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user