From b53fbe80e3282cf15ff0ed9e3167b4b8bc09a14c Mon Sep 17 00:00:00 2001 From: con Date: Mon, 11 May 2009 15:08:20 +0200 Subject: [PATCH] Include any changed file when saving before build/run. Previously there was a lot of logic figuring out which files have changed that are referenced a project. Leading to e.g. header files that are part of the project, but not in a pro file, not being saved. --- .../projectexplorer/projectexplorer.cpp | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 9f4915edaaa..adba3a69ba2 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1290,38 +1290,7 @@ bool ProjectExplorerPlugin::saveModifiedFiles(const QList & projects) if (debug) qDebug() << "ProjectExplorerPlugin::saveModifiedFiles"; - QList modifiedFi = Core::ICore::instance()->fileManager()->modifiedFiles(); - QMap modified; - - QStringList allFiles; - foreach (Project *pro, projects) - allFiles << allFilesWithDependencies(pro); - - // allFiles must be sorted for the algorithm to work - qSort(allFiles); - - foreach (Core::IFile * fi, modifiedFi) - modified.insert(fi->fileName(), fi); - - QList filesToSave; - - QMap::const_iterator mit = modified.constBegin(); - QStringList::const_iterator ait = allFiles.constBegin(); - QMap::const_iterator mend = modified.constEnd(); - QStringList::const_iterator aend = allFiles.constEnd(); - - while (mit != mend && ait != aend) { - if (mit.key() < *ait) - ++mit; - else if (*ait < mit.key()) - ++ait; - else { - filesToSave.append(mit.value()); - ++ait; - ++mit; - } - } - + QList filesToSave = Core::ICore::instance()->fileManager()->modifiedFiles(); if (!filesToSave.isEmpty()) { if (m_projectExplorerSettings.saveBeforeBuild) { Core::ICore::instance()->fileManager()->saveModifiedFilesSilently(filesToSave);