Merge branch 'feature_screenshots' into integration_json_and_tools

Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.

1 files changed, 42 insertions, 0 deletions

diff --git a/logic/screenshots/ImgurAlbumCreation.h b/logic/screenshots/ImgurAlbumCreation.h
new file mode 100644
index 00000000..6e8fbe94
--- /dev/null
+++ b/logic/screenshots/ImgurAlbumCreation.h
@@ -0,0 +1,42 @@
+#pragma once
+#include "logic/net/NetAction.h"
+#include "Screenshot.h"
+
+typedef std::shared_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;
+class ImgurAlbumCreation : public NetAction
+{
+public:
+	explicit ImgurAlbumCreation(QList<ScreenshotPtr> screenshots);
+	static ImgurAlbumCreationPtr make(QList<ScreenshotPtr> screenshots)
+	{
+		return ImgurAlbumCreationPtr(new ImgurAlbumCreation(screenshots));
+	}
+
+	QString deleteHash() const
+	{
+		return m_deleteHash;
+	}
+	QString id() const
+	{
+		return m_id;
+	}
+
+protected
+slots:
+	virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+	virtual void downloadError(QNetworkReply::NetworkError error);
+	virtual void downloadFinished();
+	virtual void downloadReadyRead()
+	{
+	}
+
+public
+slots:
+	virtual void start();
+
+private:
+	QList<ScreenshotPtr> m_screenshots;
+
+	QString m_deleteHash;
+	QString m_id;
+};