1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows/Direct2D platform plugins: Add Q_DECL_OVERRIDE.

Browse Source 
Replace old virtual declarations by Q_DECL_OVERRIDE where
applicable.
Errors discovered: QWindowsScreen::primaryOrientation() did not
overwrite any method, changed to orientation().

Task-number: QTBUG-38858
Task-number: QTBUG-38993
Change-Id: Ie85d5235f3cd35c7a24cac3c1c7693c6508b1009
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
This commit is contained in:
Friedemann Kleint 2014-07-25 13:19:03 +02:00
parent 87242756d4
commit c67f7c0f0f
18 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h
View File

@ -60,22 +60,22 @@ public:
QWindowsDirect2DPlatformPixmap(PixelType pixelType, QWindowsDirect2DBitmap *bitmap); QWindowsDirect2DPlatformPixmap(PixelType pixelType, QWindowsDirect2DBitmap *bitmap);
~QWindowsDirect2DPlatformPixmap(); ~QWindowsDirect2DPlatformPixmap();
virtual void resize(int width, int height); void resize(int width, int height) Q_DECL_OVERRIDE;
virtual void fromImage(const QImage &image, virtual void fromImage(const QImage &image,
Qt::ImageConversionFlags flags); Qt::ImageConversionFlags flags);
virtual int metric(QPaintDevice::PaintDeviceMetric metric) const; int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
virtual void fill(const QColor &color); void fill(const QColor &color) Q_DECL_OVERRIDE;
virtual bool hasAlphaChannel() const; bool hasAlphaChannel() const Q_DECL_OVERRIDE;
virtual QImage toImage() const; QImage toImage() const Q_DECL_OVERRIDE;
virtual QImage toImage(const QRect &rect) const; QImage toImage(const QRect &rect) const Q_DECL_OVERRIDE;
virtual QPaintEngine* paintEngine() const; QPaintEngine* paintEngine() const Q_DECL_OVERRIDE;
virtual qreal devicePixelRatio() const; qreal devicePixelRatio() const Q_DECL_OVERRIDE;
virtual void setDevicePixelRatio(qreal scaleFactor); void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE;
QWindowsDirect2DBitmap *bitmap() const; QWindowsDirect2DBitmap *bitmap() const;

10
src/plugins/platforms/windows/qwindowsbackingstore.h
View File

@ -59,11 +59,11 @@ public:
QWindowsBackingStore(QWindow *window); QWindowsBackingStore(QWindow *window);
~QWindowsBackingStore(); ~QWindowsBackingStore();
virtual QPaintDevice *paintDevice(); QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
virtual void flush(QWindow *window, const QRegion &region, const QPoint &offset); void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
virtual void resize(const QSize &size, const QRegion &r); void resize(const QSize &size, const QRegion &r) Q_DECL_OVERRIDE;
virtual bool scroll(const QRegion &area, int dx, int dy); bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE;
virtual void beginPaint(const QRegion &); void beginPaint(const QRegion &) Q_DECL_OVERRIDE;
HDC getDC() const; HDC getDC() const;

12
src/plugins/platforms/windows/qwindowsclipboard.h
View File

@ -54,8 +54,8 @@ class QWindowsClipboardRetrievalMimeData : public QWindowsInternalMimeData {
public: public:
protected: protected:
virtual IDataObject *retrieveDataObject() const; IDataObject *retrieveDataObject() const Q_DECL_OVERRIDE;
virtual void releaseDataObject(IDataObject *) const; void releaseDataObject(IDataObject *) const Q_DECL_OVERRIDE;
}; };
class QWindowsClipboard : public QPlatformClipboard class QWindowsClipboard : public QPlatformClipboard
@ -66,10 +66,10 @@ public:
void registerViewer(); // Call in initialization, when context is up. void registerViewer(); // Call in initialization, when context is up.
void cleanup(); void cleanup();
virtual QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard); QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE;
virtual void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard); void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE;
virtual bool supportsMode(QClipboard::Mode mode) const; bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE;
virtual bool ownsMode(QClipboard::Mode mode) const; bool ownsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE;
inline bool clipboardViewerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result); inline bool clipboardViewerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result);

6
src/plugins/platforms/windows/qwindowscursor.h
View File

