Commit 6f081680 authored by Felipe Borges's avatar Felipe Borges Committed by Christoph Cullmann
Browse files

Removing manual assingment of the KProject caught from the


session.
Signed-off-by: Felipe Borges's avatarFelipe Borges <bumbleblo2013@gmail.com>
parent c6d41320
......@@ -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));
}
}
......
Markdown is supported
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