aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2019-06-14 14:42:14 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2019-06-14 17:02:42 +0200
commit70cf78af0aa55f68ade932ba3070a2f3dbe87181 (patch)
tree108ff2bfb7e16c21e661fb1e421496c8c3aa44ef
parentca1a8d80f162d26bd280a7c05f0553946a06117e (diff)
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 <karsten.heimrich@qt.io>
-rw-r--r--src/coap/qcoapinternalmessage.cpp10
-rw-r--r--src/coap/qcoapinternalmessage_p.h2
-rw-r--r--src/coap/qcoapinternalreply.cpp9
-rw-r--r--src/coap/qcoapinternalreply_p.h3
4 files changed, 0 insertions, 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
@@ -90,16 +90,6 @@ QCoapInternalMessage::QCoapInternalMessage(const QCoapMessage &message, QObject
/*!
\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.
This constructor must be used when subclassing internally
the QCoapInternalMessage class.
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
@@ -58,15 +58,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.
For more details, refer to section
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