summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilian Wolff <mail@milianw.de>2016-09-05 10:39:14 (GMT)
committerMilian Wolff <mail@milianw.de>2016-09-05 10:43:20 (GMT)
commitb3cf451d9bc09d249b3dadc87d5cb91b065bdedb (patch)
tree494da0052b737307d4d591968d5b38fa96c8718f
parentbadc3cd1a201c2f4a01a95b80b4c8da5e67ad30d (diff)
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
-rw-r--r--resources/shared/singlefileresource/singlefileresource.h4
-rw-r--r--resources/shared/singlefileresource/singlefileresourcebase.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/resources/shared/singlefileresource/singlefileresource.h b/resources/shared/singlefileresource/singlefileresource.h
index 67b26a4..2580c1a 100644
--- a/resources/shared/singlefileresource/singlefileresource.h
+++ b/resources/shared/singlefileresource/singlefileresource.h
@@ -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)));
diff --git a/resources/shared/singlefileresource/singlefileresourcebase.h b/resources/shared/singlefileresource/singlefileresourcebase.h
index 81b3825..fa176e0 100644
--- a/resources/shared/singlefileresource/singlefileresourcebase.h
+++ b/resources/shared/singlefileresource/singlefileresourcebase.h
@@ -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 *);