QNX: Add missing override

Change-Id: Idb6216a645f7c9791674d16665331a63da46b132
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
bb10
Alexander Volkov 2016-11-27 11:30:47 +03:00
parent 7d6d70afe7
commit 5a1ff37485
19 changed files with 97 additions and 97 deletions

View File

@ -46,7 +46,7 @@ class QQnxIntegrationPlugin : public QPlatformIntegrationPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qnx.json")
public:
QPlatformIntegration *create(const QString&, const QStringList&);
QPlatformIntegration *create(const QString&, const QStringList&) override;
};
QT_END_NAMESPACE

View File

@ -103,14 +103,14 @@ public:
qClipboardDebug() << "formats=" << m_formatsToCheck;
}
bool hasFormat(const QString &mimetype) const
bool hasFormat(const QString &mimetype) const override
{
const bool result = is_clipboard_format_present(mimetype.toUtf8().constData()) == 0;
qClipboardDebug() << "mimetype=" << mimetype << "result=" << result;
return result;
}
QStringList formats() const
QStringList formats() const override
{
QStringList result;
@ -141,7 +141,7 @@ public:
}
protected:
QVariant retrieveData(const QString &mimetype, QVariant::Type preferredType) const
QVariant retrieveData(const QString &mimetype, QVariant::Type preferredType) const override
{
qClipboardDebug() << "mimetype=" << mimetype << "preferredType=" << preferredType;
if (is_clipboard_format_present(mimetype.toUtf8().constData()) != 0)

View File

@ -52,8 +52,8 @@ class QQnxClipboard : public QPlatformClipboard
public:
QQnxClipboard();
~QQnxClipboard();
QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard);
void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard);
QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override;
private:
class MimeData;

View File

@ -50,11 +50,11 @@ public:
QQnxCursor();
#if !defined(QT_NO_CURSOR)
void changeCursor(QCursor *windowCursor, QWindow *window);
void changeCursor(QCursor *windowCursor, QWindow *window) override;
#endif
void setPos(const QPoint &pos);
void setPos(const QPoint &pos) override;
QPoint pos() const;
QPoint pos() const override;
private:
QPoint m_pos;

View File

@ -61,11 +61,11 @@ public:
void setPlatformOpenGLContext(QQnxGLContext *platformOpenGLContext);
QQnxGLContext *platformOpenGLContext() const { return m_platformOpenGLContext; }
void setGeometry(const QRect &rect);
void setGeometry(const QRect &rect) override;
protected:
int pixelFormat() const;
void resetBuffers();
int pixelFormat() const override;
void resetBuffers() override;
private:
QSize m_requestedBufferSize;

View File

@ -64,13 +64,13 @@ public:
void requestSurfaceChange();
bool makeCurrent(QPlatformSurface *surface);
void doneCurrent();
void swapBuffers(QPlatformSurface *surface);
QFunctionPointer getProcAddress(const char *procName);
bool makeCurrent(QPlatformSurface *surface) override;
void doneCurrent() override;
void swapBuffers(QPlatformSurface *surface) override;
QFunctionPointer getProcAddress(const char *procName) override;
virtual QSurfaceFormat format() const { return m_windowFormat; }
bool isSharing() const;
virtual QSurfaceFormat format() const override { return m_windowFormat; }
bool isSharing() const override;
static EGLDisplay getEglDisplay();
EGLConfig getEglConfig() const { return m_eglConfig;}

View File

@ -71,22 +71,22 @@ public:
Reverted,
};
bool isValid() const;
bool isValid() const override;
bool filterEvent(const QEvent *event);
QRectF keyboardRect() const;
void reset();
void commit();
void update(Qt::InputMethodQueries);
bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap, int sequenceId);
bool filterEvent(const QEvent *event) override;
QRectF keyboardRect() const override;
void reset() override;
void commit() override;
void update(Qt::InputMethodQueries) override;
bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap, int sequenceId) override;
void showInputPanel();
void hideInputPanel();
bool isInputPanelVisible() const;
void showInputPanel() override;
void hideInputPanel() override;
bool isInputPanelVisible() const override;
QLocale locale() const;
void setFocusObject(QObject *object);
QLocale locale() const override;
void setFocusObject(QObject *object) override;
static void setHighlightColor(int index, const QColor &color);

View File

