CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove some superfluous signals

Browse Source 
Since now we're inheriting from Task, some signals can be reused.
This commit is contained in:
flow
2022-04-26 21:25:42 -03:00
parent 8c8eabf7ac
commit efa3fbff39
7 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/screenshots/ImgurAlbumCreation.cpp
View File

@ -56,32 +56,32 @@ void ImgurAlbumCreation::downloadFinished()
if (jsonError.error != QJsonParseError::NoError)
{
qDebug() << jsonError.errorString();
emit failed(m_index_within_job);
emitFailed();
return;
}
auto object = doc.object();
if (!object.value("success").toBool())
{
qDebug() << doc.toJson();
emit failed(m_index_within_job);
emitFailed();
return;
}
m_deleteHash = object.value("data").toObject().value("deletehash").toString();
m_id = object.value("data").toObject().value("id").toString();
m_state = State::Succeeded;
emit succeeded(m_index_within_job);
emit succeeded();
return;
}
else
{
qDebug() << m_reply->readAll();
m_reply.reset();
emit failed(m_index_within_job);
emitFailed();
return;
}
}
void ImgurAlbumCreation::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
setProgress(bytesReceived, bytesTotal);
emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
emit progress(bytesReceived, bytesTotal);
}

12
launcher/screenshots/ImgurUpload.cpp
View File

@ -28,7 +28,7 @@ void ImgurUpload::executeTask()
QFile f(m_shot->m_file.absoluteFilePath());
if (!f.open(QFile::ReadOnly))
{
emit failed(m_index_within_job);
emitFailed();
return;
}
@ -66,7 +66,7 @@ void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
m_state = Task::State::Failed;
finished = true;
m_reply.reset();
emit failed(m_index_within_job);
emitFailed();
}
void ImgurUpload::downloadFinished()
{
@ -84,7 +84,7 @@ void ImgurUpload::downloadFinished()
qDebug() << "imgur server did not reply with JSON" << jsonError.errorString();
finished = true;
m_reply.reset();
emit failed(m_index_within_job);
emitFailed();
return;
}
auto object = doc.object();
@ -93,7 +93,7 @@ void ImgurUpload::downloadFinished()
qDebug() << "Screenshot upload not successful:" << doc.toJson();
finished = true;
m_reply.reset();
emit failed(m_index_within_job);
emitFailed();
return;
}
m_shot->m_imgurId = object.value("data").toObject().value("id").toString();
@ -101,11 +101,11 @@ void ImgurUpload::downloadFinished()
m_shot->m_imgurDeleteHash = object.value("data").toObject().value("deletehash").toString();
m_state = Task::State::Succeeded;
finished = true;
emit succeeded(m_index_within_job);
emit succeeded();
return;
}
void ImgurUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
setProgress(bytesReceived, bytesTotal);
emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
emit progress(bytesReceived, bytesTotal);
}