merged from 0.6.7 codebase

1 files changed, 56 insertions, 56 deletions

diff --git a/api/logic/screenshots/ImgurAlbumCreation.cpp b/api/logic/screenshots/ImgurAlbumCreation.cpp
index 3724e3df..3d32f597 100644
--- a/api/logic/screenshots/ImgurAlbumCreation.cpp
+++ b/api/logic/screenshots/ImgurAlbumCreation.cpp
@@ -12,77 +12,77 @@
 
 ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenshotPtr> screenshots) : NetAction(), m_screenshots(screenshots)
 {
-	m_url = URLConstants::IMGUR_BASE_URL + "album.json";
-	m_status = Job_NotStarted;
+    m_url = URLConstants::IMGUR_BASE_URL + "album.json";
+    m_status = Job_NotStarted;
 }
 
 void ImgurAlbumCreation::start()
 {
-	m_status = Job_InProgress;
-	QNetworkRequest request(m_url);
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
-	request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-	request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
-	request.setRawHeader("Accept", "application/json");
+    m_status = Job_InProgress;
+    QNetworkRequest request(m_url);
+    request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+    request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
+    request.setRawHeader("Accept", "application/json");
 
-	QStringList hashes;
-	for (auto shot : m_screenshots)
-	{
-		hashes.append(shot->m_imgurDeleteHash);
-	}
+    QStringList hashes;
+    for (auto shot : m_screenshots)
+    {
+        hashes.append(shot->m_imgurDeleteHash);
+    }
 
-	const QByteArray data = "deletehashes=" + hashes.join(',').toUtf8() + "&title=Minecraft%20Screenshots&privacy=hidden";
+    const QByteArray data = "deletehashes=" + hashes.join(',').toUtf8() + "&title=Minecraft%20Screenshots&privacy=hidden";
 
-	QNetworkReply *rep = ENV.qnam().post(request, data);
+    QNetworkReply *rep = ENV.qnam().post(request, data);
 
-	m_reply.reset(rep);
-	connect(rep, &QNetworkReply::uploadProgress, this, &ImgurAlbumCreation::downloadProgress);
-	connect(rep, &QNetworkReply::finished, this, &ImgurAlbumCreation::downloadFinished);
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
+    m_reply.reset(rep);
+    connect(rep, &QNetworkReply::uploadProgress, this, &ImgurAlbumCreation::downloadProgress);
+    connect(rep, &QNetworkReply::finished, this, &ImgurAlbumCreation::downloadFinished);
+    connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
 }
 void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error)
 {
-	qDebug() << m_reply->errorString();
-	m_status = Job_Failed;
+    qDebug() << m_reply->errorString();
+    m_status = Job_Failed;
 }
 void ImgurAlbumCreation::downloadFinished()
 {
-	if (m_status != Job_Failed)
-	{
-		QByteArray data = m_reply->readAll();
-		m_reply.reset();
-		QJsonParseError jsonError;
-		QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-		if (jsonError.error != QJsonParseError::NoError)
-		{
-			qDebug() << jsonError.errorString();
-			emit failed(m_index_within_job);
-			return;
-		}
-		auto object = doc.object();
-		if (!object.value("success").toBool())
-		{
-			qDebug() << doc.toJson();
-			emit failed(m_index_within_job);
-			return;
-		}
-		m_deleteHash = object.value("data").toObject().value("deletehash").toString();
-		m_id = object.value("data").toObject().value("id").toString();
-		m_status = Job_Finished;
-		emit succeeded(m_index_within_job);
-		return;
-	}
-	else
-	{
-		qDebug() << m_reply->readAll();
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
+    if (m_status != Job_Failed)
+    {
+        QByteArray data = m_reply->readAll();
+        m_reply.reset();
+        QJsonParseError jsonError;
+        QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
+        if (jsonError.error != QJsonParseError::NoError)
+        {
+            qDebug() << jsonError.errorString();
+            emit failed(m_index_within_job);
+            return;
+        }
+        auto object = doc.object();
+        if (!object.value("success").toBool())
+        {
+            qDebug() << doc.toJson();
+            emit failed(m_index_within_job);
+            return;
+        }
+        m_deleteHash = object.value("data").toObject().value("deletehash").toString();
+        m_id = object.value("data").toObject().value("id").toString();
+        m_status = Job_Finished;
+        emit succeeded(m_index_within_job);
+        return;
+    }
+    else
+    {
+        qDebug() << m_reply->readAll();
+        m_reply.reset();
+        emit failed(m_index_within_job);
+        return;
+    }
 }
 void ImgurAlbumCreation::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
-	m_total_progress = bytesTotal;
-	m_progress = bytesReceived;
-	emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
+    m_total_progress = bytesTotal;
+    m_progress = bytesReceived;
+    emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
 }