diff --git a/ui/widgets/dropdown_menu.cpp b/ui/widgets/dropdown_menu.cpp index 9e69974..fd54a1a 100644 --- a/ui/widgets/dropdown_menu.cpp +++ b/ui/widgets/dropdown_menu.cpp @@ -50,10 +50,6 @@ void DropdownMenu::init() { hide(); } -not_null DropdownMenu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) { - return _menu->addAction(text, receiver, member, icon, iconOver); -} - not_null DropdownMenu::addAction(const QString &text, Fn callback, const style::icon *icon, const style::icon *iconOver) { return _menu->addAction(text, std::move(callback), icon, iconOver); } diff --git a/ui/widgets/dropdown_menu.h b/ui/widgets/dropdown_menu.h index 27a9ded..abfbc03 100644 --- a/ui/widgets/dropdown_menu.h +++ b/ui/widgets/dropdown_menu.h @@ -18,7 +18,6 @@ class DropdownMenu : public InnerDropdown { public: DropdownMenu(QWidget *parent, const style::DropdownMenu &st = st::defaultDropdownMenu); - not_null addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); not_null addAction(const QString &text, Fn callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); not_null addSeparator(); void clearActions(); diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp index ac5c900..c97143d 100644 --- a/ui/widgets/labels.cpp +++ b/ui/widgets/labels.cpp @@ -637,12 +637,17 @@ void FlatLabel::showContextMenu(QContextMenuEvent *e, ContextMenuReason reason) _contextMenu = new PopupMenu(this); if (fullSelection && !_contextCopyText.isEmpty()) { - _contextMenu->addAction(_contextCopyText, this, SLOT(onCopyContextText())); + _contextMenu->addAction( + _contextCopyText, + [=] { onCopyContextText(); }); } else if (uponSelection && !fullSelection) { - const auto text = Integration::Instance().phraseContextCopySelected(); - _contextMenu->addAction(text, this, SLOT(onCopySelectedText())); + _contextMenu->addAction( + Integration::Instance().phraseContextCopySelected(), + [=] { onCopySelectedText(); }); } else if (_selectable && !hasSelection && !_contextCopyText.isEmpty()) { - _contextMenu->addAction(_contextCopyText, this, SLOT(onCopyContextText())); + _contextMenu->addAction( + _contextCopyText, + [=] { onCopyContextText(); }); } if (const auto link = ClickHandler::getActive()) { diff --git a/ui/widgets/menu.cpp b/ui/widgets/menu.cpp index 2605a8a..37bf5b7 100644 --- a/ui/widgets/menu.cpp +++ b/ui/widgets/menu.cpp @@ -95,12 +95,6 @@ void Menu::init() { } } -not_null Menu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) { - const auto action = addAction(new QAction(text, this), icon, iconOver); - connect(action, SIGNAL(triggered(bool)), receiver, member, Qt::QueuedConnection); - return action; -} - not_null Menu::addAction(const QString &text, Fn callback, const style::icon *icon, const style::icon *iconOver) { const auto action = addAction(new QAction(text, this), icon, iconOver); connect(action, &QAction::triggered, action, std::move(callback), Qt::QueuedConnection); diff --git a/ui/widgets/menu.h b/ui/widgets/menu.h index 2cf7347..4b9f338 100644 --- a/ui/widgets/menu.h +++ b/ui/widgets/menu.h @@ -22,7 +22,6 @@ public: Menu(QWidget *parent, QMenu *menu, const style::Menu &st = st::defaultMenu); ~Menu(); - not_null addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); not_null addAction(const QString &text, Fn callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); not_null addAction(const QString &text, std::unique_ptr submenu); not_null addSeparator(); diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp index de300ec..30285b9 100644 --- a/ui/widgets/popup_menu.cpp +++ b/ui/widgets/popup_menu.cpp @@ -88,10 +88,6 @@ void PopupMenu::handleMenuResize() { _inner = rect().marginsRemoved(_padding); } -not_null PopupMenu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) { - return _menu->addAction(text, receiver, member, icon, iconOver); -} - not_null PopupMenu::addAction(const QString &text, Fn callback, const style::icon *icon, const style::icon *iconOver) { return _menu->addAction(text, std::move(callback), icon, iconOver); } diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h index ca08f98..1a8e9f3 100644 --- a/ui/widgets/popup_menu.h +++ b/ui/widgets/popup_menu.h @@ -21,7 +21,6 @@ public: PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu); PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu); - not_null addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); not_null addAction(const QString &text, Fn callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr); not_null addAction(const QString &text, std::unique_ptr submenu); not_null addSeparator();