From 48d52d9bd189ce4aecb15a996055db26f13fed04 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Mon, 11 Jul 2016 22:40:15 +0200 Subject: [PATCH] Add missing override declarations --- generators/djvu/generator_djvu.h | 4 ++-- generators/poppler/formfields.h | 14 +++++++------- generators/poppler/generator_pdf.h | 4 ++-- part.h | 2 +- shell/shell.h | 4 ++-- ui/annotationwidgets.h | 2 +- ui/minibar.h | 2 +- ui/pageview.h | 22 +++++++++++----------- ui/tocmodel.h | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/generators/djvu/generator_djvu.h b/generators/djvu/generator_djvu.h index cf9579864..4ae7376d5 100644 --- a/generators/djvu/generator_djvu.h +++ b/generators/djvu/generator_djvu.h @@ -40,10 +40,10 @@ class DjVuGenerator : public Okular::Generator QVariant metaData( const QString & key, const QVariant & option ) const Q_DECL_OVERRIDE; protected: - bool doCloseDocument(); + bool doCloseDocument() Q_DECL_OVERRIDE; // pixmap generation QImage image( Okular::PixmapRequest *request ) Q_DECL_OVERRIDE; - Okular::TextPage* textPage( Okular::Page *page ); + Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE; private: void loadPages( QVector & pagesVector, int rotation ); diff --git a/generators/poppler/formfields.h b/generators/poppler/formfields.h index 258833cc2..91aefd6b0 100644 --- a/generators/poppler/formfields.h +++ b/generators/poppler/formfields.h @@ -24,15 +24,15 @@ class PopplerFormFieldButton : public Okular::FormFieldButton int id() const Q_DECL_OVERRIDE; QString name() const Q_DECL_OVERRIDE; QString uiName() const Q_DECL_OVERRIDE; - virtual bool isReadOnly() const; - virtual bool isVisible() const; + virtual bool isReadOnly() const Q_DECL_OVERRIDE; + virtual bool isVisible() const Q_DECL_OVERRIDE; // inherited from Okular::FormFieldButton - virtual ButtonType buttonType() const; - virtual QString caption() const; - virtual bool state() const; - virtual void setState( bool state ); - virtual QList< int > siblings() const; + virtual ButtonType buttonType() const Q_DECL_OVERRIDE; + virtual QString caption() const Q_DECL_OVERRIDE; + virtual bool state() const Q_DECL_OVERRIDE; + virtual void setState( bool state ) Q_DECL_OVERRIDE; + virtual QList< int > siblings() const Q_DECL_OVERRIDE; private: Poppler::FormFieldButton * m_field; diff --git a/generators/poppler/generator_pdf.h b/generators/poppler/generator_pdf.h index 520c54c23..5a87841b1 100644 --- a/generators/poppler/generator_pdf.h +++ b/generators/poppler/generator_pdf.h @@ -58,8 +58,8 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface, p virtual ~PDFGenerator(); // [INHERITED] load a document and fill up the pagesVector - Okular::Document::OpenResult loadDocumentWithPassword( const QString & fileName, QVector & pagesVector, const QString & password ); - Okular::Document::OpenResult loadDocumentFromDataWithPassword( const QByteArray & fileData, QVector & pagesVector, const QString & password ); + Okular::Document::OpenResult loadDocumentWithPassword( const QString & fileName, QVector & pagesVector, const QString & password ) Q_DECL_OVERRIDE; + Okular::Document::OpenResult loadDocumentFromDataWithPassword( const QByteArray & fileData, QVector & pagesVector, const QString & password ) Q_DECL_OVERRIDE; void loadPages(QVector &pagesVector, int rotation=-1, bool clear=false); // [INHERITED] document information Okular::DocumentInfo generateDocumentInfo( const QSet &keys ) const Q_DECL_OVERRIDE; diff --git a/part.h b/part.h index e5fb34078..905f1c208 100644 --- a/part.h +++ b/part.h @@ -137,7 +137,7 @@ class OKULARPART_EXPORT Part : public KParts::ReadWritePart, public Okular::Docu bool openNewFilesInTabs() const Q_DECL_OVERRIDE; public Q_SLOTS: // dbus - Q_SCRIPTABLE Q_NOREPLY void goToPage(uint page); + Q_SCRIPTABLE Q_NOREPLY void goToPage(uint page) Q_DECL_OVERRIDE; Q_SCRIPTABLE Q_NOREPLY void openDocument( const QString &doc ); Q_SCRIPTABLE uint pages(); Q_SCRIPTABLE uint currentPage(); diff --git a/shell/shell.h b/shell/shell.h index ad21922b8..d015b3fc9 100644 --- a/shell/shell.h +++ b/shell/shell.h @@ -60,7 +60,7 @@ public: */ virtual ~Shell(); - QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; /** * Returns false if Okular component wasn't found @@ -138,7 +138,7 @@ private: int findTabIndex( QObject* sender ); private: - bool eventFilter(QObject *obj, QEvent *event) override; + bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; KPluginFactory* m_partFactory; KRecentFilesAction* m_recent; diff --git a/ui/annotationwidgets.h b/ui/annotationwidgets.h index 938773c21..7be7d6546 100644 --- a/ui/annotationwidgets.h +++ b/ui/annotationwidgets.h @@ -148,7 +148,7 @@ public: void applyChanges() Q_DECL_OVERRIDE; protected: - virtual QWidget * createStyleWidget(); + virtual QWidget * createStyleWidget() Q_DECL_OVERRIDE; private: Okular::LineAnnotation * m_lineAnn; diff --git a/ui/minibar.h b/ui/minibar.h index 4783d8622..7cab309a8 100644 --- a/ui/minibar.h +++ b/ui/minibar.h @@ -131,7 +131,7 @@ class MiniBar : public QWidget private: void resizeForPage( int pages ); - bool eventFilter( QObject *target, QEvent *event ); + bool eventFilter( QObject *target, QEvent *event ) Q_DECL_OVERRIDE; MiniBarLogic * m_miniBarLogic; PageNumberEdit * m_pageNumberEdit; diff --git a/ui/pageview.h b/ui/pageview.h index 05e765e96..01c39bfda 100644 --- a/ui/pageview.h +++ b/ui/pageview.h @@ -75,19 +75,19 @@ Q_OBJECT void displayMessage( const QString & message, const QString & details = QString(), PageViewMessage::Icon icon=PageViewMessage::Info, int duration=-1 ); // inherited from DocumentObserver - void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ); - void notifyViewportChanged( bool smoothMove ); - void notifyPageChanged( int pageNumber, int changedFlags ); - void notifyContentsCleared( int changedFlags ); - void notifyZoom(int factor); - bool canUnloadPixmap( int pageNum ) const; - void notifyCurrentPageChanged( int previous, int current ); + void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ) Q_DECL_OVERRIDE; + void notifyViewportChanged( bool smoothMove ) Q_DECL_OVERRIDE; + void notifyPageChanged( int pageNumber, int changedFlags ) Q_DECL_OVERRIDE; + void notifyContentsCleared( int changedFlags ) Q_DECL_OVERRIDE; + void notifyZoom(int factor) Q_DECL_OVERRIDE; + bool canUnloadPixmap( int pageNum ) const Q_DECL_OVERRIDE; + void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE; // inherited from View - bool supportsCapability( ViewCapability capability ) const; - CapabilityFlags capabilityFlags( ViewCapability capability ) const; - QVariant capability( ViewCapability capability ) const; - void setCapability( ViewCapability capability, const QVariant &option ); + bool supportsCapability( ViewCapability capability ) const Q_DECL_OVERRIDE; + CapabilityFlags capabilityFlags( ViewCapability capability ) const Q_DECL_OVERRIDE; + QVariant capability( ViewCapability capability ) const Q_DECL_OVERRIDE; + void setCapability( ViewCapability capability, const QVariant &option ) Q_DECL_OVERRIDE; QList< Okular::RegularAreaRect * > textSelections( const QPoint& start, const QPoint& end, int& firstpage ); Okular::RegularAreaRect * textSelectionForItem( PageViewItem * item, const QPoint & startPoint = QPoint(), const QPoint & endPoint = QPoint() ); diff --git a/ui/tocmodel.h b/ui/tocmodel.h index 4c56a8867..884e338cb 100644 --- a/ui/tocmodel.h +++ b/ui/tocmodel.h @@ -34,8 +34,8 @@ class TOCModel : public QAbstractItemModel virtual ~TOCModel(); // reimplementations from QAbstractItemModel - QHash roleNames() const; - int columnCount( const QModelIndex &parent = QModelIndex() ) const; + QHash roleNames() const Q_DECL_OVERRIDE; + int columnCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE; QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; bool hasChildren( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE; QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;