Commit 191a37fb authored by Albert Astals Cid's avatar Albert Astals Cid

Q_DECL_OVERRIDE -> override

parent 4072eb0c
...@@ -25,7 +25,7 @@ class DlgGeneral : public QWidget ...@@ -25,7 +25,7 @@ class DlgGeneral : public QWidget
virtual ~DlgGeneral(); virtual ~DlgGeneral();
protected: protected:
void showEvent( QShowEvent * ) Q_DECL_OVERRIDE; void showEvent( QShowEvent * ) override;
Ui_DlgGeneralBase * m_dlg; Ui_DlgGeneralBase * m_dlg;
}; };
......
...@@ -27,12 +27,12 @@ class WidgetAnnotTools : public WidgetConfigurationToolsBase ...@@ -27,12 +27,12 @@ class WidgetAnnotTools : public WidgetConfigurationToolsBase
explicit WidgetAnnotTools( QWidget * parent = nullptr ); explicit WidgetAnnotTools( QWidget * parent = nullptr );
~WidgetAnnotTools(); ~WidgetAnnotTools();
QStringList tools() const Q_DECL_OVERRIDE; QStringList tools() const override;
void setTools(const QStringList& items) Q_DECL_OVERRIDE; void setTools(const QStringList& items) override;
protected Q_SLOTS: protected Q_SLOTS:
void slotAdd() Q_DECL_OVERRIDE; void slotAdd() override;
void slotEdit() Q_DECL_OVERRIDE; void slotEdit() override;
}; };
#endif #endif
...@@ -20,14 +20,14 @@ public: ...@@ -20,14 +20,14 @@ public:
explicit WidgetDrawingTools( QWidget * parent = nullptr ); explicit WidgetDrawingTools( QWidget * parent = nullptr );
~WidgetDrawingTools(); ~WidgetDrawingTools();
QStringList tools() const Q_DECL_OVERRIDE; QStringList tools() const override;
void setTools( const QStringList& items ) Q_DECL_OVERRIDE; void setTools( const QStringList& items ) override;
QString defaultName() const; QString defaultName() const;
protected Q_SLOTS: protected Q_SLOTS:
void slotAdd() Q_DECL_OVERRIDE; void slotAdd() override;
void slotEdit() Q_DECL_OVERRIDE; void slotEdit() override;
}; };
#endif // WIDGETDRAWINGTOOLS_H #endif // WIDGETDRAWINGTOOLS_H
...@@ -34,7 +34,7 @@ class RotationJobInternal : public ThreadWeaver::Job ...@@ -34,7 +34,7 @@ class RotationJobInternal : public ThreadWeaver::Job
NormalizedRect rect() const; NormalizedRect rect() const;
protected: protected:
void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) Q_DECL_OVERRIDE; void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) override;
private: private:
RotationJobInternal( const QImage &image, Rotation oldRotation, Rotation newRotation ); RotationJobInternal( const QImage &image, Rotation oldRotation, Rotation newRotation );
......
...@@ -35,22 +35,22 @@ class CHMGenerator : public Okular::Generator ...@@ -35,22 +35,22 @@ class CHMGenerator : public Okular::Generator
public: public:
CHMGenerator( QObject *parent, const QVariantList &args ); CHMGenerator( QObject *parent, const QVariantList &args );
~CHMGenerator(); ~CHMGenerator();
bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector ) Q_DECL_OVERRIDE; bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector ) override;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE; Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE; const Okular::DocumentSynopsis * generateDocumentSynopsis() override;
bool canGeneratePixmap() const Q_DECL_OVERRIDE; bool canGeneratePixmap() const override;
void generatePixmap( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE; void generatePixmap( Okular::PixmapRequest * request ) override;
QVariant metaData( const QString & key, const QVariant & option ) const Q_DECL_OVERRIDE; QVariant metaData( const QString & key, const QVariant & option ) const override;
public Q_SLOTS: public Q_SLOTS:
void slotCompleted(); void slotCompleted();
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE; Okular::TextPage* textPage( Okular::Page *page ) override;
private: private:
void additionalRequestData(); void additionalRequestData();
......
...@@ -24,14 +24,14 @@ class ComicBookGenerator : public Okular::Generator ...@@ -24,14 +24,14 @@ class ComicBookGenerator : public Okular::Generator
virtual ~ComicBookGenerator(); virtual ~ComicBookGenerator();
// [INHERITED] load a document and fill up the pagesVector // [INHERITED] load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE; bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) override;
// [INHERITED] print document using already configured kprinter // [INHERITED] print document using already configured kprinter
bool print( QPrinter& printer ) Q_DECL_OVERRIDE; bool print( QPrinter& printer ) override;
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE; QImage image( Okular::PixmapRequest * request ) override;
private: private:
ComicBook::Document mDocument; ComicBook::Document mDocument;
......
...@@ -38,8 +38,8 @@ class NonFreeUnrarFlavour : public UnrarFlavour ...@@ -38,8 +38,8 @@ class NonFreeUnrarFlavour : public UnrarFlavour
public: public:
NonFreeUnrarFlavour(); NonFreeUnrarFlavour();
QStringList processListing( const QStringList &data ) Q_DECL_OVERRIDE; QStringList processListing( const QStringList &data ) override;
QString name() const Q_DECL_OVERRIDE; QString name() const override;
}; };
class FreeUnrarFlavour : public UnrarFlavour class FreeUnrarFlavour : public UnrarFlavour
...@@ -47,8 +47,8 @@ class FreeUnrarFlavour : public UnrarFlavour ...@@ -47,8 +47,8 @@ class FreeUnrarFlavour : public UnrarFlavour
public: public:
FreeUnrarFlavour(); FreeUnrarFlavour();
QStringList processListing( const QStringList &data ) Q_DECL_OVERRIDE; QStringList processListing( const QStringList &data ) override;
QString name() const Q_DECL_OVERRIDE; QString name() const override;
}; };
#endif #endif
......
...@@ -28,22 +28,22 @@ class DjVuGenerator : public Okular::Generator ...@@ -28,22 +28,22 @@ class DjVuGenerator : public Okular::Generator
public: public:
DjVuGenerator( QObject *parent, const QVariantList &args ); DjVuGenerator( QObject *parent, const QVariantList &args );
~DjVuGenerator(); ~DjVuGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE; bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) override;
// document information // document information
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE; Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE; const Okular::DocumentSynopsis * generateDocumentSynopsis() override;
// printing // printing
bool print( QPrinter& printer ) Q_DECL_OVERRIDE; bool print( QPrinter& printer ) override;
QVariant metaData( const QString & key, const QVariant & option ) const Q_DECL_OVERRIDE; QVariant metaData( const QString & key, const QVariant & option ) const override;
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
// pixmap generation // pixmap generation
QImage image( Okular::PixmapRequest *request ) Q_DECL_OVERRIDE; QImage image( Okular::PixmapRequest *request ) override;
Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE; Okular::TextPage* textPage( Okular::Page *page ) override;
private: private:
void loadPages( QVector<Okular::Page*> & pagesVector, int rotation ); void loadPages( QVector<Okular::Page*> & pagesVector, int rotation );
......
...@@ -26,7 +26,7 @@ namespace Epub { ...@@ -26,7 +26,7 @@ namespace Epub {
Converter(); Converter();
~Converter(); ~Converter();
QTextDocument *convert( const QString &fileName ) Q_DECL_OVERRIDE; QTextDocument *convert( const QString &fileName ) override;
private: private:
......
...@@ -35,7 +35,7 @@ namespace Epub { ...@@ -35,7 +35,7 @@ namespace Epub {
enum Multimedia { MovieResource = 4, AudioResource = 5 }; enum Multimedia { MovieResource = 4, AudioResource = 5 };
protected: protected:
QVariant loadResource(int type, const QUrl &name) Q_DECL_OVERRIDE; QVariant loadResource(int type, const QUrl &name) override;
private: private:
void checkCSS(QString &css); void checkCSS(QString &css);
......
...@@ -25,15 +25,15 @@ class FaxGenerator : public Okular::Generator ...@@ -25,15 +25,15 @@ class FaxGenerator : public Okular::Generator
FaxGenerator( QObject *parent, const QVariantList &args ); FaxGenerator( QObject *parent, const QVariantList &args );
virtual ~FaxGenerator(); virtual ~FaxGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE; bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) override;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE; Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
bool print( QPrinter& printer ) Q_DECL_OVERRIDE; bool print( QPrinter& printer ) override;
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE; QImage image( Okular::PixmapRequest * request ) override;
private: private:
QImage m_img; QImage m_img;
......
...@@ -21,7 +21,7 @@ class FictionBookGenerator : public Okular::TextDocumentGenerator ...@@ -21,7 +21,7 @@ class FictionBookGenerator : public Okular::TextDocumentGenerator
FictionBookGenerator( QObject *parent, const QVariantList &args ); FictionBookGenerator( QObject *parent, const QVariantList &args );
// [INHERITED] reparse configuration // [INHERITED] reparse configuration
void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE; void addPages( KConfigDialog* dlg ) override;
}; };
#endif #endif
...@@ -20,9 +20,9 @@ class KOOOGenerator : public Okular::TextDocumentGenerator ...@@ -20,9 +20,9 @@ class KOOOGenerator : public Okular::TextDocumentGenerator
KOOOGenerator( QObject *parent, const QVariantList &args ); KOOOGenerator( QObject *parent, const QVariantList &args );
// [INHERITED] reparse configuration // [INHERITED] reparse configuration
void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE; void addPages( KConfigDialog* dlg ) override;
void walletDataForFile( const QString &fileName, QString *walletName, QString *walletFolder, QString *walletKey ) const Q_DECL_OVERRIDE; void walletDataForFile( const QString &fileName, QString *walletName, QString *walletFolder, QString *walletKey ) const override;
}; };
#endif #endif
...@@ -29,23 +29,23 @@ class PluckerGenerator : public Okular::Generator ...@@ -29,23 +29,23 @@ class PluckerGenerator : public Okular::Generator
virtual ~PluckerGenerator(); virtual ~PluckerGenerator();
// [INHERITED] load a document and fill up the pagesVector // [INHERITED] load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE; bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) override;
// [INHERITED] document information // [INHERITED] document information
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE; Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
// [INHERITED] perform actions on document / pages // [INHERITED] perform actions on document / pages
QImage image( Okular::PixmapRequest *request ) Q_DECL_OVERRIDE; QImage image( Okular::PixmapRequest *request ) override;
// [INHERITED] text exporting // [INHERITED] text exporting
Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE; Okular::ExportFormat::List exportFormats() const override;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE; bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) override;
// [INHERITED] print document using already configured kprinter // [INHERITED] print document using already configured kprinter
bool print( QPrinter& printer ) Q_DECL_OVERRIDE; bool print( QPrinter& printer ) override;
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
private: private:
QList<QTextDocument*> mPages; QList<QTextDocument*> mPages;
......
...@@ -26,10 +26,10 @@ class PopplerAnnotationProxy : public Okular::AnnotationProxy ...@@ -26,10 +26,10 @@ class PopplerAnnotationProxy : public Okular::AnnotationProxy
PopplerAnnotationProxy( Poppler::Document *doc, QMutex *userMutex ); PopplerAnnotationProxy( Poppler::Document *doc, QMutex *userMutex );
~PopplerAnnotationProxy(); ~PopplerAnnotationProxy();
bool supports( Capability capability ) const Q_DECL_OVERRIDE; bool supports( Capability capability ) const override;
void notifyAddition( Okular::Annotation *annotation, int page ) Q_DECL_OVERRIDE; void notifyAddition( Okular::Annotation *annotation, int page ) override;
void notifyModification( const Okular::Annotation *annotation, int page, bool appearanceChanged ) Q_DECL_OVERRIDE; void notifyModification( const Okular::Annotation *annotation, int page, bool appearanceChanged ) override;
void notifyRemoval( Okular::Annotation *annotation, int page ) Q_DECL_OVERRIDE; void notifyRemoval( Okular::Annotation *annotation, int page ) override;
private: private:
Poppler::Document *ppl_doc; Poppler::Document *ppl_doc;
QMutex *mutex; QMutex *mutex;
......
...@@ -20,19 +20,19 @@ class PopplerFormFieldButton : public Okular::FormFieldButton ...@@ -20,19 +20,19 @@ class PopplerFormFieldButton : public Okular::FormFieldButton
virtual ~PopplerFormFieldButton(); virtual ~PopplerFormFieldButton();
// inherited from Okular::FormField // inherited from Okular::FormField
Okular::NormalizedRect rect() const Q_DECL_OVERRIDE; Okular::NormalizedRect rect() const override;
int id() const Q_DECL_OVERRIDE; int id() const override;
QString name() const Q_DECL_OVERRIDE; QString name() const override;
QString uiName() const Q_DECL_OVERRIDE; QString uiName() const override;
virtual bool isReadOnly() const Q_DECL_OVERRIDE; virtual bool isReadOnly() const override;
virtual bool isVisible() const Q_DECL_OVERRIDE; virtual bool isVisible() const override;
// inherited from Okular::FormFieldButton // inherited from Okular::FormFieldButton
virtual ButtonType buttonType() const Q_DECL_OVERRIDE; virtual ButtonType buttonType() const override;
virtual QString caption() const Q_DECL_OVERRIDE; virtual QString caption() const override;
virtual bool state() const Q_DECL_OVERRIDE; virtual bool state() const override;
virtual void setState( bool state ) Q_DECL_OVERRIDE; virtual void setState( bool state ) override;
virtual QList< int > siblings() const Q_DECL_OVERRIDE; virtual QList< int > siblings() const override;
private: private:
Poppler::FormFieldButton * m_field; Poppler::FormFieldButton * m_field;
......
...@@ -58,49 +58,49 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface, p ...@@ -58,49 +58,49 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface, p
virtual ~PDFGenerator(); virtual ~PDFGenerator();
// [INHERITED] load a document and fill up the pagesVector // [INHERITED] load a document and fill up the pagesVector
Okular::Document::OpenResult loadDocumentWithPassword( const QString & fileName, QVector<Okular::Page*> & pagesVector, const QString & password ) Q_DECL_OVERRIDE; Okular::Document::OpenResult loadDocumentWithPassword( const QString & fileName, QVector<Okular::Page*> & pagesVector, const QString & password ) override;
Okular::Document::OpenResult loadDocumentFromDataWithPassword( const QByteArray & fileData, QVector<Okular::Page*> & pagesVector, const QString & password ) Q_DECL_OVERRIDE; Okular::Document::OpenResult loadDocumentFromDataWithPassword( const QByteArray & fileData, QVector<Okular::Page*> & pagesVector, const QString & password ) override;
void loadPages(QVector<Okular::Page*> &pagesVector, int rotation=-1, bool clear=false); void loadPages(QVector<Okular::Page*> &pagesVector, int rotation=-1, bool clear=false);
// [INHERITED] document information // [INHERITED] document information
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE; Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE; const Okular::DocumentSynopsis * generateDocumentSynopsis() override;
Okular::FontInfo::List fontsForPage( int page ) Q_DECL_OVERRIDE; Okular::FontInfo::List fontsForPage( int page ) override;
const QList<Okular::EmbeddedFile*> * embeddedFiles() const Q_DECL_OVERRIDE; const QList<Okular::EmbeddedFile*> * embeddedFiles() const override;
PageSizeMetric pagesSizeMetric() const Q_DECL_OVERRIDE{ return Pixels; } PageSizeMetric pagesSizeMetric() const override{ return Pixels; }
QAbstractItemModel * layersModel() const Q_DECL_OVERRIDE; QAbstractItemModel * layersModel() const override;
void opaqueAction( const Okular::BackendOpaqueAction *action ) Q_DECL_OVERRIDE; void opaqueAction( const Okular::BackendOpaqueAction *action ) override;
// [INHERITED] document information // [INHERITED] document information
bool isAllowed( Okular::Permission permission ) const Q_DECL_OVERRIDE; bool isAllowed( Okular::Permission permission ) const override;
// [INHERITED] perform actions on document / pages // [INHERITED] perform actions on document / pages
QImage image( Okular::PixmapRequest *page ) Q_DECL_OVERRIDE; QImage image( Okular::PixmapRequest *page ) override;
// [INHERITED] print page using an already configured kprinter // [INHERITED] print page using an already configured kprinter
bool print( QPrinter& printer ) Q_DECL_OVERRIDE; bool print( QPrinter& printer ) override;
// [INHERITED] reply to some metadata requests // [INHERITED] reply to some metadata requests
QVariant metaData( const QString & key, const QVariant & option ) const Q_DECL_OVERRIDE; QVariant metaData( const QString & key, const QVariant & option ) const override;
// [INHERITED] reparse configuration // [INHERITED] reparse configuration
bool reparseConfig() Q_DECL_OVERRIDE; bool reparseConfig() override;
void addPages( KConfigDialog * ) Q_DECL_OVERRIDE; void addPages( KConfigDialog * ) override;
// [INHERITED] text exporting // [INHERITED] text exporting
Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE; Okular::ExportFormat::List exportFormats() const override;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE; bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) override;
// [INHERITED] print interface // [INHERITED] print interface
QWidget* printConfigurationWidget() const Q_DECL_OVERRIDE; QWidget* printConfigurationWidget() const override;
// [INHERITED] save interface // [INHERITED] save interface
bool supportsOption( SaveOption ) const Q_DECL_OVERRIDE; bool supportsOption( SaveOption ) const override;
bool save( const QString &fileName, SaveOptions options, QString *errorText ) Q_DECL_OVERRIDE; bool save( const QString &fileName, SaveOptions options, QString *errorText ) override;
Okular::AnnotationProxy* annotationProxy() const Q_DECL_OVERRIDE; Okular::AnnotationProxy* annotationProxy() const override;
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE; Okular::TextPage* textPage( Okular::Page *page ) override;
protected Q_SLOTS: protected Q_SLOTS:
void requestFontData(const Okular::FontInfo &font, QByteArray *data); void requestFontData(const Okular::FontInfo &font, QByteArray *data);
......
...@@ -24,25 +24,25 @@ class GSGenerator : public Okular::Generator, public Okular::ConfigInterface ...@@ -24,25 +24,25 @@ class GSGenerator : public Okular::Generator, public Okular::ConfigInterface
public: public:
/** virtual methods to reimplement **/ /** virtual methods to reimplement **/
// load a document and fill up the pagesVector // load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector ) Q_DECL_OVERRIDE; bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector ) override;
// Document description and Table of contents // Document description and Table of contents
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE; Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE { return 0L; } const Okular::DocumentSynopsis * generateDocumentSynopsis() override { return 0L; }
const Okular::DocumentFonts * generateDocumentFonts() { return 0L; } const Okular::DocumentFonts * generateDocumentFonts() { return 0L; }
// page contents generation // page contents generation
bool canGeneratePixmap() const Q_DECL_OVERRIDE; bool canGeneratePixmap() const override;
void generatePixmap( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE; void generatePixmap( Okular::PixmapRequest * request ) override;
QVariant metaData(const QString &key, const QVariant &option) const Q_DECL_OVERRIDE; QVariant metaData(const QString &key, const QVariant &option) const override;
// print document using already configured kprinter // print document using already configured kprinter
bool print( QPrinter& /*printer*/ ) Q_DECL_OVERRIDE; bool print( QPrinter& /*printer*/ ) override;
QString fileName() const; QString fileName() const;
bool reparseConfig() Q_DECL_OVERRIDE; bool reparseConfig() override;
void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE; void addPages( KConfigDialog* dlg ) override;
/** constructor **/ /** constructor **/
GSGenerator( QObject *parent, const QVariantList &args ); GSGenerator( QObject *parent, const QVariantList &args );
...@@ -52,7 +52,7 @@ class GSGenerator : public Okular::Generator, public Okular::ConfigInterface ...@@ -52,7 +52,7 @@ class GSGenerator : public Okular::Generator, public Okular::ConfigInterface
void slotImageGenerated(QImage *img, Okular::PixmapRequest *request); void slotImageGenerated(QImage *img, Okular::PixmapRequest *request);
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
private: private:
bool loadPages( QVector< Okular::Page * > & pagesVector ); bool loadPages( QVector< Okular::Page * > & pagesVector );
......
...@@ -23,16 +23,16 @@ class TIFFGenerator : public Okular::Generator ...@@ -23,16 +23,16 @@ class TIFFGenerator : public Okular::Generator
TIFFGenerator( QObject *parent, const QVariantList &args ); TIFFGenerator( QObject *parent, const QVariantList &args );
virtual ~TIFFGenerator(); virtual ~TIFFGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE; bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) override;
bool loadDocumentFromData( const QByteArray & fileData, QVector< Okular::Page * > & pagesVector ) Q_DECL_OVERRIDE; bool loadDocumentFromData( const QByteArray & fileData, QVector< Okular::Page * > & pagesVector ) override;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE; Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
bool print( QPrinter& printer ) Q_DECL_OVERRIDE; bool print( QPrinter& printer ) override;
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE; QImage image( Okular::PixmapRequest * request ) override;
private: private:
class Private; class Private;
......
...@@ -23,7 +23,7 @@ namespace Txt ...@@ -23,7 +23,7 @@ namespace Txt
Converter(); Converter();
~Converter(); ~Converter();
QTextDocument *convert( const QString &fileName ) Q_DECL_OVERRIDE; QTextDocument *convert( const QString &fileName ) override;
}; };
} }
......
...@@ -23,7 +23,7 @@ public: ...@@ -23,7 +23,7 @@ public:
TxtGenerator(QObject *parent, const QVariantList &args); TxtGenerator(QObject *parent, const QVariantList &args);
~TxtGenerator() {} ~TxtGenerator() {}
void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE; void addPages( KConfigDialog* dlg ) override;
}; };
#endif #endif
...@@ -116,11 +116,11 @@ public: ...@@ -116,11 +116,11 @@ public:
bool startElement( const QString & nameSpace, bool startElement( const QString & nameSpace,
const QString & localName, const QString & localName,
const QString & qname, const QString & qname,
const QXmlAttributes & atts ) Q_DECL_OVERRIDE; const QXmlAttributes & atts ) override;
bool endElement( const QString & nameSpace, bool endElement( const QString & nameSpace,
const QString & localName, const QString & localName,
const QString & qname ) Q_DECL_OVERRIDE; const QString & qname ) override;
bool startDocument() Q_DECL_OVERRIDE; bool startDocument() override;
protected: protected:
XpsPage *m_page; XpsPage *m_page;
...@@ -306,20 +306,20 @@ class XpsGenerator : public Okular::Generator ...@@ -306,20 +306,20 @@ class XpsGenerator : public Okular::Generator
XpsGenerator( QObject *parent, const QVariantList &args ); XpsGenerator( QObject *parent, const QVariantList &args );
virtual ~XpsGenerator(); virtual ~XpsGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE; bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) override;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE; Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE; const Okular::DocumentSynopsis * generateDocumentSynopsis() override;
Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE; Okular::ExportFormat::List exportFormats() const override;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE; bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) override;
bool print( QPrinter &printer ) Q_DECL_OVERRIDE; bool print( QPrinter &printer ) override;
protected: protected:
bool doCloseDocument() Q_DECL_OVERRIDE; bool doCloseDocument() override;
QImage image( Okular::PixmapRequest *page ) Q_DECL_OVERRIDE; QImage image( Okular::PixmapRequest *page ) override;
Okular::TextPage* textPage( Okular::Page * page ) Q_DECL_OVERRIDE; Okular::TextPage* textPage( Okular::Page * page ) override;
private: private:
XpsFile *m_xpsFile; XpsFile *m_xpsFile;