Commit f8764a9c authored by Marco Rebhan's avatar Marco Rebhan Committed by Albert Astals Cid
Browse files

Remove teardown function since there will only be one main menu

parent 51e6ab4b
......@@ -571,7 +571,6 @@ MainWindow::MainWindow() : KXmlGuiWindow(nullptr)
MainWindow::~MainWindow()
{
IrcContextMenus::self()->teardown();
}
QSize MainWindow::sizeHint() const
......
......@@ -70,32 +70,6 @@ void IrcContextMenus::setupUi(QWidget* parent)
updateQuickButtonMenu();
}
void IrcContextMenus::teardown()
{
disconnect(this, nullptr, nullptr, nullptr);
m_parent = nullptr;
m_quickButtonMenu = nullptr;
m_textMenu = nullptr;
m_textCopyAction = nullptr;
m_textActionsSeparator = nullptr;
m_linkActions.clear();
m_webShortcutsMenu = nullptr;
m_channelMenu = nullptr;
m_nickMenu = nullptr;
m_sharedBasicNickActions.clear();
m_modesMenu = nullptr;
m_kickBanMenu = nullptr;
m_sharedNickSettingsActions.clear();
m_ignoreAction = nullptr;
m_unignoreAction = nullptr;
m_addNotifyAction = nullptr;
m_removeNotifyAction = nullptr;
m_sharedDccActions.clear();
m_topicHistoryMenu = nullptr;
m_queryTopicAuthorAction = nullptr;
}
IrcContextMenus* IrcContextMenus::self()
{
return &s_ircContextMenusPrivate->instance;
......
......@@ -57,9 +57,8 @@ class IrcContextMenus : public QObject
~IrcContextMenus() override = default;
static IrcContextMenus* self();
void setupUi(QWidget* parent);
void teardown();
static int textMenu(const QPoint& pos, MenuOptions options, Server* server,
const QString& selectedText, const QString& link, const QString& nick = QString());
......
Supports Markdown
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