@ -101,9 +101,9 @@ public:
QWindowsCursor() {} QWindowsCursor() {}
virtual void changeCursor(QCursor * widgetCursor, QWindow * widget); void changeCursor(QCursor * widgetCursor, QWindow * widget) Q_DECL_OVERRIDE;
virtual QPoint pos() const { return mousePosition(); } QPoint pos() const Q_DECL_OVERRIDE { return mousePosition(); }
virtual void setPos(const QPoint &pos); void setPos(const QPoint &pos) Q_DECL_OVERRIDE;
static HCURSOR createPixmapCursor(const QPixmap &pixmap, const QPoint &hotSpot); static HCURSOR createPixmapCursor(const QPixmap &pixmap, const QPoint &hotSpot);
static HCURSOR createSystemCursor(const QCursor &c); static HCURSOR createSystemCursor(const QCursor &c);

4
src/plugins/platforms/windows/qwindowsdialoghelpers.h
View File

@ -71,11 +71,11 @@ public:
typedef QSharedPointer<QWindowsNativeDialogBase> QWindowsNativeDialogBasePtr; typedef QSharedPointer<QWindowsNativeDialogBase> QWindowsNativeDialogBasePtr;
~QWindowsDialogHelperBase() { cleanupThread(); } ~QWindowsDialogHelperBase() { cleanupThread(); }
virtual void exec(); void exec() Q_DECL_OVERRIDE;
virtual bool show(Qt::WindowFlags windowFlags, virtual bool show(Qt::WindowFlags windowFlags,
Qt::WindowModality windowModality, Qt::WindowModality windowModality,
QWindow *parent); QWindow *parent);
virtual void hide(); void hide() Q_DECL_OVERRIDE;
virtual bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const { return true; } virtual bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const { return true; }

6
src/plugins/platforms/windows/qwindowsdrag.h
View File

@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
class QWindowsDropMimeData : public QWindowsInternalMimeData { class QWindowsDropMimeData : public QWindowsInternalMimeData {
public: public:
QWindowsDropMimeData() {} QWindowsDropMimeData() {}
virtual IDataObject *retrieveDataObject() const; IDataObject *retrieveDataObject() const Q_DECL_OVERRIDE;
}; };
class QWindowsOleDropTarget : public IDropTarget class QWindowsOleDropTarget : public IDropTarget
@ -90,9 +90,9 @@ public:
QWindowsDrag(); QWindowsDrag();
virtual ~QWindowsDrag(); virtual ~QWindowsDrag();
virtual QMimeData *platformDropData() { return &m_dropData; } QMimeData *platformDropData() Q_DECL_OVERRIDE { return &m_dropData; }
virtual Qt::DropAction drag(QDrag *drag); Qt::DropAction drag(QDrag *drag) Q_DECL_OVERRIDE;
static QWindowsDrag *instance(); static QWindowsDrag *instance();

20
src/plugins/platforms/windows/qwindowsfontdatabase.h
View File

@ -77,17 +77,17 @@ public:
QWindowsFontDatabase(); QWindowsFontDatabase();
~QWindowsFontDatabase(); ~QWindowsFontDatabase();
virtual void populateFontDatabase(); void populateFontDatabase() Q_DECL_OVERRIDE;
virtual QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script); QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) Q_DECL_OVERRIDE;
virtual QFontEngine *fontEngine(const QFontDef &fontDef, void *handle); QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE;
virtual QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference); QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE;
virtual QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const; QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE;
virtual QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName); QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE;
virtual void releaseHandle(void *handle); void releaseHandle(void *handle) Q_DECL_OVERRIDE;
virtual QString fontDir() const; QString fontDir() const Q_DECL_OVERRIDE;
virtual QFont defaultFont() const { return systemDefaultFont(); } QFont defaultFont() const Q_DECL_OVERRIDE { return systemDefaultFont(); }
virtual bool fontsAlwaysScalable() const; bool fontsAlwaysScalable() const Q_DECL_OVERRIDE;
void derefUniqueFont(const QString &uniqueFont); void derefUniqueFont(const QString &uniqueFont);
void refUniqueFont(const QString &uniqueFont); void refUniqueFont(const QString &uniqueFont);

4
src/plugins/platforms/windows/qwindowsfontdatabase_ft.h
View File

@ -57,8 +57,8 @@ public:
QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const; QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const;
virtual QString fontDir() const; QString fontDir() const Q_DECL_OVERRIDE;
virtual QFont defaultFont() const; QFont defaultFont() const Q_DECL_OVERRIDE;
private: private:
void populate(const QString &family = QString()); void populate(const QString &family = QString());

58
src/plugins/platforms/windows/qwindowsfontengine.h
View File

@ -78,48 +78,48 @@ public:
void initFontInfo(const QFontDef &request, void initFontInfo(const QFontDef &request,
HDC fontHdc, int dpi); HDC fontHdc, int dpi);
virtual QFixed lineThickness() const; QFixed lineThickness() const Q_DECL_OVERRIDE;
virtual Properties properties() const; Properties properties() const Q_DECL_OVERRIDE;
virtual void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics); void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE;
virtual FaceId faceId() const; FaceId faceId() const Q_DECL_OVERRIDE;
virtual bool getSfntTableData(uint tag, uchar *buffer, uint *length) const; bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE;
virtual int synthesized() const; int synthesized() const Q_DECL_OVERRIDE;
virtual QFixed emSquareSize() const; QFixed emSquareSize() const Q_DECL_OVERRIDE;
virtual glyph_t glyphIndex(uint ucs4) const; glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const; bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
virtual void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const; void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const Q_DECL_OVERRIDE;
virtual void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags); void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
QPainterPath *path, QTextItem::RenderFlags flags); QPainterPath *path, QTextItem::RenderFlags flags);
HGDIOBJ selectDesignFont() const; HGDIOBJ selectDesignFont() const;
virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs); glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
virtual glyph_metrics_t boundingBox(glyph_t g) { return boundingBox(g, QTransform()); } glyph_metrics_t boundingBox(glyph_t g) Q_DECL_OVERRIDE { return boundingBox(g, QTransform()); }
virtual glyph_metrics_t boundingBox(glyph_t g, const QTransform &t); glyph_metrics_t boundingBox(glyph_t g, const QTransform &t) Q_DECL_OVERRIDE;
virtual QFixed ascent() const; QFixed ascent() const Q_DECL_OVERRIDE;
virtual QFixed descent() const; QFixed descent() const Q_DECL_OVERRIDE;
virtual QFixed leading() const; QFixed leading() const Q_DECL_OVERRIDE;
virtual QFixed xHeight() const; QFixed xHeight() const Q_DECL_OVERRIDE;
virtual QFixed averageCharWidth() const; QFixed averageCharWidth() const Q_DECL_OVERRIDE;
virtual qreal maxCharWidth() const; qreal maxCharWidth() const Q_DECL_OVERRIDE;
virtual qreal minLeftBearing() const; qreal minLeftBearing() const Q_DECL_OVERRIDE;
virtual qreal minRightBearing() const; qreal minRightBearing() const Q_DECL_OVERRIDE;
virtual QImage alphaMapForGlyph(glyph_t t) { return alphaMapForGlyph(t, QTransform()); } QImage alphaMapForGlyph(glyph_t t) Q_DECL_OVERRIDE { return alphaMapForGlyph(t, QTransform()); }
virtual QImage alphaMapForGlyph(glyph_t, const QTransform &xform); QImage alphaMapForGlyph(glyph_t, const QTransform &xform) Q_DECL_OVERRIDE;
virtual QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform); QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) Q_DECL_OVERRIDE;
virtual glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat); glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) Q_DECL_OVERRIDE;
virtual QFontEngine *cloneWithSize(qreal pixelSize) const; QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
virtual bool supportsTransformation(const QTransform &transform) const; bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE;
#ifndef Q_CC_MINGW #ifndef Q_CC_MINGW
virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0); void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) Q_DECL_OVERRIDE;
#endif #endif
bool hasUnreliableGlyphOutline() const Q_DECL_OVERRIDE; bool hasUnreliableGlyphOutline() const Q_DECL_OVERRIDE;

2
src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
View File

@ -74,7 +74,7 @@ public:
bool getSfntTableData(uint tag, uchar *buffer, uint *length) const; bool getSfntTableData(uint tag, uchar *buffer, uint *length) const;
QFixed emSquareSize() const; QFixed emSquareSize() const;
virtual glyph_t glyphIndex(uint ucs4) const; glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const; bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const;
void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const; void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const;

12
src/plugins/platforms/windows/qwindowsglcontext.h
View File

