diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2018-01-23 16:08:15 +0300 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2018-01-23 16:08:15 +0300 |
commit | 72b9beb79c09c41ee08d6a032241e27579d32c88 (patch) | |
tree | 1cd0d40770bd8bda640cbdc8e7e779251c59c884 /src/gui/sharelinkwidget.cpp | |
parent | 883080b55786ac21cbac973ee381ebc3d08f58aa (diff) | |
parent | 72363155d86b4b51b1bfbd75c7a4a19fed3f8ee9 (diff) |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
shell_integration/nautilus/syncstate.py
Diffstat (limited to 'src/gui/sharelinkwidget.cpp')
-rw-r--r-- | src/gui/sharelinkwidget.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp index 6d740fa5c..0d938bd3d 100644 --- a/src/gui/sharelinkwidget.cpp +++ b/src/gui/sharelinkwidget.cpp @@ -224,11 +224,10 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar // Connect all shares signals to gui slots connect(share.data(), &Share::serverError, this, &ShareLinkWidget::slotServerError); connect(share.data(), &Share::shareDeleted, this, &ShareLinkWidget::slotDeleteShareFetched); - connect(share.data(), SIGNAL(expireDateSet()), SLOT(slotExpireSet())); - connect(share.data(), SIGNAL(publicUploadSet()), SLOT(slotPermissionsSet())); - connect(share.data(), SIGNAL(passwordSet()), SLOT(slotPasswordSet())); - connect(share.data(), SIGNAL(passwordSetError(int, QString)), SLOT(slotPasswordSetError(int, QString))); connect(share.data(), &Share::permissionsSet, this, &ShareLinkWidget::slotPermissionsSet); + connect(linkShare.data(), &LinkShare::expireDateSet, this, &ShareLinkWidget::slotExpireSet); + connect(linkShare.data(), &LinkShare::passwordSet, this, &ShareLinkWidget::slotPasswordSet); + connect(linkShare.data(), &LinkShare::passwordSetError, this, &ShareLinkWidget::slotPasswordSetError); // Build the table row auto row = table->rowCount(); |