diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-25 12:12:55 +0200 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2020-07-06 16:30:07 +0200 |
commit | 45e3909e0fb628b6283fef8ea94861b7ca87093b (patch) | |
tree | c6cc049d4b770c5fbc1ccc0d040221267718626c /src/pdfwidgets | |
parent | 54d3437b7c7df8ba63929b6e1cfecc4be50d59f5 (diff) |
Adapt to newer dependencies
Change-Id: I495880f56fbc10d8f332f26101f8a25c2a1c5631
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/pdfwidgets')
-rw-r--r-- | src/pdfwidgets/qpdfview.cpp | 17 | ||||
-rw-r--r-- | src/pdfwidgets/qpdfview.h | 3 | ||||
-rw-r--r-- | src/pdfwidgets/qpdfview_p.h | 6 |
3 files changed, 10 insertions, 16 deletions
diff --git a/src/pdfwidgets/qpdfview.cpp b/src/pdfwidgets/qpdfview.cpp index 648e3ed57..cd2a8ef82 100644 --- a/src/pdfwidgets/qpdfview.cpp +++ b/src/pdfwidgets/qpdfview.cpp @@ -40,6 +40,8 @@ #include "qpdfpagerenderer.h" #include <QGuiApplication> +#include <QPainter> +#include <QPaintEvent> #include <QPdfDocument> #include <QPdfPageNavigation> #include <QScreen> @@ -48,8 +50,8 @@ QT_BEGIN_NAMESPACE -QPdfViewPrivate::QPdfViewPrivate() - : QAbstractScrollAreaPrivate() +QPdfViewPrivate::QPdfViewPrivate(QPdfView *q) + : q_ptr(q) , m_document(nullptr) , m_pageNavigation(nullptr) , m_pageRenderer(nullptr) @@ -277,7 +279,8 @@ void QPdfViewPrivate::updateDocumentLayout() QPdfView::QPdfView(QWidget *parent) - : QAbstractScrollArea(*new QPdfViewPrivate(), parent) + : QAbstractScrollArea(parent) + , d_ptr(new QPdfViewPrivate(this)) { Q_D(QPdfView); @@ -296,14 +299,6 @@ QPdfView::QPdfView(QWidget *parent) d->calculateViewport(); } -/*! - \internal -*/ -QPdfView::QPdfView(QPdfViewPrivate &dd, QWidget *parent) - : QAbstractScrollArea(dd, parent) -{ -} - QPdfView::~QPdfView() { } diff --git a/src/pdfwidgets/qpdfview.h b/src/pdfwidgets/qpdfview.h index cee1cb64c..25c0e7f69 100644 --- a/src/pdfwidgets/qpdfview.h +++ b/src/pdfwidgets/qpdfview.h @@ -107,14 +107,13 @@ Q_SIGNALS: void documentMarginsChanged(QMargins documentMargins); protected: - explicit QPdfView(QPdfViewPrivate &, QWidget *); - void paintEvent(QPaintEvent *event) override; void resizeEvent(QResizeEvent *event) override; void scrollContentsBy(int dx, int dy) override; private: Q_DECLARE_PRIVATE(QPdfView) + QScopedPointer<QPdfViewPrivate> d_ptr; }; QT_END_NAMESPACE diff --git a/src/pdfwidgets/qpdfview_p.h b/src/pdfwidgets/qpdfview_p.h index 9fd54b4b6..2df929e2e 100644 --- a/src/pdfwidgets/qpdfview_p.h +++ b/src/pdfwidgets/qpdfview_p.h @@ -51,18 +51,17 @@ #include "qpdfview.h" #include <QPointer> -#include <QtWidgets/private/qabstractscrollarea_p.h> QT_BEGIN_NAMESPACE class QPdfPageRenderer; -class QPdfViewPrivate : public QAbstractScrollAreaPrivate +class QPdfViewPrivate { Q_DECLARE_PUBLIC(QPdfView) public: - QPdfViewPrivate(); + QPdfViewPrivate(QPdfView *q); void init(); void documentStatusChanged(); @@ -86,6 +85,7 @@ public: DocumentLayout calculateDocumentLayout() const; void updateDocumentLayout(); + QPdfView *q_ptr; QPointer<QPdfDocument> m_document; QPdfPageNavigation* m_pageNavigation; QPdfPageRenderer *m_pageRenderer; |