All jobs: Drop ConnectionData parameter from the constructor

Having to pass ConnectionData to each and every job class was nothing but boilerplate since the very beginning. Removing it required to prepend BaseJob::start() with ConnectionData-setting code, and to provide a way to alter the request configuration depending on the (late-coming) ConnectionData object. This is a new responsibility of BaseJob::start(); the previous BaseJob::start() contents have moved to BaseJob::sendRequest() (which is now invoked on retries, instead of start()).

1 files changed, 8 insertions, 8 deletions

diff --git a/jobs/sendeventjob.h b/jobs/sendeventjob.h
index 42948cc2..7b10b3d4 100644
--- a/jobs/sendeventjob.h
+++ b/jobs/sendeventjob.h
@@ -29,12 +29,10 @@ namespace QMatrixClient
         public:
             /** Constructs a job that sends an arbitrary room event */
             template <typename EvT>
-            SendEventJob(const ConnectionData* connection, const QString& roomId,
-                         const EvT* event)
-                : BaseJob(connection, HttpVerb::Put, "SendEventJob",
-                          QStringLiteral("_matrix/client/r0/rooms/%1/send/%2/%3")
-                              .arg(roomId, EvT::TypeId,
-                                   connection->generateTxnId()),
+            SendEventJob(const QString& roomId, const EvT* event)
+                : BaseJob(HttpVerb::Put, QStringLiteral("SendEventJob"),
+                          QStringLiteral("_matrix/client/r0/rooms/%1/send/%2/")
+                              .arg(roomId, EvT::TypeId), // See also beforeStart()
                           Query(),
                           Data(event->toJson()))
             { }
@@ -43,8 +41,8 @@ namespace QMatrixClient
              * Constructs a plain text message job (for compatibility with
              * the old PostMessageJob API).
              */
-            SendEventJob(const ConnectionData* connection, const QString& roomId,
-                         const QString& type, const QString& plainText);
+            SendEventJob(const QString& roomId, const QString& type,
+                         const QString& plainText);
 
             QString eventId() const { return _eventId; }
 
@@ -53,5 +51,7 @@ namespace QMatrixClient
 
         private:
             QString _eventId;
+
+            void beforeStart(const ConnectionData* connData) override;
     };
 }  // namespace QMatrixClient