Skip to content
GitLab
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
6f081680
Commit
6f081680
authored
Feb 15, 2022
by
Felipe Borges
Committed by
Christoph Cullmann
Mar 11, 2022
Browse files
Removing manual assingment of the KProject caught from the
session. Signed-off-by:
Felipe Borges
<
bumbleblo2013@gmail.com
>
parent
c6d41320
Changes
1
Hide whitespace changes
Inline
Side-by-side
addons/project/kateprojectplugin.cpp
View file @
6f081680
...
...
@@ -123,14 +123,7 @@ KateProjectPlugin::~KateProjectPlugin()
unregisterVariables
();
for
(
KateProject
*
project
:
qAsConst
(
m_projects
))
{
<<<<<<<
HEAD
delete
project
;
=======
if
(
!
QFileInfo
(
project
->
fileName
()).
canonicalPath
().
isEmpty
()){
m_fileWatcher
.
removePath
(
QFileInfo
(
project
->
fileName
()).
canonicalPath
());
delete
project
;
}
>>>>>>>
e1da932a6
(
fixing
path
removal
when
closing
project
)
}
m_projects
.
clear
();
}
...
...
@@ -256,16 +249,8 @@ bool KateProjectPlugin::closeProject(KateProject *project)
Q_EMIT
pluginViewProjectClosing
(
project
);
if
(
m_projects
.
removeOne
(
project
))
{
<<<<<<<
HEAD
delete
project
;
return
true
;
=======
if
(
!
QFileInfo
(
project
->
fileName
()).
canonicalPath
().
isEmpty
()){
m_fileWatcher
.
removePath
(
QFileInfo
(
project
->
fileName
()).
canonicalPath
());
delete
project
;
return
true
;
}
>>>>>>>
e1da932a6
(
fixing
path
removal
when
closing
project
)
}
return
false
;
...
...
@@ -597,10 +582,7 @@ void KateProjectPlugin::readSessionConfig(const KConfigGroup &config)
const
QStringList
projectList
=
config
.
readEntry
(
"projects"
,
QStringList
());
for
(
const
QString
&
project
:
projectList
)
{
KateProject
*
pProject
=
createProjectForDirectory
(
QDir
(
project
));
if
(
pProject
!=
nullptr
)
m_projects
.
append
(
pProject
);
createProjectForDirectory
(
QDir
(
project
));
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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