@ -238,19 +238,19 @@ class QWindowsGLContext : public QWindowsOpenGLContext
{ {
public: public:
explicit QWindowsGLContext(QOpenGLStaticContext *staticContext, QOpenGLContext *context); explicit QWindowsGLContext(QOpenGLStaticContext *staticContext, QOpenGLContext *context);
virtual ~QWindowsGLContext(); ~QWindowsGLContext();
bool isSharing() const Q_DECL_OVERRIDE { return m_context->shareHandle(); } bool isSharing() const Q_DECL_OVERRIDE { return m_context->shareHandle(); }
bool isValid() const Q_DECL_OVERRIDE { return m_renderingContext; } bool isValid() const Q_DECL_OVERRIDE { return m_renderingContext; }
virtual QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_obtainedFormat; } QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_obtainedFormat; }
virtual void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
virtual bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
virtual void doneCurrent() Q_DECL_OVERRIDE; void doneCurrent() Q_DECL_OVERRIDE;
typedef void (*GL_Proc) (); typedef void (*GL_Proc) ();
virtual QFunctionPointer getProcAddress(const QByteArray &procName) Q_DECL_OVERRIDE; QFunctionPointer getProcAddress(const QByteArray &procName) Q_DECL_OVERRIDE;
HGLRC renderingContext() const { return m_renderingContext; } HGLRC renderingContext() const { return m_renderingContext; }

4
src/plugins/platforms/windows/qwindowsguieventdispatcher.h
View File

@ -59,8 +59,8 @@ public:
static const char *windowsMessageName(UINT msg); static const char *windowsMessageName(UINT msg);
virtual bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags); bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE;
virtual void sendPostedEvents(); void sendPostedEvents() Q_DECL_OVERRIDE;
private: private:
QEventLoop::ProcessEventsFlags m_flags; QEventLoop::ProcessEventsFlags m_flags;

6
src/plugins/platforms/windows/qwindowsinputcontext.h
View File

@ -68,9 +68,9 @@ public:
explicit QWindowsInputContext(); explicit QWindowsInputContext();
~QWindowsInputContext(); ~QWindowsInputContext();
virtual void reset(); void reset() Q_DECL_OVERRIDE;
virtual void update(Qt::InputMethodQueries); void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE;
virtual void invokeAction(QInputMethod::Action, int cursorPosition); void invokeAction(QInputMethod::Action, int cursorPosition) Q_DECL_OVERRIDE;
static QWindowsInputContext *instance(); static QWindowsInputContext *instance();

26
src/plugins/platforms/windows/qwindowsintegration.h
View File

@ -74,30 +74,30 @@ public:
QWindowsWindowData createWindowData(QWindow *window) const; QWindowsWindowData createWindowData(QWindow *window) const;
QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformWindow *createPlatformWindow(QWindow *window) const;
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
virtual QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE;
QOpenGLContext::OpenGLModuleType openGLModuleType(); QOpenGLContext::OpenGLModuleType openGLModuleType();
static QWindowsStaticOpenGLContext *staticOpenGLContext(); static QWindowsStaticOpenGLContext *staticOpenGLContext();
#endif #endif
virtual QAbstractEventDispatcher *createEventDispatcher() const; QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE;
void initialize() Q_DECL_OVERRIDE; void initialize() Q_DECL_OVERRIDE;
#ifndef QT_NO_CLIPBOARD #ifndef QT_NO_CLIPBOARD
virtual QPlatformClipboard *clipboard() const; QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
# ifndef QT_NO_DRAGANDDROP # ifndef QT_NO_DRAGANDDROP
virtual QPlatformDrag *drag() const; QPlatformDrag *drag() const Q_DECL_OVERRIDE;
# endif # endif
#endif // !QT_NO_CLIPBOARD #endif // !QT_NO_CLIPBOARD
virtual QPlatformInputContext *inputContext() const; QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_ACCESSIBILITY
virtual QPlatformAccessibility *accessibility() const; QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
#endif #endif
virtual QPlatformFontDatabase *fontDatabase() const; QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
virtual QStringList themeNames() const; QStringList themeNames() const Q_DECL_OVERRIDE;
virtual QPlatformTheme *createPlatformTheme(const QString &name) const; QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE;
QPlatformServices *services() const; QPlatformServices *services() const;
virtual QVariant styleHint(StyleHint hint) const; QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
virtual Qt::KeyboardModifiers queryKeyboardModifiers() const; Qt::KeyboardModifiers queryKeyboardModifiers() const Q_DECL_OVERRIDE;
virtual QList<int> possibleKeys(const QKeyEvent *e) const; QList<int> possibleKeys(const QKeyEvent *e) const Q_DECL_OVERRIDE;
static QWindowsIntegration *instance(); static QWindowsIntegration *instance();
@ -106,7 +106,7 @@ public:
unsigned options() const; unsigned options() const;
#if !defined(Q_OS_WINCE) && !defined(QT_NO_SESSIONMANAGER) #if !defined(Q_OS_WINCE) && !defined(QT_NO_SESSIONMANAGER)
virtual QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const; QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const Q_DECL_OVERRIDE;
#endif #endif
private: private:

