summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2015-08-03 09:16:45 (GMT)
committerMontel Laurent <montel@kde.org>2015-08-03 09:16:45 (GMT)
commit13ad9aa53b8e9629658f2656b3ff3480eb103117 (patch)
tree20a79d33afa31bbe6dd4b0c54ff9ce868d1aafd9
parent70159dc61ff93a5a9adf2956a8fe4044a400b4e2 (diff)
Add Q_DECL_OVERRIDE
-rw-r--r--ui/magnifierview.h2
-rw-r--r--ui/minibar.h8
-rw-r--r--ui/pageview.h26
-rw-r--r--ui/pageviewutils.h16
-rw-r--r--ui/presentationsearchbar.h4
-rw-r--r--ui/presentationwidget.h18
-rw-r--r--ui/videowidget.h6
7 files changed, 40 insertions, 40 deletions
diff --git a/ui/magnifierview.h b/ui/magnifierview.h
index da8aace..a38c44e 100644
--- a/ui/magnifierview.h
+++ b/ui/magnifierview.h
@@ -41,7 +41,7 @@ class MagnifierView : public QWidget, public Okular::DocumentObserver
void move( int x, int y );
protected:
- void paintEvent( QPaintEvent *e );
+ void paintEvent( QPaintEvent *e ) Q_DECL_OVERRIDE;
private:
Okular::NormalizedRect normalizedView() const;
diff --git a/ui/minibar.h b/ui/minibar.h
index 5654ad8..6cb7ad6 100644
--- a/ui/minibar.h
+++ b/ui/minibar.h
@@ -165,10 +165,10 @@ class ProgressWidget : public QWidget, public Okular::DocumentObserver
protected:
void setProgress( float percentage );
- void mouseMoveEvent( QMouseEvent * e );
- void mousePressEvent( QMouseEvent * e );
- void wheelEvent( QWheelEvent * e );
- void paintEvent( QPaintEvent * e );
+ void mouseMoveEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
+ void wheelEvent( QWheelEvent * e ) Q_DECL_OVERRIDE;
+ void paintEvent( QPaintEvent * e ) Q_DECL_OVERRIDE;
private:
Okular::Document * m_document;
diff --git a/ui/pageview.h b/ui/pageview.h
index ffae3e2..4757dfa 100644
--- a/ui/pageview.h
+++ b/ui/pageview.h
@@ -125,24 +125,24 @@ Q_OBJECT
void fitWindowToPage( const QSize& pageViewPortSize, const QSize& pageSize );
protected:
- void resizeEvent( QResizeEvent* );
+ void resizeEvent( QResizeEvent* ) Q_DECL_OVERRIDE;
// mouse / keyboard events
- void keyPressEvent( QKeyEvent* );
- void keyReleaseEvent( QKeyEvent* );
- void inputMethodEvent( QInputMethodEvent * );
- void wheelEvent( QWheelEvent* );
+ void keyPressEvent( QKeyEvent* ) Q_DECL_OVERRIDE;
+ void keyReleaseEvent( QKeyEvent* ) Q_DECL_OVERRIDE;
+ void inputMethodEvent( QInputMethodEvent * ) Q_DECL_OVERRIDE;
+ void wheelEvent( QWheelEvent* ) Q_DECL_OVERRIDE;
- void paintEvent( QPaintEvent *e );
- void tabletEvent (QTabletEvent *e );
- void mouseMoveEvent( QMouseEvent *e );
- void mousePressEvent( QMouseEvent *e );
- void mouseReleaseEvent( QMouseEvent *e );
- void mouseDoubleClickEvent( QMouseEvent *e );
+ void paintEvent( QPaintEvent *e ) Q_DECL_OVERRIDE;
+ void tabletEvent (QTabletEvent *e ) Q_DECL_OVERRIDE;
+ void mouseMoveEvent( QMouseEvent *e ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent *e ) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent( QMouseEvent *e ) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent( QMouseEvent *e ) Q_DECL_OVERRIDE;
- bool viewportEvent( QEvent *e );
+ bool viewportEvent( QEvent *e ) Q_DECL_OVERRIDE;
- void scrollContentsBy( int dx, int dy );
+ void scrollContentsBy( int dx, int dy ) Q_DECL_OVERRIDE;
private:
// draw background and items on the opened qpainter
diff --git a/ui/pageviewutils.h b/ui/pageviewutils.h
index ece50eb..b6b0969 100644
--- a/ui/pageviewutils.h
+++ b/ui/pageviewutils.h
@@ -107,9 +107,9 @@ class PageViewMessage : public QWidget
void display( const QString & message, const QString & details = QString(), Icon icon = Info, int durationMs = 4000 );
protected:
- bool eventFilter(QObject * obj, QEvent * event );
- void paintEvent( QPaintEvent * e );
- void mousePressEvent( QMouseEvent * e );
+ bool eventFilter(QObject * obj, QEvent * event ) Q_DECL_OVERRIDE;
+ void paintEvent( QPaintEvent * e ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
private:
QRect computeTextRect( const QString & message, int extra_width ) const;
@@ -198,11 +198,11 @@ class PageViewToolBar : public QWidget
protected:
// handle widget events { anchor_resize, paint, animation, drag }
- bool eventFilter( QObject * o, QEvent * e );
- void paintEvent( QPaintEvent * );
- void mousePressEvent( QMouseEvent * e );
- void mouseMoveEvent( QMouseEvent * e );
- void mouseReleaseEvent( QMouseEvent * e );
+ bool eventFilter( QObject * o, QEvent * e ) Q_DECL_OVERRIDE;
+ void paintEvent( QPaintEvent * ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
+ void mouseMoveEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
private:
// private variables
diff --git a/ui/presentationsearchbar.h b/ui/presentationsearchbar.h
index f154bdc..e5fa6fd 100644
--- a/ui/presentationsearchbar.h
+++ b/ui/presentationsearchbar.h
@@ -31,8 +31,8 @@ class PresentationSearchBar
void focusOnSearchEdit();
protected:
- void resizeEvent( QResizeEvent * );
- bool eventFilter( QObject *, QEvent * );
+ void resizeEvent( QResizeEvent * ) Q_DECL_OVERRIDE;
+ bool eventFilter( QObject *, QEvent * ) Q_DECL_OVERRIDE;
private:
QWidget *m_handle;
diff --git a/ui/presentationwidget.h b/ui/presentationwidget.h
index 81beb6c..fd9d462 100644
--- a/ui/presentationwidget.h
+++ b/ui/presentationwidget.h
@@ -60,15 +60,15 @@ class PresentationWidget : public QWidget, public Okular::DocumentObserver
protected:
// widget events
- bool event( QEvent * e );
- void keyPressEvent( QKeyEvent * e );
- void wheelEvent( QWheelEvent * e );
- void mousePressEvent( QMouseEvent * e );
- void mouseReleaseEvent( QMouseEvent * e );
- void mouseMoveEvent( QMouseEvent * e );
- void paintEvent( QPaintEvent * e );
- void resizeEvent( QResizeEvent * e );
- void leaveEvent( QEvent * e );
+ bool event( QEvent * e ) Q_DECL_OVERRIDE;
+ void keyPressEvent( QKeyEvent * e ) Q_DECL_OVERRIDE;
+ void wheelEvent( QWheelEvent * e ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
+ void mouseMoveEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
+ void paintEvent( QPaintEvent * e ) Q_DECL_OVERRIDE;
+ void resizeEvent( QResizeEvent * e ) Q_DECL_OVERRIDE;
+ void leaveEvent( QEvent * e ) Q_DECL_OVERRIDE;
private:
const void * getObjectRect( Okular::ObjectRect::ObjectType type, int x, int y, QRect * geometry = 0 ) const;
diff --git a/ui/videowidget.h b/ui/videowidget.h
index 64fc6d7..2d035d6 100644
--- a/ui/videowidget.h
+++ b/ui/videowidget.h
@@ -52,9 +52,9 @@ class VideoWidget : public QWidget
void stop();
protected:
- /* reimp */ bool eventFilter( QObject * object, QEvent * event );
- /* reimp */ bool event( QEvent * event );
- /* reimp */ void resizeEvent( QResizeEvent * event );
+ bool eventFilter( QObject * object, QEvent * event ) Q_DECL_OVERRIDE;
+ bool event( QEvent * event ) Q_DECL_OVERRIDE;
+ void resizeEvent( QResizeEvent * event ) Q_DECL_OVERRIDE;
private:
Q_PRIVATE_SLOT( d, void finished() )