summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-10-24 21:10:09 +0200
committerMontel Laurent <[email protected]>2017-10-24 21:10:09 +0200
commitac129fc2f505e9b5045752e6a8223448157c8177 (patch)
tree64fd3973226070885c1b6acaa51e8ac6190a4184
parenta6355ff75a691cfb390bfd9389ae727509544639 (diff)
Port to new connect api
-rw-r--r--messagelist/src/utils/aggregationconfigbutton.cpp3
-rw-r--r--messageviewer/src/viewer/viewer_p.cpp5
-rw-r--r--messageviewer/src/widgets/attachmentdialog.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/messagelist/src/utils/aggregationconfigbutton.cpp b/messagelist/src/utils/aggregationconfigbutton.cpp
index 1206513..f17ae68 100644
--- a/messagelist/src/utils/aggregationconfigbutton.cpp
+++ b/messagelist/src/utils/aggregationconfigbutton.cpp
@@ -49,8 +49,7 @@ AggregationConfigButton::AggregationConfigButton(QWidget *parent, const Aggregat
, d(new AggregationConfigButtonPrivate(this))
{
d->mAggregationComboBox = aggregationComboBox;
- connect(this, SIGNAL(pressed()),
- this, SLOT(slotConfigureAggregations()));
+ connect(this, &AggregationConfigButton::pressed, this, [this]() { d->slotConfigureAggregations(); });
// Keep aggregation combo up-to-date with any changes made in the configure dialog.
if (d->mAggregationComboBox != nullptr) {
diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index a12591c..9c1c2ae 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -1697,9 +1697,10 @@ void ViewerPrivate::createActions()
//
// copy selected text to clipboard
- mCopyAction = ac->addAction(KStandardAction::Copy, QStringLiteral("kmail_copy"), this,
- SLOT(slotCopySelectedText()));
+ mCopyAction = ac->addAction(KStandardAction::Copy, QStringLiteral("kmail_copy"));
mCopyAction->setText(i18n("Copy Text"));
+ connect(mCopyAction, &QAction::triggered, this, &ViewerPrivate::slotCopySelectedText);
+
connect(mViewer, &MailWebEngineView::selectionChanged,
this, &ViewerPrivate::viewerSelectionChanged);
viewerSelectionChanged();
diff --git a/messageviewer/src/widgets/attachmentdialog.cpp b/messageviewer/src/widgets/attachmentdialog.cpp
index b028029..e157b8a 100644
--- a/messageviewer/src/widgets/attachmentdialog.cpp
+++ b/messageviewer/src/widgets/attachmentdialog.cpp
@@ -42,7 +42,7 @@ AttachmentDialog::AttachmentDialog(QWidget *parent, const QString &filenameText,
dialog = new QDialog(parent);
dialog->setWindowTitle(i18n("Open Attachment?"));
dialog->setObjectName(QStringLiteral("attachmentSaveOpen"));
- mButtonBox = new QDialogButtonBox(QDialogButtonBox::Cancel);
+ mButtonBox = new QDialogButtonBox(QDialogButtonBox::Cancel, dialog);
QPushButton *user1Button = new QPushButton;
mButtonBox->addButton(user1Button, QDialogButtonBox::ActionRole);
dialog->connect(mButtonBox, &QDialogButtonBox::accepted, dialog, &QDialog::accept);