Merge branch 'master'

Conflicts:
	CMakeLists.txt

1 files changed, 44 insertions, 0 deletions

diff --git a/src/server/net/filedownloader.h b/src/server/net/filedownloader.h
new file mode 100644
index 0000000..68eaa39
--- /dev/null
+++ b/src/server/net/filedownloader.h
@@ -0,0 +1,44 @@
+/*
+ * filedownloader.h
+ *
+ *  Created on: Mar 7, 2014
+ *      Author: nils
+ */
+
+#ifndef FILEDOWNLOADER_H_
+#define FILEDOWNLOADER_H_
+
+#include <QObject>
+#include <QByteArray>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+
+class FileDownloader : public QObject
+{
+    Q_OBJECT
+public:
+    explicit FileDownloader(QObject *parent = 0);
+
+    virtual ~FileDownloader();
+
+    void downloadFile(const QUrl& fileUrl);
+
+    void connectSlot(QObject* obj, const char* slot);
+
+    QByteArray downloadedData() const;
+
+signals:
+        void downloaded(QByteArray& downloadedData);
+
+private slots:
+
+    void fileDownloaded(QNetworkReply* pReply);
+
+private:
+
+    QNetworkAccessManager m_WebCtrl;
+
+};
+
+#endif /* FILEDOWNLOADER_H_ */