6
src/plugins/platforms/windows/qwindowsinternalmimedata.h
View File

@ -54,9 +54,9 @@ class QDebug;
// Implementation in qwindowsclipboard.cpp. // Implementation in qwindowsclipboard.cpp.
class QWindowsInternalMimeData : public QInternalMimeData { class QWindowsInternalMimeData : public QInternalMimeData {
public: public:
virtual bool hasFormat_sys(const QString &mimetype) const; bool hasFormat_sys(const QString &mimetype) const Q_DECL_OVERRIDE;
virtual QStringList formats_sys() const; QStringList formats_sys() const Q_DECL_OVERRIDE;
virtual QVariant retrieveData_sys(const QString &mimetype, QVariant::Type preferredType) const; QVariant retrieveData_sys(const QString &mimetype, QVariant::Type preferredType) const Q_DECL_OVERRIDE;
protected: protected:
virtual IDataObject *retrieveDataObject() const = 0; virtual IDataObject *retrieveDataObject() const = 0;

24
src/plugins/platforms/windows/qwindowsscreen.h
View File

@ -88,24 +88,24 @@ public:
static QWindowsScreen *screenOf(const QWindow *w = 0); static QWindowsScreen *screenOf(const QWindow *w = 0);
virtual QRect geometry() const { return m_data.geometry; } QRect geometry() const Q_DECL_OVERRIDE { return m_data.geometry; }
virtual QRect availableGeometry() const { return m_data.availableGeometry; } QRect availableGeometry() const Q_DECL_OVERRIDE { return m_data.availableGeometry; }
virtual int depth() const { return m_data.depth; } int depth() const Q_DECL_OVERRIDE { return m_data.depth; }
virtual QImage::Format format() const { return m_data.format; } QImage::Format format() const Q_DECL_OVERRIDE { return m_data.format; }
virtual QSizeF physicalSize() const { return m_data.physicalSizeMM; } QSizeF physicalSize() const Q_DECL_OVERRIDE { return m_data.physicalSizeMM; }
virtual QDpi logicalDpi() const { return m_data.dpi; } QDpi logicalDpi() const Q_DECL_OVERRIDE { return m_data.dpi; }
virtual qreal refreshRate() const { return m_data.refreshRateHz; } qreal refreshRate() const Q_DECL_OVERRIDE { return m_data.refreshRateHz; }
virtual QString name() const { return m_data.name; } QString name() const Q_DECL_OVERRIDE { return m_data.name; }
virtual Qt::ScreenOrientation primaryOrientation() { return m_data.orientation; } Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE { return m_data.orientation; }
virtual QList<QPlatformScreen *> virtualSiblings() const; QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE;
virtual QWindow *topLevelAt(const QPoint &point) const QWindow *topLevelAt(const QPoint &point) const Q_DECL_OVERRIDE
{ return QWindowsScreen::findTopLevelAt(point, CWP_SKIPINVISIBLE); } { return QWindowsScreen::findTopLevelAt(point, CWP_SKIPINVISIBLE); }
static QWindow *findTopLevelAt(const QPoint &point, unsigned flags); static QWindow *findTopLevelAt(const QPoint &point, unsigned flags);
static QWindow *windowAt(const QPoint &point, unsigned flags = CWP_SKIPINVISIBLE); static QWindow *windowAt(const QPoint &point, unsigned flags = CWP_SKIPINVISIBLE);
static QWindow *windowUnderMouse(unsigned flags = CWP_SKIPINVISIBLE); static QWindow *windowUnderMouse(unsigned flags = CWP_SKIPINVISIBLE);
virtual QPixmap grabWindow(WId window, int x, int y, int width, int height) const; QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE;
inline void handleChanges(const QWindowsScreenData &newData); inline void handleChanges(const QWindowsScreenData &newData);

12
src/plugins/platforms/windows/qwindowstheme.h
View File

@ -59,17 +59,17 @@ public:
static QWindowsTheme *instance() { return m_instance; } static QWindowsTheme *instance() { return m_instance; }
virtual bool usePlatformNativeDialog(DialogType type) const; bool usePlatformNativeDialog(DialogType type) const Q_DECL_OVERRIDE;
virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const; QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const Q_DECL_OVERRIDE;
virtual QVariant themeHint(ThemeHint) const; QVariant themeHint(ThemeHint) const Q_DECL_OVERRIDE;
virtual const QPalette *palette(Palette type = SystemPalette) const virtual const QPalette *palette(Palette type = SystemPalette) const
{ return m_palettes[type]; } { return m_palettes[type]; }
virtual const QFont *font(Font type = SystemFont) const virtual const QFont *font(Font type = SystemFont) const
{ return m_fonts[type]; } { return m_fonts[type]; }
virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const; QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const Q_DECL_OVERRIDE;
virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size, QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size,
QPlatformTheme::IconOptions iconOptions = 0) const; QPlatformTheme::IconOptions iconOptions = 0) const Q_DECL_OVERRIDE;
void windowsThemeChanged(QWindow *window); void windowsThemeChanged(QWindow *window);

