From ce04a76b17ba045c153aed4ac8ab07c60b6b856b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 25 Sep 2017 11:58:30 +0200 Subject: [PATCH] PropagateUpload: Fix another non-normalized connect that appears while profiling --- src/libsync/propagateupload.h | 2 +- src/libsync/propagateuploadng.cpp | 4 ++-- src/libsync/propagateuploadv1.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index a43048eb6..016824464 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -71,7 +71,7 @@ private: bool _bandwidthLimited; // if _bandwidthQuota will be used bool _choked; // if upload is paused (readData() will return 0) friend class BandwidthManager; -protected slots: +public slots: void slotJobUploadProgress(qint64 sent, qint64 t); }; diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp index 379726672..6d3ddfb80 100644 --- a/src/libsync/propagateuploadng.cpp +++ b/src/libsync/propagateuploadng.cpp @@ -327,8 +327,8 @@ void PropagateUploadFileNG::startNextChunk() connect(job, &PUTFileJob::finishedSignal, this, &PropagateUploadFileNG::slotPutFinished); connect(job, &PUTFileJob::uploadProgress, this, &PropagateUploadFileNG::slotUploadProgress); - connect(job, SIGNAL(uploadProgress(qint64, qint64)), - device, SLOT(slotJobUploadProgress(qint64, qint64))); + connect(job, &PUTFileJob::uploadProgress, + device, &UploadDevice::slotJobUploadProgress); connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed); job->start(); propagator()->_activeJobList.append(this); diff --git a/src/libsync/propagateuploadv1.cpp b/src/libsync/propagateuploadv1.cpp index b03ac6d9e..0d0b2cd0f 100644 --- a/src/libsync/propagateuploadv1.cpp +++ b/src/libsync/propagateuploadv1.cpp @@ -128,7 +128,7 @@ void PropagateUploadFileV1::startNextChunk() _jobs.append(job); connect(job, &PUTFileJob::finishedSignal, this, &PropagateUploadFileV1::slotPutFinished); connect(job, &PUTFileJob::uploadProgress, this, &PropagateUploadFileV1::slotUploadProgress); - connect(job, SIGNAL(uploadProgress(qint64, qint64)), device, SLOT(slotJobUploadProgress(qint64, qint64))); + connect(job, &PUTFileJob::uploadProgress, device, &UploadDevice::slotJobUploadProgress); connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed); job->start(); propagator()->_activeJobList.append(this);