From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 11 May 2023 03:09:57 +0000 (+0800)
Subject: Clean up putmultifilejob class definition
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~51^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=311dcf29c6600e75a4c9fd8934a77609e529b688;p=nextcloud-desktop.git

Clean up putmultifilejob class definition

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/libsync/putmultifilejob.cpp b/src/libsync/putmultifilejob.cpp
index 42f397d69..6ca81ef81 100644
--- a/src/libsync/putmultifilejob.cpp
+++ b/src/libsync/putmultifilejob.cpp
@@ -20,18 +20,35 @@ namespace OCC {
 
 Q_LOGGING_CATEGORY(lcPutMultiFileJob, "nextcloud.sync.networkjob.put.multi", QtInfoMsg)
 
+PutMultiFileJob::PutMultiFileJob(AccountPtr account,
+                                 const QUrl &url,
+                                 std::vector<SingleUploadFileData> devices,
+                                 QObject *parent)
+    : AbstractNetworkJob(account, {}, parent)
+    , _devices(std::move(devices))
+    , _url(url)
+{
+    _body.setContentType(QHttpMultiPart::RelatedType);
+
+    for(const auto &singleDevice : _devices) {
+        singleDevice._device->setParent(this);
+        connect(this, &PutMultiFileJob::uploadProgress,
+                singleDevice._device.get(), &UploadDevice::slotJobUploadProgress);
+    }
+}
+
 PutMultiFileJob::~PutMultiFileJob() = default;
 
 void PutMultiFileJob::start()
 {
     QNetworkRequest req;
 
-    for(auto &oneDevice : _devices) {
+    for(const auto &oneDevice : _devices) {
         auto onePart = QHttpPart{};
 
         onePart.setBodyDevice(oneDevice._device.get());
 
-        for (QMap<QByteArray, QByteArray>::const_iterator it = oneDevice._headers.begin(); it != oneDevice._headers.end(); ++it) {
+        for (auto it = oneDevice._headers.begin(); it != oneDevice._headers.end(); ++it) {
             onePart.setRawHeader(it.key(), it.value());
         }
 
@@ -67,4 +84,14 @@ bool PutMultiFileJob::finished()
     return true;
 }
 
+QString PutMultiFileJob::errorString() const
+{
+    return _errorString.isEmpty() ? AbstractNetworkJob::errorString() : _errorString;
+}
+
+std::chrono::milliseconds PutMultiFileJob::msSinceStart() const
+{
+    return std::chrono::milliseconds(_requestTimer.elapsed());
+}
+
 }
diff --git a/src/libsync/putmultifilejob.h b/src/libsync/putmultifilejob.h
index f53b73a41..d5e70e382 100644
--- a/src/libsync/putmultifilejob.h
+++ b/src/libsync/putmultifilejob.h
@@ -49,19 +49,10 @@ class OWNCLOUDSYNC_EXPORT PutMultiFileJob : public AbstractNetworkJob
     Q_OBJECT
 
 public:
-    explicit PutMultiFileJob(AccountPtr account, const QUrl &url,
-                             std::vector<SingleUploadFileData> devices, QObject *parent = nullptr)
-        : AbstractNetworkJob(account, {}, parent)
-        , _devices(std::move(devices))
-        , _url(url)
-    {
-        _body.setContentType(QHttpMultiPart::RelatedType);
-        for(auto &singleDevice : _devices) {
-            singleDevice._device->setParent(this);
-            connect(this, &PutMultiFileJob::uploadProgress,
-                    singleDevice._device.get(), &UploadDevice::slotJobUploadProgress);
-        }
-    }
+    explicit PutMultiFileJob(AccountPtr account,
+                             const QUrl &url,
+                             std::vector<SingleUploadFileData> devices,
+                             QObject *parent = nullptr);
 
     ~PutMultiFileJob() override;
 
@@ -69,15 +60,8 @@ public:
 
     bool finished() override;
 
-    [[nodiscard]] QString errorString() const override
-    {
-        return _errorString.isEmpty() ? AbstractNetworkJob::errorString() : _errorString;
-    }
-
-    [[nodiscard]] std::chrono::milliseconds msSinceStart() const
-    {
-        return std::chrono::milliseconds(_requestTimer.elapsed());
-    }
+    [[nodiscard]] QString errorString() const override;
+    [[nodiscard]] std::chrono::milliseconds msSinceStart() const;
 
 signals:
     void finishedSignal();