@ -56,19 +56,19 @@ public:
explicit QQnxInputContext(QQnxIntegration *integration, QQnxAbstractVirtualKeyboard &keyboard);
~QQnxInputContext();
bool isValid() const;
bool isValid() const override;
void reset();
bool filterEvent( const QEvent *event );
QRectF keyboardRect() const;
void reset() override;
bool filterEvent(const QEvent *event) override;
QRectF keyboardRect() const override;
bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
void showInputPanel();
void hideInputPanel();
bool isInputPanelVisible() const;
void showInputPanel() override;
void hideInputPanel() override;
bool isInputPanelVisible() const override;
QLocale locale() const;
void setFocusObject(QObject *object);
QLocale locale() const override;
void setFocusObject(QObject *object) override;
private Q_SLOTS:
void keyboardHeightChanged();

View File

@ -89,38 +89,38 @@ public:
explicit QQnxIntegration(const QStringList &paramList);
~QQnxIntegration();
bool hasCapability(QPlatformIntegration::Capability cap) const;
bool hasCapability(QPlatformIntegration::Capability cap) const override;
QPlatformWindow *createPlatformWindow(QWindow *window) const;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
QPlatformWindow *createPlatformWindow(QWindow *window) const override;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
#if !defined(QT_NO_OPENGL)
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
#endif
#if defined(QQNX_PPS)
QPlatformInputContext *inputContext() const;
QPlatformInputContext *inputContext() const override;
#endif
void moveToScreen(QWindow *window, int screen);
bool supportsNavigatorEvents() const;
QAbstractEventDispatcher *createEventDispatcher() const;
QAbstractEventDispatcher *createEventDispatcher() const override;
QPlatformFontDatabase *fontDatabase() const { return m_fontDatabase; }
QPlatformFontDatabase *fontDatabase() const override { return m_fontDatabase; }
QPlatformNativeInterface *nativeInterface() const;
QPlatformNativeInterface *nativeInterface() const override;
#if !defined(QT_NO_CLIPBOARD)
QPlatformClipboard *clipboard() const;
QPlatformClipboard *clipboard() const override;
#endif
#if !defined(QT_NO_DRAGANDDROP)
QPlatformDrag *drag() const;
QPlatformDrag *drag() const override;
#endif
QVariant styleHint(StyleHint hint) const;
QVariant styleHint(StyleHint hint) const override;
QPlatformServices *services() const;
QPlatformServices *services() const override;
static QWindow *window(screen_window_t qnxWindow);

View File

@ -50,16 +50,16 @@ class QQnxNativeInterface : public QPlatformNativeInterface
{
public:
QQnxNativeInterface(QQnxIntegration *integration);
void *nativeResourceForWindow(const QByteArray &resource, QWindow *window);
void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen);
void *nativeResourceForIntegration(const QByteArray &resource);
void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) override;
void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen) override;
void *nativeResourceForIntegration(const QByteArray &resource) override;
#if !defined(QT_NO_OPENGL)
void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context);
void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) override;
#endif
void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value);
NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource);
void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value) override;
NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) override;
private:
QQnxIntegration *m_integration;

View File

@ -54,7 +54,7 @@ public:
~QQnxNavigatorPps();
protected:
bool requestInvokeUrl(const QByteArray &encodedUrl);
bool requestInvokeUrl(const QByteArray &encodedUrl) override;
private:
bool openPpsConnection();

View File

@ -54,12 +54,12 @@ public:
QQnxRasterBackingStore(QWindow *window);
~QQnxRasterBackingStore();
QPaintDevice *paintDevice();
void flush(QWindow *window, const QRegion &region, const QPoint &offset);
void resize(const QSize &size, const QRegion &staticContents);
bool scroll(const QRegion &area, int dx, int dy);
void beginPaint(const QRegion &region);
void endPaint();
QPaintDevice *paintDevice() override;
void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
void resize(const QSize &size, const QRegion &staticContents) override;
bool scroll(const QRegion &area, int dx, int dy) override;
void beginPaint(const QRegion &region) override;
void endPaint() override;
private:
QQnxRasterWindow *platformWindow() const;

View File

@ -58,13 +58,13 @@ public:
bool hasBuffers() const { return !bufferSize().isEmpty(); }
void setParent(const QPlatformWindow *window);
void setParent(const QPlatformWindow *window) override;
void adjustBufferSize();
protected:
int pixelFormat() const;
void resetBuffers();
int pixelFormat() const override;
void resetBuffers() override;
// Copies content from the previous buffer (back buffer) to the current buffer (front buffer)
void blitPreviousToCurrent(const QRegion &region, int dx, int dy, bool flush=false);

