Fix operators and includes in QPdfDestination

Amends 09a6eac4a63b32548ecc1ff5b16a5d8fc3ba1c04.

Change-Id: Id321d016a758d4f58d82a32575d034df226e083e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 20 insertions, 12 deletions

diff --git a/src/pdf/api/qpdfdestination.h b/src/pdf/api/qpdfdestination.h
index cad041982..325863226 100644
--- a/src/pdf/api/qpdfdestination.h
+++ b/src/pdf/api/qpdfdestination.h
@@ -38,9 +38,10 @@
 #define QPDFDESTINATION_H
 
 #include <QtPdf/qtpdfglobal.h>
-#include <QExplicitlySharedDataPointer>
-#include <QObject>
-#include <QPointF>
+#include <QtCore/qdebug.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qshareddata.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -76,6 +77,8 @@ protected:
     QExplicitlySharedDataPointer<QPdfDestinationPrivate> d;
 };
 
+Q_PDF_EXPORT QDebug operator<<(QDebug, const QPdfDestination &);
+
 QT_END_NAMESPACE
 
 #endif // QPDFDESTINATION_H
diff --git a/src/pdf/qpdfdestination.cpp b/src/pdf/qpdfdestination.cpp
index 86e429dcf..b347445e9 100644
--- a/src/pdf/qpdfdestination.cpp
+++ b/src/pdf/qpdfdestination.cpp
@@ -77,6 +77,12 @@ QPdfDestination::~QPdfDestination()
 {
 }
 
+QPdfDestination &QPdfDestination::operator=(const QPdfDestination &other)
+{
+    d = other.d;
+    return *this;
+}
+
 /*!
     \property QPdfDestination::valid
 
@@ -118,16 +124,15 @@ qreal QPdfDestination::zoom() const
     return d->zoom;
 }
 
-//QDataStream& operator<<(QDataStream& stream, const QPdfDestination& dest)
-//{
-//    stream << *dest.d.data();
-//    return stream;
-//}
-
-QDataStream& operator<<(QDataStream& stream, const QPdfDestinationPrivate& dest)
+QDebug operator<<(QDebug dbg, const QPdfDestination& dest)
 {
-    stream << QStringLiteral("QPdfDestination") << dest.page << dest.location ; // << dest.zoom();
-    return stream;
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg << "QPdfDestination(page=" << dest.page()
+        << " location=" << dest.location()
+        << " zoom=" << dest.zoom();
+    dbg << ')';
+    return dbg;
 }
 
 QT_END_NAMESPACE