diff options
| -rw-r--r-- | core/uploadDiveShare.cpp | 16 | ||||
| -rw-r--r-- | core/uploadDiveShare.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/core/uploadDiveShare.cpp b/core/uploadDiveShare.cpp index cc5b90ca6..3d75abf9a 100644 --- a/core/uploadDiveShare.cpp +++ b/core/uploadDiveShare.cpp @@ -46,18 +46,18 @@ void uploadDiveShare::doUpload(bool selected, const QString &uid, bool noPublic) reply = manager()->put(request, json_data); // 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, - SLOT(slot_uploadError(QNetworkReply::NetworkError))); + SLOT(uploadErrorSlot(QNetworkReply::NetworkError))); connect(reply, SIGNAL(uploadProgress(qint64, qint64)), this, - SLOT(slot_updateProgress(qint64, qint64))); - connect(&timeout, SIGNAL(timeout()), this, SLOT(slot_uploadTimeout())); + SLOT(updateProgressSlot(qint64, qint64))); + connect(&timeout, SIGNAL(timeout()), this, SLOT(uploadTimeoutSlot())); timeout.start(30000); // 30s } -void uploadDiveShare::slot_updateProgress(qint64 current, qint64 total) +void uploadDiveShare::updateProgressSlot(qint64 current, qint64 total) { if (!reply) return; @@ -74,7 +74,7 @@ void uploadDiveShare::slot_updateProgress(qint64 current, qint64 total) } -void uploadDiveShare::slot_uploadFinished() +void uploadDiveShare::uploadFinishedSlot() { reply->deleteLater(); timeout.stop(); @@ -86,7 +86,7 @@ void uploadDiveShare::slot_uploadFinished() } -void uploadDiveShare::slot_uploadTimeout() +void uploadDiveShare::uploadTimeoutSlot() { timeout.stop(); 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(); if (reply) { diff --git a/core/uploadDiveShare.h b/core/uploadDiveShare.h index 88ac2c519..fdd941e67 100644 --- a/core/uploadDiveShare.h +++ b/core/uploadDiveShare.h @@ -13,10 +13,10 @@ public: void doUpload(bool selected, const QString &uid, bool noPublic); private slots: - void slot_updateProgress(qint64 current, qint64 total); - void slot_uploadFinished(); - void slot_uploadTimeout(); - void slot_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, const QByteArray &html); |