diff options
author | Marc Mutz <marc.mutz@qt.io> | 2021-12-02 17:38:41 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2021-12-07 14:55:27 +0100 |
commit | e7bbeb6c981c7138c1195c495b4b4e8a8de5a207 (patch) | |
tree | 6953fb9576c5d78816a5634c1f111195fbf27eb7 /src | |
parent | d0d091b3a887cbe621e0ccc5c83c0122f602fee1 (diff) |
Make default ctors implicit
Default ctors should be implicit, because users expect '{}' to call them.
If they're explicit, because they're folded into the (QObject* parent) ctors,
then that no longer works.
Fixes: QTBUG-98881
Change-Id: Ie52812ba76ee0b489c75ecf48b0c048025fde8c7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/pdf/qpdfbookmarkmodel.h | 3 | ||||
-rw-r--r-- | src/pdf/qpdfdocument.h | 3 | ||||
-rw-r--r-- | src/pdf/qpdfpagenavigation.h | 3 | ||||
-rw-r--r-- | src/pdf/qpdfpagerenderer.h | 3 | ||||
-rw-r--r-- | src/pdf/qpdfsearchmodel.h | 3 | ||||
-rw-r--r-- | src/pdfwidgets/qpdfview.h | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/src/pdf/qpdfbookmarkmodel.h b/src/pdf/qpdfbookmarkmodel.h index ee65e11f4..315222a65 100644 --- a/src/pdf/qpdfbookmarkmodel.h +++ b/src/pdf/qpdfbookmarkmodel.h @@ -71,7 +71,8 @@ public: }; Q_ENUM(Role) - explicit QPdfBookmarkModel(QObject *parent = nullptr); + QPdfBookmarkModel() : QPdfBookmarkModel(nullptr) {} + explicit QPdfBookmarkModel(QObject *parent); ~QPdfBookmarkModel() override; QPdfDocument* document() const; diff --git a/src/pdf/qpdfdocument.h b/src/pdf/qpdfdocument.h index e20e37c77..9a81d4a8c 100644 --- a/src/pdf/qpdfdocument.h +++ b/src/pdf/qpdfdocument.h @@ -93,7 +93,8 @@ public: }; Q_ENUM(MetaDataField) - explicit QPdfDocument(QObject *parent = nullptr); + QPdfDocument() : QPdfDocument(nullptr) {} + explicit QPdfDocument(QObject *parent); ~QPdfDocument(); DocumentError load(const QString &fileName); diff --git a/src/pdf/qpdfpagenavigation.h b/src/pdf/qpdfpagenavigation.h index 4a1e0ea12..9c967bad8 100644 --- a/src/pdf/qpdfpagenavigation.h +++ b/src/pdf/qpdfpagenavigation.h @@ -61,7 +61,8 @@ class Q_PDF_EXPORT QPdfPageNavigation : public QObject Q_PROPERTY(bool canGoToNextPage READ canGoToNextPage NOTIFY canGoToNextPageChanged) public: - explicit QPdfPageNavigation(QObject *parent = nullptr); + QPdfPageNavigation() : QPdfPageNavigation(nullptr) {} + explicit QPdfPageNavigation(QObject *parent); ~QPdfPageNavigation(); QPdfDocument* document() const; diff --git a/src/pdf/qpdfpagerenderer.h b/src/pdf/qpdfpagerenderer.h index 0ba2a1b18..0898e03ea 100644 --- a/src/pdf/qpdfpagerenderer.h +++ b/src/pdf/qpdfpagerenderer.h @@ -67,7 +67,8 @@ public: }; Q_ENUM(RenderMode) - explicit QPdfPageRenderer(QObject *parent = nullptr); + QPdfPageRenderer() : QPdfPageRenderer(nullptr) {} + explicit QPdfPageRenderer(QObject *parent); ~QPdfPageRenderer() override; RenderMode renderMode() const; diff --git a/src/pdf/qpdfsearchmodel.h b/src/pdf/qpdfsearchmodel.h index a4e35fd04..d051fdc40 100644 --- a/src/pdf/qpdfsearchmodel.h +++ b/src/pdf/qpdfsearchmodel.h @@ -66,7 +66,8 @@ public: _Count }; Q_ENUM(Role) - explicit QPdfSearchModel(QObject *parent = nullptr); + QPdfSearchModel() : QPdfSearchModel(nullptr) {} + explicit QPdfSearchModel(QObject *parent); ~QPdfSearchModel(); QList<QPdfSearchResult> resultsOnPage(int page) const; diff --git a/src/pdfwidgets/qpdfview.h b/src/pdfwidgets/qpdfview.h index 26bb49dfb..92c397408 100644 --- a/src/pdfwidgets/qpdfview.h +++ b/src/pdfwidgets/qpdfview.h @@ -78,7 +78,8 @@ public: }; Q_ENUM(ZoomMode) - explicit QPdfView(QWidget *parent = nullptr); + QPdfView() : QPdfView(nullptr) {} + explicit QPdfView(QWidget *parent); ~QPdfView(); void setDocument(QPdfDocument *document); |