De-inline ~QHttpNetworkHeader()
... and adapt the whole hierarchy to idiomatic dtors (add override, remove virtual). Fixes -Wweak-vtable and all the problems that violating it brings. Pick-to: 6.8 Task-number: QTBUG-45582 Change-Id: I180c774a135b1fbf1a7e942c91af25710a4bf5fd Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
parent
c85d896257
commit
dee1be0aae
@ -7,6 +7,9 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
QHttpNetworkHeader::~QHttpNetworkHeader()
|
||||||
|
= default;
|
||||||
|
|
||||||
QHttpNetworkHeaderPrivate::QHttpNetworkHeaderPrivate(const QUrl &newUrl)
|
QHttpNetworkHeaderPrivate::QHttpNetworkHeaderPrivate(const QUrl &newUrl)
|
||||||
:url(newUrl)
|
:url(newUrl)
|
||||||
{
|
{
|
||||||
|
@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE
|
|||||||
class Q_AUTOTEST_EXPORT QHttpNetworkHeader
|
class Q_AUTOTEST_EXPORT QHttpNetworkHeader
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual ~QHttpNetworkHeader() {}
|
virtual ~QHttpNetworkHeader();
|
||||||
virtual QUrl url() const = 0;
|
virtual QUrl url() const = 0;
|
||||||
virtual void setUrl(const QUrl &url) = 0;
|
virtual void setUrl(const QUrl &url) = 0;
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ class Q_NETWORK_EXPORT QHttpNetworkReply : public QObject, public QHttpNetworkHe
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
explicit QHttpNetworkReply(const QUrl &url = QUrl(), QObject *parent = nullptr);
|
explicit QHttpNetworkReply(const QUrl &url = QUrl(), QObject *parent = nullptr);
|
||||||
virtual ~QHttpNetworkReply();
|
~QHttpNetworkReply() override;
|
||||||
|
|
||||||
QUrl url() const override;
|
QUrl url() const override;
|
||||||
void setUrl(const QUrl &url) override;
|
void setUrl(const QUrl &url) override;
|
||||||
|
@ -52,7 +52,7 @@ public:
|
|||||||
|
|
||||||
explicit QHttpNetworkRequest(const QUrl &url = QUrl(), Operation operation = Get, Priority priority = NormalPriority);
|
explicit QHttpNetworkRequest(const QUrl &url = QUrl(), Operation operation = Get, Priority priority = NormalPriority);
|
||||||
QHttpNetworkRequest(const QHttpNetworkRequest &other);
|
QHttpNetworkRequest(const QHttpNetworkRequest &other);
|
||||||
virtual ~QHttpNetworkRequest();
|
~QHttpNetworkRequest() override;
|
||||||
QHttpNetworkRequest &operator=(const QHttpNetworkRequest &other);
|
QHttpNetworkRequest &operator=(const QHttpNetworkRequest &other);
|
||||||
bool operator==(const QHttpNetworkRequest &other) const;
|
bool operator==(const QHttpNetworkRequest &other) const;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user