Skip to content

Okular
Okular
Commit 191a37fb authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files
Options

Q_DECL_OVERRIDE -> override

parent 4072eb0c
Hide whitespace changes
Inline Side-by-side
Showing with 303 additions and 303 deletions
conf/dlggeneral.h
View file @ 191a37fb
......@@ -25,7 +25,7 @@ class DlgGeneral : public QWidget
virtual ~DlgGeneral();
protected:
void showEvent( QShowEvent * ) Q_DECL_OVERRIDE;
void showEvent( QShowEvent * ) override;
Ui_DlgGeneralBase * m_dlg;
};
......
conf/widgetannottools.h
View file @ 191a37fb
......@@ -27,12 +27,12 @@ class WidgetAnnotTools : public WidgetConfigurationToolsBase
explicit WidgetAnnotTools( QWidget * parent = nullptr );
~WidgetAnnotTools();
QStringList tools() const Q_DECL_OVERRIDE;
void setTools(const QStringList& items) Q_DECL_OVERRIDE;
QStringList tools() const override;
void setTools(const QStringList& items) override;
protected Q_SLOTS:
void slotAdd() Q_DECL_OVERRIDE;
void slotEdit() Q_DECL_OVERRIDE;
void slotAdd() override;
void slotEdit() override;
};
#endif
conf/widgetdrawingtools.h
View file @ 191a37fb
......@@ -20,14 +20,14 @@ public:
explicit WidgetDrawingTools( QWidget * parent = nullptr );
~WidgetDrawingTools();
QStringList tools() const Q_DECL_OVERRIDE;
void setTools( const QStringList& items ) Q_DECL_OVERRIDE;
QStringList tools() const override;
void setTools( const QStringList& items ) override;
QString defaultName() const;
protected Q_SLOTS:
void slotAdd() Q_DECL_OVERRIDE;
void slotEdit() Q_DECL_OVERRIDE;
void slotAdd() override;
void slotEdit() override;
};
#endif // WIDGETDRAWINGTOOLS_H
core/rotationjob_p.h
View file @ 191a37fb
......@@ -34,7 +34,7 @@ class RotationJobInternal : public ThreadWeaver::Job
NormalizedRect rect() const;
protected:
void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) Q_DECL_OVERRIDE;
void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) override;
private:
RotationJobInternal( const QImage &image, Rotation oldRotation, Rotation newRotation );
......
generators/chm/generator_chm.h
View file @ 191a37fb
......@@ -35,22 +35,22 @@ class CHMGenerator : public Okular::Generator
public:
CHMGenerator( QObject *parent, const QVariantList &args );
~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;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() override;
bool canGeneratePixmap() const Q_DECL_OVERRIDE;
void generatePixmap( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
bool canGeneratePixmap() const 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:
void slotCompleted();
protected:
bool doCloseDocument() Q_DECL_OVERRIDE;
Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE;
bool doCloseDocument() override;
Okular::TextPage* textPage( Okular::Page *page ) override;
private:
void additionalRequestData();
......
generators/comicbook/generator_comicbook.h
View file @ 191a37fb
......@@ -24,14 +24,14 @@ class ComicBookGenerator : public Okular::Generator
virtual ~ComicBookGenerator();
// [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
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
bool print( QPrinter& printer ) override;
protected:
bool doCloseDocument() Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
bool doCloseDocument() override;
QImage image( Okular::PixmapRequest * request ) override;
private:
ComicBook::Document mDocument;
......
generators/comicbook/unrarflavours.h
View file @ 191a37fb
......@@ -38,8 +38,8 @@ class NonFreeUnrarFlavour : public UnrarFlavour
public:
NonFreeUnrarFlavour();
QStringList processListing( const QStringList &data ) Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
QStringList processListing( const QStringList &data ) override;
QString name() const override;
};
class FreeUnrarFlavour : public UnrarFlavour
......@@ -47,8 +47,8 @@ class FreeUnrarFlavour : public UnrarFlavour
public:
FreeUnrarFlavour();
QStringList processListing( const QStringList &data ) Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
QStringList processListing( const QStringList &data ) override;
QString name() const override;
};
#endif
......
generators/djvu/generator_djvu.h
View file @ 191a37fb
......@@ -28,22 +28,22 @@ class DjVuGenerator : public Okular::Generator
public:
DjVuGenerator( QObject *parent, const QVariantList &args );
~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
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() override;
// 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:
bool doCloseDocument() Q_DECL_OVERRIDE;
bool doCloseDocument() override;
// pixmap generation
QImage image( Okular::PixmapRequest *request ) Q_DECL_OVERRIDE;
Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest *request ) override;
Okular::TextPage* textPage( Okular::Page *page ) override;
private:
void loadPages( QVector<Okular::Page*> & pagesVector, int rotation );
......
generators/epub/converter.h
View file @ 191a37fb
......@@ -26,7 +26,7 @@ namespace Epub {
Converter();
~Converter();
QTextDocument *convert( const QString &fileName ) Q_DECL_OVERRIDE;
QTextDocument *convert( const QString &fileName ) override;
private:
......
generators/epub/epubdocument.h
View file @ 191a37fb
......@@ -35,7 +35,7 @@ namespace Epub {
enum Multimedia { MovieResource = 4, AudioResource = 5 };
protected:
QVariant loadResource(int type, const QUrl &name) Q_DECL_OVERRIDE;
QVariant loadResource(int type, const QUrl &name) override;
private:
void checkCSS(QString &css);
......
generators/fax/generator_fax.h
View file @ 191a37fb
......@@ -25,15 +25,15 @@ class FaxGenerator : public Okular::Generator
FaxGenerator( QObject *parent, const QVariantList &args );
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:
bool doCloseDocument() Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
bool doCloseDocument() override;
QImage image( Okular::PixmapRequest * request ) override;
private:
QImage m_img;
......
generators/fictionbook/generator_fb.h
View file @ 191a37fb
......@@ -21,7 +21,7 @@ class FictionBookGenerator : public Okular::TextDocumentGenerator
FictionBookGenerator( QObject *parent, const QVariantList &args );
// [INHERITED] reparse configuration
void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE;
void addPages( KConfigDialog* dlg ) override;
};
#endif
generators/ooo/generator_ooo.h
View file @ 191a37fb
......@@ -20,9 +20,9 @@ class KOOOGenerator : public Okular::TextDocumentGenerator
KOOOGenerator( QObject *parent, const QVariantList &args );
// [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
generators/plucker/generator_plucker.h
View file @ 191a37fb
......@@ -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 ) Q_DECL_OVERRIDE;
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) override;
// [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
QImage image( Okular::PixmapRequest *request ) Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest *request ) override;
// [INHERITED] text exporting
Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE;
Okular::ExportFormat::List exportFormats() const override;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) override;
// [INHERITED] print document using already configured kprinter
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
bool print( QPrinter& printer ) override;
protected:
bool doCloseDocument() Q_DECL_OVERRIDE;
bool doCloseDocument() override;
private:
QList<QTextDocument*> mPages;
......
generators/poppler/annots.h
View file @ 191a37fb
......@@ -26,10 +26,10 @@ class PopplerAnnotationProxy : public Okular::AnnotationProxy
PopplerAnnotationProxy( Poppler::Document *doc, QMutex *userMutex );
~PopplerAnnotationProxy();
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;
bool supports( Capability capability ) const override;
void notifyAddition( Okular::Annotation *annotation, int page ) override;
void notifyModification( const Okular::Annotation *annotation, int page, bool appearanceChanged ) override;
void notifyRemoval( Okular::Annotation *annotation, int page ) override;
private:
Poppler::Document *ppl_doc;
QMutex *mutex;
......
generators/poppler/formfields.h
View file @ 191a37fb
......@@ -20,19 +20,19 @@ class PopplerFormFieldButton : public Okular::FormFieldButton
virtual ~PopplerFormFieldButton();
// inherited from Okular::FormField
Okular::NormalizedRect rect() const Q_DECL_OVERRIDE;
int id() const Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
QString uiName() const Q_DECL_OVERRIDE;
virtual bool isReadOnly() const Q_DECL_OVERRIDE;
virtual bool isVisible() const Q_DECL_OVERRIDE;
Okular::NormalizedRect rect() const override;
int id() const override;
QString name() const override;
QString uiName() const override;
virtual bool isReadOnly() const override;
virtual bool isVisible() const override;
// inherited from Okular::FormFieldButton
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;
virtual ButtonType buttonType() const override;
virtual QString caption() const override;
virtual bool state() const override;
virtual void setState( bool state ) override;
virtual QList< int > siblings() const override;
private:
Poppler::FormFieldButton * m_field;
......
generators/poppler/generator_pdf.h
View file @ 191a37fb
......@@ -58,49 +58,49 @@ 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<Okular::Page*> & pagesVector, const QString & password ) Q_DECL_OVERRIDE;
Okular::Document::OpenResult loadDocumentFromDataWithPassword( const QByteArray & fileData, 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 ) override;
void loadPages(QVector<Okular::Page*> &pagesVector, int rotation=-1, bool clear=false);
// [INHERITED] document information
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE;
Okular::FontInfo::List fontsForPage( int page ) Q_DECL_OVERRIDE;
const QList<Okular::EmbeddedFile*> * embeddedFiles() const Q_DECL_OVERRIDE;
PageSizeMetric pagesSizeMetric() const Q_DECL_OVERRIDE{ return Pixels; }
QAbstractItemModel * layersModel() const Q_DECL_OVERRIDE;
void opaqueAction( const Okular::BackendOpaqueAction *action ) Q_DECL_OVERRIDE;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() override;
Okular::FontInfo::List fontsForPage( int page ) override;
const QList<Okular::EmbeddedFile*> * embeddedFiles() const override;
PageSizeMetric pagesSizeMetric() const override{ return Pixels; }
QAbstractItemModel * layersModel() const override;
void opaqueAction( const Okular::BackendOpaqueAction *action ) override;
// [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
QImage image( Okular::PixmapRequest *page ) Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest *page ) override;
// [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
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
bool reparseConfig() Q_DECL_OVERRIDE;
void addPages( KConfigDialog * ) Q_DECL_OVERRIDE;
bool reparseConfig() override;
void addPages( KConfigDialog * ) override;
// [INHERITED] text exporting
Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE;
Okular::ExportFormat::List exportFormats() const override;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) override;
// [INHERITED] print interface
QWidget* printConfigurationWidget() const Q_DECL_OVERRIDE;
QWidget* printConfigurationWidget() const override;
// [INHERITED] save interface
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;
bool supportsOption( SaveOption ) const override;
bool save( const QString &fileName, SaveOptions options, QString *errorText ) override;
Okular::AnnotationProxy* annotationProxy() const override;
protected:
bool doCloseDocument() Q_DECL_OVERRIDE;
Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE;
bool doCloseDocument() override;
Okular::TextPage* textPage( Okular::Page *page ) override;
protected Q_SLOTS:
void requestFontData(const Okular::FontInfo &font, QByteArray *data);
......
generators/spectre/generator_ghostview.h
View file @ 191a37fb
......@@ -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 ) Q_DECL_OVERRIDE;
bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector ) override;
// Document description and Table of contents
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE { return 0L; }
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() override { return 0L; }
const Okular::DocumentFonts * generateDocumentFonts() { return 0L; }
// page contents generation
bool canGeneratePixmap() const Q_DECL_OVERRIDE;
void generatePixmap( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
bool canGeneratePixmap() const 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
bool print( QPrinter& /*printer*/ ) Q_DECL_OVERRIDE;
bool print( QPrinter& /*printer*/ ) override;
QString fileName() const;
bool reparseConfig() Q_DECL_OVERRIDE;
void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE;
bool reparseConfig() override;
void addPages( KConfigDialog* dlg ) 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() Q_DECL_OVERRIDE;
bool doCloseDocument() override;
private:
bool loadPages( QVector< Okular::Page * > & pagesVector );
......
generators/tiff/generator_tiff.h
View file @ 191a37fb
......@@ -23,16 +23,16 @@ class TIFFGenerator : public Okular::Generator
TIFFGenerator( QObject *parent, const QVariantList &args );
virtual ~TIFFGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE;
bool loadDocumentFromData( const QByteArray & fileData, 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 ) 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:
bool doCloseDocument() Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
bool doCloseDocument() override;
QImage image( Okular::PixmapRequest * request ) override;
private:
class Private;
......
generators/txt/converter.h
View file @ 191a37fb
......@@ -23,7 +23,7 @@ namespace Txt
Converter();
~Converter();
QTextDocument *convert( const QString &fileName ) Q_DECL_OVERRIDE;
QTextDocument *convert( const QString &fileName ) override;
};
}
......
generators/txt/generator_txt.h
View file @ 191a37fb
......@@ -23,7 +23,7 @@ public:
TxtGenerator(QObject *parent, const QVariantList &args);
~TxtGenerator() {}
void addPages( KConfigDialog* dlg ) Q_DECL_OVERRIDE;
void addPages( KConfigDialog* dlg ) override;
};
#endif
generators/xps/generator_xps.h
View file @ 191a37fb
......@@ -116,11 +116,11 @@ public:
bool startElement( const QString & nameSpace,
const QString & localName,
const QString & qname,
const QXmlAttributes & atts ) Q_DECL_OVERRIDE;
const QXmlAttributes & atts ) override;
bool endElement( const QString & nameSpace,
const QString & localName,
const QString & qname ) Q_DECL_OVERRIDE;
bool startDocument() Q_DECL_OVERRIDE;
const QString & qname ) override;
bool startDocument() 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 ) 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;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const override;
const Okular::DocumentSynopsis * generateDocumentSynopsis() override;
Okular::ExportFormat::List exportFormats() const Q_DECL_OVERRIDE;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) Q_DECL_OVERRIDE;
Okular::ExportFormat::List exportFormats() const override;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format ) override;
bool print( QPrinter &printer ) Q_DECL_OVERRIDE;
bool print( QPrinter &printer ) override;
protected:
bool doCloseDocument() Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest *page ) Q_DECL_OVERRIDE;
Okular::TextPage* textPage( Okular::Page * page ) Q_DECL_OVERRIDE;
bool doCloseDocument() override;
QImage image( Okular::PixmapRequest *page ) override;
Okular::TextPage* textPage( Okular::Page * page ) override;
private:
XpsFile *m_xpsFile;
......
part.h
View file @ 191a37fb
......@@ -120,26 +120,26 @@ class OKULARPART_EXPORT Part : public KParts::ReadWritePart, public Okular::Docu
~Part();
// inherited from DocumentObserver
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;
void notifySetup( const QVector< Okular::Page * > &pages, int setupFlags ) override;
void notifyViewportChanged( bool smoothMove ) override;
void notifyPageChanged( int page, int flags ) override;
bool openDocument(const QUrl &url, uint page) Q_DECL_OVERRIDE;
void startPresentation() Q_DECL_OVERRIDE;
QStringList supportedMimeTypes() const Q_DECL_OVERRIDE;
bool openDocument(const QUrl &url, uint page) override;
void startPresentation() override;
QStringList supportedMimeTypes() const override;
QUrl realUrl() 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;
void showSourceLocation(const QString& fileName, int line, int column, bool showGraphically = true) override;
void clearLastShownSourceLocation() override;
bool isWatchFileModeEnabled() const override;
void setWatchFileModeEnabled(bool enable) override;
bool areSourceLocationsShownGraphically() const override;
void setShowSourceLocationsGraphically(bool show) override;
bool openNewFilesInTabs() const override;
public Q_SLOTS: // dbus
Q_SCRIPTABLE Q_NOREPLY void goToPage(uint page) Q_DECL_OVERRIDE;
Q_SCRIPTABLE Q_NOREPLY void goToPage(uint page) override;
Q_SCRIPTABLE Q_NOREPLY void openDocument( const QString &doc );
Q_SCRIPTABLE uint pages();
Q_SCRIPTABLE uint currentPage();
......@@ -167,17 +167,17 @@ class OKULARPART_EXPORT Part : public KParts::ReadWritePart, public Okular::Docu
protected:
// reimplemented from KParts::ReadWritePart
bool openFile() Q_DECL_OVERRIDE;
bool openUrl(const QUrl &url) Q_DECL_OVERRIDE;
void guiActivateEvent(KParts::GUIActivateEvent *event) Q_DECL_OVERRIDE;
bool openFile() override;
bool openUrl(const QUrl &url) override;
void guiActivateEvent(KParts::GUIActivateEvent *event) override;
void displayInfoMessage( const QString &message, KMessageWidget::MessageType messageType = KMessageWidget::Information, int duration = -1 );
public:
bool saveFile() Q_DECL_OVERRIDE;
bool queryClose() Q_DECL_OVERRIDE;
bool closeUrl() Q_DECL_OVERRIDE;
bool closeUrl(bool promptToSave) Q_DECL_OVERRIDE;
void setReadWrite(bool readwrite) Q_DECL_OVERRIDE;
bool saveAs(const QUrl & saveUrl) Q_DECL_OVERRIDE;
bool saveFile() override;
bool queryClose() override;
bool closeUrl() override;
bool closeUrl(bool promptToSave) override;
void setReadWrite(bool readwrite) override;
bool saveAs(const QUrl & saveUrl) override;
protected Q_SLOTS:
// connected to actions
......
shell/shell.h
View file @ 191a37fb
......@@ -60,7 +60,7 @@ public:
*/
virtual ~Shell();
QSize sizeHint() const Q_DECL_OVERRIDE;
QSize sizeHint() const override;
/**
* Returns false if Okular component wasn't found
......@@ -79,14 +79,14 @@ protected:
* This method is called when it is time for the app to save its
* properties for session management purposes.
*/
void saveProperties(KConfigGroup&) Q_DECL_OVERRIDE;
void saveProperties(KConfigGroup&) override;
/**
* This method is called when this app is restored. The KConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
void readProperties(const KConfigGroup&) Q_DECL_OVERRIDE;
void readProperties(const KConfigGroup&) override;
/**
* Expose internal functions for session restore testing
......@@ -97,9 +97,9 @@ protected:
void readSettings();
void writeSettings();
void setFullScreen( bool );
bool queryClose() Q_DECL_OVERRIDE;
bool queryClose() override;
void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
void showEvent(QShowEvent *event) override;
private Q_SLOTS:
void fileOpen();
......@@ -138,7 +138,7 @@ private:
int findTabIndex( QObject* sender );
private:
bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *obj, QEvent *event) override;
KPluginFactory* m_partFactory;
KRecentFilesAction* m_recent;
......
ui/annotationmodel.h
View file @ 191a37fb
......@@ -33,13 +33,13 @@ class AnnotationModel : public QAbstractItemModel
virtual ~AnnotationModel();
// reimplementations from QAbstractItemModel
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;
QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
QModelIndex parent( const QModelIndex &index ) const Q_DECL_OVERRIDE;
int rowCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
bool hasChildren( const QModelIndex &parent = QModelIndex() ) const override;
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const override;
QModelIndex parent( const QModelIndex &index ) const override;
int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
bool isAnnotation( const QModelIndex &index ) const;
Okular::Annotation* annotationForIndex( const QModelIndex &index ) const;
......
ui/annotationproxymodels.h
View file @ 191a37fb
......@@ -32,7 +32,7 @@ class PageFilterProxyModel : public QSortFilterProxyModel
/**
* Reimplemented from QSortFilterProxy.
*/
bool filterAcceptsRow( int, const QModelIndex& ) const Q_DECL_OVERRIDE;
bool filterAcceptsRow( int, const QModelIndex& ) const override;
public Q_SLOTS:
/**
......@@ -67,16 +67,16 @@ class PageGroupProxyModel : public QAbstractProxyModel
*/
explicit PageGroupProxyModel( QObject *parent = nullptr );
int columnCount( const QModelIndex &parentIndex ) const Q_DECL_OVERRIDE;
int rowCount( const QModelIndex &parentIndex ) const Q_DECL_OVERRIDE;
int columnCount( const QModelIndex &parentIndex ) const override;
int rowCount( const QModelIndex &parentIndex ) const override;
QModelIndex index( int row, int column, const QModelIndex &parentIndex = QModelIndex() ) const Q_DECL_OVERRIDE;