diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2017-09-20 11:14:48 +0300 |
---|---|---|
committer | Olivier Goffart <olivier@woboq.com> | 2017-09-21 15:05:39 +0300 |
commit | ff4213b59f223b60e87e70af2db6201986f76df8 (patch) | |
tree | 98398cd1a1014b9ef1c47457b9139ccf3a546ace /src/gui/sharemanager.cpp | |
parent | c4e51247d833d4f08df7036fe4a7823a6f6e0ff6 (diff) |
Use the Qt5 connection syntax (automated with clazy)
This is motivated by the fact that QMetaObject::noralizeSignature takes 7.35%
CPU of the LargeSyncBench. (Mostly from ABstractNetworkJob::setupConnections and
PropagateUploadFileV1::startNextChunk). It could be fixed by using normalized
signature in the connection statement, but i tought it was a good oportunity
to modernize the code.
This commit only contains calls that were automatically converted with clazy.
Diffstat (limited to 'src/gui/sharemanager.cpp')
-rw-r--r-- | src/gui/sharemanager.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp index 37c39839f..95a976451 100644 --- a/src/gui/sharemanager.cpp +++ b/src/gui/sharemanager.cpp @@ -72,8 +72,8 @@ QSharedPointer<Sharee> Share::getShareWith() const void Share::setPermissions(Permissions permissions) { OcsShareJob *job = new OcsShareJob(_account); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotPermissionsSet(QJsonDocument, QVariant))); - connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotOcsError(int, QString))); + connect(job, &OcsShareJob::shareJobFinished, this, &Share::slotPermissionsSet); + connect(job, &OcsJob::ocsError, this, &Share::slotOcsError); job->setPermissions(getId(), permissions); } @@ -91,8 +91,8 @@ Share::Permissions Share::getPermissions() const void Share::deleteShare() { OcsShareJob *job = new OcsShareJob(_account); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotDeleted())); - connect(job, SIGNAL(ocsError(int, const QString &)), SLOT(slotOcsError(int, const QString &))); + connect(job, &OcsShareJob::shareJobFinished, this, &Share::slotDeleted); + connect(job, &OcsJob::ocsError, this, &Share::slotOcsError); job->deleteShare(getId()); } @@ -164,8 +164,8 @@ QString LinkShare::getName() const void LinkShare::setName(const QString &name) { OcsShareJob *job = new OcsShareJob(_account); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotNameSet(QJsonDocument, QVariant))); - connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotOcsError(int, QString))); + connect(job, &OcsShareJob::shareJobFinished, this, &LinkShare::slotNameSet); + connect(job, &OcsJob::ocsError, this, &LinkShare::slotOcsError); job->setName(getId(), name); } @@ -177,8 +177,8 @@ QString LinkShare::getToken() const void LinkShare::setPassword(const QString &password) { OcsShareJob *job = new OcsShareJob(_account); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotPasswordSet(QJsonDocument, QVariant))); - connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotSetPasswordError(int, QString))); + connect(job, &OcsShareJob::shareJobFinished, this, &LinkShare::slotPasswordSet); + connect(job, &OcsJob::ocsError, this, &LinkShare::slotSetPasswordError); job->setPassword(getId(), password); } @@ -191,8 +191,8 @@ void LinkShare::slotPasswordSet(const QJsonDocument &, const QVariant &value) void LinkShare::setExpireDate(const QDate &date) { OcsShareJob *job = new OcsShareJob(_account); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotExpireDateSet(QJsonDocument, QVariant))); - connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotOcsError(int, QString))); + connect(job, &OcsShareJob::shareJobFinished, this, &LinkShare::slotExpireDateSet); + connect(job, &OcsJob::ocsError, this, &LinkShare::slotOcsError); job->setExpireDate(getId(), date); } @@ -234,8 +234,8 @@ void ShareManager::createLinkShare(const QString &path, const QString &password) { OcsShareJob *job = new OcsShareJob(_account); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotLinkShareCreated(QJsonDocument))); - connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotOcsError(int, QString))); + connect(job, &OcsShareJob::shareJobFinished, this, &ShareManager::slotLinkShareCreated); + connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError); job->createLinkShare(path, name, password); } @@ -276,8 +276,8 @@ void ShareManager::createShare(const QString &path, continuation.permissions = permissions; _jobContinuation[job] = QVariant::fromValue(continuation); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotCreateShare(QJsonDocument))); - connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotOcsError(int, QString))); + connect(job, &OcsShareJob::shareJobFinished, this, &ShareManager::slotCreateShare); + connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError); job->getSharedWithMe(); } @@ -308,8 +308,8 @@ void ShareManager::slotCreateShare(const QJsonDocument &reply) } OcsShareJob *job = new OcsShareJob(_account); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotShareCreated(QJsonDocument))); - connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotOcsError(int, QString))); + connect(job, &OcsShareJob::shareJobFinished, this, &ShareManager::slotShareCreated); + connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError); job->createShare(cont.path, cont.shareType, cont.shareWith, cont.permissions); } @@ -325,8 +325,8 @@ void ShareManager::slotShareCreated(const QJsonDocument &reply) void ShareManager::fetchShares(const QString &path) { OcsShareJob *job = new OcsShareJob(_account); - connect(job, SIGNAL(shareJobFinished(QJsonDocument, QVariant)), SLOT(slotSharesFetched(QJsonDocument))); - connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotOcsError(int, QString))); + connect(job, &OcsShareJob::shareJobFinished, this, &ShareManager::slotSharesFetched); + connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError); job->getShares(path); } |