Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Network
Konversation
Commits
f8764a9c
Commit
f8764a9c
authored
Oct 14, 2021
by
Marco Rebhan
Committed by
Albert Astals Cid
Nov 04, 2021
Browse files
Remove teardown function since there will only be one main menu
parent
51e6ab4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/mainwindow.cpp
View file @
f8764a9c
...
...
@@ -571,7 +571,6 @@ MainWindow::MainWindow() : KXmlGuiWindow(nullptr)
MainWindow
::~
MainWindow
()
{
IrcContextMenus
::
self
()
->
teardown
();
}
QSize
MainWindow
::
sizeHint
()
const
...
...
src/viewer/irccontextmenus.cpp
View file @
f8764a9c
...
...
@@ -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
;
...
...
src/viewer/irccontextmenus.h
View file @
f8764a9c
...
...
@@ -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
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment