core: replace QPointer with shared_ptr/weak_ptr (#48110)

src/core/qzmq/src/qzmqsocket.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012-2020 Justin Karneges
- * Copyright (C) 2024 Fastly, Inc.
+ * Copyright (C) 2024-2025 Fastly, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <QStringList>
-#include <QPointer>
 #include <QMutex>
 #include <boost/signals2.hpp>
 #include "rust/bindings.h"
@@ -362,10 +361,8 @@ static void removeGlobalContextRef()
 	}
 }
 
-class Socket::Private : public QObject
+class Socket::Private
 {
-	Q_OBJECT
-
 public:
 	Socket *q;
 	bool usingGlobalContext;
@@ -382,7 +379,6 @@ class Socket::Private : public QObject
 	bool writeQueueEnabled;
 
 	Private(Socket *_q, Socket::Type type, Context *_context) :
-		QObject(_q),
 		q(_q),
 		canWrite(false),
 		canRead(false),
@@ -599,9 +595,9 @@ class Socket::Private : public QObject
 
 		if(canRead)
 		{
-			QPointer<QObject> self = this;
+			std::weak_ptr<Private> self = q->d;
 			q->readyRead();
-			if(!self)
+			if(self.expired())
 				return;
 		}
 
@@ -639,19 +635,16 @@ class Socket::Private : public QObject
 Socket::Socket(Type type, QObject *parent) :
 	QObject(parent)
 {
-	d = new Private(this, type, 0);
+	d = std::make_shared<Private>(this, type, nullptr);
 }
 
 Socket::Socket(Type type, Context *context, QObject *parent) :
 	QObject(parent)
 {
-	d = new Private(this, type, context);
+	d = std::make_shared<Private>(this, type, context);
 }
 
-Socket::~Socket()
-{
-	delete d;
-}
+Socket::~Socket() = default;
 
 void Socket::setShutdownWaitTime(int msecs)
 {
@@ -773,5 +766,3 @@ void Socket::write(const QList<QByteArray> &message)
 }
 
 }
-
-#include "qzmqsocket.moc"

src/core/qzmq/src/qzmqsocket.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012-2015 Justin Karneges
- * Copyright (C) 2024 Fastly, Inc.
+ * Copyright (C) 2024-2025 Fastly, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -113,7 +113,7 @@ class Socket : public QObject
 
 	class Private;
 	friend class Private;
-	Private *d;
+	std::shared_ptr<Private> d;
 };
 
 }

src/core/qzmq/src/qzmqvalve.cpp

@@ -24,16 +24,13 @@
 
 #include "qzmqvalve.h"
 
-#include <QPointer>
 #include "qzmqsocket.h"
 #include "defercall.h"
 
 namespace QZmq {
 
-class Valve::Private : public QObject
+class Valve::Private
 {
-	Q_OBJECT
-
 public:
 	Valve *q;
 	QZmq::Socket *sock;
@@ -44,7 +41,6 @@ class Valve::Private : public QObject
 	DeferCall deferCall;
 
 	Private(Valve *_q) :
-		QObject(_q),
 		q(_q),
 		sock(0),
 		isOpen(false),
@@ -70,7 +66,7 @@ class Valve::Private : public QObject
 
 	void tryRead()
 	{
-		QPointer<QObject> self = this;
+		std::weak_ptr<Private> self = q->d;
 
 		int count = 0;
 		while(isOpen && sock->canRead())
@@ -86,7 +82,7 @@ class Valve::Private : public QObject
 			if(!msg.isEmpty())
 			{
 				q->readyRead(msg);
-				if(!self)
+				if(self.expired())
 					return;
 			}
 
@@ -112,14 +108,11 @@ class Valve::Private : public QObject
 Valve::Valve(QZmq::Socket *sock, QObject *parent) :
 	QObject(parent)
 {
-	d = new Private(this);
+	d = std::make_shared<Private>(this);
 	d->setup(sock);
 }
 
-Valve::~Valve()
-{
-	delete d;
-}
+Valve::~Valve() = default;
 
 bool Valve::isOpen() const
 {
@@ -147,5 +140,3 @@ void Valve::close()
 }
 
 }
-
-#include "qzmqvalve.moc"

src/core/qzmq/src/qzmqvalve.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012 Justin Karneges
+ * Copyright (C) 2025 Fastly, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -54,7 +55,7 @@ class Valve : public QObject
 private:
 	class Private;
 	friend class Private;
-	Private *d;
+	std::shared_ptr<Private> d;
 };
 
 }

src/core/statsmanager.cpp

@@ -26,7 +26,6 @@
 #include <assert.h>
 #include <QVector>
 #include <QDateTime>
-#include <QPointer>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include "qzmqsocket.h"

src/core/zhttpmanager.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012-2021 Fanout, Inc.
+ * Copyright (C) 2025 Fastly, Inc.
  *
  * This file is part of Pushpin.
  *
@@ -25,7 +26,6 @@
 #include <assert.h>
 #include <QStringList>
 #include <QHash>
-#include <QPointer>
 #include "qzmqsocket.h"
 #include "qzmqvalve.h"
 #include "tnetstring.h"
