dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace emit with Q_EMIT

Browse Source
This commit is contained in:
Jonas Kvinge
2024-08-25 01:06:30 +02:00
parent cb0db8750f
commit 8da616491d
158 changed files with 891 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/subsonic/subsonicrequest.cpp
View File

@@ -124,8 +124,8 @@ void SubsonicRequest::Reset() {
void SubsonicRequest::GetAlbums() {
emit UpdateStatus(tr("Retrieving albums..."));
emit UpdateProgress(0);
Q_EMIT UpdateStatus(tr("Retrieving albums..."));
Q_EMIT UpdateProgress(0);
AddAlbumsRequest();
}
@@ -313,10 +313,10 @@ void SubsonicRequest::AlbumsFinishCheck(const int offset, const int size, const
album_songs_requests_pending_.clear();
if (album_songs_requested_ > 0) {
if (album_songs_requested_ == 1) emit UpdateStatus(tr("Retrieving songs for %1 album...").arg(album_songs_requested_));
else emit UpdateStatus(tr("Retrieving songs for %1 albums...").arg(album_songs_requested_));
emit ProgressSetMaximum(album_songs_requested_);
emit UpdateProgress(0);
if (album_songs_requested_ == 1) Q_EMIT UpdateStatus(tr("Retrieving songs for %1 album...").arg(album_songs_requested_));
else Q_EMIT UpdateStatus(tr("Retrieving songs for %1 albums...").arg(album_songs_requested_));
Q_EMIT ProgressSetMaximum(album_songs_requested_);
Q_EMIT UpdateProgress(0);
}
}
@@ -362,7 +362,7 @@ void SubsonicRequest::AlbumSongsReplyReceived(QNetworkReply *reply, const QStrin
--album_songs_requests_active_;
++album_songs_received_;
emit UpdateProgress(album_songs_received_);
Q_EMIT UpdateProgress(album_songs_received_);
QByteArray data = GetReplyData(reply);
@@ -687,10 +687,10 @@ void SubsonicRequest::GetAlbumCovers() {
}
FlushAlbumCoverRequests();
if (album_covers_requested_ == 1) emit UpdateStatus(tr("Retrieving album cover for %1 album...").arg(album_covers_requested_));
else emit UpdateStatus(tr("Retrieving album covers for %1 albums...").arg(album_covers_requested_));
emit ProgressSetMaximum(album_covers_requested_);
emit UpdateProgress(0);
if (album_covers_requested_ == 1) Q_EMIT UpdateStatus(tr("Retrieving album cover for %1 album...").arg(album_covers_requested_));
else Q_EMIT UpdateStatus(tr("Retrieving album covers for %1 albums...").arg(album_covers_requested_));
Q_EMIT ProgressSetMaximum(album_covers_requested_);
Q_EMIT UpdateProgress(0);
}
@@ -779,7 +779,7 @@ void SubsonicRequest::AlbumCoverReceived(QNetworkReply *reply, const AlbumCoverR
if (finished_) return;
emit UpdateProgress(album_covers_received_);
Q_EMIT UpdateProgress(album_covers_received_);
if (!album_covers_requests_sent_.contains(request.cover_id)) {
AlbumCoverFinishCheck();
@@ -876,14 +876,14 @@ void SubsonicRequest::FinishCheck() {
) {
finished_ = true;
if (no_results_ && songs_.isEmpty()) {
emit Results(SongMap(), QString());
Q_EMIT Results(SongMap(), QString());
}
else {
if (songs_.isEmpty() && errors_.isEmpty()) {
emit Results(songs_, tr("Unknown error"));
Q_EMIT Results(songs_, tr("Unknown error"));
}
else {
emit Results(songs_, ErrorsToHTML(errors_));
Q_EMIT Results(songs_, ErrorsToHTML(errors_));
}
}

28
src/subsonic/subsonicservice.cpp
View File

@@ -338,8 +338,8 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply, const QUrl &url, con
}
//int status = obj_error["code"].toInt();
QString message = obj_error[QLatin1String("message")].toString();
emit TestComplete(false, message);
emit TestFailure(message);
Q_EMIT TestComplete(false, message);
Q_EMIT TestFailure(message);
return;
}
@@ -352,13 +352,13 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply, const QUrl &url, con
QString message = obj_response[QLatin1String("message")].toString();
if (status == QLatin1String("failed")) {
emit TestComplete(false, message);
emit TestFailure(message);
Q_EMIT TestComplete(false, message);
Q_EMIT TestFailure(message);
return;
}
if (status == QLatin1String("ok")) {
emit TestComplete(true);
emit TestSuccess();
Q_EMIT TestComplete(true);
Q_EMIT TestSuccess();
return;
}
@@ -369,15 +369,15 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply, const QUrl &url, con
void SubsonicService::CheckConfiguration() {
if (server_url_.isEmpty()) {
emit TestComplete(false, QStringLiteral("Missing Subsonic server url."));
Q_EMIT TestComplete(false, QStringLiteral("Missing Subsonic server url."));
return;
}
if (username_.isEmpty()) {
emit TestComplete(false, QStringLiteral("Missing Subsonic username."));
Q_EMIT TestComplete(false, QStringLiteral("Missing Subsonic username."));
return;
}
if (password_.isEmpty()) {
emit TestComplete(false, QStringLiteral("Missing Subsonic password."));
Q_EMIT TestComplete(false, QStringLiteral("Missing Subsonic password."));
return;
}
@@ -411,12 +411,12 @@ void SubsonicService::ResetSongsRequest() {
void SubsonicService::GetSongs() {
if (!server_url().isValid()) {
emit SongsResults(SongMap(), tr("Server URL is invalid."));
Q_EMIT SongsResults(SongMap(), tr("Server URL is invalid."));
return;
}
if (username().isEmpty() || password().isEmpty()) {
emit SongsResults(SongMap(), tr("Missing username or password."));
Q_EMIT SongsResults(SongMap(), tr("Missing username or password."));
return;
}
@@ -439,7 +439,7 @@ void SubsonicService::DeleteSongs() {
void SubsonicService::SongsResultsReceived(const SongMap &songs, const QString &error) {
emit SongsResults(songs, error);
Q_EMIT SongsResults(songs, error);
ResetSongsRequest();
@@ -456,8 +456,8 @@ void SubsonicService::PingError(const QString &error, const QVariant &debug) {
}
if (debug.isValid()) qLog(Debug) << debug;
emit TestFailure(error_html);
emit TestComplete(false, error_html);
Q_EMIT TestFailure(error_html);
Q_EMIT TestComplete(false, error_html);
errors_.clear();