diff options
author | Albert Astals Cid <aacid@kde.org> | 2019-12-02 19:36:51 +0100 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2019-12-02 19:36:51 +0100 |
commit | 53a4fbbbbbcb5d2a48a140b70af9d3177ebe02c2 (patch) | |
tree | 3bcc71d9694f306ecb169444d060ddf888f8b232 /qt5 | |
parent | 3caf1a7a54372f74090caf284ddd3e8e94286d49 (diff) |
Enable modernize-use-override
not claiming copyright for this since it's a mechanical change
Diffstat (limited to 'qt5')
-rw-r--r-- | qt5/demos/abstractinfodock.h | 2 | ||||
-rw-r--r-- | qt5/demos/embeddedfiles.h | 2 | ||||
-rw-r--r-- | qt5/demos/fonts.h | 2 | ||||
-rw-r--r-- | qt5/demos/info.h | 2 | ||||
-rw-r--r-- | qt5/demos/metadata.h | 2 | ||||
-rw-r--r-- | qt5/demos/navigationtoolbar.h | 2 | ||||
-rw-r--r-- | qt5/demos/optcontent.h | 2 | ||||
-rw-r--r-- | qt5/demos/pageview.h | 2 | ||||
-rw-r--r-- | qt5/demos/permissions.h | 2 | ||||
-rw-r--r-- | qt5/demos/thumbnails.h | 2 | ||||
-rw-r--r-- | qt5/demos/toc.cpp | 2 | ||||
-rw-r--r-- | qt5/demos/toc.h | 2 | ||||
-rw-r--r-- | qt5/demos/viewer.h | 2 | ||||
-rw-r--r-- | qt5/src/ArthurOutputDev.h | 2 | ||||
-rw-r--r-- | qt5/src/poppler-annotation.cc | 12 | ||||
-rw-r--r-- | qt5/src/poppler-annotation.h | 28 | ||||
-rw-r--r-- | qt5/src/poppler-form.h | 8 | ||||
-rw-r--r-- | qt5/src/poppler-link-extractor-private.h | 2 | ||||
-rw-r--r-- | qt5/src/poppler-link.cc | 4 | ||||
-rw-r--r-- | qt5/src/poppler-link.h | 20 | ||||
-rw-r--r-- | qt5/src/poppler-optcontent.h | 2 | ||||
-rw-r--r-- | qt5/src/poppler-qiodeviceoutstream-private.h | 2 | ||||
-rw-r--r-- | qt5/src/poppler-qt5.h | 4 | ||||
-rw-r--r-- | qt5/tests/test-password-qt5.cpp | 2 | ||||
-rw-r--r-- | qt5/tests/test-poppler-qt5.cpp | 2 |
25 files changed, 57 insertions, 57 deletions
diff --git a/qt5/demos/abstractinfodock.h b/qt5/demos/abstractinfodock.h index 8ed26a1c..557fca7e 100644 --- a/qt5/demos/abstractinfodock.h +++ b/qt5/demos/abstractinfodock.h @@ -29,7 +29,7 @@ class AbstractInfoDock : public QDockWidget, public DocumentObserver public: AbstractInfoDock(QWidget *parent = nullptr); - ~AbstractInfoDock(); + ~AbstractInfoDock() override; void documentLoaded() override; void documentClosed() override; diff --git a/qt5/demos/embeddedfiles.h b/qt5/demos/embeddedfiles.h index c9aa7af8..7ddb6b1e 100644 --- a/qt5/demos/embeddedfiles.h +++ b/qt5/demos/embeddedfiles.h @@ -29,7 +29,7 @@ class EmbeddedFilesDock : public AbstractInfoDock public: EmbeddedFilesDock(QWidget *parent = nullptr); - ~EmbeddedFilesDock(); + ~EmbeddedFilesDock() override; void documentLoaded() override; void documentClosed() override; diff --git a/qt5/demos/fonts.h b/qt5/demos/fonts.h index 00b0a281..e056e01b 100644 --- a/qt5/demos/fonts.h +++ b/qt5/demos/fonts.h @@ -29,7 +29,7 @@ class FontsDock : public AbstractInfoDock public: FontsDock(QWidget *parent = nullptr); - ~FontsDock(); + ~FontsDock() override; void documentClosed() override; diff --git a/qt5/demos/info.h b/qt5/demos/info.h index 7a2aae0f..d964a9f4 100644 --- a/qt5/demos/info.h +++ b/qt5/demos/info.h @@ -29,7 +29,7 @@ class InfoDock : public AbstractInfoDock public: InfoDock(QWidget *parent = nullptr); - ~InfoDock(); + ~InfoDock() override; void documentClosed() override; diff --git a/qt5/demos/metadata.h b/qt5/demos/metadata.h index a47f3b48..f5dc391d 100644 --- a/qt5/demos/metadata.h +++ b/qt5/demos/metadata.h @@ -29,7 +29,7 @@ class MetadataDock : public AbstractInfoDock public: MetadataDock(QWidget *parent = nullptr); - ~MetadataDock(); + ~MetadataDock() override; void documentClosed() override; diff --git a/qt5/demos/navigationtoolbar.h b/qt5/demos/navigationtoolbar.h index 0e87daee..0f63e649 100644 --- a/qt5/demos/navigationtoolbar.h +++ b/qt5/demos/navigationtoolbar.h @@ -34,7 +34,7 @@ class NavigationToolBar : public QToolBar, public DocumentObserver public: NavigationToolBar(QWidget *parent = nullptr); - ~NavigationToolBar(); + ~NavigationToolBar() override; void documentLoaded() override; void documentClosed() override; diff --git a/qt5/demos/optcontent.h b/qt5/demos/optcontent.h index bc8419c1..7764a42b 100644 --- a/qt5/demos/optcontent.h +++ b/qt5/demos/optcontent.h @@ -29,7 +29,7 @@ class OptContentDock : public AbstractInfoDock public: OptContentDock(QWidget *parent = nullptr); - ~OptContentDock(); + ~OptContentDock() override; void documentLoaded() override; void documentClosed() override; diff --git a/qt5/demos/pageview.h b/qt5/demos/pageview.h index 7640d2a2..9149ec0d 100644 --- a/qt5/demos/pageview.h +++ b/qt5/demos/pageview.h @@ -32,7 +32,7 @@ class PageView : public QScrollArea, public DocumentObserver public: PageView(QWidget *parent = nullptr); - ~PageView(); + ~PageView() override; void documentLoaded() override; void documentClosed() override; diff --git a/qt5/demos/permissions.h b/qt5/demos/permissions.h index 46aa1879..9c5072b8 100644 --- a/qt5/demos/permissions.h +++ b/qt5/demos/permissions.h @@ -29,7 +29,7 @@ class PermissionsDock : public AbstractInfoDock public: PermissionsDock(QWidget *parent = nullptr); - ~PermissionsDock(); + ~PermissionsDock() override; void documentClosed() override; diff --git a/qt5/demos/thumbnails.h b/qt5/demos/thumbnails.h index b2e4d0ab..3eda6cf7 100644 --- a/qt5/demos/thumbnails.h +++ b/qt5/demos/thumbnails.h @@ -31,7 +31,7 @@ class ThumbnailsDock : public AbstractInfoDock public: ThumbnailsDock(QWidget *parent = nullptr); - ~ThumbnailsDock(); + ~ThumbnailsDock() override; void documentClosed() override; diff --git a/qt5/demos/toc.cpp b/qt5/demos/toc.cpp index 1efdc16a..678aa438 100644 --- a/qt5/demos/toc.cpp +++ b/qt5/demos/toc.cpp @@ -61,7 +61,7 @@ class TocModel : public QAbstractItemModel } } - ~TocModel() + ~TocModel() override { qDeleteAll(m_topItems); } diff --git a/qt5/demos/toc.h b/qt5/demos/toc.h index d7f015ff..b6c77ba7 100644 --- a/qt5/demos/toc.h +++ b/qt5/demos/toc.h @@ -30,7 +30,7 @@ class TocDock : public AbstractInfoDock public: TocDock(QWidget *parent = nullptr); - ~TocDock(); + ~TocDock() override; void documentClosed() override; diff --git a/qt5/demos/viewer.h b/qt5/demos/viewer.h index 343010f0..105b1bbe 100644 --- a/qt5/demos/viewer.h +++ b/qt5/demos/viewer.h @@ -37,7 +37,7 @@ class PdfViewer : public QMainWindow public: PdfViewer(QWidget *parent = nullptr); - ~PdfViewer(); + ~PdfViewer() override; QSize sizeHint() const override; diff --git a/qt5/src/ArthurOutputDev.h b/qt5/src/ArthurOutputDev.h index 39228024..b6285775 100644 --- a/qt5/src/ArthurOutputDev.h +++ b/qt5/src/ArthurOutputDev.h @@ -69,7 +69,7 @@ public: ArthurOutputDev(QPainter *painter ); // Destructor. - ~ArthurOutputDev(); + ~ArthurOutputDev() override; void setFontHinting(FontHinting hinting) { m_fontHinting = hinting; } diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc index bb5be98f..b09fc681 100644 --- a/qt5/src/poppler-annotation.cc +++ b/qt5/src/poppler-annotation.cc @@ -3691,7 +3691,7 @@ class LinkAnnotationPrivate : public AnnotationPrivate { public: LinkAnnotationPrivate(); - ~LinkAnnotationPrivate(); + ~LinkAnnotationPrivate() override; Annotation * makeAlias() override; Annot* createNativeAnnot(::Page *destPage, DocumentData *doc) override; @@ -4170,7 +4170,7 @@ class FileAttachmentAnnotationPrivate : public AnnotationPrivate { public: FileAttachmentAnnotationPrivate(); - ~FileAttachmentAnnotationPrivate(); + ~FileAttachmentAnnotationPrivate() override; Annotation * makeAlias() override; Annot* createNativeAnnot(::Page *destPage, DocumentData *doc) override; @@ -4274,7 +4274,7 @@ class SoundAnnotationPrivate : public AnnotationPrivate { public: SoundAnnotationPrivate(); - ~SoundAnnotationPrivate(); + ~SoundAnnotationPrivate() override; Annotation * makeAlias() override; Annot* createNativeAnnot(::Page *destPage, DocumentData *doc) override; @@ -4378,7 +4378,7 @@ class MovieAnnotationPrivate : public AnnotationPrivate { public: MovieAnnotationPrivate(); - ~MovieAnnotationPrivate(); + ~MovieAnnotationPrivate() override; Annotation * makeAlias() override; Annot* createNativeAnnot(::Page *destPage, DocumentData *doc) override; @@ -4482,7 +4482,7 @@ class ScreenAnnotationPrivate : public AnnotationPrivate { public: ScreenAnnotationPrivate(); - ~ScreenAnnotationPrivate(); + ~ScreenAnnotationPrivate() override; Annotation * makeAlias() override; Annot* createNativeAnnot(::Page *destPage, DocumentData *doc) override; @@ -4983,7 +4983,7 @@ class RichMediaAnnotationPrivate : public AnnotationPrivate { } - ~RichMediaAnnotationPrivate() + ~RichMediaAnnotationPrivate() override { delete settings; delete content; diff --git a/qt5/src/poppler-annotation.h b/qt5/src/poppler-annotation.h index 3bc34b4d..d3f96ec8 100644 --- a/qt5/src/poppler-annotation.h +++ b/qt5/src/poppler-annotation.h @@ -454,7 +454,7 @@ class POPPLER_QT5_EXPORT TextAnnotation : public Annotation enum InplaceIntent { Unknown, Callout, TypeWriter }; TextAnnotation( TextType type ); - ~TextAnnotation(); + ~TextAnnotation() override; SubType subType() const override; /** @@ -531,7 +531,7 @@ class POPPLER_QT5_EXPORT LineAnnotation : public Annotation /// \since 0.20 LineAnnotation( LineType type ); - ~LineAnnotation(); + ~LineAnnotation() override; SubType subType() const override; /// \since 0.20 @@ -586,7 +586,7 @@ class POPPLER_QT5_EXPORT GeomAnnotation : public Annotation public: GeomAnnotation(); - ~GeomAnnotation(); + ~GeomAnnotation() override; SubType subType() const override; // common enums @@ -618,7 +618,7 @@ class POPPLER_QT5_EXPORT HighlightAnnotation : public Annotation public: HighlightAnnotation(); - ~HighlightAnnotation(); + ~HighlightAnnotation() override; SubType subType() const override; /** @@ -685,7 +685,7 @@ class POPPLER_QT5_EXPORT StampAnnotation : public Annotation public: StampAnnotation(); - ~StampAnnotation(); + ~StampAnnotation() override; SubType subType() const override; /** @@ -736,7 +736,7 @@ class POPPLER_QT5_EXPORT InkAnnotation : public Annotation public: InkAnnotation(); - ~InkAnnotation(); + ~InkAnnotation() override; SubType subType() const override; QList< QLinkedList<QPointF> > inkPaths() const; @@ -756,7 +756,7 @@ class POPPLER_QT5_EXPORT LinkAnnotation : public Annotation friend class AnnotationPrivate; public: - ~LinkAnnotation(); + ~LinkAnnotation() override; SubType subType() const override; // local enums @@ -794,7 +794,7 @@ class POPPLER_QT5_EXPORT CaretAnnotation : public Annotation public: CaretAnnotation(); - ~CaretAnnotation(); + ~CaretAnnotation() override; SubType subType() const override; /** @@ -825,7 +825,7 @@ class POPPLER_QT5_EXPORT FileAttachmentAnnotation : public Annotation friend class AnnotationPrivate; public: - ~FileAttachmentAnnotation(); + ~FileAttachmentAnnotation() override; SubType subType() const override; /** @@ -869,7 +869,7 @@ class POPPLER_QT5_EXPORT SoundAnnotation : public Annotation friend class AnnotationPrivate; public: - ~SoundAnnotation(); + ~SoundAnnotation() override; SubType subType() const override; /** @@ -913,7 +913,7 @@ class POPPLER_QT5_EXPORT MovieAnnotation : public Annotation friend class AnnotationPrivate; public: - ~MovieAnnotation(); + ~MovieAnnotation() override; SubType subType() const override; /** @@ -957,7 +957,7 @@ class POPPLER_QT5_EXPORT ScreenAnnotation : public Annotation friend class AnnotationPrivate; public: - ~ScreenAnnotation(); + ~ScreenAnnotation() override; SubType subType() const override; @@ -1014,7 +1014,7 @@ class POPPLER_QT5_EXPORT WidgetAnnotation : public Annotation friend class AnnotationPrivate; public: - ~WidgetAnnotation(); + ~WidgetAnnotation() override; SubType subType() const override; @@ -1046,7 +1046,7 @@ class POPPLER_QT5_EXPORT RichMediaAnnotation : public Annotation friend class AnnotationPrivate; public: - ~RichMediaAnnotation(); + ~RichMediaAnnotation() override; SubType subType() const override; diff --git a/qt5/src/poppler-form.h b/qt5/src/poppler-form.h index 435cdfea..836ada37 100644 --- a/qt5/src/poppler-form.h +++ b/qt5/src/poppler-form.h @@ -235,7 +235,7 @@ namespace Poppler { /// \cond PRIVATE FormFieldButton(DocumentData *doc, ::Page *p, ::FormWidgetButton *w); /// \endcond - ~FormFieldButton(); + ~FormFieldButton() override; FormType type() const override; @@ -306,7 +306,7 @@ namespace Poppler { /// \cond PRIVATE FormFieldText(DocumentData *doc, ::Page *p, ::FormWidgetText *w); /// \endcond - ~FormFieldText(); + ~FormFieldText() override; FormType type() const override; @@ -395,7 +395,7 @@ namespace Poppler { /// \cond PRIVATE FormFieldChoice(DocumentData *doc, ::Page *p, ::FormWidgetChoice *w); /// \endcond - ~FormFieldChoice(); + ~FormFieldChoice() override; FormType type() const override; @@ -755,7 +755,7 @@ namespace Poppler { /// \cond PRIVATE FormFieldSignature(DocumentData *doc, ::Page *p, ::FormWidgetSignature *w); /// \endcond - ~FormFieldSignature(); + ~FormFieldSignature() override; FormType type() const override; diff --git a/qt5/src/poppler-link-extractor-private.h b/qt5/src/poppler-link-extractor-private.h index f6995867..0d95d255 100644 --- a/qt5/src/poppler-link-extractor-private.h +++ b/qt5/src/poppler-link-extractor-private.h @@ -34,7 +34,7 @@ class LinkExtractorOutputDev : public OutputDev { public: LinkExtractorOutputDev(PageData *data); - ~LinkExtractorOutputDev(); + ~LinkExtractorOutputDev() override; // inherited from OutputDev bool upsideDown() override { return false; } diff --git a/qt5/src/poppler-link.cc b/qt5/src/poppler-link.cc index 37233502..436cd4bb 100644 --- a/qt5/src/poppler-link.cc +++ b/qt5/src/poppler-link.cc @@ -126,7 +126,7 @@ class LinkSoundPrivate : public LinkPrivate { public: LinkSoundPrivate( const QRectF &area ); - ~LinkSoundPrivate(); + ~LinkSoundPrivate() override; double volume; bool sync : 1; @@ -149,7 +149,7 @@ class LinkRenditionPrivate : public LinkPrivate { public: LinkRenditionPrivate( const QRectF &area, ::MediaRendition *rendition, ::LinkRendition::RenditionOperation operation, const QString &script, const Ref ref ); - ~LinkRenditionPrivate(); + ~LinkRenditionPrivate() override; MediaRendition *rendition; LinkRendition::RenditionAction action; diff --git a/qt5/src/poppler-link.h b/qt5/src/poppler-link.h index 7f52e203..93221846 100644 --- a/qt5/src/poppler-link.h +++ b/qt5/src/poppler-link.h @@ -264,7 +264,7 @@ class POPPLER_QT5_EXPORT LinkGoto : public Link /** * Destructor. */ - ~LinkGoto(); + ~LinkGoto() override; /** * Whether the destination is in an external document @@ -319,7 +319,7 @@ class POPPLER_QT5_EXPORT LinkExecute : public Link /** * Destructor. */ - ~LinkExecute(); + ~LinkExecute() override; LinkType linkType() const override; private: @@ -353,7 +353,7 @@ class POPPLER_QT5_EXPORT LinkBrowse : public Link /** * Destructor. */ - ~LinkBrowse(); + ~LinkBrowse() override; LinkType linkType() const override; private: @@ -404,7 +404,7 @@ class POPPLER_QT5_EXPORT LinkAction : public Link /** * Destructor. */ - ~LinkAction(); + ~LinkAction() override; LinkType linkType() const override; private: @@ -425,7 +425,7 @@ class POPPLER_QT5_EXPORT LinkSound : public Link /** * Destructor. */ - ~LinkSound(); + ~LinkSound() override; LinkType linkType() const override; @@ -502,7 +502,7 @@ class POPPLER_QT5_EXPORT LinkRendition : public Link /** * Destructor. */ - ~LinkRendition(); + ~LinkRendition() override; LinkType linkType() const override; @@ -555,7 +555,7 @@ class POPPLER_QT5_EXPORT LinkJavaScript : public Link /** * Destructor. */ - ~LinkJavaScript(); + ~LinkJavaScript() override; LinkType linkType() const override; @@ -601,7 +601,7 @@ class POPPLER_QT5_EXPORT LinkMovie : public Link /** * Destructor. */ - ~LinkMovie(); + ~LinkMovie() override; LinkType linkType() const override; /** * Returns the operation to be performed on the movie. @@ -632,7 +632,7 @@ class POPPLER_QT5_EXPORT LinkOCGState : public Link /** * Destructor. */ - ~LinkOCGState(); + ~LinkOCGState() override; LinkType linkType() const override; @@ -656,7 +656,7 @@ class POPPLER_QT5_EXPORT LinkHide: public Link /** * Destructor. */ - ~LinkHide(); + ~LinkHide() override; LinkType linkType() const override; diff --git a/qt5/src/poppler-optcontent.h b/qt5/src/poppler-optcontent.h index 6e062464..b2c5d85a 100644 --- a/qt5/src/poppler-optcontent.h +++ b/qt5/src/poppler-optcontent.h @@ -53,7 +53,7 @@ namespace Poppler Q_OBJECT public: - ~OptContentModel(); + ~OptContentModel() override; QModelIndex index(int row, int column, const QModelIndex &parent) const override; QModelIndex parent(const QModelIndex &child) const override; diff --git a/qt5/src/poppler-qiodeviceoutstream-private.h b/qt5/src/poppler-qiodeviceoutstream-private.h index 775344d9..0a4ccbb1 100644 --- a/qt5/src/poppler-qiodeviceoutstream-private.h +++ b/qt5/src/poppler-qiodeviceoutstream-private.h @@ -31,7 +31,7 @@ class QIODeviceOutStream : public OutStream { public: QIODeviceOutStream(QIODevice* device); - ~QIODeviceOutStream(); + ~QIODeviceOutStream() override; void close() override; Goffset getPos() override; diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h index 912ccdfd..c501f67f 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h @@ -1928,7 +1928,7 @@ height = dummy.height(); /** Destructor. */ - ~PSConverter(); + ~PSConverter() override; /** Sets the list of pages to print. Mandatory. */ void setPageList(const QList<int> &pageList); @@ -2049,7 +2049,7 @@ height = dummy.height(); /** Destructor. */ - ~PDFConverter(); + ~PDFConverter() override; /** Sets the options for the PDF export. diff --git a/qt5/tests/test-password-qt5.cpp b/qt5/tests/test-password-qt5.cpp index 9281407d..e7ea1f49 100644 --- a/qt5/tests/test-password-qt5.cpp +++ b/qt5/tests/test-password-qt5.cpp @@ -12,7 +12,7 @@ class PDFDisplay : public QWidget // picture display widget Q_OBJECT public: PDFDisplay( Poppler::Document *d, QWidget *parent = nullptr ); - ~PDFDisplay(); + ~PDFDisplay() override; protected: void paintEvent( QPaintEvent * ) override; void keyPressEvent( QKeyEvent * ) override; diff --git a/qt5/tests/test-poppler-qt5.cpp b/qt5/tests/test-poppler-qt5.cpp index 91e4a276..301cb05b 100644 --- a/qt5/tests/test-poppler-qt5.cpp +++ b/qt5/tests/test-poppler-qt5.cpp @@ -16,7 +16,7 @@ class PDFDisplay : public QWidget // picture display widget Q_OBJECT public: PDFDisplay( Poppler::Document *d, bool arthur, QWidget *parent = nullptr ); - ~PDFDisplay(); + ~PDFDisplay() override; void setShowTextRects(bool show); void display(); protected: |