@@ -516,7 +516,7 @@ class ZhttpManager::Private : public QObject
 
 	void client_req_readyRead()
 	{
-		QPointer<QObject> self = this;
+		std::weak_ptr<Private> self = q->d;
 
 		while(client_req_sock->canRead())
 		{
@@ -563,7 +563,7 @@ class ZhttpManager::Private : public QObject
 			if(req)
 			{
 				req->handle(id.id, id.seq, p);
-				if(!self)
+				if(self.expired())
 					return;
 
 				continue;
@@ -605,7 +605,7 @@ class ZhttpManager::Private : public QObject
 			return;
 		}
 
-		QPointer<QObject> self = this;
+		std::weak_ptr<Private> self = q->d;
 
 		foreach(const ZhttpResponsePacket::Id &id, p.ids)
 		{
@@ -614,7 +614,7 @@ class ZhttpManager::Private : public QObject
 			if(sock)
 			{
 				sock->handle(id.id, id.seq, p);
-				if(!self)
+				if(self.expired())
 					return;
 
 				continue;
@@ -625,7 +625,7 @@ class ZhttpManager::Private : public QObject
 			if(req)
 			{
 				req->handle(id.id, id.seq, p);
-				if(!self)
+				if(self.expired())
 					return;
 
 				continue;
@@ -805,7 +805,7 @@ class ZhttpManager::Private : public QObject
 			return;
 		}
 
-		QPointer<QObject> self = this;
+		std::weak_ptr<Private> self = q->d;
 
 		foreach(const ZhttpRequestPacket::Id &id, p.ids)
 		{
@@ -814,7 +814,7 @@ class ZhttpManager::Private : public QObject
 			if(sock)
 			{
 				sock->handle(id.id, id.seq, p);
-				if(!self)
+				if(self.expired())
 					return;
 
 				continue;
@@ -825,7 +825,7 @@ class ZhttpManager::Private : public QObject
 			if(req)
 			{
 				req->handle(id.id, id.seq, p);
-				if(!self)
+				if(self.expired())
 					return;
 
 				continue;
@@ -982,13 +982,10 @@ class ZhttpManager::Private : public QObject
 ZhttpManager::ZhttpManager(QObject *parent) :
 	QObject(parent)
 {
-	d = new Private(this);
+	d = std::make_shared<Private>(this);
 }
 
-ZhttpManager::~ZhttpManager()
-{
-	delete d;
-}
+ZhttpManager::~ZhttpManager() = default;
 
 int ZhttpManager::connectionCount() const
 {

src/core/zhttpmanager.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012-2013 Fanout, Inc.
+ * Copyright (C) 2025 Fastly, Inc.
  *
  * This file is part of Pushpin.
  *
@@ -79,7 +80,7 @@ class ZhttpManager : public QObject
 private:
 	class Private;
 	friend class Private;
-	Private *d;
+	std::shared_ptr<Private> d;
 
 	friend class ZhttpRequest;
 	friend class ZWebSocket;

src/core/zhttprequest.cpp

@@ -24,7 +24,6 @@
 #include "zhttprequest.h"
 
 #include <assert.h>
-#include <QPointer>
 #include "zhttprequestpacket.h"
 #include "zhttpresponsepacket.h"
 #include "bufferlist.h"
@@ -411,7 +410,7 @@ class ZhttpRequest::Private : public QObject
 
 	void tryWrite()
 	{
-		QPointer<QObject> self = this;
+		std::weak_ptr<Private> self = q->d;
 
 		if(state == ClientRequesting)
 		{
@@ -494,7 +493,7 @@ class ZhttpRequest::Private : public QObject
 			}
 		}
 
-		if(!self)
+		if(self.expired())
 			return;
 
 		trySendPause();
@@ -1045,9 +1044,9 @@ class ZhttpRequest::Private : public QObject
 		}
 		else if(state == ClientRequesting)
 		{
-			QPointer<QObject> self = this;
+			std::weak_ptr<Private> self = q->d;
 			tryWrite();
-			if(!self)
+			if(self.expired())
 				return;
 
 			if(writableChanged)
@@ -1131,23 +1130,23 @@ class ZhttpRequest::Private : public QObject
 				cleanup();
 			}
 
-			QPointer<QObject> self = this;
+			std::weak_ptr<Private> self = q->d;
 
 			if(!packet.body.isEmpty())
 				q->bytesWritten(packet.body.size());
 			else if(!packet.more)
 				q->bytesWritten(0);
 
-			if(!self)
+			if(self.expired())
 				return;
 
 			trySendPause();
 		}
 		else if(state == ServerResponding)
 		{
-			QPointer<QObject> self = this;
+			std::weak_ptr<Private> self = q->d;
 			tryWrite();
-			if(!self)
+			if(self.expired())
 				return;
 
 			if(writableChanged)
@@ -1187,13 +1186,10 @@ class ZhttpRequest::Private : public QObject
 ZhttpRequest::ZhttpRequest(QObject *parent) :
 	HttpRequest(parent)
 {
-	d = new Private(this);
+	d = std::make_shared<Private>(this);
 }
 
-ZhttpRequest::~ZhttpRequest()
-{
-	delete d;
-}
+ZhttpRequest::~ZhttpRequest() = default;
 
 ZhttpRequest::Rid ZhttpRequest::rid() const
 {