1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename signal in QNetworkFile

Browse Source 
Address the "Overloaded signals should be avoided" warning: there
is already a method named "error" in QFileDevice, rename the signal
"error" to "networkError".

Found by an Axivion scan.

Pick-to: 6.7 6.5
Task-number: QTBUG-125026
Change-Id: I2f1b5752238aca614af82a94e2918399c582f74d
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 7f0450a47f2cab8c0482131475eba7162f4bdf8f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mate Barany 2024-07-05 15:17:52 +02:00 committed by Qt Cherry-pick Bot
parent 5cd80af50f
commit 873bacc549
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/access/qnetworkfile.cpp
View File

@ -30,7 +30,7 @@ void QNetworkFile::open()
if (fi.isDir()) { if (fi.isDir()) {
QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", QString msg = QCoreApplication::translate("QNetworkAccessFileBackend",
"Cannot open %1: Path is a directory").arg(fileName()); "Cannot open %1: Path is a directory").arg(fileName());
emit error(QNetworkReply::ContentOperationNotPermittedError, msg); emit networkError(QNetworkReply::ContentOperationNotPermittedError, msg);
} else { } else {
emit headerRead(QHttpHeaders::WellKnownHeader::LastModified, emit headerRead(QHttpHeaders::WellKnownHeader::LastModified,
QNetworkHeadersPrivate::toHttpDate(fi.lastModified())); QNetworkHeadersPrivate::toHttpDate(fi.lastModified()));
@ -41,9 +41,9 @@ void QNetworkFile::open()
QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", QString msg = QCoreApplication::translate("QNetworkAccessFileBackend",
"Error opening %1: %2").arg(fileName(), errorString()); "Error opening %1: %2").arg(fileName(), errorString());
if (exists()) if (exists())
emit error(QNetworkReply::ContentAccessDenied, msg); emit networkError(QNetworkReply::ContentAccessDenied, msg);
else else
emit error(QNetworkReply::ContentNotFoundError, msg); emit networkError(QNetworkReply::ContentNotFoundError, msg);
} }
} }
emit finished(opened); emit finished(opened);

2
src/network/access/qnetworkfile_p.h
View File

@ -36,7 +36,7 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void finished(bool ok); void finished(bool ok);
void headerRead(QHttpHeaders::WellKnownHeader, const QByteArray &value); void headerRead(QHttpHeaders::WellKnownHeader, const QByteArray &value);
void error(QNetworkReply::NetworkError error, const QString &message); void networkError(QNetworkReply::NetworkError error, const QString &message);
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/network/access/qnetworkreplyfileimpl.cpp
View File

@ -87,7 +87,7 @@ QNetworkReplyFileImpl::QNetworkReplyFileImpl(QNetworkAccessManager *manager, con
auto realFile = new QNetworkFile(fileName); auto realFile = new QNetworkFile(fileName);
connect(realFile, &QNetworkFile::headerRead, this, &QNetworkReplyFileImpl::setWellKnownHeader, connect(realFile, &QNetworkFile::headerRead, this, &QNetworkReplyFileImpl::setWellKnownHeader,
Qt::QueuedConnection); Qt::QueuedConnection);
connect(realFile, &QNetworkFile::error, this, &QNetworkReplyFileImpl::setError, connect(realFile, &QNetworkFile::networkError, this, &QNetworkReplyFileImpl::setError,
Qt::QueuedConnection); Qt::QueuedConnection);
connect(realFile, SIGNAL(finished(bool)), SLOT(fileOpenFinished(bool)), connect(realFile, SIGNAL(finished(bool)), SLOT(fileOpenFinished(bool)),
Qt::QueuedConnection); Qt::QueuedConnection);