View File

@ -71,26 +71,26 @@ public:
QQnxScreen(screen_context_t context, screen_display_t display, bool primaryScreen);
~QQnxScreen();
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 override;
QRect geometry() const { return m_currentGeometry; }
QRect availableGeometry() const;
int depth() const;
QImage::Format format() const { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; }
QSizeF physicalSize() const { return m_currentPhysicalSize; }
QRect geometry() const override { return m_currentGeometry; }
QRect availableGeometry() const override;
int depth() const override;
QImage::Format format() const override { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; }
QSizeF physicalSize() const override { return m_currentPhysicalSize; }
qreal refreshRate() const;
qreal refreshRate() const override;
Qt::ScreenOrientation nativeOrientation() const;
Qt::ScreenOrientation orientation() const;
Qt::ScreenOrientation nativeOrientation() const override;
Qt::ScreenOrientation orientation() const override;
QWindow *topLevelAt(const QPoint &point) const;
QWindow *topLevelAt(const QPoint &point) const override;
bool isPrimaryScreen() const { return m_primaryScreen; }
int rotation() const { return m_currentRotation; }
QString name() const { return m_name; }
QString name() const override { return m_name; }
int nativeFormat() const { return (depth() == 32) ? SCREEN_FORMAT_RGBA8888 : SCREEN_FORMAT_RGB565; }
screen_display_t nativeDisplay() const { return m_display; }
@ -111,7 +111,7 @@ public:
QQnxWindow *rootWindow() const;
void setRootWindow(QQnxWindow*);
QPlatformCursor *cursor() const;
QPlatformCursor *cursor() const override;
Q_SIGNALS:
void foreignWindowCreated(void *window);

View File

@ -75,7 +75,7 @@ Q_SIGNALS:
void windowClosed(void *window);
protected:
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) override;
#if defined(QQNX_SCREENEVENTTHREAD)
private Q_SLOTS:

View File

@ -65,7 +65,7 @@ public:
void unlock();
protected:
void run();
void run() override;
Q_SIGNALS:
void eventPending();

View File

@ -52,8 +52,8 @@ public:
explicit QQnxServices(QQnxAbstractNavigator *navigator);
~QQnxServices();
bool openUrl(const QUrl &url);
bool openDocument(const QUrl &url);
bool openUrl(const QUrl &url) override;
bool openDocument(const QUrl &url) override;
private:
bool navigatorInvoke(const QUrl &url);

View File

@ -56,14 +56,14 @@ public:
QQnxVirtualKeyboardPps();
~QQnxVirtualKeyboardPps();
bool showKeyboard();
bool hideKeyboard();
bool showKeyboard() override;
bool hideKeyboard() override;
public Q_SLOTS:
void start();
protected:
void applyKeyboardOptions();
void applyKeyboardOptions() override;
private Q_SLOTS:
void ppsDataReady();

View File

@ -67,13 +67,13 @@ public:
QQnxWindow(QWindow *window, screen_context_t context, bool needRootWindow);
virtual ~QQnxWindow();
void setGeometry(const QRect &rect);
void setVisible(bool visible);
void setOpacity(qreal level);
void setGeometry(const QRect &rect) override;
void setVisible(bool visible) override;
void setOpacity(qreal level) override;
bool isExposed() const;
bool isExposed() const override;
WId winId() const { return window()->type() == Qt::Desktop ? -1 : (WId)m_window; }
WId winId() const override { return window()->type() == Qt::Desktop ? -1 : (WId)m_window; }
screen_window_t nativeHandle() const { return m_window; }
void setBufferSize(const QSize &size);
@ -81,14 +81,14 @@ public:
void setScreen(QQnxScreen *platformScreen);
void setParent(const QPlatformWindow *window);
void raise();
void lower();
void requestActivateWindow();
void setWindowState(Qt::WindowState state);
void setParent(const QPlatformWindow *window) override;
void raise() override;
void lower() override;
void requestActivateWindow() override;
void setWindowState(Qt::WindowState state) override;
void setExposed(bool exposed);
void propagateSizeHints();
void propagateSizeHints() override;
void setMMRendererWindowName(const QString &name);
void setMMRendererWindow(screen_window_t handle);