feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools: Rename CppPreprocessor to CppSourceProcessor

Browse Source 
...since it does quite a bit more than only preprocessing, as the name
suggests. We use that class to process source files in general. The
output is not a preprocessed source, but a set of CPlusPlus::Documents
with symbols.

Change-Id: I787d0f22f9f042ddf0c99e8c2f0bdb9aa7001735
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-05-16 15:51:04 -04:00
parent 43895b038f
commit ec97d967e6
13 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/cpptools/cppsnapshotupdater.cpp
View File

@@ -27,7 +27,7 @@
**
****************************************************************************/
#include "cpppreprocessor.h"
#include "cppsourceprocessor.h"
#include "cppsnapshotupdater.h"
#include <utils/qtcassert.h>
@@ -159,25 +159,25 @@ void SnapshotUpdater::update(CppModelManager::WorkingCopy workingCopy)
workingCopy.insert(editorDefinesFileName, m_editorDefines);
}
CppPreprocessor preproc(modelManager, m_snapshot);
CppSourceProcessor sourceProcessor(modelManager, m_snapshot);
Snapshot globalSnapshot = modelManager->snapshot();
globalSnapshot.remove(fileInEditor());
preproc.setGlobalSnapshot(globalSnapshot);
preproc.setWorkingCopy(workingCopy);
preproc.setIncludePaths(m_includePaths);
preproc.setFrameworkPaths(m_frameworkPaths);
preproc.run(configurationFileName);
sourceProcessor.setGlobalSnapshot(globalSnapshot);
sourceProcessor.setWorkingCopy(workingCopy);
sourceProcessor.setIncludePaths(m_includePaths);
sourceProcessor.setFrameworkPaths(m_frameworkPaths);
sourceProcessor.run(configurationFileName);
if (!m_projectConfigFile.isEmpty())
preproc.run(m_projectConfigFile);
sourceProcessor.run(m_projectConfigFile);
if (m_usePrecompiledHeaders) {
foreach (const QString &precompiledHeader, m_precompiledHeaders)
preproc.run(precompiledHeader);
sourceProcessor.run(precompiledHeader);
}
if (!m_editorDefines.isEmpty())
preproc.run(editorDefinesFileName);
preproc.run(m_fileInEditor);
sourceProcessor.run(editorDefinesFileName);
sourceProcessor.run(m_fileInEditor);
m_snapshot = preproc.snapshot();
m_snapshot = sourceProcessor.snapshot();
Snapshot newSnapshot = m_snapshot.simplified(document());
for (Snapshot::const_iterator i = m_snapshot.begin(), ei = m_snapshot.end(); i != ei; ++i) {
if (Client::isInjectedFile(i.key()))