From: asemmar Date: Thu, 2 Jul 2020 21:40:27 +0000 (+0200) Subject: fixed bad spelling of word 'retreive' except in sqlite dependancy X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~115 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d5587e386c5c48b0e657f5f855a30b7a83739c75;p=nextcloud-desktop.git fixed bad spelling of word 'retreive' except in sqlite dependancy Signed-off-by: asemmar --- diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 655e6f0dd..47870d99e 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -82,7 +82,7 @@ Folder::Folder(const FolderDefinition &definition, qCWarning(lcFolder, "Could not read system exclude file"); connect(_accountState.data(), &AccountState::isConnectedChanged, this, &Folder::canSyncChanged); - connect(_engine.data(), &SyncEngine::rootEtag, this, &Folder::etagRetreivedFromSyncEngine); + connect(_engine.data(), &SyncEngine::rootEtag, this, &Folder::etagRetrievedFromSyncEngine); connect(_engine.data(), &SyncEngine::started, this, &Folder::slotSyncStarted, Qt::QueuedConnection); connect(_engine.data(), &SyncEngine::finished, this, &Folder::slotSyncFinished, Qt::QueuedConnection); @@ -293,12 +293,12 @@ void Folder::slotRunEtagJob() _requestEtagJob = new RequestEtagJob(account, remotePath(), this); _requestEtagJob->setTimeout(60 * 1000); // check if the etag is different when retrieved - QObject::connect(_requestEtagJob.data(), &RequestEtagJob::etagRetreived, this, &Folder::etagRetreived); + QObject::connect(_requestEtagJob.data(), &RequestEtagJob::etagRetrieved, this, &Folder::etagRetrieved); FolderMan::instance()->slotScheduleETagJob(alias(), _requestEtagJob); // The _requestEtagJob is auto deleting itself on finish. Our guard pointer _requestEtagJob will then be null. } -void Folder::etagRetreived(const QString &etag) +void Folder::etagRetrieved(const QString &etag) { // re-enable sync if it was disabled because network was down FolderMan::instance()->setSyncEnabled(true); @@ -312,7 +312,7 @@ void Folder::etagRetreived(const QString &etag) _accountState->tagLastSuccessfullETagRequest(); } -void Folder::etagRetreivedFromSyncEngine(const QString &etag) +void Folder::etagRetrievedFromSyncEngine(const QString &etag) { qCInfo(lcFolder) << "Root etag from during sync:" << etag; accountState()->tagLastSuccessfullETagRequest(); diff --git a/src/gui/folder.h b/src/gui/folder.h index 93d213ae9..518353f6a 100644 --- a/src/gui/folder.h +++ b/src/gui/folder.h @@ -290,8 +290,8 @@ private slots: void slotItemCompleted(const SyncFileItemPtr &); void slotRunEtagJob(); - void etagRetreived(const QString &); - void etagRetreivedFromSyncEngine(const QString &); + void etagRetrieved(const QString &); + void etagRetrievedFromSyncEngine(const QString &); void slotEmitFinishedDelayed(); diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index bb5786ea9..081fc4d6e 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -110,7 +110,7 @@ bool RequestEtagJob::finished() } } } - emit etagRetreived(etag); + emit etagRetrieved(etag); } return true; } @@ -1027,7 +1027,7 @@ bool DeleteApiJob::finished() const auto replyData = QString::fromUtf8(reply()->readAll()); qCInfo(lcJsonApiJob()) << "TMX Delete Job" << replyData; emit result(httpStatus); - return true; + return true; } void fetchPrivateLinkUrl(AccountPtr account, const QString &remotePath, @@ -1063,4 +1063,3 @@ void fetchPrivateLinkUrl(AccountPtr account, const QString &remotePath, } } // namespace OCC - diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h index e6fdbcc8c..dbbc3e408 100644 --- a/src/libsync/networkjobs.h +++ b/src/libsync/networkjobs.h @@ -333,7 +333,7 @@ public: void start() override; signals: - void etagRetreived(const QString &etag); + void etagRetrieved(const QString &etag); private slots: bool finished() override;