mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: divehare change slot names

Browse source 
change slot names from slot_* to *Slot

Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-12-12 12:39:29 +01:00 committed by Dirk Hohndel
parent 786b0db724
commit aefe87112a
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/uploadDiveShare.cpp
View file

@ -46,18 +46,18 @@ void uploadDiveShare::doUpload(bool selected, const QString &uid, bool noPublic)
reply = manager()->put(request, json_data); reply = manager()->put(request, json_data);
// connect signals from upload process // connect signals from upload process
connect(reply, SIGNAL(finished()), this, SLOT(slot_uploadFinished())); connect(reply, SIGNAL(finished()), this, SLOT(uploadFinishedSlot()));
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
SLOT(slot_uploadError(QNetworkReply::NetworkError))); SLOT(uploadErrorSlot(QNetworkReply::NetworkError)));
connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this, connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this,
SLOT(slot_updateProgress(qint64, qint64))); SLOT(updateProgressSlot(qint64, qint64)));
connect(&timeout, SIGNAL(timeout()), this, SLOT(slot_uploadTimeout())); connect(&timeout, SIGNAL(timeout()), this, SLOT(uploadTimeoutSlot()));
timeout.start(30000); // 30s timeout.start(30000); // 30s
} }
void uploadDiveShare::slot_updateProgress(qint64 current, qint64 total) void uploadDiveShare::updateProgressSlot(qint64 current, qint64 total)
{ {
if (!reply) if (!reply)
return; return;
@ -74,7 +74,7 @@ void uploadDiveShare::slot_updateProgress(qint64 current, qint64 total)
} }
void uploadDiveShare::slot_uploadFinished() void uploadDiveShare::uploadFinishedSlot()
{ {
reply->deleteLater(); reply->deleteLater();
timeout.stop(); timeout.stop();
@ -86,7 +86,7 @@ void uploadDiveShare::slot_uploadFinished()
} }
void uploadDiveShare::slot_uploadTimeout() void uploadDiveShare::uploadTimeoutSlot()
{ {
timeout.stop(); timeout.stop();
if (reply) { if (reply) {
@ -99,7 +99,7 @@ void uploadDiveShare::slot_uploadTimeout()
} }
void uploadDiveShare::slot_uploadError(QNetworkReply::NetworkError error) void uploadDiveShare::uploadErrorSlot(QNetworkReply::NetworkError error)
{ {
timeout.stop(); timeout.stop();
if (reply) { if (reply) {

8
core/uploadDiveShare.h
View file

@ -13,10 +13,10 @@ public:
void doUpload(bool selected, const QString &uid, bool noPublic); void doUpload(bool selected, const QString &uid, bool noPublic);
private slots: private slots:
void slot_updateProgress(qint64 current, qint64 total); void updateProgressSlot(qint64 current, qint64 total);
void slot_uploadFinished(); void uploadFinishedSlot();
void slot_uploadTimeout(); void uploadTimeoutSlot();
void slot_uploadError(QNetworkReply::NetworkError error); void uploadErrorSlot(QNetworkReply::NetworkError error);
signals: signals:
void uploadFinish(bool success, const QString &text, const QByteArray &html); void uploadFinish(bool success, const QString &text, const QByteArray &html);