[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [messagelib] /: Port to new connect api
From:       Montel Laurent <null () kde ! org>
Date:       2017-10-24 19:10:20
Message-ID: E1e74ai-0007Sv-1m () code ! kde ! org
[Download RAW message or body]

Git commit ac129fc2f505e9b5045752e6a8223448157c8177 by Montel Laurent.
Committed on 24/10/2017 at 19:10.
Pushed by mlaurent into branch 'master'.

Port to new connect api

M  +1    -2    messagelist/src/utils/aggregationconfigbutton.cpp
M  +3    -2    messageviewer/src/viewer/viewer_p.cpp
M  +1    -1    messageviewer/src/widgets/attachmentdialog.cpp

https://commits.kde.org/messagelib/ac129fc2f505e9b5045752e6a8223448157c8177

diff --git a/messagelist/src/utils/aggregationconfigbutton.cpp \
b/messagelist/src/utils/aggregationconfigbutton.cpp index 12065130..f17ae68b 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 a12591c9..9c1c2ae7 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 b0280290..e157b8ac 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);


[prev in list] [next in list] [prev in thread] [next in thread]