Commit c5be8cab authored by Laurent Montel's avatar Laurent Montel 😁

Port to new connect api

parent a1bb01c2
...@@ -150,8 +150,7 @@ Pane::Pane(bool restoreSession, QAbstractItemModel *model, QItemSelectionModel * ...@@ -150,8 +150,7 @@ Pane::Pane(bool restoreSession, QAbstractItemModel *model, QItemSelectionModel *
d->mNewTabButton->setAccessibleName(i18n("New tab")); d->mNewTabButton->setAccessibleName(i18n("New tab"));
#endif #endif
setCornerWidget(d->mNewTabButton, Qt::TopLeftCorner); setCornerWidget(d->mNewTabButton, Qt::TopLeftCorner);
connect(d->mNewTabButton, SIGNAL(clicked()), connect(d->mNewTabButton, &QToolButton::clicked, this, [this]() { d->onNewTabClicked(); });
SLOT(onNewTabClicked()));
d->mCloseTabButton = new QToolButton(this); d->mCloseTabButton = new QToolButton(this);
d->mCloseTabButton->setIcon(QIcon::fromTheme(QStringLiteral("tab-close"))); d->mCloseTabButton->setIcon(QIcon::fromTheme(QStringLiteral("tab-close")));
...@@ -242,7 +241,7 @@ void Pane::setXmlGuiClient(KXMLGUIClient *xmlGuiClient) ...@@ -242,7 +241,7 @@ void Pane::setXmlGuiClient(KXMLGUIClient *xmlGuiClient)
QAction *action = new QAction(i18n("Create New Tab"), this); QAction *action = new QAction(i18n("Create New Tab"), this);
d->mXmlGuiClient->actionCollection()->addAction(QStringLiteral("create_new_tab"), action); d->mXmlGuiClient->actionCollection()->addAction(QStringLiteral("create_new_tab"), action);
d->mXmlGuiClient->actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_O)); d->mXmlGuiClient->actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_O));
connect(action, SIGNAL(triggered(bool)), SLOT(onNewTabClicked())); connect(action, &QAction::triggered, this, [this]() { d->onNewTabClicked(); });
d->mActionMenu->addAction(action); d->mActionMenu->addAction(action);
d->mMaxTabCreated = count(); d->mMaxTabCreated = count();
......
...@@ -433,7 +433,6 @@ private: ...@@ -433,7 +433,6 @@ private:
void readConfig(bool restoreSession); void readConfig(bool restoreSession);
Q_PRIVATE_SLOT(d, void onSelectionChanged(const QItemSelection &, const QItemSelection &)) Q_PRIVATE_SLOT(d, void onSelectionChanged(const QItemSelection &, const QItemSelection &))
Q_PRIVATE_SLOT(d, void onNewTabClicked())
Q_PRIVATE_SLOT(d, void onCloseTabClicked()) Q_PRIVATE_SLOT(d, void onCloseTabClicked())
Q_PRIVATE_SLOT(d, void activateTab()) Q_PRIVATE_SLOT(d, void activateTab())
Q_PRIVATE_SLOT(d, void moveTabLeft()) Q_PRIVATE_SLOT(d, void moveTabLeft())
......
...@@ -63,8 +63,8 @@ bool VerifyOpaqueBodyPartMemento::start() ...@@ -63,8 +63,8 @@ bool VerifyOpaqueBodyPartMemento::start()
#endif #endif
return false; return false;
} }
connect(m_job, SIGNAL(result(GpgME::VerificationResult,QByteArray)), connect(m_job.data(), &VerifyOpaqueJob::result,
this, SLOT(slotResult(GpgME::VerificationResult,QByteArray))); this, &VerifyOpaqueBodyPartMemento::slotResult);
setRunning(true); setRunning(true);
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment