summaryrefslogtreecommitdiffstats
path: root/src/core/api/qwebenginedownloadrequest.cpp
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2021-06-08 16:28:58 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-10 23:20:07 +0000
commitee3e1886d6154a3faaf7536986e8c70ec4f3c373 (patch)
tree0603c3e229f865001cdd4678a2c8812aa1cbd21c /src/core/api/qwebenginedownloadrequest.cpp
parentd627842e98c1cbaec0123566dc1af7b6018e5dc1 (diff)
Fix some compiler warnings
- Remove deprecated Qt::AA_EnableHighDpiScaling and Qt::AA_UseHighDpiPixmaps from examples. High-DPI scaling is always enabled. - Reorder initialization of members of QWebEngineDownloadRequestPrivate. Also remove m_ prefix from public members' name. - Remove unused parameters from methods of DummyDelegate. - Add missing overrides in auto tests. Change-Id: I18d6973b8bee574b37b73fbaaa8d57002ac8ba2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 740b8c94f27930a33298c81c2284d1f0a9e2f11b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core/api/qwebenginedownloadrequest.cpp')
-rw-r--r--src/core/api/qwebenginedownloadrequest.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/core/api/qwebenginedownloadrequest.cpp b/src/core/api/qwebenginedownloadrequest.cpp
index eae48b017..006fd2e4b 100644
--- a/src/core/api/qwebenginedownloadrequest.cpp
+++ b/src/core/api/qwebenginedownloadrequest.cpp
@@ -158,8 +158,7 @@ static inline QWebEngineDownloadRequest::DownloadInterruptReason toDownloadInter
*/
QWebEngineDownloadRequestPrivate::QWebEngineDownloadRequestPrivate(QtWebEngineCore::ProfileAdapter *adapter, const QUrl &url)
- : m_profileAdapter(adapter)
- , downloadFinished(false)
+ : downloadFinished(false)
, downloadId(-1)
, downloadState(QWebEngineDownloadRequest::DownloadCancelled)
, savePageFormat(QWebEngineDownloadRequest::MimeHtmlSaveFormat)
@@ -170,7 +169,8 @@ QWebEngineDownloadRequestPrivate::QWebEngineDownloadRequestPrivate(QtWebEngineCo
, totalBytes(-1)
, receivedBytes(0)
, isSavePageDownload(false)
- , m_adapterClient(nullptr)
+ , profileAdapter(adapter)
+ , adapterClient(nullptr)
{
}
@@ -272,8 +272,8 @@ void QWebEngineDownloadRequest::cancel()
// We directly cancel the download request if the user cancels
// before it even started, so no need to notify the profile here.
if (state == QWebEngineDownloadRequest::DownloadInProgress) {
- if (d->m_profileAdapter)
- d->m_profileAdapter->cancelDownload(d->downloadId);
+ if (d->profileAdapter)
+ d->profileAdapter->cancelDownload(d->downloadId);
} else {
d->downloadState = QWebEngineDownloadRequest::DownloadCancelled;
Q_EMIT stateChanged(d->downloadState);
@@ -299,8 +299,8 @@ void QWebEngineDownloadRequest::pause()
if (state != QWebEngineDownloadRequest::DownloadInProgress)
return;
- if (d->m_profileAdapter)
- d->m_profileAdapter->pauseDownload(d->downloadId);
+ if (d->profileAdapter)
+ d->profileAdapter->pauseDownload(d->downloadId);
}
/*!
@@ -319,8 +319,8 @@ void QWebEngineDownloadRequest::resume()
if (d->downloadFinished || (state != QWebEngineDownloadRequest::DownloadInProgress && state != QWebEngineDownloadRequest::DownloadInterrupted))
return;
- if (d->m_profileAdapter)
- d->m_profileAdapter->resumeDownload(d->downloadId);
+ if (d->profileAdapter)
+ d->profileAdapter->resumeDownload(d->downloadId);
}
/*!
@@ -521,10 +521,10 @@ void QWebEngineDownloadRequest::setDownloadDirectory(const QString &directory)
Q_EMIT downloadDirectoryChanged();
}
- if (!d->isCustomFileName && d->m_profileAdapter) {
- QString newFileName = QFileInfo(d->m_profileAdapter->determineDownloadPath(d->downloadDirectory,
- d->suggestedFileName,
- d->startTime)).fileName();
+ if (!d->isCustomFileName && d->profileAdapter) {
+ QString newFileName = QFileInfo(d->profileAdapter->determineDownloadPath(d->downloadDirectory,
+ d->suggestedFileName,
+ d->startTime)).fileName();
if (d->downloadFileName != newFileName) {
d->downloadFileName = newFileName;
Q_EMIT downloadFileNameChanged();