Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git: remove UCRT64 action #28

Merged
merged 2 commits into from
Jul 31, 2024
Merged

git: remove UCRT64 action #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b785c72
fix: #14 update QNetworkReply signals
nullobsi Jul 29, 2024
82875b5
git: remove UCRT64 action
nullobsi Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/msys2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
fail-fast: false
matrix:
include:
- { icon: '🟨', sys: ucrt64 }
- { icon: '🟧', sys: clang64 }
name: 🚧${{ matrix.icon }} ${{ matrix.sys }}
defaults:
Expand Down
28 changes: 14 additions & 14 deletions network/networkaccessmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,24 +81,24 @@ void NetworkJob::connectJob()
return;
}

connect(job, SIGNAL(finished()), this, SLOT(jobFinished()));
connect(job, SIGNAL(readyRead()), this, SLOT(handleReadyRead()));
connect(job, SIGNAL(error(QNetworkReply::NetworkError)), this, SIGNAL(error(QNetworkReply::NetworkError)));
connect(job, SIGNAL(uploadProgress(qint64, qint64)), this, SIGNAL(uploadProgress(qint64, qint64)));
connect(job, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(downloadProg(qint64, qint64)));
connect(job, SIGNAL(destroyed(QObject*)), this, SLOT(jobDestroyed(QObject*)));
connect(job, &QNetworkReply::finished, this, &NetworkJob::jobFinished);
connect(job, &QNetworkReply::readyRead, this, &NetworkJob::handleReadyRead);
connect(job, &QNetworkReply::errorOccurred, this, &NetworkJob::errorOccurred);
connect(job, &QNetworkReply::uploadProgress, this, &NetworkJob::uploadProgress);
connect(job, &QNetworkReply::downloadProgress, this, &NetworkJob::downloadProg);
connect(job, &QNetworkReply::destroyed, this, &NetworkJob::jobDestroyed);
}

void NetworkJob::cancelJob()
{
DBUG << (void*)this << (void*)job;
if (job) {
disconnect(job, SIGNAL(finished()), this, SLOT(jobFinished()));
disconnect(job, SIGNAL(readyRead()), this, SLOT(handleReadyRead()));
disconnect(job, SIGNAL(error(QNetworkReply::NetworkError)), this, SIGNAL(error(QNetworkReply::NetworkError)));
disconnect(job, SIGNAL(uploadProgress(qint64, qint64)), this, SIGNAL(uploadProgress(qint64, qint64)));
disconnect(job, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(downloadProg(qint64, qint64)));
disconnect(job, SIGNAL(destroyed(QObject*)), this, SLOT(jobDestroyed(QObject*)));
disconnect(job, &QNetworkReply::finished, this, &NetworkJob::jobFinished);
disconnect(job, &QNetworkReply::readyRead, this, &NetworkJob::handleReadyRead);
disconnect(job, &QNetworkReply::errorOccurred, this, &NetworkJob::errorOccurred);
disconnect(job, &QNetworkReply::uploadProgress, this, &NetworkJob::uploadProgress);
disconnect(job, &QNetworkReply::downloadProgress, this, &NetworkJob::downloadProg);
disconnect(job, &QNetworkReply::destroyed, this, &NetworkJob::jobDestroyed);
job->abort();
job->close();
job->deleteLater();
Expand Down Expand Up @@ -224,8 +224,8 @@ NetworkJob* NetworkAccessManager::get(const QNetworkRequest& req, int timeout)
}

if (0 != timeout) {
connect(reply, SIGNAL(destroyed()), SLOT(replyFinished()));
connect(reply, SIGNAL(finished()), SLOT(replyFinished()));
connect(reply, &NetworkJob::destroyed, this, &NetworkAccessManager::replyFinished);
connect(reply, &NetworkJob::finished, this, &NetworkAccessManager::replyFinished);
timers[reply] = startTimer(timeout);
}
return reply;
Expand Down
2 changes: 1 addition & 1 deletion network/networkaccessmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class NetworkJob : public QObject {

Q_SIGNALS:
void finished();
void error(QNetworkReply::NetworkError);
void errorOccurred(QNetworkReply::NetworkError);
void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
void downloadPercent(int pc);
Expand Down
Loading