mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: rename slot in uploadDiveLogsDE

Browse source 
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>
This commit is contained in:
jan Iversen 2019-12-09 10:49:40 +01:00 • committed by Dirk Hohndel
parent 4ee7cb7d1d
commit fa8acc0f40
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/uploadDiveLogsDE.cpp
View file

@ -246,18 +246,18 @@ void uploadDiveLogsDE::uploadDives(const QString &filename, const QString &useri
reply = manager()->post(request, multipart); reply = manager()->post(request, multipart);
// connect signals from upload process // 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, connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
SLOT(uploadError(QNetworkReply::NetworkError))); SLOT(uploadErrorSlot(QNetworkReply::NetworkError)));
connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this, connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this,
SLOT(updateProgress(qint64, qint64))); SLOT(updateProgressSlot(qint64, qint64)));
connect(&timeout, SIGNAL(timeout()), this, SLOT(uploadTimeout())); connect(&timeout, SIGNAL(timeout()), this, SLOT(uploadTimeoutSlot()));
timeout.start(30000); // 30s timeout.start(30000); // 30s
} }
void uploadDiveLogsDE::updateProgress(qint64 current, qint64 total) void uploadDiveLogsDE::updateProgressSlot(qint64 current, qint64 total)
{ {
if (!reply) if (!reply)
return; return;
@ -274,7 +274,7 @@ void uploadDiveLogsDE::updateProgress(qint64 current, qint64 total)
} }
void uploadDiveLogsDE::uploadFinished() void uploadDiveLogsDE::uploadFinishedSlot()
{ {
QString err; QString err;
@ -314,7 +314,7 @@ void uploadDiveLogsDE::uploadFinished()
} }
void uploadDiveLogsDE::uploadTimeout() void uploadDiveLogsDE::uploadTimeoutSlot()
{ {
QString err(tr("divelogs.de not responding")); QString err(tr("divelogs.de not responding"));
report_error(err.toUtf8()); 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)); QString err(tr("network error %1").arg(error));
report_error(err.toUtf8()); report_error(err.toUtf8());

8
core/uploadDiveLogsDE.h
View file

@ -17,10 +17,10 @@ public:
bool prepareDives(const QString &tempfile, const bool selected); bool prepareDives(const QString &tempfile, const bool selected);
private slots: private slots:
void updateProgress(qint64 current, qint64 total); void updateProgressSlot(qint64 current, qint64 total);
void uploadFinished(); void uploadFinishedSlot();
void uploadTimeout(); void uploadTimeoutSlot();
void uploadError(QNetworkReply::NetworkError error); void uploadErrorSlot(QNetworkReply::NetworkError error);
signals: signals:
void uploadFinish(bool success, const QString &text); void uploadFinish(bool success, const QString &text);