core: rename slot in uploadDiveLogsDE

The difference between slot names and signal names was to insignificant
e.g. uploadFinish (signal) uploadFinished (slot).

Change slot names to slot_<name> should clear any confusion.

Signed-off-by: Jan Iversen <jan@casacondor.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/core/uploadDiveLogsDE.cpp b/core/uploadDiveLogsDE.cpp
index 88cd0c87e..1d085529a 100644
--- a/core/uploadDiveLogsDE.cpp
+++ b/core/uploadDiveLogsDE.cpp
@@ -246,18 +246,18 @@ void uploadDiveLogsDE::uploadDives(const QString &filename, const QString &useri
 	reply = manager()->post(request, multipart);
 
 	// connect signals from upload process
-	connect(reply, SIGNAL(finished()), this, SLOT(uploadFinished()));
+	connect(reply, SIGNAL(finished()), this, SLOT(uploadFinishedSlot()));
 	connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
-		SLOT(uploadError(QNetworkReply::NetworkError)));
+		SLOT(uploadErrorSlot(QNetworkReply::NetworkError)));
 	connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this,
-		SLOT(updateProgress(qint64, qint64)));
-	connect(&timeout, SIGNAL(timeout()), this, SLOT(uploadTimeout()));
+		SLOT(updateProgressSlot(qint64, qint64)));
+	connect(&timeout, SIGNAL(timeout()), this, SLOT(uploadTimeoutSlot()));
 
 	timeout.start(30000); // 30s
 }
 
 
-void uploadDiveLogsDE::updateProgress(qint64 current, qint64 total)
+void uploadDiveLogsDE::updateProgressSlot(qint64 current, qint64 total)
 {
 	if (!reply)
 		return;
@@ -274,7 +274,7 @@ void uploadDiveLogsDE::updateProgress(qint64 current, qint64 total)
 }
 
 
-void uploadDiveLogsDE::uploadFinished()
+void uploadDiveLogsDE::uploadFinishedSlot()
 {
 	QString err;
 
@@ -314,7 +314,7 @@ void uploadDiveLogsDE::uploadFinished()
 }
 
 
-void uploadDiveLogsDE::uploadTimeout()
+void uploadDiveLogsDE::uploadTimeoutSlot()
 {
 	QString err(tr("divelogs.de not responding"));
 	report_error(err.toUtf8());
@@ -323,7 +323,7 @@ void uploadDiveLogsDE::uploadTimeout()
 }
 
 
-void uploadDiveLogsDE::uploadError(QNetworkReply::NetworkError error)
+void uploadDiveLogsDE::uploadErrorSlot(QNetworkReply::NetworkError error)
 {
 	QString err(tr("network error %1").arg(error));
 	report_error(err.toUtf8());
diff --git a/core/uploadDiveLogsDE.h b/core/uploadDiveLogsDE.h
index 0375c95a4..83bb813d6 100644
--- a/core/uploadDiveLogsDE.h
+++ b/core/uploadDiveLogsDE.h
@@ -17,10 +17,10 @@ public:
 	bool prepareDives(const QString &tempfile, const bool selected);
 
 private slots:
-	void updateProgress(qint64 current, qint64 total);
-	void uploadFinished();
-	void uploadTimeout();
-	void uploadError(QNetworkReply::NetworkError error);
+	void updateProgressSlot(qint64 current, qint64 total);
+	void uploadFinishedSlot();
+	void uploadTimeoutSlot();
+	void uploadErrorSlot(QNetworkReply::NetworkError error);
 
 signals:
 	void uploadFinish(bool success, const QString &text);