48
src/plugins/platforms/windows/qwindowswindow.h
View File

@ -151,46 +151,46 @@ public:
QWindowsWindow(QWindow *window, const QWindowsWindowData &data); QWindowsWindow(QWindow *window, const QWindowsWindowData &data);
~QWindowsWindow(); ~QWindowsWindow();
virtual QSurfaceFormat format() const { return m_format; } QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
virtual void setGeometry(const QRect &rect); void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
virtual QRect geometry() const { return m_data.geometry; } QRect geometry() const Q_DECL_OVERRIDE { return m_data.geometry; }
QRect normalGeometry() const Q_DECL_OVERRIDE; QRect normalGeometry() const Q_DECL_OVERRIDE;
virtual void setVisible(bool visible); void setVisible(bool visible) Q_DECL_OVERRIDE;
bool isVisible() const; bool isVisible() const;
virtual bool isExposed() const { return testFlag(Exposed); } bool isExposed() const Q_DECL_OVERRIDE { return testFlag(Exposed); }
virtual bool isActive() const; bool isActive() const Q_DECL_OVERRIDE;
virtual bool isEmbedded(const QPlatformWindow *parentWindow) const; bool isEmbedded(const QPlatformWindow *parentWindow) const Q_DECL_OVERRIDE;
virtual QPoint mapToGlobal(const QPoint &pos) const; QPoint mapToGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;
virtual QPoint mapFromGlobal(const QPoint &pos) const; QPoint mapFromGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;
virtual void setWindowFlags(Qt::WindowFlags flags); void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
virtual void setWindowState(Qt::WindowState state); void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
HWND handle() const { return m_data.hwnd; } HWND handle() const { return m_data.hwnd; }
virtual WId winId() const { return WId(m_data.hwnd); } WId winId() const Q_DECL_OVERRIDE { return WId(m_data.hwnd); }
virtual void setParent(const QPlatformWindow *window); void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE;
virtual void setWindowTitle(const QString &title); void setWindowTitle(const QString &title) Q_DECL_OVERRIDE;
virtual void raise(); void raise() Q_DECL_OVERRIDE;
virtual void lower(); void lower() Q_DECL_OVERRIDE;
void windowEvent(QEvent *event); void windowEvent(QEvent *event);
virtual void propagateSizeHints(); void propagateSizeHints() Q_DECL_OVERRIDE;
virtual QMargins frameMargins() const; QMargins frameMargins() const Q_DECL_OVERRIDE;
virtual void setOpacity(qreal level); void setOpacity(qreal level) Q_DECL_OVERRIDE;
virtual void setMask(const QRegion &region); void setMask(const QRegion &region) Q_DECL_OVERRIDE;
qreal opacity() const { return m_opacity; } qreal opacity() const { return m_opacity; }
virtual void requestActivateWindow(); void requestActivateWindow() Q_DECL_OVERRIDE;
virtual bool setKeyboardGrabEnabled(bool grab); bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE;
virtual bool setMouseGrabEnabled(bool grab); bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE;
inline bool hasMouseCapture() const { return GetCapture() == m_data.hwnd; } inline bool hasMouseCapture() const { return GetCapture() == m_data.hwnd; }
virtual bool startSystemResize(const QPoint &pos, Qt::Corner corner); bool startSystemResize(const QPoint &pos, Qt::Corner corner) Q_DECL_OVERRIDE;
void setFrameStrutEventsEnabled(bool enabled); void setFrameStrutEventsEnabled(bool enabled);
bool frameStrutEventsEnabled() const { return testFlag(FrameStrutEventsEnabled); } bool frameStrutEventsEnabled() const { return testFlag(FrameStrutEventsEnabled); }