Commit ddd55c10 authored by Ahmad Samir's avatar Ahmad Samir
Browse files

Use new signal/slot syntax

Remove Q_PRIVATE_SLOT usage, now redundant.

NO_CHANGELOG
parent 9100f1eb
......@@ -59,7 +59,7 @@ void CommandHistory::createActions(KActionCollection *actionCollection)
undoAction->setIcon(standardAction->icon());
actionCollection->addAction(KStandardAction::name(KStandardAction::Undo), undoAction);
actionCollection->setDefaultShortcuts(undoAction, standardAction->shortcuts());
disconnect(undoAction, SIGNAL(triggered()), &d->m_undoStack, nullptr);
disconnect(undoAction, &QAction::triggered, &d->m_undoStack, nullptr);
connect(undoAction, &QAction::triggered, this, &CommandHistory::undo);
delete standardAction;
......@@ -68,7 +68,7 @@ void CommandHistory::createActions(KActionCollection *actionCollection)
redoAction->setIcon(standardAction->icon());
actionCollection->addAction(KStandardAction::name(KStandardAction::Redo), redoAction);
actionCollection->setDefaultShortcuts(redoAction, standardAction->shortcuts());
disconnect(redoAction, SIGNAL(triggered()), &d->m_undoStack, nullptr);
disconnect(redoAction, &QAction::triggered, &d->m_undoStack, nullptr);
connect(redoAction, &QAction::triggered, this, &CommandHistory::redo);
delete standardAction;
}
......
......@@ -78,8 +78,10 @@ KBookmarkModel::KBookmarkModel(const KBookmark& root, CommandHistory* commandHis
Q_ASSERT(bookmarkManager());
// update when the model updates after a D-Bus signal, coming from this
// process or from another one
connect(bookmarkManager(), SIGNAL(changed(QString,QString)),
this, SLOT(_kd_slotBookmarksChanged(QString,QString)));
connect(bookmarkManager(), &KBookmarkManager::changed,
this, [this](const QString &groupAddress, const QString &caller) {
d->_kd_slotBookmarksChanged(groupAddress, caller);
});
}
void KBookmarkModel::setRoot(const KBookmark& root)
......
......@@ -91,7 +91,6 @@ public Q_SLOTS:
private:
class Private;
Private * const d;
Q_PRIVATE_SLOT(d, void _kd_slotBookmarksChanged(const QString &groupAddress, const QString &caller = QString()))
};
#endif
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