From 70cf78af0aa55f68ade932ba3070a2f3dbe87181 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 14 Jun 2019 14:42:14 +0200 Subject: Fix compilation with the latest qtbase dev branch Copies of the QObjectData (as a result, also QObjectPrivate) have been disabled recently. Removed unnecessary copy constructors of the private classes and their usages. Change-Id: I15dd766abc88a657a267cbdc95f0c95346a47f72 Reviewed-by: Karsten Heimrich --- src/coap/qcoapinternalmessage.cpp | 10 ---------- src/coap/qcoapinternalmessage_p.h | 2 -- src/coap/qcoapinternalreply.cpp | 9 --------- src/coap/qcoapinternalreply_p.h | 3 --- 4 files changed, 24 deletions(-) diff --git a/src/coap/qcoapinternalmessage.cpp b/src/coap/qcoapinternalmessage.cpp index 59f63ba..fe4a34c 100644 --- a/src/coap/qcoapinternalmessage.cpp +++ b/src/coap/qcoapinternalmessage.cpp @@ -88,16 +88,6 @@ QCoapInternalMessage::QCoapInternalMessage(const QCoapMessage &message, QObject d->message = message; } -/*! - \internal - - Constructs a copy of \a other and sets \a parent as the parent object. -*/ -QCoapInternalMessage::QCoapInternalMessage(const QCoapInternalMessage &other, QObject *parent) : - QObject(*new QCoapInternalMessagePrivate(*other.d_func()), parent) -{ -} - /*! \internal Constructs a new QCoapInternalMessage with \a dd as the d_ptr. diff --git a/src/coap/qcoapinternalmessage_p.h b/src/coap/qcoapinternalmessage_p.h index 8ed1309..d6a08af 100644 --- a/src/coap/qcoapinternalmessage_p.h +++ b/src/coap/qcoapinternalmessage_p.h @@ -54,7 +54,6 @@ class Q_AUTOTEST_EXPORT QCoapInternalMessage : public QObject public: explicit QCoapInternalMessage(QObject *parent = nullptr); explicit QCoapInternalMessage(const QCoapMessage &message, QObject *parent = nullptr); - QCoapInternalMessage(const QCoapInternalMessage &other, QObject *parent = nullptr); virtual ~QCoapInternalMessage() {} void addOption(QCoapOption::OptionName name, const QByteArray &value); @@ -84,7 +83,6 @@ class Q_AUTOTEST_EXPORT QCoapInternalMessagePrivate : public QObjectPrivate { public: QCoapInternalMessagePrivate() = default; - QCoapInternalMessagePrivate(const QCoapInternalMessagePrivate &other) = default; ~QCoapInternalMessagePrivate(); QCoapMessage message; diff --git a/src/coap/qcoapinternalreply.cpp b/src/coap/qcoapinternalreply.cpp index b795046..2e7495c 100644 --- a/src/coap/qcoapinternalreply.cpp +++ b/src/coap/qcoapinternalreply.cpp @@ -56,15 +56,6 @@ QCoapInternalReply::QCoapInternalReply(QObject *parent) : { } -/*! - \internal - Constructs a copy of \a other with \a parent as the parent obect. -*/ -QCoapInternalReply::QCoapInternalReply(const QCoapInternalReply &other, QObject *parent) : - QCoapInternalMessage(*new QCoapInternalReplyPrivate(*other.d_func()), parent) -{ -} - /*! \internal Creates a QCoapInternalReply from the CoAP \a reply frame. diff --git a/src/coap/qcoapinternalreply_p.h b/src/coap/qcoapinternalreply_p.h index f144b47..4e9d60b 100644 --- a/src/coap/qcoapinternalreply_p.h +++ b/src/coap/qcoapinternalreply_p.h @@ -55,7 +55,6 @@ class Q_AUTOTEST_EXPORT QCoapInternalReply : public QCoapInternalMessage Q_OBJECT public: explicit QCoapInternalReply(QObject *parent = nullptr); - QCoapInternalReply(const QCoapInternalReply &other, QObject *parent = nullptr); static QCoapInternalReply *createFromFrame(const QByteArray &frame, QObject *parent = nullptr); void appendData(const QByteArray &data); @@ -84,6 +83,4 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QCoapInternalReply) - #endif // QCOAPINTERNALREPLY_H -- cgit v1.2.3