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

Remove the virtual keyword from reimpl. methods

Browse Source 
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 <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
This commit is contained in:
Rafael Roquetto 2012-03-26 15:26:24 +02:00 committed by Qt by Nokia
parent 5d117fd427
commit 68ecbffb30
10 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/qnx/qqnxclipboard.h
View File

@ -51,9 +51,9 @@ class QQnxClipboard : public QPlatformClipboard
{ {
public: public:
QQnxClipboard(); QQnxClipboard();
virtual ~QQnxClipboard(); ~QQnxClipboard();
virtual QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard); QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard);
virtual void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard); void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard);
private: private:
class MimeData; class MimeData;

2
src/plugins/platforms/qnx/qqnxeventthread.h
View File

@ -57,7 +57,7 @@ public:
static void injectKeyboardEvent(int flags, int sym, int mod, int scan, int cap); static void injectKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
protected: protected:
virtual void run(); void run();
private: private:
void shutdown(); void shutdown();

20
src/plugins/platforms/qnx/qqnxglbackingstore.h
View File

@ -58,11 +58,11 @@ class QQnxGLPaintDevice : public QGLPaintDevice
{ {
public: public:
QQnxGLPaintDevice(QWindow *window); QQnxGLPaintDevice(QWindow *window);
virtual ~QQnxGLPaintDevice(); ~QQnxGLPaintDevice();
virtual QPaintEngine *paintEngine() const; QPaintEngine *paintEngine() const;
virtual QSize size() const; QSize size() const;
virtual QGLContext *context() const { return m_glContext; } QGLContext *context() const { return m_glContext; }
private: private:
QQnxWindow *m_window; QQnxWindow *m_window;
@ -73,13 +73,13 @@ class QQnxGLBackingStore : public QPlatformBackingStore
{ {
public: public:
QQnxGLBackingStore(QWindow *window); QQnxGLBackingStore(QWindow *window);
virtual ~QQnxGLBackingStore(); ~QQnxGLBackingStore();
virtual QPaintDevice *paintDevice() { return m_paintDevice; } QPaintDevice *paintDevice() { return m_paintDevice; }
virtual void flush(QWindow *window, const QRegion &region, const QPoint &offset); void flush(QWindow *window, const QRegion &region, const QPoint &offset);
virtual void resize(const QSize &size, const QRegion &staticContents); void resize(const QSize &size, const QRegion &staticContents);
virtual void beginPaint(const QRegion &region); void beginPaint(const QRegion &region);
virtual void endPaint(const QRegion &region); void endPaint(const QRegion &region);
void resizeSurface(const QSize &size); void resizeSurface(const QSize &size);

8
src/plugins/platforms/qnx/qqnxglcontext.h
View File

@ -61,10 +61,10 @@ public:
static void initialize(); static void initialize();
static void shutdown(); static void shutdown();
virtual bool makeCurrent(QPlatformSurface *surface); bool makeCurrent(QPlatformSurface *surface);
virtual void doneCurrent(); void doneCurrent();
virtual void swapBuffers(QPlatformSurface *surface); void swapBuffers(QPlatformSurface *surface);
virtual QFunctionPointer getProcAddress(const QByteArray &procName); QFunctionPointer getProcAddress(const QByteArray &procName);
virtual QSurfaceFormat format() const { return m_windowFormat; } virtual QSurfaceFormat format() const { return m_windowFormat; }

16
src/plugins/platforms/qnx/qqnxinputcontext_imf.h
View File

@ -62,18 +62,18 @@ public:
QQnxInputContext(QQnxVirtualKeyboard &keyboard); QQnxInputContext(QQnxVirtualKeyboard &keyboard);
~QQnxInputContext(); ~QQnxInputContext();
virtual bool isValid() const; bool isValid() const;
virtual bool filterEvent(const QEvent *event); bool filterEvent(const QEvent *event);
virtual void reset(); void reset();
virtual void update(Qt::InputMethodQueries); void update(Qt::InputMethodQueries);
bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap); bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
virtual void showInputPanel(); void showInputPanel();
virtual void hideInputPanel(); void hideInputPanel();
virtual bool isInputPanelVisible() const; bool isInputPanelVisible() const;
virtual QLocale locale() const; QLocale locale() const;
protected: protected:
// Filters only for IMF events. // Filters only for IMF events.

12
src/plugins/platforms/qnx/qqnxinputcontext_noimf.h
View File

@ -57,17 +57,17 @@ public:
explicit QQnxInputContext(QQnxVirtualKeyboard &keyboard); explicit QQnxInputContext(QQnxVirtualKeyboard &keyboard);
~QQnxInputContext(); ~QQnxInputContext();
virtual bool isValid() const; bool isValid() const;
void reset(); 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); bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
virtual void showInputPanel(); void showInputPanel();
virtual void hideInputPanel(); void hideInputPanel();
virtual bool isInputPanelVisible() const; bool isInputPanelVisible() const;
virtual QLocale locale() const; QLocale locale() const;
private Q_SLOTS: private Q_SLOTS:
void keyboardVisibilityChanged(bool visible); void keyboardVisibilityChanged(bool visible);

26
src/plugins/platforms/qnx/qqnxintegration.h
View File

@ -68,32 +68,32 @@ class QQnxIntegration : public QPlatformIntegration
{ {
public: public:
QQnxIntegration(); QQnxIntegration();
virtual ~QQnxIntegration(); ~QQnxIntegration();
virtual bool hasCapability(QPlatformIntegration::Capability cap) const; bool hasCapability(QPlatformIntegration::Capability cap) const;
virtual QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformWindow *createPlatformWindow(QWindow *window) const;
virtual QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
virtual QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
virtual QPlatformInputContext *inputContext() const; QPlatformInputContext *inputContext() const;
virtual QList<QPlatformScreen *> screens() const; QList<QPlatformScreen *> screens() const;
virtual void moveToScreen(QWindow *window, int screen); 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 #ifndef QT_NO_CLIPBOARD
virtual QPlatformClipboard *clipboard() const; QPlatformClipboard *clipboard() const;
#endif #endif
virtual QVariant styleHint(StyleHint hint) const; QVariant styleHint(StyleHint hint) const;
bool paintUsingOpenGL() const { return m_paintUsingOpenGL; } bool paintUsingOpenGL() const { return m_paintUsingOpenGL; }
virtual QPlatformServices *services() const; QPlatformServices *services() const;
static QWindow *window(screen_window_t qnxWindow); static QWindow *window(screen_window_t qnxWindow);

14
src/plugins/platforms/qnx/qqnxrasterbackingstore.h
View File

@ -54,14 +54,14 @@ class QQnxRasterBackingStore : public QPlatformBackingStore
{ {
public: public:
QQnxRasterBackingStore(QWindow *window); QQnxRasterBackingStore(QWindow *window);
virtual ~QQnxRasterBackingStore(); ~QQnxRasterBackingStore();
virtual QPaintDevice *paintDevice(); QPaintDevice *paintDevice();
virtual void flush(QWindow *window, const QRegion &region, const QPoint &offset); void flush(QWindow *window, const QRegion &region, const QPoint &offset);
virtual void resize(const QSize &size, const QRegion &staticContents); void resize(const QSize &size, const QRegion &staticContents);
virtual bool scroll(const QRegion &area, int dx, int dy); bool scroll(const QRegion &area, int dx, int dy);
virtual void beginPaint(const QRegion &region); void beginPaint(const QRegion &region);
virtual void endPaint(const QRegion &region); void endPaint(const QRegion &region);
private: private:
class ScrollOp { class ScrollOp {

12
src/plugins/platforms/qnx/qqnxscreen.h
View File

@ -66,11 +66,11 @@ public:
static QQnxScreen *primaryDisplay() { return static_cast<QQnxScreen*>(ms_screens.at(0)); } static QQnxScreen *primaryDisplay() { return static_cast<QQnxScreen*>(ms_screens.at(0)); }
static int defaultDepth(); static int defaultDepth();
virtual QRect geometry() const { return m_currentGeometry; } QRect geometry() const { return m_currentGeometry; }
virtual QRect availableGeometry() const; QRect availableGeometry() const;
virtual int depth() const { return defaultDepth(); } int depth() const { return defaultDepth(); }
virtual QImage::Format format() const { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; } QImage::Format format() const { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; }
virtual QSizeF physicalSize() const { return m_currentPhysicalSize; } QSizeF physicalSize() const { return m_currentPhysicalSize; }
bool isPrimaryScreen() const { return m_primaryScreen; } bool isPrimaryScreen() const { return m_primaryScreen; }
@ -98,7 +98,7 @@ private Q_SLOTS:
private: private:
QQnxScreen(screen_context_t context, screen_display_t display, bool primaryScreen); QQnxScreen(screen_context_t context, screen_display_t display, bool primaryScreen);
virtual ~QQnxScreen(); ~QQnxScreen();
static bool orthogonal(int rotation1, int rotation2); static bool orthogonal(int rotation1, int rotation2);

16
src/plugins/platforms/qnx/qqnxwindow.h
View File

@ -69,11 +69,11 @@ public:
QQnxWindow(QWindow *window, screen_context_t context); QQnxWindow(QWindow *window, screen_context_t context);
virtual ~QQnxWindow(); virtual ~QQnxWindow();
virtual void setGeometry(const QRect &rect); void setGeometry(const QRect &rect);
virtual void setVisible(bool visible); void setVisible(bool visible);
virtual void setOpacity(qreal level); 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; } screen_window_t nativeHandle() const { return m_window; }
void setBufferSize(const QSize &size); void setBufferSize(const QSize &size);
@ -86,10 +86,10 @@ public:
void setScreen(QQnxScreen *platformScreen); void setScreen(QQnxScreen *platformScreen);
virtual void setParent(const QPlatformWindow *window); void setParent(const QPlatformWindow *window);
virtual void raise(); void raise();
virtual void lower(); void lower();
virtual void requestActivateWindow(); void requestActivateWindow();
void gainedFocus(); void gainedFocus();