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
Utilities
Kate
Commits
b96ca726
Commit
b96ca726
authored
Apr 25, 2021
by
Waqar Ahmed
Committed by
Christoph Cullmann
Apr 26, 2021
Browse files
Fix leaks in KateConfigDialog
Signed-off-by:
Waqar Ahmed
<
waqar.17a@gmail.com
>
parent
2626a9eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
kate/kateconfigdialog.cpp
View file @
b96ca726
...
...
@@ -280,13 +280,13 @@ void KateConfigDialog::addPluginPage(KTextEditor::Plugin *plugin)
item
->
setHeader
(
cp
->
fullName
());
item
->
setIcon
(
cp
->
icon
());
PluginPageListItem
*
info
=
new
PluginPageListItem
;
info
->
plugin
=
plugin
;
info
->
pageParent
=
page
;
info
->
pluginPage
=
cp
;
info
->
idInPlugin
=
i
;
info
->
pageWidgetItem
=
item
;
connect
(
info
->
pluginPage
,
&
KTextEditor
::
ConfigPage
::
changed
,
this
,
&
KateConfigDialog
::
slotChanged
);
PluginPageListItem
info
;
info
.
plugin
=
plugin
;
info
.
pageParent
=
page
;
info
.
pluginPage
=
cp
;
info
.
idInPlugin
=
i
;
info
.
pageWidgetItem
=
item
;
connect
(
info
.
pluginPage
,
&
KTextEditor
::
ConfigPage
::
changed
,
this
,
&
KateConfigDialog
::
slotChanged
);
m_pluginPages
.
insert
(
item
,
info
);
}
}
...
...
@@ -294,12 +294,10 @@ void KateConfigDialog::addPluginPage(KTextEditor::Plugin *plugin)
void
KateConfigDialog
::
removePluginPage
(
KTextEditor
::
Plugin
*
plugin
)
{
QList
<
KPageWidgetItem
*>
remove
;
for
(
QHash
<
KPageWidgetItem
*
,
PluginPageListItem
*>::
const_iterator
it
=
m_pluginPages
.
constBegin
();
it
!=
m_pluginPages
.
constEnd
();
++
it
)
{
PluginPageListItem
*
pli
=
it
.
value
();
if
(
!
pli
)
{
continue
;
}
if
(
pli
->
plugin
==
plugin
)
{
for
(
QHash
<
KPageWidgetItem
*
,
PluginPageListItem
>::
const_iterator
it
=
m_pluginPages
.
constBegin
();
it
!=
m_pluginPages
.
constEnd
();
++
it
)
{
const
PluginPageListItem
&
pli
=
it
.
value
();
if
(
pli
.
plugin
==
plugin
)
{
remove
.
append
(
it
.
key
());
}
}
...
...
@@ -307,11 +305,10 @@ void KateConfigDialog::removePluginPage(KTextEditor::Plugin *plugin)
qCDebug
(
LOG_KATE
)
<<
remove
.
count
();
while
(
!
remove
.
isEmpty
())
{
KPageWidgetItem
*
wItem
=
remove
.
takeLast
();
PluginPageListItem
*
pI
tem
=
m_pluginPages
.
take
(
wItem
);
delete
pI
tem
->
pluginPage
;
delete
pI
tem
->
pageParent
;
PluginPageListItem
i
tem
=
m_pluginPages
.
take
(
wItem
);
delete
i
tem
.
pluginPage
;
delete
i
tem
.
pageParent
;
removePage
(
wItem
);
delete
pItem
;
}
}
...
...
@@ -385,12 +382,9 @@ void KateConfigDialog::slotApply()
#endif
}
for
(
PluginPageListItem
*
plugin
:
qAsConst
(
m_pluginPages
))
{
if
(
!
plugin
)
{
continue
;
}
if
(
plugin
->
pluginPage
)
{
plugin
->
pluginPage
->
apply
();
for
(
const
PluginPageListItem
&
plugin
:
qAsConst
(
m_pluginPages
))
{
if
(
plugin
.
pluginPage
)
{
plugin
.
pluginPage
->
apply
();
}
}
...
...
@@ -418,9 +412,9 @@ void KateConfigDialog::slotChanged()
void
KateConfigDialog
::
showAppPluginPage
(
KTextEditor
::
Plugin
*
p
,
int
id
)
{
for
(
PluginPageListItem
*
plugin
:
qAsConst
(
m_pluginPages
))
{
if
((
plugin
->
plugin
==
p
)
&&
(
id
==
plugin
->
idInPlugin
))
{
setCurrentPage
(
plugin
->
pageWidgetItem
);
for
(
const
PluginPageListItem
&
plugin
:
qAsConst
(
m_pluginPages
))
{
if
((
plugin
.
plugin
==
p
)
&&
(
id
==
plugin
.
idInPlugin
))
{
setCurrentPage
(
plugin
.
pageWidgetItem
);
break
;
}
}
...
...
kate/kateconfigdialog.h
View file @
b96ca726
...
...
@@ -89,7 +89,7 @@ private:
Ui
::
SessionConfigWidget
sessionConfigUi
;
QHash
<
KPageWidgetItem
*
,
PluginPageListItem
*
>
m_pluginPages
;
QHash
<
KPageWidgetItem
*
,
PluginPageListItem
>
m_pluginPages
;
QList
<
KTextEditor
::
ConfigPage
*>
m_editorPages
;
#ifdef WITH_KUSERFEEDBACK
...
...
Write
Preview
Markdown
is supported
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