merged from 0.6.7 codebase

1 files changed, 80 insertions, 80 deletions

diff --git a/api/logic/screenshots/ImgurUpload.cpp b/api/logic/screenshots/ImgurUpload.cpp
index 659879f6..74165869 100644
--- a/api/logic/screenshots/ImgurUpload.cpp
+++ b/api/logic/screenshots/ImgurUpload.cpp
@@ -14,101 +14,101 @@
 
 ImgurUpload::ImgurUpload(ScreenshotPtr shot) : NetAction(), m_shot(shot)
 {
-	m_url = URLConstants::IMGUR_BASE_URL + "upload.json";
-	m_status = Job_NotStarted;
+    m_url = URLConstants::IMGUR_BASE_URL + "upload.json";
+    m_status = Job_NotStarted;
 }
 
 void ImgurUpload::start()
 {
-	finished = false;
-	m_status = Job_InProgress;
-	QNetworkRequest request(m_url);
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
-	request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
-	request.setRawHeader("Accept", "application/json");
+    finished = false;
+    m_status = Job_InProgress;
+    QNetworkRequest request(m_url);
+    request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
+    request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
+    request.setRawHeader("Accept", "application/json");
 
-	QFile f(m_shot->m_file.absoluteFilePath());
-	if (!f.open(QFile::ReadOnly))
-	{
-		emit failed(m_index_within_job);
-		return;
-	}
+    QFile f(m_shot->m_file.absoluteFilePath());
+    if (!f.open(QFile::ReadOnly))
+    {
+        emit failed(m_index_within_job);
+        return;
+    }
 
-	QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
-	QHttpPart filePart;
-	filePart.setBody(f.readAll().toBase64());
-	filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png");
-	filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\"");
-	multipart->append(filePart);
-	QHttpPart typePart;
-	typePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"type\"");
-	typePart.setBody("base64");
-	multipart->append(typePart);
-	QHttpPart namePart;
-	namePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"name\"");
-	namePart.setBody(m_shot->m_file.baseName().toUtf8());
-	multipart->append(namePart);
+    QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
+    QHttpPart filePart;
+    filePart.setBody(f.readAll().toBase64());
+    filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png");
+    filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\"");
+    multipart->append(filePart);
+    QHttpPart typePart;
+    typePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"type\"");
+    typePart.setBody("base64");
+    multipart->append(typePart);
+    QHttpPart namePart;
+    namePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"name\"");
+    namePart.setBody(m_shot->m_file.baseName().toUtf8());
+    multipart->append(namePart);
 
-	QNetworkReply *rep = ENV.qnam().post(request, multipart);
+    QNetworkReply *rep = ENV.qnam().post(request, multipart);
 
-	m_reply.reset(rep);
-	connect(rep, &QNetworkReply::uploadProgress, this, &ImgurUpload::downloadProgress);
-	connect(rep, &QNetworkReply::finished, this, &ImgurUpload::downloadFinished);
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
-			SLOT(downloadError(QNetworkReply::NetworkError)));
+    m_reply.reset(rep);
+    connect(rep, &QNetworkReply::uploadProgress, this, &ImgurUpload::downloadProgress);
+    connect(rep, &QNetworkReply::finished, this, &ImgurUpload::downloadFinished);
+    connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
+            SLOT(downloadError(QNetworkReply::NetworkError)));
 }
 void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
 {
-	qCritical() << "ImgurUpload failed with error" << m_reply->errorString() << "Server reply:\n" << m_reply->readAll();
-	if(finished)
-	{
-		qCritical() << "Double finished ImgurUpload!";
-		return;
-	}
-	m_status = Job_Failed;
-	finished = true;
-	m_reply.reset();
-	emit failed(m_index_within_job);
+    qCritical() << "ImgurUpload failed with error" << m_reply->errorString() << "Server reply:\n" << m_reply->readAll();
+    if(finished)
+    {
+        qCritical() << "Double finished ImgurUpload!";
+        return;
+    }
+    m_status = Job_Failed;
+    finished = true;
+    m_reply.reset();
+    emit failed(m_index_within_job);
 }
 void ImgurUpload::downloadFinished()
 {
-	if(finished)
-	{
-		qCritical() << "Double finished ImgurUpload!";
-		return;
-	}
-	QByteArray data = m_reply->readAll();
-	m_reply.reset();
-	QJsonParseError jsonError;
-	QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		qDebug() << "imgur server did not reply with JSON" << jsonError.errorString();
-		finished = true;
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
-	auto object = doc.object();
-	if (!object.value("success").toBool())
-	{
-		qDebug() << "Screenshot upload not successful:" << doc.toJson();
-		finished = true;
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
-	m_shot->m_imgurId = object.value("data").toObject().value("id").toString();
-	m_shot->m_url = object.value("data").toObject().value("link").toString();
-	m_shot->m_imgurDeleteHash = object.value("data").toObject().value("deletehash").toString();
-	m_status = Job_Finished;
-	finished = true;
-	emit succeeded(m_index_within_job);
-	return;
+    if(finished)
+    {
+        qCritical() << "Double finished ImgurUpload!";
+        return;
+    }
+    QByteArray data = m_reply->readAll();
+    m_reply.reset();
+    QJsonParseError jsonError;
+    QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
+    if (jsonError.error != QJsonParseError::NoError)
+    {
+        qDebug() << "imgur server did not reply with JSON" << jsonError.errorString();
+        finished = true;
+        m_reply.reset();
+        emit failed(m_index_within_job);
+        return;
+    }
+    auto object = doc.object();
+    if (!object.value("success").toBool())
+    {
+        qDebug() << "Screenshot upload not successful:" << doc.toJson();
+        finished = true;
+        m_reply.reset();
+        emit failed(m_index_within_job);
+        return;
+    }
+    m_shot->m_imgurId = object.value("data").toObject().value("id").toString();
+    m_shot->m_url = object.value("data").toObject().value("link").toString();
+    m_shot->m_imgurDeleteHash = object.value("data").toObject().value("deletehash").toString();
+    m_status = Job_Finished;
+    finished = true;
+    emit succeeded(m_index_within_job);
+    return;
 }
 void ImgurUpload::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);
 }