Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/folderwizard.cpp16
-rw-r--r--src/gui/folderwizard.h2
-rw-r--r--src/gui/owncloudsetupwizard.cpp14
-rw-r--r--src/gui/owncloudsetupwizard.h2
-rw-r--r--src/libsync/networkjobs.cpp6
-rw-r--r--src/libsync/networkjobs.h5
-rw-r--r--src/libsync/propagateremotemkdir.cpp5
-rw-r--r--src/libsync/propagateupload.h2
-rw-r--r--src/libsync/propagateuploadng.cpp8
9 files changed, 34 insertions, 26 deletions
diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index f0b6ca65b..582934e16 100644
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -203,21 +203,19 @@ void FolderWizardRemotePath::slotCreateRemoteFolder(const QString &folder)
MkColJob *job = new MkColJob(_account, fullPath, this);
/* check the owncloud configuration file and query the ownCloud */
- connect(job, static_cast<void (MkColJob::*)(QNetworkReply::NetworkError)>(&MkColJob::finished),
+ connect(job, &MkColJob::finishedWithoutError,
this, &FolderWizardRemotePath::slotCreateRemoteFolderFinished);
connect(job, &AbstractNetworkJob::networkError, this, &FolderWizardRemotePath::slotHandleMkdirNetworkError);
job->start();
}
-void FolderWizardRemotePath::slotCreateRemoteFolderFinished(QNetworkReply::NetworkError error)
+void FolderWizardRemotePath::slotCreateRemoteFolderFinished()
{
- if (error == QNetworkReply::NoError) {
- qCDebug(lcWizard) << "webdav mkdir request finished";
- showWarn(tr("Folder was successfully created on %1.").arg(Theme::instance()->appNameGUI()));
- slotRefreshFolders();
- _ui.folderEntry->setText(static_cast<MkColJob *>(sender())->path());
- slotLsColFolderEntry();
- }
+ qCDebug(lcWizard) << "webdav mkdir request finished";
+ showWarn(tr("Folder was successfully created on %1.").arg(Theme::instance()->appNameGUI()));
+ slotRefreshFolders();
+ _ui.folderEntry->setText(static_cast<MkColJob *>(sender())->path());
+ slotLsColFolderEntry();
}
void FolderWizardRemotePath::slotHandleMkdirNetworkError(QNetworkReply *reply)
diff --git a/src/gui/folderwizard.h b/src/gui/folderwizard.h
index 8dfed314f..251f4afd2 100644
--- a/src/gui/folderwizard.h
+++ b/src/gui/folderwizard.h
@@ -92,7 +92,7 @@ protected slots:
void showWarn(const QString & = QString()) const;
void slotAddRemoteFolder();
void slotCreateRemoteFolder(const QString &);
- void slotCreateRemoteFolderFinished(QNetworkReply::NetworkError error);
+ void slotCreateRemoteFolderFinished();
void slotHandleMkdirNetworkError(QNetworkReply *);
void slotHandleLsColNetworkError(QNetworkReply *);
void slotUpdateDirectories(const QStringList &);
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index 515e6128f..a6ac9bd7e 100644
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -336,21 +336,23 @@ void OwncloudSetupWizard::createRemoteFolder()
qCDebug(lcWizard) << "creating folder on ownCloud:" << _remoteFolder;
MkColJob *job = new MkColJob(_ocWizard->account(), _remoteFolder, this);
- connect(job, SIGNAL(finished(QNetworkReply::NetworkError)), SLOT(slotCreateRemoteFolderFinished(QNetworkReply::NetworkError)));
+ connect(job, &MkColJob::finishedWithError, this, &OwncloudSetupWizard::slotCreateRemoteFolderFinished);
+ connect(job, &MkColJob::finishedWithoutError, this, [this] {
+ qCDebug(lcWizard) << "Remote folder" << _remoteFolder << "created successfully.";
+ finalizeSetup(true);
+ });
job->start();
}
-void OwncloudSetupWizard::slotCreateRemoteFolderFinished(QNetworkReply::NetworkError error)
+void OwncloudSetupWizard::slotCreateRemoteFolderFinished(QNetworkReply *reply)
{
+ auto error = reply->error();
qCDebug(lcWizard) << "** webdav mkdir request finished " << error;
// disconnect(ownCloudInfo::instance(), SIGNAL(webdavColCreated(QNetworkReply::NetworkError)),
// this, SLOT(slotCreateRemoteFolderFinished(QNetworkReply::NetworkError)));
bool success = true;
-
- if (error == QNetworkReply::NoError) {
- qCDebug(lcWizard) << "Remote folder" << _remoteFolder << "created successfully.";
- } else if (error == 202) {
+ if (error == 202) {
qCDebug(lcWizard) << "The remote folder" << _remoteFolder << "already exists. Connecting it for syncing.";
} else if (error > 202 && error < 300) {
_ocWizard->displayError(tr("The folder creation resulted in HTTP error code %1").arg((int)error));
diff --git a/src/gui/owncloudsetupwizard.h b/src/gui/owncloudsetupwizard.h
index eac6a368d..2aa235fa5 100644
--- a/src/gui/owncloudsetupwizard.h
+++ b/src/gui/owncloudsetupwizard.h
@@ -60,7 +60,7 @@ private slots:
void slotCreateLocalAndRemoteFolders(const QString &, const QString &);
void slotRemoteFolderExists(QNetworkReply *);
- void slotCreateRemoteFolderFinished(QNetworkReply::NetworkError);
+ void slotCreateRemoteFolderFinished(QNetworkReply *reply);
void slotAssistantFinished(int);
private:
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index da4362792..ef2c7797c 100644
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -168,7 +168,11 @@ bool MkColJob::finished()
qCInfo(lcMkColJob) << "MKCOL of" << reply()->request().url() << "FINISHED WITH STATUS"
<< replyStatusString();
- emit finished(reply()->error());
+ if (reply()->error() != QNetworkReply::NoError) {
+ Q_EMIT finishedWithError(reply());
+ } else {
+ Q_EMIT finishedWithoutError();
+ }
return true;
}
diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h
index 7fe4970f7..002026b56 100644
--- a/src/libsync/networkjobs.h
+++ b/src/libsync/networkjobs.h
@@ -241,9 +241,10 @@ public:
void start() override;
signals:
- void finished(QNetworkReply::NetworkError);
+ void finishedWithError(QNetworkReply *reply);
+ void finishedWithoutError();
-private slots:
+private:
bool finished() override;
};
diff --git a/src/libsync/propagateremotemkdir.cpp b/src/libsync/propagateremotemkdir.cpp
index 56925ca00..6bec9733e 100644
--- a/src/libsync/propagateremotemkdir.cpp
+++ b/src/libsync/propagateremotemkdir.cpp
@@ -42,7 +42,7 @@ void PropagateRemoteMkdir::start()
_job = new DeleteJob(propagator()->account(),
propagator()->fullRemotePath(_item->_file),
this);
- connect(_job, SIGNAL(finishedSignal()), SLOT(slotStartMkcolJob()));
+ connect(qobject_cast<DeleteJob *>(_job), &DeleteJob::finishedSignal, this, &PropagateRemoteMkdir::slotStartMkcolJob);
_job->start();
}
@@ -56,7 +56,8 @@ void PropagateRemoteMkdir::slotStartMkcolJob()
_job = new MkColJob(propagator()->account(),
propagator()->fullRemotePath(_item->_file),
this);
- connect(_job, SIGNAL(finished(QNetworkReply::NetworkError)), this, SLOT(slotMkcolJobFinished()));
+ connect(qobject_cast<MkColJob *>(_job), &MkColJob::finishedWithError, this, &PropagateRemoteMkdir::slotMkcolJobFinished);
+ connect(qobject_cast<MkColJob *>(_job), &MkColJob::finishedWithoutError, this, &PropagateRemoteMkdir::slotMkcolJobFinished);
_job->start();
}
diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h
index 5c8d8daee..720c0d8a5 100644
--- a/src/libsync/propagateupload.h
+++ b/src/libsync/propagateupload.h
@@ -390,7 +390,7 @@ private slots:
void slotPropfindFinishedWithError();
void slotPropfindIterate(const QString &name, const QMap<QString, QString> &properties);
void slotDeleteJobFinished();
- void slotMkColFinished(QNetworkReply::NetworkError);
+ void slotMkColFinished();
void slotPutFinished();
void slotMoveJobFinished();
void slotUploadProgress(qint64, qint64);
diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp
index 95f8836ec..bcc544d9c 100644
--- a/src/libsync/propagateuploadng.cpp
+++ b/src/libsync/propagateuploadng.cpp
@@ -290,13 +290,15 @@ void PropagateUploadFileNG::startNewUpload()
QMap<QByteArray, QByteArray> headers;
headers["OC-Total-Length"] = QByteArray::number(_item->_size);
auto job = new MkColJob(propagator()->account(), chunkUrl(), headers, this);
- connect(job, SIGNAL(finished(QNetworkReply::NetworkError)),
- this, SLOT(slotMkColFinished(QNetworkReply::NetworkError)));
+ connect(job, &MkColJob::finishedWithError,
+ this, &PropagateUploadFileNG::slotMkColFinished);
+ connect(job, &MkColJob::finishedWithoutError,
+ this, &PropagateUploadFileNG::slotMkColFinished);
connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed);
job->start();
}
-void PropagateUploadFileNG::slotMkColFinished(QNetworkReply::NetworkError)
+void PropagateUploadFileNG::slotMkColFinished()
{
propagator()->_activeJobList.removeOne(this);
auto job = qobject_cast<MkColJob *>(sender());
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 08:25:26 +0300