From 68ecbffb303490beef2ebfa7d8cdb66a7ca73469 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Mon, 26 Mar 2012 15:26:24 +0200 Subject: Remove the virtual keyword from reimpl. methods Qt Coding Standards state that "when reimplementing a virtual method, do not put the virtual keyword in the header file'". Change-Id: I89ae34eee78ad5b58a3e41845384a656225ed658 Reviewed-by: Kevin Krammer Reviewed-by: Robin Burchell Reviewed-by: Sean Harmer --- src/plugins/platforms/qnx/qqnxclipboard.h | 6 ++--- src/plugins/platforms/qnx/qqnxeventthread.h | 2 +- src/plugins/platforms/qnx/qqnxglbackingstore.h | 20 ++++++++--------- src/plugins/platforms/qnx/qqnxglcontext.h | 8 +++---- src/plugins/platforms/qnx/qqnxinputcontext_imf.h | 16 ++++++------- src/plugins/platforms/qnx/qqnxinputcontext_noimf.h | 12 +++++----- src/plugins/platforms/qnx/qqnxintegration.h | 26 +++++++++++----------- src/plugins/platforms/qnx/qqnxrasterbackingstore.h | 14 ++++++------ src/plugins/platforms/qnx/qqnxscreen.h | 12 +++++----- src/plugins/platforms/qnx/qqnxwindow.h | 16 ++++++------- 10 files changed, 66 insertions(+), 66 deletions(-) (limited to 'src/plugins/platforms/qnx') diff --git a/src/plugins/platforms/qnx/qqnxclipboard.h b/src/plugins/platforms/qnx/qqnxclipboard.h index 1104885d8c..c9ceff41f6 100644 --- a/src/plugins/platforms/qnx/qqnxclipboard.h +++ b/src/plugins/platforms/qnx/qqnxclipboard.h @@ -51,9 +51,9 @@ class QQnxClipboard : public QPlatformClipboard { public: QQnxClipboard(); - virtual ~QQnxClipboard(); - virtual QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard); - virtual void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard); + ~QQnxClipboard(); + QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard); + void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard); private: class MimeData; diff --git a/src/plugins/platforms/qnx/qqnxeventthread.h b/src/plugins/platforms/qnx/qqnxeventthread.h index 9724587c37..0bb26c3c06 100644 --- a/src/plugins/platforms/qnx/qqnxeventthread.h +++ b/src/plugins/platforms/qnx/qqnxeventthread.h @@ -57,7 +57,7 @@ public: static void injectKeyboardEvent(int flags, int sym, int mod, int scan, int cap); protected: - virtual void run(); + void run(); private: void shutdown(); diff --git a/src/plugins/platforms/qnx/qqnxglbackingstore.h b/src/plugins/platforms/qnx/qqnxglbackingstore.h index d04fe22f5d..b694079f37 100644 --- a/src/plugins/platforms/qnx/qqnxglbackingstore.h +++ b/src/plugins/platforms/qnx/qqnxglbackingstore.h @@ -58,11 +58,11 @@ class QQnxGLPaintDevice : public QGLPaintDevice { public: QQnxGLPaintDevice(QWindow *window); - virtual ~QQnxGLPaintDevice(); + ~QQnxGLPaintDevice(); - virtual QPaintEngine *paintEngine() const; - virtual QSize size() const; - virtual QGLContext *context() const { return m_glContext; } + QPaintEngine *paintEngine() const; + QSize size() const; + QGLContext *context() const { return m_glContext; } private: QQnxWindow *m_window; @@ -73,13 +73,13 @@ class QQnxGLBackingStore : public QPlatformBackingStore { public: QQnxGLBackingStore(QWindow *window); - virtual ~QQnxGLBackingStore(); + ~QQnxGLBackingStore(); - virtual QPaintDevice *paintDevice() { return m_paintDevice; } - virtual void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); - virtual void resize(const QSize &size, const QRegion &staticContents); - virtual void beginPaint(const QRegion ®ion); - virtual void endPaint(const QRegion ®ion); + QPaintDevice *paintDevice() { return m_paintDevice; } + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); + void resize(const QSize &size, const QRegion &staticContents); + void beginPaint(const QRegion ®ion); + void endPaint(const QRegion ®ion); void resizeSurface(const QSize &size); diff --git a/src/plugins/platforms/qnx/qqnxglcontext.h b/src/plugins/platforms/qnx/qqnxglcontext.h index 36c439802a..ee8d61ce00 100644 --- a/src/plugins/platforms/qnx/qqnxglcontext.h +++ b/src/plugins/platforms/qnx/qqnxglcontext.h @@ -61,10 +61,10 @@ public: static void initialize(); static void shutdown(); - virtual bool makeCurrent(QPlatformSurface *surface); - virtual void doneCurrent(); - virtual void swapBuffers(QPlatformSurface *surface); - virtual QFunctionPointer getProcAddress(const QByteArray &procName); + bool makeCurrent(QPlatformSurface *surface); + void doneCurrent(); + void swapBuffers(QPlatformSurface *surface); + QFunctionPointer getProcAddress(const QByteArray &procName); virtual QSurfaceFormat format() const { return m_windowFormat; } diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h index 2574e19527..16972fbf00 100644 --- a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h +++ b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h @@ -62,18 +62,18 @@ public: QQnxInputContext(QQnxVirtualKeyboard &keyboard); ~QQnxInputContext(); - virtual bool isValid() const; + bool isValid() const; - virtual bool filterEvent(const QEvent *event); - virtual void reset(); - virtual void update(Qt::InputMethodQueries); + bool filterEvent(const QEvent *event); + void reset(); + void update(Qt::InputMethodQueries); bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap); - virtual void showInputPanel(); - virtual void hideInputPanel(); - virtual bool isInputPanelVisible() const; + void showInputPanel(); + void hideInputPanel(); + bool isInputPanelVisible() const; - virtual QLocale locale() const; + QLocale locale() const; protected: // Filters only for IMF events. diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h b/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h index efc501b65f..50927d244b 100644 --- a/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h +++ b/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h @@ -57,17 +57,17 @@ public: explicit QQnxInputContext(QQnxVirtualKeyboard &keyboard); ~QQnxInputContext(); - virtual bool isValid() const; + bool isValid() const; void reset(); - virtual bool filterEvent( const QEvent *event ); + bool filterEvent( const QEvent *event ); bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap); - virtual void showInputPanel(); - virtual void hideInputPanel(); - virtual bool isInputPanelVisible() const; + void showInputPanel(); + void hideInputPanel(); + bool isInputPanelVisible() const; - virtual QLocale locale() const; + QLocale locale() const; private Q_SLOTS: void keyboardVisibilityChanged(bool visible); diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h index 6b4a4a1651..3c291c3f49 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.h +++ b/src/plugins/platforms/qnx/qqnxintegration.h @@ -68,32 +68,32 @@ class QQnxIntegration : public QPlatformIntegration { public: QQnxIntegration(); - virtual ~QQnxIntegration(); + ~QQnxIntegration(); - virtual bool hasCapability(QPlatformIntegration::Capability cap) const; + bool hasCapability(QPlatformIntegration::Capability cap) const; - virtual QPlatformWindow *createPlatformWindow(QWindow *window) const; - virtual QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; - virtual QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; + QPlatformWindow *createPlatformWindow(QWindow *window) const; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; - virtual QPlatformInputContext *inputContext() const; + QPlatformInputContext *inputContext() const; - virtual QList screens() const; - virtual void moveToScreen(QWindow *window, int screen); + QList screens() const; + void moveToScreen(QWindow *window, int screen); - virtual QAbstractEventDispatcher *guiThreadEventDispatcher() const; + QAbstractEventDispatcher *guiThreadEventDispatcher() const; - virtual QPlatformFontDatabase *fontDatabase() const { return m_fontDatabase; } + QPlatformFontDatabase *fontDatabase() const { return m_fontDatabase; } #ifndef QT_NO_CLIPBOARD - virtual QPlatformClipboard *clipboard() const; + QPlatformClipboard *clipboard() const; #endif - virtual QVariant styleHint(StyleHint hint) const; + QVariant styleHint(StyleHint hint) const; bool paintUsingOpenGL() const { return m_paintUsingOpenGL; } - virtual QPlatformServices *services() const; + QPlatformServices *services() const; static QWindow *window(screen_window_t qnxWindow); diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h index fec51a19b9..7a7f211e9a 100644 --- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h +++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h @@ -54,14 +54,14 @@ class QQnxRasterBackingStore : public QPlatformBackingStore { public: QQnxRasterBackingStore(QWindow *window); - virtual ~QQnxRasterBackingStore(); + ~QQnxRasterBackingStore(); - virtual QPaintDevice *paintDevice(); - virtual void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); - virtual void resize(const QSize &size, const QRegion &staticContents); - virtual bool scroll(const QRegion &area, int dx, int dy); - virtual void beginPaint(const QRegion ®ion); - virtual void endPaint(const QRegion ®ion); + QPaintDevice *paintDevice(); + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); + void resize(const QSize &size, const QRegion &staticContents); + bool scroll(const QRegion &area, int dx, int dy); + void beginPaint(const QRegion ®ion); + void endPaint(const QRegion ®ion); private: class ScrollOp { diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h index 4d1590349b..081114a4fb 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.h +++ b/src/plugins/platforms/qnx/qqnxscreen.h @@ -66,11 +66,11 @@ public: static QQnxScreen *primaryDisplay() { return static_cast(ms_screens.at(0)); } static int defaultDepth(); - virtual QRect geometry() const { return m_currentGeometry; } - virtual QRect availableGeometry() const; - virtual int depth() const { return defaultDepth(); } - virtual QImage::Format format() const { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; } - virtual QSizeF physicalSize() const { return m_currentPhysicalSize; } + QRect geometry() const { return m_currentGeometry; } + QRect availableGeometry() const; + int depth() const { return defaultDepth(); } + QImage::Format format() const { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; } + QSizeF physicalSize() const { return m_currentPhysicalSize; } bool isPrimaryScreen() const { return m_primaryScreen; } @@ -98,7 +98,7 @@ private Q_SLOTS: private: QQnxScreen(screen_context_t context, screen_display_t display, bool primaryScreen); - virtual ~QQnxScreen(); + ~QQnxScreen(); static bool orthogonal(int rotation1, int rotation2); diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h index 9c03af7594..cbe4eba7a4 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.h +++ b/src/plugins/platforms/qnx/qqnxwindow.h @@ -69,11 +69,11 @@ public: QQnxWindow(QWindow *window, screen_context_t context); virtual ~QQnxWindow(); - virtual void setGeometry(const QRect &rect); - virtual void setVisible(bool visible); - virtual void setOpacity(qreal level); + void setGeometry(const QRect &rect); + void setVisible(bool visible); + void setOpacity(qreal level); - virtual WId winId() const { return (WId)m_window; } + WId winId() const { return (WId)m_window; } screen_window_t nativeHandle() const { return m_window; } void setBufferSize(const QSize &size); @@ -86,10 +86,10 @@ public: void setScreen(QQnxScreen *platformScreen); - virtual void setParent(const QPlatformWindow *window); - virtual void raise(); - virtual void lower(); - virtual void requestActivateWindow(); + void setParent(const QPlatformWindow *window); + void raise(); + void lower(); + void requestActivateWindow(); void gainedFocus(); -- cgit v1.2.3