summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-29 23:24:39 +0200
committerMontel Laurent <[email protected]>2017-09-29 23:24:39 +0200
commit9df71876c6cab2169250c7beeb977f3fa0440abc (patch)
tree72aab11f380d25bb82491e6c68a3b44da07f9459
parentb07b5af6f7b7c809dd050d404d50d9bcbe159198 (diff)
Port to new connect api + add parent to QDialogButtonBox
-rw-r--r--agents/archivemailagent/archivemaildialog.cpp2
-rw-r--r--agents/mailfilteragent/filterlogdialog.cpp2
-rw-r--r--src/editor/kmcomposerwin.cpp3
-rw-r--r--src/kmmainwin.cpp4
-rw-r--r--src/kmreaderwin.cpp2
-rw-r--r--src/kontactplugin/summary/kcmkontactsummary.cpp4
6 files changed, 8 insertions, 9 deletions
diff --git a/agents/archivemailagent/archivemaildialog.cpp b/agents/archivemailagent/archivemaildialog.cpp
index 8314aca..2b150c2 100644
--- a/agents/archivemailagent/archivemaildialog.cpp
+++ b/agents/archivemailagent/archivemaildialog.cpp
@@ -58,7 +58,7 @@ ArchiveMailDialog::ArchiveMailDialog(QWidget *parent)
mWidget->setObjectName(QStringLiteral("archivemailwidget"));
mainLayout->addWidget(mWidget);
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help);
+ QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help, this);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
diff --git a/agents/mailfilteragent/filterlogdialog.cpp b/agents/mailfilteragent/filterlogdialog.cpp
index db1f7e4..0e4a613 100644
--- a/agents/mailfilteragent/filterlogdialog.cpp
+++ b/agents/mailfilteragent/filterlogdialog.cpp
@@ -61,7 +61,7 @@ FilterLogDialog::FilterLogDialog(QWidget *parent)
{
setWindowTitle(i18n("Filter Log Viewer"));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
+ QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close, this);
mUser1Button = new QPushButton(this);
buttonBox->addButton(mUser1Button, QDialogButtonBox::ActionRole);
mUser2Button = new QPushButton(this);
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index ac6161c..42f8882 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -469,8 +469,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState
applyMainWindowSettings(KMKernel::self()->config()->group("Composer"));
connect(mEdtSubject, &PimCommon::LineEditWithAutoCorrection::textChanged, this, &KMComposerWin::slotUpdateWindowTitle);
- connect(identity, SIGNAL(identityChanged(uint)),
- SLOT(slotIdentityChanged(uint)));
+ connect(identity, &KIdentityManagement::IdentityCombo::identityChanged, [this](uint val) {slotIdentityChanged(val);});
connect(kmkernel->identityManager(), SIGNAL(changed(uint)),
SLOT(slotIdentityChanged(uint)));
diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
index 7e7b0d8..eaf94e6 100644
--- a/src/kmmainwin.cpp
+++ b/src/kmmainwin.cpp
@@ -81,8 +81,8 @@ KMMainWin::KMMainWin(QWidget *)
connect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg,
this, &KMMainWin::displayStatusMessage);
- connect(mKMMainWidget, SIGNAL(captionChangeRequest(QString)),
- SLOT(setCaption(QString)));
+ connect(mKMMainWidget, &KMMainWidget::captionChangeRequest,
+ this, QOverload<const QString &>::of(&KMainWindow::setCaption));
mKMMainWidget->updateQuickSearchLineText();
mHideMenuBarAction->setChecked(KMailSettings::self()->showMenuBar());
diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp
index 468079b..3349cfc 100644
--- a/src/kmreaderwin.cpp
+++ b/src/kmreaderwin.cpp
@@ -100,7 +100,7 @@ KMReaderWin::KMReaderWin(QWidget *aParent, QWidget *mainWindow, KActionCollectio
connect(mViewer, &MessageViewer::Viewer::showMessage, this, &KMReaderWin::slotShowMessage);
connect(mViewer, &MessageViewer::Viewer::showStatusBarMessage, this, &KMReaderWin::showStatusBarMessage);
connect(mViewer, &MessageViewer::Viewer::printingFinished, this, &KMReaderWin::slotPrintingFinished);
- connect(mViewer, SIGNAL(deleteMessage(Akonadi::Item)), this, SLOT(slotDeleteMessage(Akonadi::Item)));
+ connect(mViewer, QOverload<const Akonadi::Item &>::of(&Viewer::deleteMessage), this, &KMReaderWin::slotDeleteMessage);
mViewer->addMessageLoadedHandler(new MessageViewer::MarkMessageReadHandler(this));
mViewer->addMessageLoadedHandler(new MailCommon::SendMdnHandler(kmkernel, this));
diff --git a/src/kontactplugin/summary/kcmkontactsummary.cpp b/src/kontactplugin/summary/kcmkontactsummary.cpp
index 71a72ab..ce9df99 100644
--- a/src/kontactplugin/summary/kcmkontactsummary.cpp
+++ b/src/kontactplugin/summary/kcmkontactsummary.cpp
@@ -108,8 +108,8 @@ KCMKontactSummary::KCMKontactSummary(QWidget *parent)
layout->setStretchFactor(mPluginView, 1);
load();
- connect(mPluginView, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
- this, SLOT(changed()));
+ connect(mPluginView, &QTreeWidget::itemChanged,
+ this, QOverload<>::of(&KCMKontactSummary::changed));
KAboutData *about = new KAboutData(QStringLiteral("kontactsummary"),
i18n("kontactsummary"),