winrt: Add missing override
Change-Id: I2f257756bc606f8eb5cad2afe67b90810a2e394c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
parent
aac3a4c032
commit
1a0e690d50
@ -129,6 +129,17 @@ static QFontDatabase::WritingSystem writingSystemFromUnicodeRange(const DWRITE_U
|
||||
return QFontDatabase::Other;
|
||||
}
|
||||
|
||||
QWinRTFontDatabase::~QWinRTFontDatabase()
|
||||
{
|
||||
qCDebug(lcQpaFonts) << __FUNCTION__;
|
||||
|
||||
foreach (IDWriteFontFile *fontFile, m_fonts.keys())
|
||||
fontFile->Release();
|
||||
|
||||
foreach (IDWriteFontFamily *fontFamily, m_fontFamilies)
|
||||
fontFamily->Release();
|
||||
}
|
||||
|
||||
QString QWinRTFontDatabase::fontDir() const
|
||||
{
|
||||
qCDebug(lcQpaFonts) << __FUNCTION__;
|
||||
@ -146,17 +157,6 @@ QString QWinRTFontDatabase::fontDir() const
|
||||
return fontDirectory;
|
||||
}
|
||||
|
||||
QWinRTFontDatabase::~QWinRTFontDatabase()
|
||||
{
|
||||
qCDebug(lcQpaFonts) << __FUNCTION__;
|
||||
|
||||
foreach (IDWriteFontFile *fontFile, m_fonts.keys())
|
||||
fontFile->Release();
|
||||
|
||||
foreach (IDWriteFontFamily *fontFamily, m_fontFamilies)
|
||||
fontFamily->Release();
|
||||
}
|
||||
|
||||
QFont QWinRTFontDatabase::defaultFont() const
|
||||
{
|
||||
return QFont(QStringLiteral("Segoe UI"));
|
||||
|
@ -70,8 +70,8 @@ struct FontDescription
|
||||
class QWinRTFontDatabase : public QBasicFontDatabase
|
||||
{
|
||||
public:
|
||||
QString fontDir() const;
|
||||
~QWinRTFontDatabase();
|
||||
QString fontDir() const override;
|
||||
QFont defaultFont() const override;
|
||||
bool fontsAlwaysScalable() const override;
|
||||
void populateFontDatabase() override;
|
||||
|
@ -50,7 +50,7 @@ class QWinRTIntegrationPlugin : public QPlatformIntegrationPlugin
|
||||
|
||||
public:
|
||||
QStringList keys() const;
|
||||
QPlatformIntegration *create(const QString&, const QStringList&);
|
||||
QPlatformIntegration *create(const QString&, const QStringList&) override;
|
||||
};
|
||||
|
||||
QStringList QWinRTIntegrationPlugin::keys() const
|
||||
|
@ -58,11 +58,11 @@ class QWinRTBackingStore : public QPlatformBackingStore
|
||||
public:
|
||||
explicit QWinRTBackingStore(QWindow *window);
|
||||
~QWinRTBackingStore();
|
||||
QPaintDevice *paintDevice();
|
||||
void beginPaint(const QRegion &);
|
||||
void endPaint();
|
||||
void flush(QWindow *window, const QRegion ®ion, const QPoint &offset);
|
||||
void resize(const QSize &size, const QRegion &staticContents);
|
||||
QPaintDevice *paintDevice() override;
|
||||
void beginPaint(const QRegion &) override;
|
||||
void endPaint() override;
|
||||
void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override;
|
||||
void resize(const QSize &size, const QRegion &staticContents) override;
|
||||
QImage toImage() const override;
|
||||
|
||||
private:
|
||||
|
@ -51,9 +51,9 @@ public:
|
||||
explicit QWinRTCursor();
|
||||
~QWinRTCursor();
|
||||
#ifndef QT_NO_CURSOR
|
||||
void changeCursor(QCursor * windowCursor, QWindow *window);
|
||||
void changeCursor(QCursor * windowCursor, QWindow *window) override;
|
||||
#endif
|
||||
QPoint pos() const;
|
||||
QPoint pos() const override;
|
||||
|
||||
private:
|
||||
QScopedPointer<QWinRTCursorPrivate> d_ptr;
|
||||
|
@ -51,8 +51,8 @@ public:
|
||||
explicit QWinRTEventDispatcher(QObject *parent = 0);
|
||||
|
||||
protected:
|
||||
bool hasPendingEvents();
|
||||
bool sendPostedEvents(QEventLoop::ProcessEventsFlags flags);
|
||||
bool hasPendingEvents() override;
|
||||
bool sendPostedEvents(QEventLoop::ProcessEventsFlags flags) override;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
@ -82,11 +82,11 @@ public:
|
||||
bool defaultNameFilterDisables() const override { return false; }
|
||||
void setDirectory(const QUrl &directory) override;
|
||||
QUrl directory() const override;
|
||||
void selectFile(const QUrl &saveFileName);
|
||||
void selectFile(const QUrl &saveFileName) override;
|
||||
QList<QUrl> selectedFiles() const override;
|
||||
void setFilter() override { }
|
||||
void selectNameFilter(const QString &selectedNameFilter) override;
|
||||
QString selectedNameFilter() const;
|
||||
QString selectedNameFilter() const override;
|
||||
|
||||
#ifndef Q_OS_WINPHONE
|
||||
HRESULT onSingleFilePicked(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::Storage::StorageFile *> *,
|
||||
|
@ -70,13 +70,13 @@ class QWinRTInputContext : public QPlatformInputContext
|
||||
public:
|
||||
explicit QWinRTInputContext(QWinRTScreen *);
|
||||
|
||||
QRectF keyboardRect() const;
|
||||
QRectF keyboardRect() const override;
|
||||
|
||||
bool isInputPanelVisible() const;
|
||||
bool isInputPanelVisible() const override;
|
||||
|
||||
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
|
||||
void showInputPanel();
|
||||
void hideInputPanel();
|
||||
void showInputPanel() override;
|
||||
void hideInputPanel() override;
|
||||
#endif
|
||||
|
||||
private slots:
|
||||
|
@ -69,11 +69,11 @@ public:
|
||||
explicit QWinRTMessageDialogHelper(const QWinRTTheme *theme);
|
||||
~QWinRTMessageDialogHelper();
|
||||
|
||||
void exec();
|
||||
void exec() override;
|
||||
bool show(Qt::WindowFlags windowFlags,
|
||||
Qt::WindowModality windowModality,
|
||||
QWindow *parent);
|
||||
void hide();
|
||||
QWindow *parent) override;
|
||||
void hide() override;
|
||||
|
||||
private:
|
||||
HRESULT onCompleted(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::UI::Popups::IUICommand *> *asyncInfo,
|
||||
|
@ -52,8 +52,8 @@ public:
|
||||
explicit QWinRTServices();
|
||||
~QWinRTServices();
|
||||
|
||||
bool openUrl(const QUrl &url);
|
||||
bool openDocument(const QUrl &url);
|
||||
bool openUrl(const QUrl &url) override;
|
||||
bool openDocument(const QUrl &url) override;
|
||||
|
||||
private:
|
||||
QScopedPointer<QWinRTServicesPrivate> d_ptr;
|
||||
|
@ -54,8 +54,8 @@ class QWinRTTheme : public QPlatformTheme
|
||||
public:
|
||||
QWinRTTheme();
|
||||
|
||||
bool usePlatformNativeDialog(DialogType type) const;
|
||||
QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const;
|
||||
bool usePlatformNativeDialog(DialogType type) const override;
|
||||
QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override;
|
||||
|
||||
const QPalette *palette(Palette type = SystemPalette) const override;
|
||||
|
||||
|
@ -56,14 +56,14 @@ public:
|
||||
QWinRTWindow(QWindow *window);
|
||||
~QWinRTWindow();
|
||||
|
||||
QSurfaceFormat format() const;
|
||||
bool isActive() const;
|
||||
bool isExposed() const;
|
||||
void setGeometry(const QRect &rect);
|
||||
void setVisible(bool visible);
|
||||
void setWindowTitle(const QString &title);
|
||||
void raise();
|
||||
void lower();
|
||||
QSurfaceFormat format() const override;
|
||||
bool isActive() const override;
|
||||
bool isExposed() const override;
|
||||
void setGeometry(const QRect &rect) override;
|
||||
void setVisible(bool visible) override;
|
||||
void setWindowTitle(const QString &title) override;
|
||||
void raise() override;
|
||||
void lower() override;
|
||||
|
||||
WId winId() const override;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user