Merge branch 'develop'

1 files changed, 14 insertions, 9 deletions

diff --git a/logic/net/ByteArrayDownload.h b/logic/net/ByteArrayDownload.h
index cfc6a8d0..fc32dc04 100644
--- a/logic/net/ByteArrayDownload.h
+++ b/logic/net/ByteArrayDownload.h
@@ -1,24 +1,29 @@
 #pragma once
-#include "Download.h"
+#include "NetAction.h"
 
-class ByteArrayDownload: public Download
+typedef std::shared_ptr<class ByteArrayDownload> ByteArrayDownloadPtr;
+class ByteArrayDownload : public NetAction
 {
 	Q_OBJECT
 public:
 	ByteArrayDownload(QUrl url);
-	
+	static ByteArrayDownloadPtr make(QUrl url)
+	{
+		return ByteArrayDownloadPtr(new ByteArrayDownload(url));
+	}
+
 public:
 	/// if not saving to file, downloaded data is placed here
 	QByteArray m_data;
-	
-public slots:
+
+public
+slots:
 	virtual void start();
-	
-protected slots:
+
+protected
+slots:
 	void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
 	void downloadError(QNetworkReply::NetworkError error);
 	void downloadFinished();
 	void downloadReadyRead();
 };
-
-typedef std::shared_ptr<ByteArrayDownload> ByteArrayDownloadPtr;