Merge lp:~elgaton/ubuntu/precise/kile/fix-for-994498 into lp:ubuntu/precise/kile

[Alessandro Menti]

Backported patch from upstream to prevent crashes when Kile is closed and a project file is open

[lp:~elgaton/ubuntu/precise/kile/fix-for-994498]

49. By Alessandro Menti on 2012-08-25

* Added missing .pc files

[Marc Deslauriers (mdeslaur)]

I've uploaded a slightly modified version of this merge request to precise-proposed for processing by the SRU team. Thanks!

review: Approve

Unmerged revisions

49. By Alessandro Menti on 2012-08-25

* Added missing .pc files

48. By Alessandro Menti <email address hidden> on 2012-08-07

* Fixed wrong distribution in the changelog

47. By Alessandro Menti <email address hidden> on 2012-08-07

* Added missing patch

46. By Alessandro Menti <email address hidden> on 2012-08-07

Fixed segfault on close when a project is open (LP: #994498). Patch by
Eugene Shalygin.

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-08-25 08:51:18 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-08-25 08:51:18 +0000
@@ -0,0 +1,1 @@
+series
 
=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-04-16 00:46:18 +0000
+++ .pc/applied-patches	2012-08-25 08:51:18 +0000
@@ -3,3 +3,4 @@
 kubuntu_01_improved_viewpart_warning.diff
 kubuntu_02_disable_embedded_kbibtex.diff
 kubuntu_use_utf8.diff
+kile-fix-closing-994498.patch
 
=== added directory '.pc/kile-fix-closing-994498.patch'
=== added directory '.pc/kile-fix-closing-994498.patch/src'
=== added file '.pc/kile-fix-closing-994498.patch/src/kiledocmanager.cpp'
--- .pc/kile-fix-closing-994498.patch/src/kiledocmanager.cpp	1970-01-01 00:00:00 +0000
+++ .pc/kile-fix-closing-994498.patch/src/kiledocmanager.cpp	2012-08-25 08:51:18 +0000
@@ -0,0 +1,2382 @@
+/*****************************************************************************
+*   Copyright (C) 2004 by Jeroen Wijnhout ([e-mail])      *
+*             (C) 2006-2010 by Michel Ludwig ([e-mail])     *
+*             (C) 2007 by Holger Danielsson ([e-mail])  *
+******************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+// 2007-03-12 dani
+//  - use KileDocument::Extensions
+
+#include "kiledocmanager.h"
+
+#include <QAbstractItemView>
+
+#include <QTextCodec>
+#include <QFile>
+#include <QDir>
+
+#include <QList>
+#include <QDropEvent>
+
+#include <KTextEditor/Document>
+#include <KTextEditor/Editor>
+#include <KTextEditor/EditorChooser>
+#include <KTextEditor/SessionConfigInterface>
+#include <KTextEditor/View>
+#include <kapplication.h>
+#include "kiledebug.h"
+#include <KEncodingFileDialog>
+#include <KLocale>
+#include <KMimeType>
+#include <kmessagebox.h>
+#include <KProgressDialog>
+#include <kfile.h>
+#include <krun.h>
+#include <kstandarddirs.h>
+#include <kio/netaccess.h>
+#include <kpushbutton.h>
+#include <kurl.h>
+#include <kfileitem.h>
+
+#include "templates.h"
+#include "dialogs/newfilewizard.h"
+#include "dialogs/managetemplatesdialog.h"
+#include "kileinfo.h"
+#include "scriptmanager.h"
+#include "kileproject.h"
+#include "documentinfo.h"
+#include "kileviewmanager.h"
+#include "widgets/filebrowserwidget.h"
+#include "widgets/projectview.h"
+#include "widgets/structurewidget.h"
+#include "dialogs/projectdialogs.h"
+#include "kiletool.h"
+#include "kiletool_enums.h"
+#include "kilestdtools.h"
+#include "kilelistselector.h"
+#include "kiletoolmanager.h"
+#include "widgets/konsolewidget.h"
+#include "kileconfig.h"
+#include "widgets/logwidget.h"
+#include "widgets/progressdialog.h"
+#include "dialogs/cleandialog.h"
+
+/*
+ * Newly created text documents have an empty URL and a non-empty document name.
+ */
+ 
+/*
+ * WARNING: Several methods in the document manager can open dialogs and consequently
+ *          launch a new event loop. It is therefore possible that the auto save feature
+ *          gets triggered when such a dialog is shown, potentially modifying variables
+ *          that are currently being modified by the method in question. It is therefore
+ *          *essential* that the 'm_autoSaveLock' variable is locked before such a method is
+ *          executed (also see the 'Locker' class).
+ */
+
+class Locker
+{
+	public:
+		Locker(unsigned int *lock)
+		{
+			m_lock = lock;
+			++*m_lock;
+		}
+
+		~Locker()
+		{
+			if(*m_lock == 0) {
+				return;
+			}
+			--*m_lock;
+		}
+
+	private:
+		unsigned int *m_lock;
+};
+
+#define MAX_NUMBER_OF_STORED_SETTINGS 50
+
+namespace KileDocument
+{
+
+Manager::Manager(KileInfo *info, QObject *parent, const char *name) :
+	QObject(parent),
+	m_ki(info),
+	m_progressDialog(NULL),
+	m_autoSaveLock(0),
+	m_currentlySavingAll(false)
+{
+	setObjectName(name);
+	m_editor = KTextEditor::EditorChooser::editor();
+	if(!m_editor) {
+		KMessageBox::error(m_ki->mainWindow(), i18n("No editor component found. Please check your KDE installation."),
+		                                       i18n("No editor component found."));
+	}
+}
+
+Manager::~Manager()
+{
+	KILE_DEBUG() << "==KileDocument::Manager::~Manager()=========";
+	if(m_progressDialog.isNull()) {
+		delete m_progressDialog.data();
+	}
+}
+
+void Manager::trashDoc(TextInfo *docinfo, KTextEditor::Document *doc /*= NULL */ )
+{
+	KILE_DEBUG() << "==void Manager::trashDoc(" << docinfo->url().toLocalFile() << ")=====";
+
+	if(m_ki->isOpen(docinfo->url())) {
+		return;
+	}
+
+	if(doc) {
+		doc = docinfo->getDoc();
+	}
+
+	//look for doc before we detach the docinfo
+	//if we do it the other way around, docFor will always return nil
+ 	if(!doc) {
+		doc = docFor(docinfo->url());
+	}
+
+	KILE_DEBUG() << "DETACHING " << docinfo;
+	docinfo->detach();
+
+	KILE_DEBUG() << "\tTRASHING " <<  doc;
+	if(!doc) {
+		return;
+	}
+
+	KILE_DEBUG() << "just checking: docinfo->getDoc() =  " << docinfo->getDoc();
+	KILE_DEBUG() << "just checking: docFor(docinfo->url()) = " << docFor(docinfo->url());
+
+	for (int i = 0; i < m_textInfoList.count(); ++i) {
+		if((m_textInfoList.at(i) != docinfo) && (m_textInfoList.at(i)->getDoc() == doc)) {
+			KMessageBox::information(0, i18n("The internal structure of Kile is corrupted (probably due to a bug in Kile). Please select Save All from the File menu and close Kile.\nThe Kile team apologizes for any inconvenience and would appreciate a bug report."));
+			kWarning() << "docinfo " << m_textInfoList.at(i) << " url " << m_textInfoList.at(i)->url().fileName() << " has a wild pointer!!!";
+		}
+	}
+
+	KILE_DEBUG() << "DELETING doc";
+	delete doc;
+}
+
+// update all Info's with changed user commands
+void Manager::updateInfos()
+{
+	for(QList<TextInfo*>::iterator it = m_textInfoList.begin(); it != m_textInfoList.end(); ++it) {
+		(*it)->updateStructLevelInfo();
+	}
+}
+
+bool Manager::isAutoSaveAllowed()
+{
+	return (m_autoSaveLock == 0);
+}
+
+KTextEditor::Editor* Manager::getEditor()
+{
+	return m_editor;
+}
+
+KTextEditor::Document* Manager::docFor(const KUrl & url)
+{
+	for(QList<TextInfo*>::iterator it = m_textInfoList.begin(); it != m_textInfoList.end(); ++it) {
+		TextInfo *info = *it;
+
+		if(m_ki->similarOrEqualURL(info->url(), url)) {
+			return info->getDoc();
+		}
+	}
+
+	return NULL;
+}
+
+Info* Manager::getInfo() const
+{
+	KTextEditor::Document *doc = m_ki->activeTextDocument();
+	if ( doc != 0L )
+		return textInfoFor(doc);
+	else
+		return 0L;
+}
+
+TextInfo* Manager::textInfoFor(const QString & path) const
+{
+	if(path.isEmpty()) {
+		return NULL;
+	}
+
+	KILE_DEBUG() << "==KileInfo::textInfoFor(" << path << ")==========================";
+	for(QList<TextInfo*>::const_iterator it = m_textInfoList.begin(); it != m_textInfoList.end(); ++it) {
+		TextInfo *info = *it;
+
+		if(info->url().toLocalFile() == path) {
+			return info;
+		}
+	}
+
+	KILE_DEBUG() << "\tCOULD NOT find info for " << path;
+	return NULL;
+}
+
+TextInfo* Manager::textInfoForURL(const KUrl& url)
+{
+	if(url.isEmpty()) {
+		return NULL;
+	}
+
+	KILE_DEBUG() << "==KileInfo::textInfoFor(" << url << ")==========================";
+
+	for(QList<TextInfo*>::iterator it = m_textInfoList.begin(); it != m_textInfoList.end(); ++it) {
+		TextInfo *info = *it;
+
+		if (info->url() == url) {
+			return info;
+		}
+	}
+
+	KILE_DEBUG() << "\tCOULD NOT find info for " << url;
+	return NULL;
+}
+
+TextInfo* Manager::textInfoFor(KTextEditor::Document* doc) const
+{
+	if(!doc) {
+		return NULL;
+	}
+
+	for(QList<TextInfo*>::const_iterator it = m_textInfoList.begin(); it != m_textInfoList.end(); ++it) {
+		if((*it)->getDoc() == doc) {
+			return (*it);
+		}
+	}
+
+	return NULL;
+}
+
+void Manager::mapItem(TextInfo *docinfo, KileProjectItem *item)
+{
+	item->setInfo(docinfo);
+}
+
+KileProject* Manager::projectFor(const KUrl &projecturl)
+{
+	//find project with url = projecturl
+	for(QList<KileProject*>::iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+		KileProject *project = *it;
+		if(project->url() == projecturl) {
+			return project;
+		}
+	}
+
+	return NULL;
+}
+
+KileProject* Manager::projectFor(const QString &name)
+{
+	//find project with url = projecturl
+	for(QList<KileProject*>::iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+		KileProject *project = *it;
+
+		if (project->name() == name) {
+			return project;
+		}
+	}
+
+	return NULL;
+}
+
+KileProjectItem* Manager::itemFor(const KUrl &url, KileProject *project /*=0L*/) const
+{
+	if (!project) {
+		for(QList<KileProject*>::const_iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+			KileProject *project = *it;
+
+			KILE_DEBUG() << "looking in project " << project->name();
+			if (project->contains(url)) {
+				KILE_DEBUG() << "\t\tfound!";
+				return project->item(url);
+			}
+		}
+		KILE_DEBUG() << "\t nothing found";
+	}
+	else {
+		if(project->contains(url)) {
+			return project->item(url);
+		}
+	}
+
+	return NULL;
+}
+
+KileProjectItem* Manager::itemFor(Info *docinfo, KileProject *project /*=0*/) const
+{
+	if(docinfo)
+		return itemFor(docinfo->url(), project);
+	else
+		return NULL;
+}
+
+QList<KileProjectItem*> Manager::itemsFor(Info *docinfo) const
+{
+	if(!docinfo) {
+		return QList<KileProjectItem*>();
+	}
+
+	KILE_DEBUG() << "==KileInfo::itemsFor(" << docinfo->url().fileName() << ")============";
+	QList<KileProjectItem*> list;
+	for(QList<KileProject*>::const_iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+		KileProject *project = *it;
+
+		KILE_DEBUG() << "\tproject: " << (*it)->name();
+		if(project->contains(docinfo)) {
+			KILE_DEBUG() << "\t\tcontains";
+			list.append(project->item(docinfo));
+		}
+	}
+
+	return list;
+}
+
+QList<KileProjectItem*> Manager::itemsFor(const KUrl& url) const
+{
+	QList<KileProjectItem*> list;
+	for(QList<KileProject*>::const_iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+		KileProject *project = *it;
+
+		if(project->contains(url)) {
+			list.append(project->item(url));
+		}
+	}
+
+	return list;
+}
+
+bool Manager::isProjectOpen()
+{
+	return ( m_projects.count() > 0 );
+}
+
+KileProject* Manager::activeProject()
+{
+	KTextEditor::Document *doc = m_ki->activeTextDocument();
+
+	if (doc) {
+		for(QList<KileProject*>::iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+			KileProject *project = *it;
+
+			if(project->contains(doc->url())) {
+				return project;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+KileProjectItem* Manager::activeProjectItem()
+{
+	KileProject *curpr = activeProject();
+	KTextEditor::Document *doc = m_ki->activeTextDocument();
+
+	if (curpr && doc) {
+		QList<KileProjectItem*> list = curpr->items();
+
+		for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+			KileProjectItem *item = *it;
+
+			if (item->url() == doc->url()) {
+				return item;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+TextInfo* Manager::createTextDocumentInfo(KileDocument::Type type, const KUrl & url, const KUrl& baseDirectory)
+{
+	TextInfo *docinfo = 0L;
+
+	//see if this file belongs to an opened project
+	KileProjectItem *item = itemFor(url);
+	if ( item != 0L ) docinfo = item->getInfo();
+
+	if ( docinfo == 0L )
+	{
+		switch(type)
+		{
+			case Undefined: // fall through
+			case Text:
+				KILE_DEBUG() << "CREATING TextInfo for " << url.url();
+				docinfo = new TextInfo(NULL, m_ki->extensions(),
+				                             m_ki->abbreviationManager());
+				break;
+			case LaTeX:
+				KILE_DEBUG() << "CREATING LaTeXInfo for " << url.url();
+				docinfo = new LaTeXInfo(NULL, m_ki->extensions(),
+				                              m_ki->abbreviationManager(),
+                                                              m_ki->latexCommands(),
+                                                              m_ki->editorExtension(),
+                                                              m_ki->configurationManager(),
+                                                              m_ki->codeCompletionManager());
+				break;
+			case BibTeX:
+				KILE_DEBUG() << "CREATING BibInfo for " << url.url();
+				docinfo = new BibInfo(NULL, m_ki->extensions(),
+				                            m_ki->abbreviationManager(),
+				                            m_ki->latexCommands());
+				break;
+			case Script:
+				KILE_DEBUG() << "CREATING ScriptInfo for " << url.url();
+				docinfo = new ScriptInfo(NULL, m_ki->extensions(),
+				                               m_ki->abbreviationManager());
+				break;
+		}
+		docinfo->setBaseDirectory(baseDirectory);
+		emit(documentInfoCreated(docinfo));
+		m_textInfoList.append(docinfo);
+	}
+
+	KILE_DEBUG() << "DOCINFO: returning " << docinfo << " " << docinfo->url().fileName();
+	return docinfo;
+}
+
+void Manager::recreateTextDocumentInfo(TextInfo *oldinfo)
+{
+	QList<KileProjectItem*> list = itemsFor(oldinfo);
+	KUrl url = oldinfo->url();
+	TextInfo *newinfo = createTextDocumentInfo(m_ki->extensions()->determineDocumentType(url), url, oldinfo->getBaseDirectory());
+
+	newinfo->setDoc(oldinfo->getDoc());
+
+	for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+		(*it)->setInfo(newinfo);
+	}
+
+	removeTextDocumentInfo(oldinfo);
+
+	emit(updateStructure(false, newinfo));
+}
+
+bool Manager::removeTextDocumentInfo(TextInfo *docinfo, bool closingproject /* = false */)
+{
+	KILE_DEBUG() << "==Manager::removeTextDocumentInfo(Info *docinfo)=====";
+	QList<KileProjectItem*> itms = itemsFor(docinfo);
+	bool oneItem = false;
+	if(itms.count() == 1) {
+		oneItem = true;
+	}
+
+	if(itms.count() == 0 || ( closingproject && oneItem )) {
+		KILE_DEBUG() << "\tremoving " << docinfo <<  " count = " << m_textInfoList.count();
+		m_textInfoList.removeAll(docinfo);
+
+		emit(closingDocument(docinfo));
+
+		cleanupDocumentInfoForProjectItems(docinfo);
+		delete docinfo;
+
+		return true;
+	}
+
+	KILE_DEBUG() << "\tnot removing " << docinfo;
+	return false;
+}
+
+
+KTextEditor::Document* Manager::createDocument(const KUrl& url, TextInfo *docinfo, const QString& encoding,
+                                                                                   const QString& mode,
+                                                                                   const QString& highlight)
+{
+	KILE_DEBUG() << "==KTextEditor::Document* Manager::createDocument()===========";
+
+	KTextEditor::Document *doc = NULL;
+
+	if(!m_editor) {
+		return NULL;
+	}
+
+	doc = docFor(url);
+	if (doc) {
+		kWarning() << url << " already has a document!";
+		return doc;
+	}
+	doc = m_editor->createDocument(NULL);
+	KILE_DEBUG() << "appending document " <<  doc;
+
+	docinfo->setDoc(doc); // do this here to set up all the signals correctly in 'TextInfo'
+	doc->setEncoding(encoding);
+
+	KILE_DEBUG() << "url is = " << docinfo->url();
+
+	if(!url.isEmpty()) {
+		bool r = doc->openUrl(url);
+		// don't add scripts to the recent files
+		if(r && docinfo->getType() != Script) {
+        		emit(addToRecentFiles(url));
+		}
+	}
+
+	//handle changes of the document
+	connect(doc, SIGNAL(documentNameChanged(KTextEditor::Document*)), this, SIGNAL(documentNameChanged(KTextEditor::Document*)));
+	connect(doc, SIGNAL(documentUrlChanged(KTextEditor::Document*)), this, SIGNAL(documentUrlChanged(KTextEditor::Document*)));
+	connect(doc, SIGNAL(modifiedChanged(KTextEditor::Document*)), this, SLOT(newDocumentStatus(KTextEditor::Document*)));
+	KTextEditor::ModificationInterface *modificationInterface = qobject_cast<KTextEditor::ModificationInterface*>(doc);
+	if(modificationInterface) {
+		modificationInterface->setModifiedOnDiskWarning(true);
+		connect(doc, SIGNAL(modifiedOnDisk(KTextEditor::Document*,bool,KTextEditor::ModificationInterface::ModifiedOnDiskReason)),
+                        this, SIGNAL(documentModificationStatusChanged(KTextEditor::Document*,bool,KTextEditor::ModificationInterface::ModifiedOnDiskReason)));
+	}
+
+	if(!mode.isEmpty()){
+		docinfo->setMode(mode);     // this ensures that mode passed with the mode parameter is actually used
+	}
+	if(!highlight.isEmpty()){
+		docinfo->setHighlightingMode(highlight);
+	}
+	// FIXME: the whole structure updating stuff needs to be rewritten; updates should originate from
+	//        the docinfo only, i.e. the structure view should just react to changes!
+	connect(docinfo, SIGNAL(completed(KileDocument::Info*)), m_ki->structureWidget(), SLOT(update(KileDocument::Info*)));
+
+	KILE_DEBUG() << "createDocument: url " << doc->url();
+	KILE_DEBUG() << "createDocument: SANITY check: " << (docinfo->getDoc() == docFor(docinfo->url()));
+	return doc;
+}
+
+KTextEditor::View* Manager::loadItem(KileDocument::Type type, KileProjectItem *item, const QString & text, bool openProjectItemViews)
+{
+	KTextEditor::View *view = NULL;
+
+	KILE_DEBUG() << "==loadItem(" << item->url().toLocalFile() << ")======";
+
+	if(item->type() != KileProjectItem::Image) {
+		view = loadText(type, item->url(), item->encoding(), openProjectItemViews && item->isOpen(), item->mode(), item->highlight(), text);
+		KILE_DEBUG() << "\tloadItem: docfor = " << docFor(item->url().toLocalFile());
+
+		TextInfo *docinfo = textInfoFor(item->url().toLocalFile());
+		item->setInfo(docinfo);
+
+		KILE_DEBUG() << "\tloadItem: docinfo = " << docinfo << " doc = " << docinfo->getDoc() << " docfor = " << docFor(docinfo->url().toLocalFile());
+		if ( docinfo->getDoc() != docFor(docinfo->url().toLocalFile()) ) kWarning() << "docinfo->getDoc() != docFor()";
+	}
+	else {
+		KILE_DEBUG() << "\tloadItem: no document generated";
+		TextInfo *docinfo = createTextDocumentInfo(m_ki->extensions()->determineDocumentType(item->url()), item->url());
+		item->setInfo(docinfo);
+
+		if(!docFor(item->url())) {
+			docinfo->detach();
+			KILE_DEBUG() << "\t\t\tdetached";
+		}
+	}
+
+	return view;
+}
+
+KTextEditor::View* Manager::loadText(KileDocument::Type type, const KUrl& url, const QString& encoding,
+                                                                               bool create,
+                                                                               const QString& mode,
+                                                                               const QString& highlight,
+                                                                               const QString& text,
+                                                                               int index,
+                                                                               const KUrl& baseDirectory)
+{
+	KILE_DEBUG() << "==loadText(" << url.url() << ")=================";
+	//if doc already opened, update the structure view and return the view
+	if(!url.isEmpty() && m_ki->isOpen(url)) {
+		return m_ki->viewManager()->switchToTextView(url);
+	}
+
+	TextInfo *docinfo = createTextDocumentInfo(type, url, baseDirectory);
+	KTextEditor::Document *doc = createDocument(url, docinfo, encoding, mode, highlight);
+
+	m_ki->structureWidget()->clean(docinfo);
+
+	if(!text.isEmpty()) {
+		doc->setText(text);
+	}
+
+	//FIXME: use signal/slot
+	if (doc && create) {
+		return m_ki->viewManager()->createTextView(docinfo, index);
+	}
+
+	KILE_DEBUG() << "just after createView()";
+	KILE_DEBUG() << "\tdocinfo = " << docinfo << " doc = " << docinfo->getDoc() << " docfor = " << docFor(docinfo->url().toLocalFile());
+
+	return NULL;
+}
+
+//FIXME: template stuff should be in own class
+KTextEditor::View* Manager::loadTemplate(TemplateItem *sel)
+{
+	KILE_DEBUG() << "templateitem *sel = " << sel;
+	QString text;
+
+	if(!sel) {
+		return NULL;
+	}
+
+	Locker lock(&m_autoSaveLock);
+	if (sel->name() != KileTemplate::Manager::defaultEmptyTemplateCaption()
+	    && sel->name() != KileTemplate::Manager::defaultEmptyLaTeXTemplateCaption()
+	    && sel->name() != KileTemplate::Manager::defaultEmptyBibTeXTemplateCaption()) {
+		if(!m_editor) {
+			return NULL;
+		}
+		//create a new document to open the template in
+		KTextEditor::Document *tempdoc = m_editor->createDocument(NULL);
+
+		if (!tempdoc->openUrl(KUrl(sel->path()))) {
+			KMessageBox::error(m_ki->mainWindow(), i18n("Could not find template: %1", sel->name()), i18n("File Not Found"));
+		}
+		else {
+			//substitute templates variables
+			text = tempdoc->text();
+			delete tempdoc;
+			replaceTemplateVariables(text);
+		}
+	}
+
+	KileDocument::Type type = sel->type();
+	//always set the base directory for scripts
+	return createDocumentWithText(text, type, QString(), (type == KileDocument::Script ? m_ki->scriptManager()->getLocalScriptDirectory() : QString()));
+}
+
+KTextEditor::View* Manager::createDocumentWithText(const QString& text, KileDocument::Type type /* = KileDocument::Undefined */, const QString& /* extension */, const KUrl& baseDirectory)
+{
+	KTextEditor::View *view = loadText(type, KUrl(), QString(), true, QString(), QString(), text, -1, baseDirectory);
+	if(view) {
+		//FIXME this shouldn't be necessary!!!
+		view->document()->setModified(true);
+		newDocumentStatus(view->document());
+	}
+
+	return view;
+}
+
+KTextEditor::View* Manager::createNewJScript()
+{
+	KTextEditor::View *view = createDocumentWithText(QString(), Script, "js", m_ki->scriptManager()->getLocalScriptDirectory());
+	emit(updateStructure(false, NULL));
+	emit(updateModeStatus());
+	return view;
+}
+
+KTextEditor::View* Manager::createNewLaTeXDocument()
+{
+	KTextEditor::View *view = createDocumentWithText(QString(), LaTeX);
+	emit(updateStructure(false, NULL));
+	emit(updateModeStatus());
+	return view;
+}
+
+void Manager::replaceTemplateVariables(QString &line)
+{
+	line=line.replace("$$AUTHOR$$", KileConfig::author());
+	line=line.replace("$$DOCUMENTCLASSOPTIONS$$", KileConfig::documentClassOptions());
+	if (!KileConfig::templateEncoding().isEmpty()) { line=line.replace("$$INPUTENCODING$$", "\\usepackage["+ KileConfig::templateEncoding() +"]{inputenc}");}
+	else {
+		line = line.remove("$$INPUTENCODING$$");
+	}
+}
+
+void Manager::createTemplate()
+{
+	KTextEditor::View *view = m_ki->viewManager()->currentTextView();
+	if (view) {
+		if (view->document()->isModified()) {
+			KMessageBox::information(m_ki->mainWindow(),i18n("Please save the file first."));
+			return;
+		}
+	}
+	else {
+		KMessageBox::information(m_ki->mainWindow(),i18n("Open/create a document first."));
+		return;
+	}
+
+	KUrl url = view->document()->url();
+	KileDocument::Type type = m_ki->extensions()->determineDocumentType(url);
+
+	if(type == KileDocument::Undefined || type == KileDocument::Text) {
+		KMessageBox::information(m_ki->mainWindow(),i18n("A template for this type of document cannot be created."));
+		return;
+	}
+
+	ManageTemplatesDialog mtd(m_ki->templateManager(), url, i18n("Create Template From Document"));
+	mtd.exec();
+}
+
+void Manager::removeTemplate()
+{
+	ManageTemplatesDialog mtd(m_ki->templateManager(), i18n("Remove Template"));
+	mtd.exec();
+}
+
+void Manager::fileNew(KileDocument::Type type)
+{
+	NewFileWizard *nfw = new NewFileWizard(m_ki->templateManager(), type, m_ki->mainWindow());
+	if(nfw->exec()) {
+		Locker lock(&m_autoSaveLock);
+		KTextEditor::View *view = loadTemplate(nfw->getSelection());
+		if(view) {
+			if(nfw->useWizard()) {
+				emit(startWizard());
+			}
+			emit(updateStructure(false, NULL));
+			emit(updateModeStatus());
+		}
+	}
+	delete nfw;
+}
+
+void Manager::fileNewScript()
+{
+	Locker lock(&m_autoSaveLock);
+	fileNew(KileDocument::Script);
+}
+
+void Manager::fileNew(const KUrl& url)
+{
+	Locker lock(&m_autoSaveLock);
+	//create an empty file
+	QFile file(url.toLocalFile());
+	file.open(QIODevice::ReadWrite);
+	file.close();
+
+	fileOpen(url, QString());
+}
+
+void Manager::fileOpen()
+{
+	//determine the starting dir for the file dialog
+	QString compileName = m_ki->getCompileName();
+	QString currentDir;
+	if(QFileInfo(compileName).exists()) {
+		currentDir = QFileInfo(compileName).absolutePath();
+	}
+	else {
+		currentDir = m_ki->fileSelector()->currentUrl().toLocalFile();
+	}
+
+	// use a filter for fileOpen dialog
+	Extensions *extensions = m_ki->extensions();
+	QString filter = extensions->latexDocumentFileFilter() + '\n'
+	                 + extensions->latexPackageFileFilter() + '\n'
+	                 + extensions->bibtexFileFilter() + '\n'
+	                 + extensions->metapostFileFilter() + '\n'
+	                 + "*|" + i18n("All Files");
+
+	// try to get the current encoding, this is kind of ugly ...
+	QString encoding = m_ki->toolManager()->config()->group("Kate Document Defaults").readEntry("Encoding","");
+
+	//get the URLs
+	KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenUrlsAndEncoding(encoding, currentDir, filter, m_ki->mainWindow(), i18n("Open Files"));
+
+	Locker lock(&m_autoSaveLock);
+	//open them
+	KUrl::List urls = result.URLs;
+	for (KUrl::List::Iterator i=urls.begin(); i != urls.end(); ++i) {
+		fileOpen(*i, result.encoding);
+	}
+}
+
+void Manager::fileSelected(const KFileItem& file)
+{
+	Locker lock(&m_autoSaveLock);
+	fileSelected(file.url());
+}
+
+void Manager::fileSelected(const KileProjectItem * item)
+{
+	Locker lock(&m_autoSaveLock);
+	fileOpen(item->url(), item->encoding());
+}
+
+void Manager::fileSelected(const KUrl& url)
+{
+	Locker lock(&m_autoSaveLock);
+	fileOpen(url, QString());
+}
+
+void Manager::saveURL(const KUrl & url)
+{
+	Locker lock(&m_autoSaveLock);
+	KTextEditor::Document *doc = docFor(url);
+	if(doc) {
+		doc->save();
+	}
+}
+
+void Manager::newDocumentStatus(KTextEditor::Document *doc)
+{
+	KILE_DEBUG() << "void Manager::newDocumentStatus(Kate::Document)" << endl;
+	if(!doc) {
+		return;
+	}
+
+	//sync terminal
+	m_ki->texKonsole()->sync();
+
+	emit(documentModificationStatusChanged(doc, doc->isModified(), KTextEditor::ModificationInterface::OnDiskUnmodified));
+}
+
+bool Manager::fileSaveAll(bool amAutoSaving, bool disUntitled)
+{
+	// this can occur when autosaving should take place when we
+	// are still busy with it (KIO::NetAccess keeps the event loop running)
+	if(m_currentlySavingAll) {
+		return true;
+	}
+	m_currentlySavingAll = true;
+	KTextEditor::View *view = NULL;
+	QFileInfo fi;
+	bool oneSaveFailed = false;
+	KUrl url, backupUrl;
+
+	KILE_DEBUG() << "===Kile::fileSaveAll(amAutoSaving = " <<  amAutoSaving << ",disUntitled = " << disUntitled <<")";
+
+	for(int i = 0; i < m_ki->viewManager()->textViewCount(); ++i) {
+		view = m_ki->viewManager()->textView(i);
+
+		if(view && view->document()->isModified()) {
+			url = view->document()->url();
+			fi.setFile(url.toLocalFile());
+
+			if( (!amAutoSaving && !(disUntitled && url.isEmpty())) // DisregardUntitled is true and we have an untitled doc and don't autosave
+				|| (amAutoSaving && !url.isEmpty())            //don't save untitled documents when autosaving
+				|| (!amAutoSaving && !disUntitled)             // both false, so we want to save everything
+			  )
+			{
+
+				KILE_DEBUG() << "The files _" << autosaveWarnings.join(", ") <<  "_ have autosaveWarnings";
+
+				if(amAutoSaving) {
+					if(!fi.isWritable()) {
+						if(autosaveWarnings.contains(url.toLocalFile())) {
+							KILE_DEBUG() << "File " << url.prettyUrl() << " is not writeable (again), trying next file";
+							continue;
+						}
+						else {
+							autosaveWarnings.append(url.toLocalFile());
+							KILE_DEBUG() << "File " << url.prettyUrl() << " is not writeable (first time)";
+						}
+					}
+					else {
+						autosaveWarnings.removeAll(url.toLocalFile());
+					}
+				}
+				if(amAutoSaving && fi.size() > 0) { // the size check ensures that we don't save empty files (to prevent something like #125809 in the future).
+					KUrl backupUrl = KUrl(url.toLocalFile()+ ".backup");
+
+				 	// patch for secure permissions, slightly modified for kile by Thomas Braun, taken from #103331
+
+					// get the right permissions, start with safe default
+					mode_t  perms = 0600;
+					KIO::UDSEntry fentry;
+					if (KIO::NetAccess::stat (url, fentry, m_ki->mainWindow())) {
+						KILE_DEBUG () << "stating successful: " << url.prettyUrl();
+						KFileItem item (fentry, url);
+						perms = item.permissions();
+					}
+
+					// first del existing file if any, than copy over the file we have
+					// failure if a: the existing file could not be deleted, b: the file could not be copied
+					if((!KIO::NetAccess::exists( backupUrl, false, m_ki->mainWindow())
+					   || KIO::NetAccess::del( backupUrl, m_ki->mainWindow()))
+					   && KIO::NetAccess::file_copy(url, backupUrl, m_ki->mainWindow())) {
+						KILE_DEBUG() << "backing up successful (" << url.prettyUrl() << " -> "<<backupUrl.prettyUrl() << ")";
+					}
+					else {
+						KILE_DEBUG() << "backing up failed (" << url.prettyUrl() << " -> " << backupUrl.prettyUrl() << ")";
+						m_ki->logWidget()->printMessage(KileTool::Error,
+						                                i18n("The file %1 could not be saved, check the permissions and free disk space.", backupUrl.prettyUrl()),
+						                                i18n("Autosave"));
+					}
+				}
+
+				KILE_DEBUG() << "trying to save: " << url.toLocalFile();
+				bool saveResult = view->document()->documentSave();
+				fi.refresh();
+
+				if(!saveResult) {
+					oneSaveFailed = true;
+					m_ki->logWidget()->printMessage(KileTool::Error,
+					                                i18n("Kile encountered problems while saving the file %1. Do you have enough free disk space left?", url.prettyUrl()),
+					                                i18n("Saving"));
+				}
+			}
+		}
+	}
+
+	/*
+	 This may look superfluos but actually it is not, in the case of multiple modified docs it ensures that the structure view keeps synchronized with the currentTextView
+	 And if we only have one masterdoc or none nothing goes wrong.
+	*/
+	emit(updateStructure(false, NULL));
+	m_currentlySavingAll = false;
+	return !oneSaveFailed;
+}
+
+void Manager::fileOpen(const KUrl& url, const QString& encoding, int index)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "==Kile::fileOpen==========================";
+
+	KILE_DEBUG() << "url is " << url.url();
+	const KUrl realurl = symlinkFreeURL(url);
+	KILE_DEBUG() << "symlink free url is " << realurl.url();
+
+	bool isopen = m_ki->isOpen(realurl);
+	if(isopen) {
+		m_ki->viewManager()->switchToTextView(realurl);
+		return;
+	}
+
+	KTextEditor::View *view = loadText(m_ki->extensions()->determineDocumentType(realurl), realurl, encoding, true, QString(), QString(), QString(), index);
+	QList<KileProjectItem*> itemList = itemsFor(realurl);
+	TextInfo *textInfo = textInfoForURL(realurl);
+
+	for(QList<KileProjectItem*>::iterator it = itemList.begin(); it != itemList.end(); ++it) {
+		(*it)->setInfo(textInfo);
+	}
+
+	if(itemList.isEmpty()) {
+		emit addToProjectView(realurl);
+		loadDocumentAndViewSettings(view->document());
+	}
+	else if(view) {
+		KileProjectItem *item = itemList.first();
+		view->setCursorPosition(KTextEditor::Cursor(item->lineNumber(),item->columnNumber()));
+		item->loadDocumentAndViewSettings();
+	}
+
+	emit(updateStructure(false, NULL));
+	emit(updateModeStatus());
+	// update undefined references in this file
+	emit(updateReferences(textInfoFor(realurl.toLocalFile())));
+}
+
+bool Manager::fileSave(KTextEditor::View *view)
+{
+	Locker lock(&m_autoSaveLock);
+	if(!view) {
+		view = m_ki->viewManager()->currentTextView();
+	}
+	if(!view) {
+		return false;
+	}
+	KUrl url = view->document()->url();
+	if(url.isEmpty()) { // newly created document
+		return fileSaveAs(view);
+	}
+	else {
+		bool ret = view->document()->documentSave();
+		emit(updateStructure(false, textInfoFor(view->document())));
+		return ret;
+	}
+}
+
+bool Manager::fileSaveAs(KTextEditor::View* view)
+{
+	Locker lock(&m_autoSaveLock);
+	if(!view) {
+		view = m_ki->viewManager()->currentTextView();
+	}
+	if(!view) {
+		return false;
+	}
+
+	KTextEditor::Document* doc = view->document();
+	Q_ASSERT(doc);
+	KileDocument::TextInfo* info = textInfoFor(doc);
+	Q_ASSERT(info);
+	QString startDir = info->url().url();
+	KUrl oldURL = info->url();
+	if(startDir.isEmpty()) {
+		KUrl baseDirectory = info->getBaseDirectory();
+		if(baseDirectory.isEmpty()) {
+			startDir = "kfiledialog:///KILE_LATEX_SAVE_DIR";
+		}
+		else {
+			startDir = baseDirectory.url();
+		}
+	}
+
+	KILE_DEBUG() << "startDir is " << startDir;
+
+	KEncodingFileDialog::Result result;
+	KUrl saveURL;
+	while(true) {
+		QString filter = info->getFileFilter() + "\n* |" + i18n("All Files");
+		result = KEncodingFileDialog::getSaveUrlAndEncoding(doc->encoding(), startDir, filter, m_ki->mainWindow(), i18n("Save File"));
+		if(result.URLs.isEmpty() || result.URLs.first().isEmpty()) {
+			return false;
+		}
+		saveURL = result.URLs.first();
+		if(info->getType() == KileDocument::LaTeX) {
+			saveURL = Info::makeValidTeXURL(saveURL, m_ki->mainWindow(),
+			                                m_ki->extensions()->isTexFile(saveURL), false); // don't check for file existence
+		}
+		if(KIO::NetAccess::exists(saveURL, true, m_ki->mainWindow())) { // check for writing possibility
+			int r =  KMessageBox::warningContinueCancel(m_ki->mainWindow(), i18n("A file with the name \"%1\" exists already. Do you want to overwrite it?", saveURL.fileName()), i18n("Overwrite File?"), KGuiItem(i18n("&Overwrite")));
+			if(r != KMessageBox::Continue) {
+				continue;
+			}
+		}
+		break;
+	}
+	doc->setEncoding(result.encoding);
+	if(!doc->saveAs(saveURL)) {
+		return false;
+	}
+	if(oldURL != saveURL) {
+		if(info->isDocumentTypePromotionAllowed()) {
+			recreateTextDocumentInfo(info);
+			info = textInfoFor(doc);
+		}
+		m_ki->structureWidget()->updateUrl(info);
+		emit addToRecentFiles(saveURL);
+		emit addToProjectView(doc->url());
+	}
+	return true;
+}
+
+void Manager::fileSaveCopyAs()
+{
+	Locker lock(&m_autoSaveLock);
+	KTextEditor::Document *doc= m_ki->activeTextDocument();
+	KTextEditor::View *view = NULL;
+	if(doc) {
+		KileDocument::TextInfo *originalInfo = textInfoFor(doc);
+
+		if(!originalInfo) {
+			return;
+		}
+
+		view = createDocumentWithText(doc->text(),originalInfo->getType());
+
+		KileDocument::TextInfo *newInfo = textInfoFor(view->document());
+
+		if(originalInfo->url().isEmpty()) { // untitled doc
+			newInfo->setBaseDirectory(m_ki->fileSelector()->currentUrl().toLocalFile());
+		}
+		else {
+			newInfo->setBaseDirectory(originalInfo->url().toLocalFile());
+		}
+
+		fileSaveAs(view);
+
+		doc = view->document();
+		if(doc && !doc->isModified()) { // fileSaveAs was successful
+			fileClose(doc);
+		}
+	}
+}
+
+bool Manager::fileCloseAllOthers(KTextEditor::View *currentView)
+{
+	Locker lock(&m_autoSaveLock);
+	QAction *action = m_ki->mainWindow()->action("file_close_all_others");
+	// the 'data' property can be set by the view manager
+	QVariant var = action->data();
+	if(!currentView && var.isValid()) {
+		// the 'data' property for the relevant actions is cleared
+		// inside the view manager
+		currentView = var.value<KTextEditor::View*>();
+	}
+	if(!currentView) {
+		currentView = m_ki->viewManager()->currentTextView();
+	}
+	if(!currentView) {
+		return false;
+	}
+
+	QList<KTextEditor::View*> viewList;
+	for(int i = 0; i < m_ki->viewManager()->textViewCount(); ++i) {
+		KTextEditor::View *view = m_ki->viewManager()->textView(i);
+		if(currentView == view) {
+			continue;
+		}
+		viewList.push_back(view);
+
+	}
+	for(QList<KTextEditor::View*>::iterator it = viewList.begin();
+	    it != viewList.end(); ++it) {
+		if (!fileClose(*it)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+bool Manager::fileCloseAll()
+{
+	Locker lock(&m_autoSaveLock);
+	KTextEditor::View * view = m_ki->viewManager()->currentTextView();
+
+	//assumes one view per doc here
+	while(m_ki->viewManager()->textViewCount() > 0) {
+		view = m_ki->viewManager()->textView(0);
+		if (!fileClose(view->document())) {
+			return false;
+		}
+	}
+	return true;
+}
+
+bool Manager::fileClose(const KUrl & url)
+{
+	KTextEditor::Document *doc = docFor(url);
+	if(!doc) {
+		return true;
+	}
+	else {
+		return fileClose(doc);
+	}
+}
+
+bool Manager::fileClose(KTextEditor::View *view)
+{
+	QAction *action = m_ki->mainWindow()->action("file_close");
+	// the 'data' property can be set by the view manager
+	QVariant var = action->data();
+	if(!view && var.isValid()) {
+		view = var.value<KTextEditor::View*>();
+		// the 'data' property for the relevant actions is cleared
+		// inside the view manager
+	}
+	if(!view) {
+		view = m_ki->viewManager()->currentTextView();
+	}
+	if(!view) {
+		return false;
+	}
+	return fileClose(view->document());
+}
+
+bool Manager::fileClose(KTextEditor::Document *doc /* = 0L*/, bool closingproject /*= false*/)
+{
+	KILE_DEBUG() << "==Kile::fileClose==========================";
+
+	if(!doc) {
+		doc = m_ki->activeTextDocument();
+	}
+
+	if(!doc) {
+		return true;
+	}
+
+	Locker lock(&m_autoSaveLock);
+
+	//FIXME: remove from docinfo map, remove from dirwatch
+	KILE_DEBUG() << "doc->url().toLocalFile()=" << doc->url().toLocalFile();
+
+	const KUrl url = doc->url();
+
+	TextInfo *docinfo= textInfoFor(doc);
+	if(!docinfo) {
+		kWarning() << "no DOCINFO for " << url.url();
+		return true;
+	}
+	bool inProject = false;
+	QList<KileProjectItem*> items = itemsFor(docinfo);
+	for(QList<KileProjectItem*>::iterator it = items.begin(); it != items.end(); ++it) {
+		KileProjectItem *item = *it;
+
+		//FIXME: refactor here
+		if(item && doc) {
+			storeProjectItem(item, doc);
+			inProject = true;
+		}
+	}
+
+	if(!inProject) {
+	KILE_DEBUG() << "not in project";
+		saveDocumentAndViewSettings(doc);
+	}
+
+	if(doc->closeUrl()) {
+		// docinfo may have been recreated from 'Untitled' doc to a named doc
+		if(url.isEmpty()) {
+			docinfo= textInfoFor(doc);
+		}
+
+		if(KileConfig::cleanUpAfterClose()) {
+			cleanUpTempFiles(url, true); // yes we pass here url and not docinfo->url()
+		}
+
+		//FIXME: use signal/slot
+		if( doc->views().count() > 0){
+			m_ki->viewManager()->removeView(doc->views().first());
+		}
+		//remove the decorations
+
+		trashDoc(docinfo, doc);
+		m_ki->structureWidget()->clean(docinfo);
+		removeTextDocumentInfo(docinfo, closingproject);
+
+		emit removeFromProjectView(url);
+		emit updateModeStatus();
+	}
+	else {
+		return false;
+	}
+
+	return true;
+}
+
+void Manager::buildProjectTree(const KUrl & url)
+{
+	KileProject * project = projectFor(url);
+
+	if (project) {
+		buildProjectTree(project);
+	}
+}
+
+void Manager::buildProjectTree(KileProject *project)
+{
+	if(!project) {
+		project = activeProject();
+	}
+
+	if(!project) {
+		project = selectProject(i18n("Refresh Project Tree"));
+	}
+
+	if (project) {
+		//TODO: update structure for all docs
+		project->buildProjectTree();
+	}
+	else if (m_projects.count() == 0) {
+		KMessageBox::error(m_ki->mainWindow(), i18n("The current document is not associated to a project. Please activate a document that is associated to the project you want to build the tree for, then choose Refresh Project Tree again."),i18n( "Could Not Refresh Project Tree"));
+	}
+}
+
+void Manager::projectNew()
+{
+	KileNewProjectDlg *dlg = new KileNewProjectDlg(m_ki->templateManager(), m_ki->extensions(), m_ki->mainWindow());
+
+	if (dlg->exec())
+	{
+		Locker lock(&m_autoSaveLock);
+		KileProject *project = dlg->project();
+
+		//add the project file to the project
+		KileProjectItem *item = new KileProjectItem(project, project->url());
+		item->setOpenState(false);
+		projectOpenItem(item);
+
+		if(dlg->createNewFile()){
+			QString filename = dlg->file();
+
+			//create the new document and fill it with the template
+			KTextEditor::View *view = loadTemplate(dlg->getSelection());
+
+			if(view) {
+				//derive the URL from the base url of the project
+				KUrl url = project->baseURL();
+				url.addPath(filename);
+
+				TextInfo *docinfo = textInfoFor(view->document());
+
+				//save the new file
+				view->document()->saveAs(url);
+				emit(documentModificationStatusChanged(view->document(),
+				     false, KTextEditor::ModificationInterface::OnDiskUnmodified));
+
+				//add this file to the project
+				item = new KileProjectItem(project, url);
+				//project->add(item);
+				mapItem(docinfo, item);
+
+				//docinfo->updateStruct(m_kwStructure->level());
+				emit(updateStructure(false, docinfo));
+			}
+		}
+
+		project->buildProjectTree();
+		//project->save();
+		addProject(project);
+		emit(updateModeStatus());
+		emit(addToRecentProjects(project->url()));
+	}
+}
+
+void Manager::addProject(KileProject *project)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "==void Manager::addProject(const KileProject *project)==========";
+	m_projects.append(project);
+	KILE_DEBUG() << "\tnow " << m_projects.count() << " projects";
+	emit addToProjectView(project);
+	connect(project, SIGNAL(projectTreeChanged(const KileProject *)), this, SIGNAL(projectTreeChanged(const KileProject *)));
+}
+
+KileProject* Manager::selectProject(const QString& caption)
+{
+	QStringList list;
+	for(QList<KileProject*>::iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+		list.append((*it)->name());
+	}
+
+	KileProject *project = NULL;
+	QString name;
+	if (list.count() > 1) {
+		KileListSelector *dlg  = new KileListSelector(list, caption, i18n("Select Project"), m_ki->mainWindow());
+		if (dlg->exec())
+		{
+			name = list[dlg->currentItem()];
+		}
+		delete dlg;
+	}
+	else if (list.count() == 0) {
+		return NULL;
+	}
+	else {
+		name = m_projects.first()->name();
+	}
+
+	project = projectFor(name);
+
+	return project;
+}
+
+void Manager::addToProject(const KUrl & url)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "===Kile::addToProject(const KUrl & url =" << url.url() << ")";
+
+	KileProject *project = selectProject(i18n("Add to Project"));
+
+	if (project) {
+		addToProject(project, url);
+	}
+}
+
+void Manager::addToProject(KileProject* project, const KUrl & url)
+{
+	Locker lock(&m_autoSaveLock);
+	const KUrl realurl = symlinkFreeURL(url);
+	QFileInfo fi(realurl.toLocalFile());
+
+	if (project->contains(realurl)) {
+		m_ki->logWidget()->printMessage(KileTool::Info,
+		                                i18n("The file %1 is already member of the project %2", realurl.fileName(), project->name()),
+		                                i18n("Add to Project"));
+		return;
+	}
+	else if(!fi.exists() || !fi.isReadable())
+	{
+		m_ki->logWidget()->printMessage(KileTool::Info,
+		                                i18n("The file %1 can not be added because it does not exist or is not readable", realurl.fileName()),
+		                                i18n("Add to Project"));
+		return;
+	}
+
+	KileProjectItem *item = new KileProjectItem(project, realurl);
+	item->setOpenState(m_ki->isOpen(realurl));
+	projectOpenItem(item);
+	emit addToProjectView(item);
+	buildProjectTree(project);
+}
+
+void Manager::removeFromProject(KileProjectItem *item)
+{
+	Locker lock(&m_autoSaveLock);
+	if (item && item->project()) {
+		KILE_DEBUG() << "\tprojecturl = " << item->project()->url().toLocalFile() << ", url = " << item->url().toLocalFile();
+
+		if (item->project()->url() == item->url()) {
+			KMessageBox::error(m_ki->mainWindow(), i18n("This file is the project file, which holds all the information about your project.  As such, it cannot be removed from the project."), i18n("Cannot Remove File From Project"));
+			return;
+		}
+
+		emit removeItemFromProjectView(item, m_ki->isOpen(item->url()));
+
+		KileProject *project = item->project();
+		project->remove(item);
+
+		// update undefined references in all project files
+		updateProjectReferences(project);
+		project->buildProjectTree();
+	}
+}
+
+void Manager::projectOpenItem(KileProjectItem *item, bool openProjectItemViews)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "==Kile::projectOpenItem==========================";
+	KILE_DEBUG() << "\titem:" << item->url().toLocalFile();
+
+	if (m_ki->isOpen(item->url())) { //remove item from projectview (this file was opened before as a normal file)
+		emit removeFromProjectView(item->url());
+	}
+
+	KTextEditor::View *view = loadItem(m_ki->extensions()->determineDocumentType(item->url()), item, QString(), openProjectItemViews);
+	if(item->getInfo()) { // make sure that the item has been parsed, even if it isn't shown
+	                      // this is necessary to identify the correct LaTeX root document (bug 233667)
+		m_ki->structureWidget()->update(item->getInfo());
+	}
+
+	if((!item->isOpen()) && !view && item->getInfo()) { //doc shouldn't be displayed, trash the doc
+		trashDoc(item->getInfo());
+	}
+	else if(view) {
+		view->setCursorPosition(KTextEditor::Cursor(item->lineNumber(), item->columnNumber()));
+		item->loadDocumentAndViewSettings();
+	}
+
+	//oops, doc apparently was open while the project settings wants it closed, don't trash it the doc, update openstate instead
+	if ((!item->isOpen()) && view) {
+		item->setOpenState(true);
+	}
+}
+
+KileProject* Manager::projectOpen(const KUrl & url, int step, int max, bool openProjectItemViews)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "==Kile::projectOpen==========================";
+	KILE_DEBUG() << "\tfilename: " << url.fileName();
+
+	const KUrl realurl = symlinkFreeURL(url);
+
+	if(m_ki->projectIsOpen(realurl)) {
+		if(m_progressDialog) {
+			m_progressDialog->hide();
+		}
+
+		KMessageBox::information(m_ki->mainWindow(), i18n("The project you tried to open is already opened. If you wanted to reload the project, close the project before you re-open it."),i18n("Project Already Open"));
+		return NULL;
+	}
+
+	QFileInfo fi(realurl.toLocalFile());
+	if(!fi.isReadable()) {
+		if(m_progressDialog) {
+			m_progressDialog->hide();
+		}
+
+		if (KMessageBox::warningYesNo(m_ki->mainWindow(), i18n("The project file for the project \"%1\" does not exist or is not readable. Remove this project from the recent projects list?", url.prettyUrl()), i18n("Could Not Load Project File"))  == KMessageBox::Yes) {
+			emit(removeFromRecentProjects(realurl));
+		}
+		return NULL;
+	}
+
+	if(!m_progressDialog) {
+		createProgressDialog();
+	}
+
+	m_progressDialog->show();
+
+	KileProject *kp = new KileProject(realurl,m_ki->extensions());
+
+	if(kp->isInvalid()) {
+		if(m_progressDialog) {
+			m_progressDialog->hide();
+		}
+		delete kp;
+		return NULL;
+	}
+
+	emit(addToRecentProjects(realurl));
+
+	QList<KileProjectItem*> list = kp->items();
+
+	int project_steps = list.count() + 1;
+	m_progressDialog->progressBar()->setMaximum(project_steps * max);
+	project_steps *= step;
+	m_progressDialog->progressBar()->setValue(project_steps);
+
+	// open the project files in the correct order
+	QVector<KileProjectItem*> givenPositionVector(list.count(), NULL);
+	QList<KileProjectItem*> notCorrectlyOrderedList;
+	for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+		KileProjectItem *item = *it;
+		int order = item->order();
+
+		if(order >= 0 && order >= list.count()) {
+			order = -1;
+		}
+		if(!item->isOpen() || order < 0 || givenPositionVector[order] != NULL) {
+			notCorrectlyOrderedList.push_back(item);
+		}
+		else {
+			givenPositionVector[order] = item;
+		}
+	}
+
+	QList<KileProjectItem*> orderedList;
+	for(int i = 0; i < givenPositionVector.size(); ++i) {
+		KileProjectItem *item = givenPositionVector[i];
+		if(item) {
+			orderedList.push_back(item);
+		}
+	}
+	for(QList<KileProjectItem*>::iterator i = notCorrectlyOrderedList.begin(); i != notCorrectlyOrderedList.end(); ++i) {
+		orderedList.push_back(*i);
+	}
+
+	unsigned int counter = 0;
+	for (QList<KileProjectItem*>::iterator i = orderedList.begin(); i != orderedList.end(); ++i) {
+		projectOpenItem(*i, openProjectItemViews);
+		m_progressDialog->progressBar()->setValue(counter + project_steps);
+		kapp->processEvents();
+		++counter;
+	}
+
+	kp->buildProjectTree();
+	addProject(kp);
+
+	emit(updateStructure(false, NULL));
+	emit(updateModeStatus());
+	// update undefined references in all project files
+	updateProjectReferences(kp);
+
+	if (step == (max - 1)) {
+		m_progressDialog->hide();
+	}
+
+	m_ki->viewManager()->switchToTextView(kp->lastDocument());
+
+	return kp;
+}
+
+// as all labels are gathered in the project, we can check for unsolved references
+void Manager::updateProjectReferences(KileProject *project)
+{
+	QList<KileProjectItem*> list = project->items();
+	for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+		emit(updateReferences((*it)->getInfo()));
+	}
+}
+
+KileProject* Manager::projectOpen()
+{
+	KILE_DEBUG() << "==Kile::projectOpen==========================";
+	KUrl url = KFileDialog::getOpenUrl( KileConfig::defaultProjectLocation(), i18n("*.kilepr|Kile Project Files\n*|All Files"), m_ki->mainWindow(), i18n("Open Project") );
+
+	if(!url.isEmpty()) {
+		return projectOpen(url);
+	}
+	else {
+		return NULL;
+	}
+}
+
+
+void Manager::projectSave(KileProject *project /* = 0 */)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "==Kile::projectSave==========================";
+	if (!project) {
+		//find the project that corresponds to the active doc
+		project= activeProject();
+	}
+
+	if(!project) {
+		project = selectProject(i18n("Save Project"));
+	}
+
+	if(project) {
+		QList<KileProjectItem*> list = project->items();
+		KTextEditor::Document *doc = NULL;
+		KileProjectItem *item = NULL;
+		TextInfo *docinfo = NULL;
+
+		// determine the order in which the project items are opened
+		QVector<KileProjectItem*> viewPositionVector(m_ki->viewManager()->getTabCount(), NULL);
+		for(QList<KileProjectItem*>::iterator i = list.begin(); i != list.end(); ++i) {
+			docinfo = (*i)->getInfo();
+			if(docinfo) {
+				KTextEditor::View *view = m_ki->viewManager()->textView(docinfo);
+				if(view) {
+					int position = m_ki->viewManager()->getIndexOf(view);
+					if(position >= 0 && position < viewPositionVector.size()) {
+						viewPositionVector[position] = *i;
+					}
+				}
+			}
+		}
+		int position = 0;
+		for(int i = 0; i < viewPositionVector.size(); ++i) {
+			if(viewPositionVector[i] != NULL) {
+				viewPositionVector[i]->setOrder(position);
+				++position;
+			}
+		}
+
+		//update the open-state of the items
+		for (QList<KileProjectItem*>::iterator i = list.begin(); i != list.end(); ++i) {
+			item = *i;
+			KILE_DEBUG() << "\tsetOpenState(" << (*i)->url().toLocalFile() << ") to " << m_ki->isOpen(item->url());
+			item->setOpenState(m_ki->isOpen(item->url()));
+			docinfo = item->getInfo();
+
+			if(docinfo) {
+				doc = docinfo->getDoc();
+			}
+			if(doc) {
+				storeProjectItem(item, doc);
+			}
+
+			doc = NULL;
+			docinfo = NULL;
+		}
+
+		project->save();
+	}
+	else {
+		KMessageBox::error(m_ki->mainWindow(), i18n("The current document is not associated to a project. Please activate a document that is associated to the project you want to save, then choose Save Project again."),i18n( "Could Determine Active Project"));
+	}
+}
+
+void Manager::projectAddFiles(const KUrl & url)
+{
+	Locker lock(&m_autoSaveLock);
+	KileProject *project = projectFor(url);
+
+	if (project) {
+		projectAddFiles(project,url);
+	}
+}
+
+void Manager::projectAddFiles(KileProject *project,const KUrl & fileUrl)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "==Kile::projectAddFiles()==========================";
+ 	if(project == 0) {
+		project = activeProject();
+	}
+
+	if(project == 0) {
+		project = selectProject(i18n("Add Files to Project"));
+	}
+
+	if (project) {
+		QString currentDir;
+		if(fileUrl.isEmpty())
+			currentDir=project->url().directory();
+		else
+			currentDir=fileUrl.directory();
+
+		KILE_DEBUG() << "currentDir is " << currentDir;
+		KFileDialog *dlg = new KFileDialog(currentDir, i18n("*|All Files"), m_ki->mainWindow());
+		dlg->setModal(true);
+		KPushButton* okButton = dlg->okButton();
+		okButton->setText(i18n("Add"));
+		dlg->setCaption(i18n("Add Files"));
+		dlg->setMode(KFile::Files | KFile::ExistingOnly);
+
+		if(dlg->exec()) {
+			KUrl::List urls = dlg->selectedUrls();
+			for(int i=0; i < urls.count(); ++i) {
+				addToProject(project, urls[i]);
+			}
+			// update undefined references in all project files
+			updateProjectReferences(project);
+		}
+		delete dlg;
+
+		//open them
+	}
+	else if (m_projects.count() == 0) {
+		KMessageBox::error(m_ki->mainWindow(), i18n("There are no projects opened. Please open the project you want to add files to, then choose Add Files again."),i18n( "Could Not Determine Active Project"));
+	}
+}
+
+void Manager::toggleArchive(KileProjectItem *item)
+{
+	item->setArchive(!item->archive());
+}
+
+void Manager::projectOptions(const KUrl & url)
+{
+	KileProject *project = projectFor(url);
+
+	if (project) {
+		projectOptions(project);
+	}
+}
+
+void Manager::projectOptions(KileProject *project /* = 0*/)
+{
+	KILE_DEBUG() << "==Kile::projectOptions==========================";
+	if(!project) {
+		project = activeProject();
+	}
+
+	if(!project) {
+		project = selectProject(i18n("Project Options For"));
+	}
+
+	if (project) {
+		KILE_DEBUG() << "\t" << project->name();
+		KileProjectOptionsDlg *dlg = new KileProjectOptionsDlg(project, m_ki->extensions(), m_ki->mainWindow());
+		dlg->exec();
+	}
+	else if (m_projects.count() == 0) {
+		KMessageBox::error(m_ki->mainWindow(), i18n("The current document is not associated to a project. Please activate a document that is associated to the project you want to modify, then choose Project Options again."),i18n( "Could Not Determine Active Project"));
+	}
+}
+
+bool Manager::projectCloseAll()
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "==Kile::projectCloseAll==========================";
+
+	for(QList<KileProject*>::iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+		if(!projectClose((*it)->url())) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool Manager::projectClose(const KUrl & url)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "==Kile::projectClose==========================";
+	KileProject *project = 0;
+
+	if (url.isEmpty()) {
+		 project = activeProject();
+
+		if (!project) {
+			project = selectProject(i18n("Close Project"));
+		}
+	}
+	else {
+		project = projectFor(url);
+	}
+
+	if(project) {
+		KILE_DEBUG() << "\tclosing:" << project->name();
+		project->setLastDocument(m_ki->getName());
+
+		projectSave(project);
+
+		QList<KileProjectItem*> list = project->items();
+
+		bool close = true;
+		KTextEditor::Document *doc = NULL;
+		TextInfo *docinfo = NULL;
+		for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+			KileProjectItem *item = *it;
+
+			doc = NULL;
+			docinfo = item->getInfo();
+			if (docinfo) {
+				doc = docinfo->getDoc();
+			}
+			else {
+				continue;
+			}
+			if (doc) {
+				KILE_DEBUG() << "\t\tclosing item " << doc->url().toLocalFile();
+				bool r = fileClose(doc, true);
+				close = close && r;
+				if (!close) {
+					break;
+				}
+			}
+			else {
+				// we still need to delete the TextInfo object
+				removeTextDocumentInfo(docinfo, true);
+			}
+		}
+
+		if (close) {
+			m_projects.removeAll(project);
+			emit removeFromProjectView(project);
+			delete project;
+			emit(updateModeStatus());
+			return true;
+		}
+		else
+			return false;
+	}
+	else if (m_projects.count() == 0)
+		KMessageBox::error(m_ki->mainWindow(), i18n("The current document is not associated to a project. Please activate a document that is associated to the project you want to close, then choose Close Project again."),i18n( "Could Not Close Project"));
+
+	return true;
+}
+
+void Manager::storeProjectItem(KileProjectItem *item, KTextEditor::Document *doc)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "===Kile::storeProjectItem==============";
+	KILE_DEBUG() << "\titem = " << item << ", doc = " << doc;
+	item->setEncoding(doc->encoding());
+	item->setMode(doc->mode());
+	item->setHighlight(doc->highlightingMode());
+	uint l = 0, c = 0;
+	QList<KTextEditor::View*> viewList = doc->views();
+	if(viewList.size() > 0) {
+		KTextEditor::View *view = static_cast<KTextEditor::View*>(viewList.first());
+
+		if (view) {
+			KTextEditor::Cursor cursor = view->cursorPosition();
+			l = cursor.line();
+			c = cursor.column();
+		}
+	}
+	item->setLineNumber(l);
+	item->setColumnNumber(c);
+	item->saveDocumentAndViewSettings();
+}
+
+void Manager::cleanUpTempFiles(const KUrl &url, bool silent)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "===void Manager::cleanUpTempFiles(const KUrl " << url.toLocalFile() << ", bool " << silent << ")===";
+
+	if( url.isEmpty() )
+		return;
+
+	QStringList extlist;
+	QFileInfo fi(url.toLocalFile());
+	const QStringList templist = KileConfig::cleanUpFileExtensions().split(' ');
+	const QString fileName = fi.fileName();
+	const QString dirPath = fi.absolutePath();
+	const QString baseName = fi.completeBaseName();
+
+	for (int i = 0; i < templist.count(); ++i) {
+		fi.setFile( dirPath + '/' + baseName + templist[i] );
+		if(fi.exists()) {
+			extlist.append(templist[i]);
+		}
+	}
+
+	if(!silent && fileName.isEmpty()) {
+		return;
+	}
+
+	if (!silent && extlist.count() > 0) {
+		KILE_DEBUG() << "not silent";
+		KileDialog::Clean *dialog = new KileDialog::Clean(m_ki->mainWindow(), fileName, extlist);
+		if(dialog->exec()) {
+			extlist = dialog->getCleanlist();
+		}
+		else {
+			delete dialog;
+			return;
+		}
+
+		delete dialog;
+	}
+
+	if(extlist.count() == 0) {
+		m_ki->logWidget()->printMessage(KileTool::Warning, i18n("Nothing to clean for %1", fileName),
+		                                i18n("Clean"));
+	}
+	else {
+		for(int i = 0; i < extlist.count(); ++i) {
+			QFile file(dirPath + '/' + baseName + extlist[i]);
+			KILE_DEBUG() << "About to remove file = " << file.fileName();
+			file.remove();
+		}
+		m_ki->logWidget()->printMessage(KileTool::Info,
+		                                i18n("Cleaning %1: %2", fileName, extlist.join(" ")),
+		                                i18n("Clean"));
+	}
+}
+
+void Manager::openDroppedURLs(QDropEvent *e) {
+	Locker lock(&m_autoSaveLock);
+	KUrl::List urls = KUrl::List::fromMimeData(e->mimeData());
+	Extensions *extensions = m_ki->extensions();
+
+	for(KUrl::List::iterator i = urls.begin(); i != urls.end(); ++i) {
+		KUrl url = *i;
+		if(extensions->isProjectFile(url)) {
+			projectOpen(url);
+		}
+		else {
+			fileOpen(url);
+		}
+	}
+}
+
+void Manager::reloadXMLOnAllDocumentsAndViews()
+{
+	for(QList<TextInfo*>::iterator it = m_textInfoList.begin(); it != m_textInfoList.end(); ++it) {
+		KTextEditor::Document *doc = (*it)->getDoc();
+		// FIXME: 'doc' can be null, for example if it belongs to a project item
+		//        which has been closed, but this should be improved in the sense
+		//        that 'm_textInfoList' should only contain 'TextInfo' objects which
+		//        contain valid pointers to 'KTextEditor::Document' objects.
+		if(!doc) {
+			continue;
+		}
+		doc->reloadXML();
+		QList<KTextEditor::View*> views = doc->views(); 
+		for(QList<KTextEditor::View*>::iterator viewIt = views.begin(); viewIt != views.end(); ++viewIt) {
+			(*viewIt)->reloadXML();
+		}
+	}
+}
+
+// Show all opened projects and switch to another one, if you want
+
+void Manager::projectShow()
+{
+	Locker lock(&m_autoSaveLock);
+	if(m_projects.count() <= 1) {
+		return;
+	}
+
+	// select the new project
+	KileProject *project = selectProject(i18n("Switch Project"));
+	if(!project || project==activeProject()) {
+		return;
+	}
+
+	// get last opened document
+	const KUrl lastdoc = project->lastDocument();
+	KileProjectItem *docitem = (!lastdoc.isEmpty()) ? itemFor(lastdoc, project) : NULL;
+
+	// if not, we search for the first opened tex file of this project
+	// if no file is opened, we take the first tex file mentioned in the list
+	KileProjectItem *first_texitem = NULL;
+	if(!docitem) {
+		QList<KileProjectItem*> list = project->items();
+		for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+			KileProjectItem *item = *it;
+
+			QString itempath = item->path();
+
+			// called from KAction 'Show projects...': find the first opened
+			// LaTeX document or, if that fails, any other opened file
+			QStringList extlist = (m_ki->extensions()->latexDocuments() + ' ' + m_ki->extensions()->latexPackages()).split(' ');
+			for(QStringList::Iterator it=extlist.begin(); it!=extlist.end(); ++it) {
+				if(itempath.indexOf( (*it), -(*it).length() ) >= 0)  {
+					if (m_ki->isOpen(item->url()))  {
+						docitem = item;
+						break;
+					}
+					else if(!first_texitem) {
+						first_texitem = item;
+					}
+				}
+			}
+			if(docitem) {
+				break;
+			}
+		}
+	}
+
+	// did we find one opened file or must we take the first entry
+	if(!docitem) {
+		if(!first_texitem) {
+			return;
+		}
+		docitem = first_texitem;
+	}
+
+	// ok, we can switch to another project now
+	if (m_ki->isOpen(docitem->url())) {
+		m_ki->viewManager()->switchToTextView(docitem->url());
+	}
+	else {
+		fileOpen(docitem->url(), docitem->encoding());
+	}
+}
+
+void Manager::projectRemoveFiles()
+{
+	Locker lock(&m_autoSaveLock);
+	QList<KileProjectItem*> itemsList = selectProjectFileItems(i18n("Select Files to Remove"));
+	if(itemsList.count() > 0) {
+		for(QList<KileProjectItem*>::iterator it = itemsList.begin(); it != itemsList.end(); ++it) {
+			removeFromProject(*it);
+		}
+	}
+}
+
+void Manager::projectShowFiles()
+{
+	Locker lock(&m_autoSaveLock);
+	KileProjectItem *item = selectProjectFileItem( i18n("Select File") );
+	if(item) {
+		if (item->type() == KileProjectItem::ProjectFile) {
+			dontOpenWarning(item, i18n("Show Project Files"), i18n("project configuration file"));
+		}
+		else if(item->type() == KileProjectItem::Image) {
+			dontOpenWarning(item, i18n("Show Project Files"), i18n("graphics file"));
+		}
+		else { // ok, we can switch to another file
+			if  (m_ki->isOpen(item->url())) {
+				m_ki->viewManager()->switchToTextView(item->url());
+			}
+			else {
+				fileOpen(item->url(), item->encoding() );
+			}
+		}
+	}
+}
+
+void Manager::projectOpenAllFiles()
+{
+	Locker lock(&m_autoSaveLock);
+	KileProject *project = selectProject(i18n("Select Project"));
+	if(project) {
+		projectOpenAllFiles(project->url());
+	}
+}
+
+void Manager::projectOpenAllFiles(const KUrl & url)
+{
+	Locker lock(&m_autoSaveLock);
+	KileProject* project;
+	KTextEditor::Document* doc = NULL;
+
+	if(!url.isValid()) {
+		return;
+	}
+	project = projectFor(url);
+
+	if(!project)
+		return;
+
+
+	if(m_ki->viewManager()->currentTextView()) {
+		doc = m_ki->viewManager()->currentTextView()->document();
+	}
+	// we remember the actual view, so the user gets the same view back after opening
+
+	QList<KileProjectItem*> list = project->items();
+	for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+		KileProjectItem *item = *it;
+
+		if (item->type()==KileProjectItem::ProjectFile) {
+			dontOpenWarning( item, i18n("Open All Project Files"), i18n("project configuration file") );
+		}
+		else if(item->type()==KileProjectItem::Image) {
+			dontOpenWarning( item, i18n("Open All Project Files"), i18n("graphics file") );
+		}
+		else if(!m_ki->isOpen(item->url())) {
+			fileOpen(item->url(), item->encoding());
+		}
+	}
+
+	if(doc) { // we have a doc so switch back to original view
+		m_ki->viewManager()->switchToTextView(doc->url());
+	}
+}
+
+QStringList Manager::getProjectFiles()
+{
+	QStringList filelist;
+
+	KileProject *project = activeProject();
+	if ( project )
+	{
+		QList<KileProjectItem*> list = project->items();
+		for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+			KileProjectItem *item = *it;
+
+			if(item->type() != KileProjectItem::ProjectFile && item->type() != KileProjectItem::Image) {
+				filelist << item->url().toLocalFile();
+			}
+		}
+	}
+	return filelist;
+}
+
+void Manager::dontOpenWarning(KileProjectItem *item, const QString &action, const QString &filetype)
+{
+	m_ki->logWidget()->printMessage(KileTool::Info,
+	                                i18n("not opened: %1 (%2)", item->url().toLocalFile(), filetype),
+	                                action);
+}
+
+KileProjectItem* Manager::selectProjectFileItem(const QString &label)
+{
+	// select a project
+	KileProject *project = selectProject(i18n("Select Project"));
+	if(!project) {
+		return NULL;
+	}
+
+	// get a list of files
+	QStringList filelist;
+	QMap<QString, KileProjectItem*> map;
+	QList<KileProjectItem*> list = project->items();
+	for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+		KileProjectItem *item = *it;
+
+		filelist << item->path();
+		map[item->path()] = item;
+	}
+
+	// select one of these files
+	KileProjectItem *item = NULL;
+	KileListSelector *dlg  = new KileListSelector(filelist,i18n("Project Files"),label, m_ki->mainWindow());
+	if(dlg->exec()) {
+		if(dlg->currentItem() >= 0) {
+			QString name = filelist[dlg->currentItem()];
+			if(map.contains(name)) {
+				item = map[name];
+			}
+			else {
+				KMessageBox::error(m_ki->mainWindow(), i18n("Could not determine the selected file."),i18n( "Project Error"));
+			}
+		}
+	}
+	delete dlg;
+
+	return item;
+}
+
+QList<KileProjectItem*> Manager::selectProjectFileItems(const QString &label)
+{
+	KileProject *project = selectProject(i18n("Select Project"));
+	if(!project) {
+		return QList<KileProjectItem*>();
+	}
+
+	QStringList filelist;
+	QMap<QString,KileProjectItem *> map;
+
+	QList<KileProjectItem*> list = project->items();
+	for(QList<KileProjectItem*>::iterator it = list.begin(); it != list.end(); ++it) {
+		KileProjectItem *item = *it;
+
+		filelist << item->path();
+		map[item->path()] = item;
+	}
+
+	QList<KileProjectItem*> itemsList;
+
+	KileListSelectorMultiple *dlg  = new KileListSelectorMultiple(filelist, i18n("Project Files"), label, m_ki->mainWindow());
+	if(dlg->exec()) {
+		if(dlg->currentItem() >= 0) {
+			QStringList selectedfiles = dlg->selected();
+			for(QStringList::Iterator it = selectedfiles.begin(); it != selectedfiles.end(); ++it ){
+				if(map.contains(*it)) {
+					itemsList.append(map[(*it)]);
+				}
+				else {
+					KMessageBox::error(m_ki->mainWindow(), i18n("Could not determine the selected file."), i18n( "Project Error"));
+				}
+			}
+		}
+	}
+	delete dlg;
+
+	return itemsList;
+}
+
+// add a new file to the project
+//  - only when there is an active project
+//  - if the file doesn't already belong to it (checked by addToProject)
+
+void Manager::projectAddFile(QString filename, bool graphics)
+{
+	Locker lock(&m_autoSaveLock);
+	KILE_DEBUG() << "===Kile::projectAddFile==============";
+	KileProject *project = activeProject();
+	if(!project) {
+		return;
+	}
+
+	QFileInfo fi(filename);
+	if(!fi.exists()) {
+		if(graphics) {
+			return;
+		}
+
+		// called from InputDialog after a \input- or \include command:
+		//  - if the chosen file has an extension: accept
+		//  - if not we add the default TeX extension: accept if it exists else reject
+		QString ext = fi.completeSuffix();
+		if ( ! ext.isEmpty() )
+			return;
+
+		filename += m_ki->extensions()->latexDocumentDefault();
+		if ( QFileInfo(filename).exists() )
+			return;
+	}
+
+	//ok, we have a project and an existing file
+	KILE_DEBUG() << "\tadd file: " << filename;
+	m_ki->viewManager()->updateStructure(false);
+
+	KUrl url;
+	url.setPath(filename);
+	addToProject(project, url);
+}
+
+const KUrl Manager::symlinkFreeURL(const KUrl& url)
+{
+#ifdef Q_WS_WIN
+	//TODO: maybe actually do something here?  Seems unncecessary given Windows' lack of symlinks though...
+	//Also: the else'd code below fails badly on Windows
+	return url;
+#else
+	KILE_DEBUG() << "===symlinkFreeURL==";
+
+	if( !url.isLocalFile() )
+		return url;
+
+	QDir dir(url.directory());
+	QString filename=url.toLocalFile(); // if the directory does not exist we return the old url (just to be sure)
+
+	if(dir.exists())
+		filename= dir.canonicalPath() + '/' + url.fileName();
+	else
+		KILE_DEBUG() << "directory " << url.directory() << "does not exist";
+
+	return KUrl(filename);
+#endif //def Q_WS_WIN
+}
+
+void Manager::cleanupDocumentInfoForProjectItems(KileDocument::Info *info)
+{
+	QList<KileProjectItem*> itemsList = itemsFor(info);
+	for(QList<KileProjectItem*>::iterator it = itemsList.begin(); it != itemsList.end(); ++it) {
+		(*it)->setInfo(NULL);
+	}
+}
+
+void Manager::createProgressDialog()
+{
+	m_progressDialog = new KileWidget::ProgressDialog(m_ki->mainWindow(), i18n("Opening Project..."));
+	m_progressDialog->setModal(true);
+	m_progressDialog->setAllowCancel(false);
+	m_progressDialog->setLabelText(i18n("Scanning project files..."));
+	m_progressDialog->setAutoClose(true);
+	m_progressDialog->setMinimumDuration(2000);
+	m_progressDialog->hide();
+}
+
+void Manager::loadDocumentAndViewSettings(KTextEditor::Document *document)
+{
+	KConfigGroup configGroup = configGroupForDocumentSettings(document);
+	if(!configGroup.exists()) {
+		return;
+	}
+#if KDE_IS_VERSION(4,3,75)
+	KTextEditor::ParameterizedSessionConfigInterface *interface = qobject_cast<KTextEditor::ParameterizedSessionConfigInterface*>(document);
+	if(!interface) {
+		return;
+	}
+	interface->readParameterizedSessionConfig(configGroup, KTextEditor::ParameterizedSessionConfigInterface::SkipUrl);
+
+	QList<KTextEditor::View*> viewList = document->views();
+	int i = 0;
+	for(QList<KTextEditor::View*>::iterator it = viewList.begin(); it != viewList.end(); ++it) {
+		KTextEditor::View *view = *it;
+		KTextEditor::SessionConfigInterface *viewConfigInterface = qobject_cast<KTextEditor::SessionConfigInterface*>(view);
+		if(!interface) {
+			continue;
+		}
+		configGroup = configGroupForViewSettings(document, i);
+		viewConfigInterface->readSessionConfig(configGroup);
+		++i;
+	}
+#endif
+}
+
+void Manager::saveDocumentAndViewSettings(KTextEditor::Document *document)
+{
+	KConfigGroup configGroup = configGroupForDocumentSettings(document);
+#if KDE_IS_VERSION(4,3,75)
+	KUrl url = document->url();
+	url.setPassword(""); // we don't want the password to appear in the configuration file
+	deleteDocumentAndViewSettingsGroups(url);
+
+	KTextEditor::ParameterizedSessionConfigInterface *interface = qobject_cast<KTextEditor::ParameterizedSessionConfigInterface*>(document);
+	if(!interface) {
+		return;
+	}
+	interface->writeParameterizedSessionConfig(configGroup, KTextEditor::ParameterizedSessionConfigInterface::SkipUrl);
+
+	QList<KTextEditor::View*> viewList = document->views();
+	int i = 0;
+	for(QList<KTextEditor::View*>::iterator it = viewList.begin(); it != viewList.end(); ++it) {
+		KTextEditor::View *view = *it;
+		KTextEditor::SessionConfigInterface *viewConfigInterface = qobject_cast<KTextEditor::SessionConfigInterface*>(view);
+		if(!interface) {
+			continue;
+		}
+		configGroup = configGroupForViewSettings(document, i);
+		viewConfigInterface->writeSessionConfig(configGroup);
+		++i;
+	}
+	// finally remove the config groups for the oldest documents that exceed MAX_NUMBER_OF_STORED_SETTINGS
+	configGroup = KGlobal::config()->group("Session Settings");
+	KUrl::List urlList(configGroup.readEntry("Saved Documents", QStringList()));
+	urlList.removeAll(url);
+	urlList.push_front(url);
+	// remove excess elements
+	if(urlList.length() > MAX_NUMBER_OF_STORED_SETTINGS) {
+		int excessNumber = urlList.length() - MAX_NUMBER_OF_STORED_SETTINGS;
+		for(; excessNumber > 0; --excessNumber) {
+			KUrl url = urlList.takeLast();
+			deleteDocumentAndViewSettingsGroups(url);
+		}
+	}
+	configGroup.writeEntry("Documents", url);
+	configGroup.writeEntry("Saved Documents", urlList.toStringList());
+#endif
+}
+
+KConfigGroup Manager::configGroupForDocumentSettings(KTextEditor::Document *doc) const
+{
+	return KGlobal::config()->group(configGroupNameForDocumentSettings(doc->url()));
+}
+
+QString Manager::configGroupNameForDocumentSettings(const KUrl& url) const
+{
+	KUrl url2 = url;
+	url2.setPassword("");
+	return "Document-Settings,URL=" + url2.url();
+}
+
+KConfigGroup Manager::configGroupForViewSettings(KTextEditor::Document *doc, int viewIndex) const
+{
+	return KGlobal::config()->group(configGroupNameForViewSettings(doc->url(), viewIndex));
+}
+
+QString Manager::configGroupNameForViewSettings(const KUrl& url, int viewIndex) const
+{
+	KUrl url2 = url;
+	url2.setPassword("");
+	return "View-Settings,View=" + QString::number(viewIndex) + ",URL=" + url2.url();
+}
+
+void Manager::deleteDocumentAndViewSettingsGroups(const KUrl& url)
+{
+	QString urlString = url.url();
+	QStringList groupList = KGlobal::config()->groupList();
+	for(QStringList::iterator i = groupList.begin(); i != groupList.end(); ++i) {
+		QString groupName = *i;
+		if(groupName.startsWith("Document-Settings")
+		|| groupName.startsWith("View-Settings")) {
+			int urlIndex = groupName.indexOf("URL=");
+			if(urlIndex >= 0 && groupName.mid(urlIndex + 4) == urlString) {
+				KGlobal::config()->deleteGroup(groupName);
+			}
+		}
+	}
+}
+
+}
+
+#include "kiledocmanager.moc"
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-04-16 00:46:18 +0000
+++ debian/changelog	2012-08-25 08:51:18 +0000
@@ -1,3 +1,10 @@
+kile (1:2.1.0-1ubuntu3) precise-updates; urgency=low
+
+  * Fixed segfault on close when a project is open (LP: #994498). Patch by
+    Eugene Shalygin.
+
+ -- Alessandro Menti <[e-mail]>  Tue, 07 Aug 2012 19:52:40 +0200
+
 kile (1:2.1.0-1ubuntu2) precise; urgency=low
 
   * Add kubuntu_use_utf8.diff to prevent pulling in texlive-latex-extra
 
=== added file 'debian/patches/kile-fix-closing-994498.patch'
--- debian/patches/kile-fix-closing-994498.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/kile-fix-closing-994498.patch	2012-08-25 08:51:18 +0000
@@ -0,0 +1,31 @@
+Description: Fix crash when closing with a project file open
+ This patch fixes a segmentation fault that occurs when Kile is closed and
+ a project file is open (the stack trace shows QUrl::isEmpty at the top of
+ the stack in one of the threads). The original "iterator" is removed and
+ replaced by a more reliable access to the m_projects collection.
+ Upstream patch by Eugene Shalygin.
+Author: Alessandro Menti <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/994498
+Origin: upstream, https://bugs.kde.org/attachment.cgi?id=66957
+Bug: https://bugs.kde.org/show_bug.cgi?id=289458
+Forwarded: not-needed
+
+--- kile-2.1.0.orig/src/kiledocmanager.cpp
++++ kile-2.1.0/src/kiledocmanager.cpp
+@@ -1738,11 +1738,11 @@ bool Manager::projectCloseAll()
+ 	Locker lock(&m_autoSaveLock);
+ 	KILE_DEBUG() << "==Kile::projectCloseAll==========================";
+ 
+-	for(QList<KileProject*>::iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
+-		if(!projectClose((*it)->url())) {
+-			return false;
+-		}
+-	}
++    while (m_projects.size()) {
++       if(!projectClose(m_projects.front()->url())) {
++            return false;
++        } 
++    }
+ 
+ 	return true;
+ }
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-04-16 00:46:18 +0000
+++ debian/patches/series	2012-08-25 08:51:18 +0000
@@ -3,3 +3,4 @@
 kubuntu_01_improved_viewpart_warning.diff
 kubuntu_02_disable_embedded_kbibtex.diff
 kubuntu_use_utf8.diff
+kile-fix-closing-994498.patch
 
=== modified file 'src/kiledocmanager.cpp'
--- src/kiledocmanager.cpp	2011-06-11 14:55:19 +0000
+++ src/kiledocmanager.cpp	2012-08-25 08:51:18 +0000
@@ -1738,11 +1738,11 @@
 	Locker lock(&m_autoSaveLock);
 	KILE_DEBUG() << "==Kile::projectCloseAll==========================";
 
-	for(QList<KileProject*>::iterator it = m_projects.begin(); it != m_projects.end(); ++it) {
-		if(!projectClose((*it)->url())) {
-			return false;
-		}
-	}
+    while (m_projects.size()) {
+       if(!projectClose(m_projects.front()->url())) {
+            return false;
+        } 
+    }
 
 	return true;
 }