Commit b3cf451d authored by Milian Wolff's avatar Milian Wolff
Browse files

Unbreak compile by making the slots protected and using parent class.

Some signals are connected to these slots form SingleFileResource,
so it cannot be private. Also, it seems I'm not able to pass
the PMF from the base class, but rather have to use the current
templated class...

This now actually compiles for me with:

gcc (GCC) 6.1.1 20160802
parent badc3cd1
......@@ -165,7 +165,7 @@ public:
// NOTE: Test what happens with remotefile -> save, close before save is finished.
mDownloadJob = KIO::file_copy(mCurrentUrl, QUrl::fromLocalFile(cacheFile()), -1, KIO::Overwrite | KIO::DefaultFlags | KIO::HideProgressInfo);
connect(mDownloadJob, &KJob::result,
this, &SingleFileResourceBase::slotDownloadJobResult);
this, &SingleFileResource<Settings>::slotDownloadJobResult);
connect(mDownloadJob, SIGNAL(percent(KJob *, ulong)),
SLOT(handleProgress(KJob *, ulong)));
......@@ -272,7 +272,7 @@ public:
// Start a job to upload the locally cached file to the remote location.
mUploadJob = KIO::file_copy(QUrl::fromLocalFile(cacheFile()), mCurrentUrl, -1, KIO::Overwrite | KIO::DefaultFlags | KIO::HideProgressInfo);
connect(mUploadJob, &KJob::result,
this, &SingleFileResourceBase::slotUploadJobResult);
this, &SingleFileResource<Settings>::slotUploadJobResult);
connect(mUploadJob, SIGNAL(percent(KJob *, ulong)),
SLOT(handleProgress(KJob *, ulong)));
......
......@@ -176,8 +176,6 @@ protected:
protected Q_SLOTS:
void scheduleWrite(); /// Called when changes are added to the ChangeRecorder.
private Q_SLOTS:
void handleProgress(KJob *, unsigned long);
void fileChanged(const QString &fileName);
void slotDownloadJobResult(KJob *);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment