deferred: don't delete self, to allow smart pointers to manage (#48174)

Author: jkarneges

src/handler/conncheckworker.cpp

@@ -61,8 +61,8 @@ ConnCheckWorker::ConnCheckWorker(ZrpcRequest *req, ZrpcManager *proxyControlClie
 	if(!missing_.isEmpty())
 	{
 		// ask the proxy about any cids we don't know about
-		Deferred *d = ControlRequest::connCheck(proxyControlClient, missing_, this);
-		finishedConnection_ = d->finished.connect(boost::bind(&ConnCheckWorker::proxyConnCheck_finished, this, boost::placeholders::_1));
+		connCheck_ = std::unique_ptr<Deferred>(ControlRequest::connCheck(proxyControlClient, missing_));
+		finishedConnection_ = connCheck_->finished.connect(boost::bind(&ConnCheckWorker::proxyConnCheck_finished, this, boost::placeholders::_1));
 		return;
 	}
 

src/handler/conncheckworker.h

@@ -46,6 +46,7 @@ class ConnCheckWorker : public Deferred
 	std::unique_ptr<ZrpcRequest> req_;
 	CidSet cids_;
 	CidSet missing_;
+	std::unique_ptr<Deferred> connCheck_;
 	Connection finishedConnection_;
 
 	void respondError(const QByteArray &condition);

src/handler/deferred.cpp

@@ -33,11 +33,6 @@ Deferred::~Deferred()
 {
 }
 
-void Deferred::cancel()
-{
-	delete this;
-}
-
 void Deferred::setFinished(bool ok, const QVariant &value)
 {
 	result_.success = ok;
@@ -49,5 +44,4 @@ void Deferred::setFinished(bool ok, const QVariant &value)
 void Deferred::doFinish()
 {
 	finished(result_);
-	delete this;
 }

src/handler/deferred.h

@@ -56,8 +56,6 @@ class Deferred : public QObject
 public:
 	virtual ~Deferred();
 
-	virtual void cancel();
-
 	boost::signals2::signal<void(const DeferredResult&)> finished;
 
 protected: