From e0fdb8c0f36fc78d3f445c3a218902bc132a33ec Mon Sep 17 00:00:00 2001
From: Javier <dev.git@javispedro.com>
Date: Sat, 13 Dec 2014 00:24:07 +0100
Subject: progress reporting callbacks in uploadmanager

---
 daemon/uploadmanager.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'daemon/uploadmanager.h')

diff --git a/daemon/uploadmanager.h b/daemon/uploadmanager.h
index b4e951a..45453b6 100644
--- a/daemon/uploadmanager.h
+++ b/daemon/uploadmanager.h
@@ -16,13 +16,14 @@ public:
 
     typedef std::function<void()> SuccessCallback;
     typedef std::function<void(int)> ErrorCallback;
+    typedef std::function<void(qreal)> ProgressCallback;
 
     uint upload(WatchConnector::UploadType type, int index, const QString &filename, QIODevice *device, int size = -1,
-                SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback());
+                SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback(), ProgressCallback progressCallback = ProgressCallback());
 
-    uint uploadAppBinary(int slot, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback());
-    uint uploadAppResources(int slot, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback());
-    uint uploadFile(const QString &filename, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback());
+    uint uploadAppBinary(int slot, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback(), ProgressCallback progressCallback = ProgressCallback());
+    uint uploadAppResources(int slot, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback(), ProgressCallback progressCallback = ProgressCallback());
+    uint uploadFile(const QString &filename, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback(), ProgressCallback progressCallback = ProgressCallback());
 
     void cancel(uint id, int code = 0);
 
@@ -47,11 +48,13 @@ private:
         int index;
         QString filename;
         QIODevice *device;
+        int size;
         int remaining;
         Stm32Crc crc;
 
-        std::function<void()> successCallback;
-        std::function<void(int)> errorCallback;
+        SuccessCallback successCallback;
+        ErrorCallback errorCallback;
+        ProgressCallback progressCallback;
     };
 
     void startNextUpload();
-- 
cgit v1.2.3