summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2015-08-18 13:27:20 (GMT)
committerMontel Laurent <montel@kde.org>2015-08-18 13:27:20 (GMT)
commit014b712359db87d37d5061de56a3aaf93825d0cf (patch)
tree5d8e2e5a5e0a181269af17af44293f2afea9992f
parent6fab218de945c0493cf1337f5322bfa419d13ead (diff)
Use explicit. Q_DECL_OVERRIDE
-rw-r--r--conf/dlggeneral.h2
-rw-r--r--conf/widgetannottools.h2
-rw-r--r--generators/comicbook/unrarflavours.h8
-rw-r--r--generators/epub/epubdocument.h2
-rw-r--r--generators/fax/faxexpand.h2
-rw-r--r--generators/fax/generator_fax.h2
-rw-r--r--generators/fictionbook/generator_fb.h2
-rw-r--r--generators/ooo/generator_ooo.h4
-rw-r--r--generators/plucker/generator_plucker.h14
-rw-r--r--generators/poppler/annots.h8
-rw-r--r--generators/poppler/generator_pdf.h22
-rw-r--r--generators/spectre/generator_ghostview.h20
-rw-r--r--generators/tiff/generator_tiff.h4
-rw-r--r--generators/xps/generator_xps.h24
-rw-r--r--part.h26
-rw-r--r--ui/annotationproxymodels.h44
-rw-r--r--ui/annotationtools.h2
-rw-r--r--ui/annotationwidgets.h48
-rw-r--r--ui/bookmarklist.h2
-rw-r--r--ui/minibar.h20
-rw-r--r--ui/pageviewutils.h2
21 files changed, 130 insertions, 130 deletions
diff --git a/conf/dlggeneral.h b/conf/dlggeneral.h
index 71628ce..4145d92 100644
--- a/conf/dlggeneral.h
+++ b/conf/dlggeneral.h
@@ -23,7 +23,7 @@ class DlgGeneral : public QWidget
virtual ~DlgGeneral();
protected:
- virtual void showEvent( QShowEvent * );
+ void showEvent( QShowEvent * ) Q_DECL_OVERRIDE;
Ui_DlgGeneralBase * m_dlg;
};
diff --git a/conf/widgetannottools.h b/conf/widgetannottools.h
index 6e9ec1d..cf6a7be 100644
--- a/conf/widgetannottools.h
+++ b/conf/widgetannottools.h
@@ -103,6 +103,6 @@ class EditAnnotToolDialog : public QDialog
void slotDataChanged();
};
-Q_DECLARE_METATYPE( EditAnnotToolDialog::ToolType );
+Q_DECLARE_METATYPE( EditAnnotToolDialog::ToolType )
#endif
diff --git a/generators/comicbook/unrarflavours.h b/generators/comicbook/unrarflavours.h
index 974cd04..81e9d7e 100644
--- a/generators/comicbook/unrarflavours.h
+++ b/generators/comicbook/unrarflavours.h
@@ -38,8 +38,8 @@ class NonFreeUnrarFlavour : public UnrarFlavour
public:
NonFreeUnrarFlavour();
- virtual QStringList processListing( const QStringList &data );
- virtual QString name() const;
+ QStringList processListing( const QStringList &data ) Q_DECL_OVERRIDE;
+ QString name() const Q_DECL_OVERRIDE;
};
class FreeUnrarFlavour : public UnrarFlavour
@@ -47,8 +47,8 @@ class FreeUnrarFlavour : public UnrarFlavour
public:
FreeUnrarFlavour();
- virtual QStringList processListing( const QStringList &data );
- virtual QString name() const;
+ QStringList processListing( const QStringList &data ) Q_DECL_OVERRIDE;
+ QString name() const Q_DECL_OVERRIDE;
};
#endif
diff --git a/generators/epub/epubdocument.h b/generators/epub/epubdocument.h
index 1873607..d428fb3 100644
--- a/generators/epub/epubdocument.h
+++ b/generators/epub/epubdocument.h
@@ -33,7 +33,7 @@ namespace Epub {
enum Multimedia { MovieResource = 4, AudioResource = 5 };
protected:
- virtual QVariant loadResource(int type, const QUrl &name);
+ QVariant loadResource(int type, const QUrl &name) Q_DECL_OVERRIDE;
private:
void checkCSS(QString &css);
diff --git a/generators/fax/faxexpand.h b/generators/fax/faxexpand.h
index 070450e..f062974 100644
--- a/generators/fax/faxexpand.h
+++ b/generators/fax/faxexpand.h
@@ -53,7 +53,7 @@ struct strip { /* tiff strip descriptor */
class pagenode { /* compressed page descriptor */
public:
pagenode();
- ~pagenode() { };
+ ~pagenode() { }
int nstrips; /* number of strips */
int rowsperstrip; /* number of rows per strip */
int stripnum; /* current strip while expanding */
diff --git a/generators/fax/generator_fax.h b/generators/fax/generator_fax.h
index c1e8623..5999296 100644
--- a/generators/fax/generator_fax.h
+++ b/generators/fax/generator_fax.h
@@ -32,7 +32,7 @@ class FaxGenerator : public Okular::Generator
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
protected:
- bool doCloseDocument();
+ bool doCloseDocument() Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
private:
diff --git a/generators/fictionbook/generator_fb.h b/generators/fictionbook/generator_fb.h
index 5eb4d1b..e58b372 100644
--- a/generators/fictionbook/generator_fb.h
+++ b/generators/fictionbook/generator_fb.h
@@ -21,7 +21,7 @@ class FictionBookGenerator : public Okular::TextDocumentGenerator
FictionBookGenerator( QObject *parent, const QVariantList &args );
// [INHERITED] reparse configuration
- void addPages( KConfigDialog* dlg );
+ void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE;
};
#endif
diff --git a/generators/ooo/generator_ooo.h b/generators/ooo/generator_ooo.h
index 65836eb..147feef 100644
--- a/generators/ooo/generator_ooo.h
+++ b/generators/ooo/generator_ooo.h
@@ -20,9 +20,9 @@ class KOOOGenerator : public Okular::TextDocumentGenerator
KOOOGenerator( QObject *parent, const QVariantList &args );
// [INHERITED] reparse configuration
- void addPages( KConfigDialog* dlg );
+ void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE;
- virtual void walletDataForFile( const QString &fileName, QString *walletName, QString *walletFolder, QString *walletKey ) const;
+ void walletDataForFile( const QString &fileName, QString *walletName, QString *walletFolder, QString *walletKey ) const Q_DECL_OVERRIDE;
};
#endif
diff --git a/generators/plucker/generator_plucker.h b/generators/plucker/generator_plucker.h
index dbc46eb..a5b7127 100644
--- a/generators/plucker/generator_plucker.h
+++ b/generators/plucker/generator_plucker.h
@@ -29,23 +29,23 @@ class PluckerGenerator : public Okular::Generator
virtual ~PluckerGenerator();
// [INHERITED] load a document and fill up the pagesVector
- bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
+ bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE;
// [INHERITED] document information
- Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const;
+ Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
// [INHERITED] perform actions on document / pages
- QImage image( Okular::PixmapRequest *request );
+ QImage image( Okular::PixmapRequest *request ) Q_DECL_OVERRIDE;
// [INHERITED] text exporting
- Okular::ExportFormat::List exportFormats() const;
- bool exportTo( const QString &fileName, const Okular::ExportFormat &format );
+ Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE;
+ bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE;
// [INHERITED] print document using already configured kprinter
- bool print( QPrinter& printer );
+ bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
protected:
- bool doCloseDocument();
+ bool doCloseDocument() Q_DECL_OVERRIDE;
private:
QList<QTextDocument*> mPages;
diff --git a/generators/poppler/annots.h b/generators/poppler/annots.h
index bb7311a..6dfdbff 100644
--- a/generators/poppler/annots.h
+++ b/generators/poppler/annots.h
@@ -26,10 +26,10 @@ class PopplerAnnotationProxy : public Okular::AnnotationProxy
PopplerAnnotationProxy( Poppler::Document *doc, QMutex *userMutex );
~PopplerAnnotationProxy();
- bool supports( Capability capability ) const;
- void notifyAddition( Okular::Annotation *annotation, int page );
- void notifyModification( const Okular::Annotation *annotation, int page, bool appearanceChanged );
- void notifyRemoval( Okular::Annotation *annotation, int page );
+ bool supports( Capability capability ) const Q_DECL_OVERRIDE;
+ void notifyAddition( Okular::Annotation *annotation, int page ) Q_DECL_OVERRIDE;
+ void notifyModification( const Okular::Annotation *annotation, int page, bool appearanceChanged ) Q_DECL_OVERRIDE;
+ void notifyRemoval( Okular::Annotation *annotation, int page ) Q_DECL_OVERRIDE;
private:
Poppler::Document *ppl_doc;
QMutex *mutex;
diff --git a/generators/poppler/generator_pdf.h b/generators/poppler/generator_pdf.h
index c1df30b..d66eb3b 100644
--- a/generators/poppler/generator_pdf.h
+++ b/generators/poppler/generator_pdf.h
@@ -78,27 +78,27 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface, p
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
// [INHERITED] reply to some metadata requests
- QVariant metaData( const QString & key, const QVariant & option ) const;
+ QVariant metaData( const QString & key, const QVariant & option ) const Q_DECL_OVERRIDE;
// [INHERITED] reparse configuration
- bool reparseConfig();
- void addPages( KConfigDialog * );
+ bool reparseConfig() Q_DECL_OVERRIDE;
+ void addPages( KConfigDialog * ) Q_DECL_OVERRIDE;
// [INHERITED] text exporting
- Okular::ExportFormat::List exportFormats() const;
- bool exportTo( const QString &fileName, const Okular::ExportFormat &format );
+ Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE;
+ bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE;
// [INHERITED] print interface
- QWidget* printConfigurationWidget() const;
+ QWidget* printConfigurationWidget() const Q_DECL_OVERRIDE;
// [INHERITED] save interface
- bool supportsOption( SaveOption ) const;
- bool save( const QString &fileName, SaveOptions options, QString *errorText );
- Okular::AnnotationProxy* annotationProxy() const;
+ bool supportsOption( SaveOption ) const Q_DECL_OVERRIDE;
+ bool save( const QString &fileName, SaveOptions options, QString *errorText ) Q_DECL_OVERRIDE;
+ Okular::AnnotationProxy* annotationProxy() const Q_DECL_OVERRIDE;
protected:
- bool doCloseDocument();
- Okular::TextPage* textPage( Okular::Page *page );
+ bool doCloseDocument() Q_DECL_OVERRIDE;
+ Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE;
protected slots:
void requestFontData(const Okular::FontInfo &font, QByteArray *data);
diff --git a/generators/spectre/generator_ghostview.h b/generators/spectre/generator_ghostview.h
index bd66005..c25bf52 100644
--- a/generators/spectre/generator_ghostview.h
+++ b/generators/spectre/generator_ghostview.h
@@ -24,25 +24,25 @@ class GSGenerator : public Okular::Generator, public Okular::ConfigInterface
public:
/** virtual methods to reimplement **/
// load a document and fill up the pagesVector
- bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector );
+ bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector ) Q_DECL_OVERRIDE;
// Document description and Table of contents
- Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const;
- const Okular::DocumentSynopsis * generateDocumentSynopsis() { return 0L; }
+ Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
+ const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE { return 0L; }
const Okular::DocumentFonts * generateDocumentFonts() { return 0L; }
// page contents generation
- bool canGeneratePixmap() const;
- void generatePixmap( Okular::PixmapRequest * request );
+ bool canGeneratePixmap() const Q_DECL_OVERRIDE;
+ void generatePixmap( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
- QVariant metaData(const QString &key, const QVariant &option) const;
+ QVariant metaData(const QString &key, const QVariant &option) const Q_DECL_OVERRIDE;
// print document using already configured kprinter
- bool print( QPrinter& /*printer*/ );
+ bool print( QPrinter& /*printer*/ ) Q_DECL_OVERRIDE;
QString fileName() const;
- bool reparseConfig();
- void addPages( KConfigDialog* dlg );
+ bool reparseConfig() Q_DECL_OVERRIDE;
+ void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE;
/** constructor **/
GSGenerator( QObject *parent, const QVariantList &args );
@@ -52,7 +52,7 @@ class GSGenerator : public Okular::Generator, public Okular::ConfigInterface
void slotImageGenerated(QImage *img, Okular::PixmapRequest *request);
protected:
- bool doCloseDocument();
+ bool doCloseDocument() Q_DECL_OVERRIDE;
private:
bool loadPages( QVector< Okular::Page * > & pagesVector );
diff --git a/generators/tiff/generator_tiff.h b/generators/tiff/generator_tiff.h
index 1122a46..bb74907 100644
--- a/generators/tiff/generator_tiff.h
+++ b/generators/tiff/generator_tiff.h
@@ -31,8 +31,8 @@ class TIFFGenerator : public Okular::Generator
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
protected:
- bool doCloseDocument();
- QImage image( Okular::PixmapRequest * request );
+ bool doCloseDocument() Q_DECL_OVERRIDE;
+ QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/generators/xps/generator_xps.h b/generators/xps/generator_xps.h
index 8980714..76c42f3 100644
--- a/generators/xps/generator_xps.h
+++ b/generators/xps/generator_xps.h
@@ -116,11 +116,11 @@ public:
bool startElement( const QString & nameSpace,
const QString & localName,
const QString & qname,
- const QXmlAttributes & atts );
+ const QXmlAttributes & atts ) Q_DECL_OVERRIDE;
bool endElement( const QString & nameSpace,
const QString & localName,
- const QString & qname );
- bool startDocument();
+ const QString & qname ) Q_DECL_OVERRIDE;
+ bool startDocument() Q_DECL_OVERRIDE;
protected:
XpsPage *m_page;
@@ -306,20 +306,20 @@ class XpsGenerator : public Okular::Generator
XpsGenerator( QObject *parent, const QVariantList &args );
virtual ~XpsGenerator();
- bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
+ bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE;
- Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const;
- const Okular::DocumentSynopsis * generateDocumentSynopsis();
+ Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
+ const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE;
- Okular::ExportFormat::List exportFormats() const;
- bool exportTo( const QString &fileName, const Okular::ExportFormat &format );
+ Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE;
+ bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE;
- bool print( QPrinter &printer );
+ bool print( QPrinter &printer ) Q_DECL_OVERRIDE;
protected:
- bool doCloseDocument();
- QImage image( Okular::PixmapRequest *page );
- Okular::TextPage* textPage( Okular::Page * page );
+ bool doCloseDocument() Q_DECL_OVERRIDE;
+ QImage image( Okular::PixmapRequest *page ) Q_DECL_OVERRIDE;
+ Okular::TextPage* textPage( Okular::Page * page ) Q_DECL_OVERRIDE;
private:
XpsFile *m_xpsFile;
diff --git a/part.h b/part.h
index 11642db..a014f3b 100644
--- a/part.h
+++ b/part.h
@@ -116,23 +116,23 @@ class OKULARPART_EXPORT Part : public KParts::ReadWritePart, public Okular::Docu
~Part();
// inherited from DocumentObserver
- void notifySetup( const QVector< Okular::Page * > &pages, int setupFlags );
- void notifyViewportChanged( bool smoothMove );
- void notifyPageChanged( int page, int flags );
+ void notifySetup( const QVector< Okular::Page * > &pages, int setupFlags ) Q_DECL_OVERRIDE;
+ void notifyViewportChanged( bool smoothMove ) Q_DECL_OVERRIDE;
+ void notifyPageChanged( int page, int flags ) Q_DECL_OVERRIDE;
- bool openDocument(const QUrl &url, uint page);
- void startPresentation();
- QStringList supportedMimeTypes() const;
+ bool openDocument(const QUrl &url, uint page) Q_DECL_OVERRIDE;
+ void startPresentation() Q_DECL_OVERRIDE;
+ QStringList supportedMimeTypes() const Q_DECL_OVERRIDE;
QUrl realUrl() const;
- void showSourceLocation(const QString& fileName, int line, int column, bool showGraphically = true);
- void clearLastShownSourceLocation();
- bool isWatchFileModeEnabled() const;
- void setWatchFileModeEnabled(bool enable);
- bool areSourceLocationsShownGraphically() const;
- void setShowSourceLocationsGraphically(bool show);
- bool openNewFilesInTabs() const;
+ void showSourceLocation(const QString& fileName, int line, int column, bool showGraphically = true) Q_DECL_OVERRIDE;
+ void clearLastShownSourceLocation() Q_DECL_OVERRIDE;
+ bool isWatchFileModeEnabled() const Q_DECL_OVERRIDE;
+ void setWatchFileModeEnabled(bool enable) Q_DECL_OVERRIDE;
+ bool areSourceLocationsShownGraphically() const Q_DECL_OVERRIDE;
+ void setShowSourceLocationsGraphically(bool show) Q_DECL_OVERRIDE;
+ bool openNewFilesInTabs() const Q_DECL_OVERRIDE;
public slots: // dbus
Q_SCRIPTABLE Q_NOREPLY void goToPage(uint page);
diff --git a/ui/annotationproxymodels.h b/ui/annotationproxymodels.h
index cfbba04..01603ee 100644
--- a/ui/annotationproxymodels.h
+++ b/ui/annotationproxymodels.h
@@ -27,7 +27,7 @@ class PageFilterProxyModel : public QSortFilterProxyModel
*
* @param parent The parent object.
*/
- PageFilterProxyModel( QObject *parent = Q_NULLPTR );
+ explicit PageFilterProxyModel( QObject *parent = Q_NULLPTR );
/**
* Reimplemented from QSortFilterProxy.
@@ -65,18 +65,18 @@ class PageGroupProxyModel : public QAbstractProxyModel
*
* @param parent The parent object.
*/
- PageGroupProxyModel( QObject *parent = Q_NULLPTR );
+ explicit PageGroupProxyModel( QObject *parent = Q_NULLPTR );
- virtual int columnCount( const QModelIndex &parentIndex ) const;
- virtual int rowCount( const QModelIndex &parentIndex ) const;
+ int columnCount( const QModelIndex &parentIndex ) const Q_DECL_OVERRIDE;
+ int rowCount( const QModelIndex &parentIndex ) const Q_DECL_OVERRIDE;
- virtual QModelIndex index( int row, int column, const QModelIndex &parentIndex = QModelIndex() ) const;
- virtual QModelIndex parent( const QModelIndex &index ) const;
+ QModelIndex index( int row, int column, const QModelIndex &parentIndex = QModelIndex() ) const Q_DECL_OVERRIDE;
+ QModelIndex parent( const QModelIndex &index ) const Q_DECL_OVERRIDE;
- virtual QModelIndex mapFromSource( const QModelIndex &sourceIndex ) const;
- virtual QModelIndex mapToSource( const QModelIndex &proxyIndex ) const;
+ QModelIndex mapFromSource( const QModelIndex &sourceIndex ) const Q_DECL_OVERRIDE;
+ QModelIndex mapToSource( const QModelIndex &proxyIndex ) const Q_DECL_OVERRIDE;
- virtual void setSourceModel( QAbstractItemModel *model );
+ void setSourceModel( QAbstractItemModel *model ) Q_DECL_OVERRIDE;
public Q_SLOTS:
/**
@@ -107,25 +107,25 @@ class AuthorGroupProxyModel : public QAbstractProxyModel
*
* @param parent The parent object.
*/
- AuthorGroupProxyModel( QObject *parent = Q_NULLPTR );
+ explicit AuthorGroupProxyModel( QObject *parent = Q_NULLPTR );
~AuthorGroupProxyModel();
- virtual int columnCount( const QModelIndex &parentIndex ) const;
- virtual int rowCount( const QModelIndex &parentIndex ) const;
+ int columnCount( const QModelIndex &parentIndex ) const Q_DECL_OVERRIDE;
+ int rowCount( const QModelIndex &parentIndex ) const Q_DECL_OVERRIDE;
- virtual QModelIndex index( int row, int column, const QModelIndex &parentIndex = QModelIndex() ) const;
- virtual QModelIndex parent( const QModelIndex &index ) const;
+ QModelIndex index( int row, int column, const QModelIndex &parentIndex = QModelIndex() ) const Q_DECL_OVERRIDE;
+ QModelIndex parent( const QModelIndex &index ) const Q_DECL_OVERRIDE;
- virtual QModelIndex mapFromSource( const QModelIndex &sourceIndex ) const;
- virtual QModelIndex mapToSource( const QModelIndex &proxyIndex ) const;
+ QModelIndex mapFromSource( const QModelIndex &sourceIndex ) const Q_DECL_OVERRIDE;
+ QModelIndex mapToSource( const QModelIndex &proxyIndex ) const Q_DECL_OVERRIDE;
- virtual void setSourceModel( QAbstractItemModel *model );
+ void setSourceModel( QAbstractItemModel *model ) Q_DECL_OVERRIDE;
- virtual QItemSelection mapSelectionToSource(const QItemSelection &selection) const;
- virtual QItemSelection mapSelectionFromSource(const QItemSelection &selection) const;
- QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const;
- QMap<int, QVariant> itemData(const QModelIndex &index) const;
- Qt::ItemFlags flags(const QModelIndex &index) const;
+ QItemSelection mapSelectionToSource(const QItemSelection &selection) const Q_DECL_OVERRIDE;
+ QItemSelection mapSelectionFromSource(const QItemSelection &selection) const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ QMap<int, QVariant> itemData(const QModelIndex &index) const Q_DECL_OVERRIDE;
+ Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
public Q_SLOTS:
/**
diff --git a/ui/annotationtools.h b/ui/annotationtools.h
index cd1b380..a261154 100644
--- a/ui/annotationtools.h
+++ b/ui/annotationtools.h
@@ -92,7 +92,7 @@ class SmoothPathEngine
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ ) Q_DECL_OVERRIDE;
// These are two alternative ways to get the resulting path. Don't call them both!
- QList< Okular::Annotation* > end();
+ QList< Okular::Annotation* > end() Q_DECL_OVERRIDE;
SmoothPath endSmoothPath();
private:
diff --git a/ui/annotationwidgets.h b/ui/annotationwidgets.h
index 8a4f5a4..95317c0 100644
--- a/ui/annotationwidgets.h
+++ b/ui/annotationwidgets.h
@@ -104,12 +104,12 @@ class TextAnnotationWidget
Q_OBJECT
public:
- TextAnnotationWidget( Okular::Annotation * ann );
+ explicit TextAnnotationWidget( Okular::Annotation * ann );
- virtual void applyChanges();
+ void applyChanges() Q_DECL_OVERRIDE;
protected:
- virtual QWidget * createStyleWidget();
+ QWidget * createStyleWidget() Q_DECL_OVERRIDE;
private:
Okular::TextAnnotation * m_textAnn;
@@ -124,12 +124,12 @@ class StampAnnotationWidget
Q_OBJECT
public:
- StampAnnotationWidget( Okular::Annotation * ann );
+ explicit StampAnnotationWidget( Okular::Annotation * ann );
- virtual void applyChanges();
+ void applyChanges() Q_DECL_OVERRIDE;
protected:
- virtual QWidget * createStyleWidget();
+ QWidget * createStyleWidget() Q_DECL_OVERRIDE;
private:
Okular::StampAnnotation * m_stampAnn;
@@ -142,9 +142,9 @@ class LineAnnotationWidget
Q_OBJECT
public:
- LineAnnotationWidget( Okular::Annotation * ann );
+ explicit LineAnnotationWidget( Okular::Annotation * ann );
- virtual void applyChanges();
+ void applyChanges() Q_DECL_OVERRIDE;
protected:
virtual QWidget * createStyleWidget();
@@ -165,12 +165,12 @@ class HighlightAnnotationWidget
Q_OBJECT
public:
- HighlightAnnotationWidget( Okular::Annotation * ann );
+ explicit HighlightAnnotationWidget( Okular::Annotation * ann );
- virtual void applyChanges();
+ void applyChanges() Q_DECL_OVERRIDE;
protected:
- virtual QWidget * createStyleWidget();
+ QWidget * createStyleWidget() Q_DECL_OVERRIDE;
private:
Okular::HighlightAnnotation * m_hlAnn;
@@ -183,12 +183,12 @@ class GeomAnnotationWidget
Q_OBJECT
public:
- GeomAnnotationWidget( Okular::Annotation * ann );
+ explicit GeomAnnotationWidget( Okular::Annotation * ann );
- virtual void applyChanges();
+ void applyChanges() Q_DECL_OVERRIDE;
protected:
- virtual QWidget * createStyleWidget();
+ QWidget * createStyleWidget() Q_DECL_OVERRIDE;
private:
Okular::GeomAnnotation * m_geomAnn;
@@ -204,13 +204,13 @@ class FileAttachmentAnnotationWidget
Q_OBJECT
public:
- FileAttachmentAnnotationWidget( Okular::Annotation * ann );
+ explicit FileAttachmentAnnotationWidget( Okular::Annotation * ann );
- virtual void applyChanges();
+ void applyChanges() Q_DECL_OVERRIDE;
protected:
- virtual QWidget * createStyleWidget();
- virtual QWidget * createExtraWidget();
+ QWidget * createStyleWidget() Q_DECL_OVERRIDE;
+ QWidget * createExtraWidget() Q_DECL_OVERRIDE;
private:
Okular::FileAttachmentAnnotation * m_attachAnn;
@@ -223,12 +223,12 @@ class CaretAnnotationWidget
Q_OBJECT
public:
- CaretAnnotationWidget( Okular::Annotation * ann );
+ explicit CaretAnnotationWidget( Okular::Annotation * ann );
- virtual void applyChanges();
+ void applyChanges() Q_DECL_OVERRIDE;
protected:
- virtual QWidget * createStyleWidget();
+ QWidget * createStyleWidget() Q_DECL_OVERRIDE;
private:
Okular::CaretAnnotation * m_caretAnn;
@@ -241,12 +241,12 @@ class InkAnnotationWidget
Q_OBJECT
public:
- InkAnnotationWidget( Okular::Annotation * ann );
+ explicit InkAnnotationWidget( Okular::Annotation * ann );
- virtual void applyChanges();
+ void applyChanges() Q_DECL_OVERRIDE;
protected:
- virtual QWidget * createStyleWidget();
+ QWidget * createStyleWidget() Q_DECL_OVERRIDE;
private:
Okular::InkAnnotation * m_inkAnn;
diff --git a/ui/bookmarklist.h b/ui/bookmarklist.h
index e890820..9c3b6dc 100644
--- a/ui/bookmarklist.h
+++ b/ui/bookmarklist.h
@@ -35,7 +35,7 @@ class BookmarkList : public QWidget, public Okular::DocumentObserver
~BookmarkList();
// inherited from DocumentObserver
- void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags );
+ void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ) Q_DECL_OVERRIDE;
private slots:
void slotFilterBookmarks( bool );
diff --git a/ui/minibar.h b/ui/minibar.h
index 6cb7ad6..f54796a 100644
--- a/ui/minibar.h
+++ b/ui/minibar.h
@@ -33,13 +33,13 @@ class PagesEdit : public KLineEdit
public:
PagesEdit( MiniBar * parent );
- void setText( const QString & );
+ void setText( const QString & ) Q_DECL_OVERRIDE;
protected:
- void focusInEvent( QFocusEvent * e );
- void focusOutEvent( QFocusEvent * e );
- void mousePressEvent( QMouseEvent * e );
- void wheelEvent( QWheelEvent * e );
+ void focusInEvent( QFocusEvent * e ) Q_DECL_OVERRIDE;
+ void focusOutEvent( QFocusEvent * e ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent * e ) Q_DECL_OVERRIDE;
+ void wheelEvent( QWheelEvent * e ) Q_DECL_OVERRIDE;
private slots:
void updatePalette();
@@ -64,7 +64,7 @@ class PageLabelEdit : public PagesEdit
Q_OBJECT
public:
PageLabelEdit( MiniBar * parent );
- void setText( const QString & newText );
+ void setText( const QString & newText ) Q_DECL_OVERRIDE;
void setPageLabels( const QVector< Okular::Page * > & pageVector );
signals:
@@ -94,8 +94,8 @@ class MiniBarLogic : public QObject, public Okular::DocumentObserver
int currentPage() const;
// [INHERITED] from DocumentObserver
- void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags );
- void notifyCurrentPageChanged( int previous, int current );
+ void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ) Q_DECL_OVERRIDE;
+ void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE;
private:
QSet<MiniBar *> m_miniBars;
@@ -114,7 +114,7 @@ class MiniBar : public QWidget
MiniBar( QWidget *parent, MiniBarLogic * miniBarLogic );
~MiniBar();
- void changeEvent( QEvent * event ) ;
+ void changeEvent( QEvent * event ) Q_DECL_OVERRIDE;
signals:
void gotoPage();
@@ -154,7 +154,7 @@ class ProgressWidget : public QWidget, public Okular::DocumentObserver
~ProgressWidget();
// [INHERITED] from DocumentObserver
- void notifyCurrentPageChanged( int previous, int current );
+ void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE;
void slotGotoNormalizedPage( float index );
diff --git a/ui/pageviewutils.h b/ui/pageviewutils.h
index b6b0969..a6420a4 100644
--- a/ui/pageviewutils.h
+++ b/ui/pageviewutils.h
@@ -150,7 +150,7 @@ class ToolBarButton : public QToolButton
void buttonDoubleClicked( int buttonID );
protected:
- void mouseDoubleClickEvent( QMouseEvent * event );
+ void mouseDoubleClickEvent( QMouseEvent * event ) Q_DECL_OVERRIDE;
private:
int m_id;