Commit ec97d967 authored by Nikolai Kosjar's avatar Nikolai Kosjar

CppTools: Rename CppPreprocessor to CppSourceProcessor

...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: default avatarErik Verbruggen <erik.verbruggen@digia.com>
parent 43895b03
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include <cpptools/cppcodestylepreferences.h> #include <cpptools/cppcodestylepreferences.h>
#include <cpptools/cppmodelmanager.h> #include <cpptools/cppmodelmanager.h>
#include <cpptools/cpppreprocessertesthelper.h> #include <cpptools/cppsourceprocessertesthelper.h>
#include <cpptools/cpppreprocessor.h> #include <cpptools/cppsourceprocessor.h>
#include <cpptools/cpptoolssettings.h> #include <cpptools/cpptoolssettings.h>
#include <cpptools/includeutils.h> #include <cpptools/includeutils.h>
...@@ -1859,9 +1859,9 @@ QList<Include> includesForSource(const QByteArray &source) ...@@ -1859,9 +1859,9 @@ QList<Include> includesForSource(const QByteArray &source)
CppModelManager *cmm = CppModelManager::instance(); CppModelManager *cmm = CppModelManager::instance();
cmm->GC(); cmm->GC();
CppPreprocessor pp((QPointer<CppModelManager>(cmm))); CppSourceProcessor sourceProcessor((QPointer<CppModelManager>(cmm)));
pp.setIncludePaths(QStringList(TestIncludePaths::globalIncludePath())); sourceProcessor.setIncludePaths(QStringList(TestIncludePaths::globalIncludePath()));
pp.run(fileName); sourceProcessor.run(fileName);
Document::Ptr document = cmm->document(fileName); Document::Ptr document = cmm->document(fileName);
return document->resolvedIncludes(); return document->resolvedIncludes();
......
#include "builtinindexingsupport.h" #include "builtinindexingsupport.h"
#include "cppmodelmanager.h" #include "cppmodelmanager.h"
#include "cpppreprocessor.h" #include "cppsourceprocessor.h"
#include "searchsymbols.h" #include "searchsymbols.h"
#include "cpptoolsconstants.h" #include "cpptoolsconstants.h"
#include "cpptoolsplugin.h" #include "cpptoolsplugin.h"
...@@ -22,7 +22,7 @@ static const bool DumpFileNameWhileParsing = qgetenv("QTC_DUMP_FILENAME_WHILE_PA ...@@ -22,7 +22,7 @@ static const bool DumpFileNameWhileParsing = qgetenv("QTC_DUMP_FILENAME_WHILE_PA
namespace { namespace {
static void parse(QFutureInterface<void> &future, static void parse(QFutureInterface<void> &future,
CppPreprocessor *preproc, CppSourceProcessor *sourceProcessor,
QStringList files) QStringList files)
{ {
if (files.isEmpty()) if (files.isEmpty())
...@@ -32,7 +32,7 @@ static void parse(QFutureInterface<void> &future, ...@@ -32,7 +32,7 @@ static void parse(QFutureInterface<void> &future,
QStringList headers; QStringList headers;
foreach (const QString &file, files) { foreach (const QString &file, files) {
preproc->removeFromCache(file); sourceProcessor->removeFromCache(file);
if (ProjectFile::isSource(ProjectFile::classify(file))) if (ProjectFile::isSource(ProjectFile::classify(file)))
sources.append(file); sources.append(file);
else else
...@@ -43,7 +43,7 @@ static void parse(QFutureInterface<void> &future, ...@@ -43,7 +43,7 @@ static void parse(QFutureInterface<void> &future,
files = sources; files = sources;
files += headers; files += headers;
preproc->setTodo(files); sourceProcessor->setTodo(files);
future.setProgressRange(0, files.size()); future.setProgressRange(0, files.size());
...@@ -63,9 +63,9 @@ static void parse(QFutureInterface<void> &future, ...@@ -63,9 +63,9 @@ static void parse(QFutureInterface<void> &future,
const bool isSourceFile = i < sourceCount; const bool isSourceFile = i < sourceCount;
if (isSourceFile) { if (isSourceFile) {
(void) preproc->run(conf); (void) sourceProcessor->run(conf);
} else if (!processingHeaders) { } else if (!processingHeaders) {
(void) preproc->run(conf); (void) sourceProcessor->run(conf);
processingHeaders = true; processingHeaders = true;
} }
...@@ -74,19 +74,19 @@ static void parse(QFutureInterface<void> &future, ...@@ -74,19 +74,19 @@ static void parse(QFutureInterface<void> &future,
QStringList includePaths = parts.isEmpty() QStringList includePaths = parts.isEmpty()
? fallbackIncludePaths ? fallbackIncludePaths
: parts.first()->includePaths; : parts.first()->includePaths;
preproc->setIncludePaths(includePaths); sourceProcessor->setIncludePaths(includePaths);
preproc->run(fileName); sourceProcessor->run(fileName);
future.setProgressValue(files.size() - preproc->todo().size()); future.setProgressValue(files.size() - sourceProcessor->todo().size());
if (isSourceFile) if (isSourceFile)
preproc->resetEnvironment(); sourceProcessor->resetEnvironment();
} }
future.setProgressValue(files.size()); future.setProgressValue(files.size());
preproc->modelManager()->finishedRefreshingSourceFiles(files); sourceProcessor->modelManager()->finishedRefreshingSourceFiles(files);
delete preproc; delete sourceProcessor;
} }
class BuiltinSymbolSearcher: public SymbolSearcher class BuiltinSymbolSearcher: public SymbolSearcher
...@@ -184,7 +184,7 @@ QFuture<void> BuiltinIndexingSupport::refreshSourceFiles(const QStringList &sour ...@@ -184,7 +184,7 @@ QFuture<void> BuiltinIndexingSupport::refreshSourceFiles(const QStringList &sour
CppModelManager *mgr = CppModelManager::instance(); CppModelManager *mgr = CppModelManager::instance();
const WorkingCopy workingCopy = mgr->workingCopy(); const WorkingCopy workingCopy = mgr->workingCopy();
CppPreprocessor *preproc = new CppPreprocessor(mgr, m_dumpFileNameWhileParsing); CppSourceProcessor *preproc = new CppSourceProcessor(mgr, m_dumpFileNameWhileParsing);
preproc->setRevision(++m_revision); preproc->setRevision(++m_revision);
preproc->setIncludePaths(mgr->includePaths()); preproc->setIncludePaths(mgr->includePaths());
preproc->setFrameworkPaths(mgr->frameworkPaths()); preproc->setFrameworkPaths(mgr->frameworkPaths());
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "cpphighlightingsupport.h" #include "cpphighlightingsupport.h"
#include "cppindexingsupport.h" #include "cppindexingsupport.h"
#include "cppmodelmanagersupportinternal.h" #include "cppmodelmanagersupportinternal.h"
#include "cpppreprocessor.h" #include "cppsourceprocessor.h"
#include "cpptoolsconstants.h" #include "cpptoolsconstants.h"
#include "cpptoolseditorsupport.h" #include "cpptoolseditorsupport.h"
#include "cpptoolsplugin.h" #include "cpptoolsplugin.h"
...@@ -310,7 +310,7 @@ QStringList CppModelManager::internalIncludePaths() const ...@@ -310,7 +310,7 @@ QStringList CppModelManager::internalIncludePaths() const
const ProjectInfo pinfo = it.value(); const ProjectInfo pinfo = it.value();
foreach (const ProjectPart::Ptr &part, pinfo.projectParts()) foreach (const ProjectPart::Ptr &part, pinfo.projectParts())
foreach (const QString &path, part->includePaths) foreach (const QString &path, part->includePaths)
includePaths.append(CppPreprocessor::cleanPath(path)); includePaths.append(CppSourceProcessor::cleanPath(path));
} }
includePaths.removeDuplicates(); includePaths.removeDuplicates();
return includePaths; return includePaths;
...@@ -325,7 +325,7 @@ QStringList CppModelManager::internalFrameworkPaths() const ...@@ -325,7 +325,7 @@ QStringList CppModelManager::internalFrameworkPaths() const
const ProjectInfo pinfo = it.value(); const ProjectInfo pinfo = it.value();
foreach (const ProjectPart::Ptr &part, pinfo.projectParts()) foreach (const ProjectPart::Ptr &part, pinfo.projectParts())
foreach (const QString &path, part->frameworkPaths) foreach (const QString &path, part->frameworkPaths)
frameworkPaths.append(CppPreprocessor::cleanPath(path)); frameworkPaths.append(CppSourceProcessor::cleanPath(path));
} }
frameworkPaths.removeDuplicates(); frameworkPaths.removeDuplicates();
return frameworkPaths; return frameworkPaths;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include "cpppreprocessor.h" #include "cppsourceprocessor.h"
#include "cpptoolseditorsupport.h" #include "cpptoolseditorsupport.h"
#include "cpptoolsplugin.h" #include "cpptoolsplugin.h"
#include "cpptoolstestcase.h" #include "cpptoolstestcase.h"
...@@ -345,7 +345,7 @@ void CppToolsPlugin::test_modelmanager_refresh_also_includes_of_project_files() ...@@ -345,7 +345,7 @@ void CppToolsPlugin::test_modelmanager_refresh_also_includes_of_project_files()
/// QTCREATORBUG-9205 /// QTCREATORBUG-9205
/// Check: When reparsing the same files again, no errors occur /// Check: When reparsing the same files again, no errors occur
/// (The CppPreprocessor's already seen files are properly cleared!). /// (The CppSourceProcessor's already seen files are properly cleared!).
void CppToolsPlugin::test_modelmanager_refresh_several_times() void CppToolsPlugin::test_modelmanager_refresh_several_times()
{ {
ModelManagerTestHelper helper; ModelManagerTestHelper helper;
...@@ -646,7 +646,7 @@ void CppToolsPlugin::test_modelmanager_snapshot_after_two_projects() ...@@ -646,7 +646,7 @@ void CppToolsPlugin::test_modelmanager_snapshot_after_two_projects()
/// Check: (1) For a project with a *.ui file an AbstractEditorSupport object /// Check: (1) For a project with a *.ui file an AbstractEditorSupport object
/// is added for the ui_* file. /// is added for the ui_* file.
/// Check: (2) The CppPreprocessor can successfully resolve the ui_* file /// Check: (2) The CppSourceProcessor can successfully resolve the ui_* file
/// though it might not be actually generated in the build dir. /// though it might not be actually generated in the build dir.
void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles()
{ {
...@@ -678,8 +678,8 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() ...@@ -678,8 +678,8 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles()
QCOMPARE(fileNamesInWorkinCopy.at(0), mm->configurationFileName()); QCOMPARE(fileNamesInWorkinCopy.at(0), mm->configurationFileName());
QCOMPARE(fileNamesInWorkinCopy.at(1), expectedUiHeaderFileName); QCOMPARE(fileNamesInWorkinCopy.at(1), expectedUiHeaderFileName);
// Check CppPreprocessor / includes. // Check CppSourceProcessor / includes.
// The CppPreprocessor is expected to find the ui_* file in the working copy. // The CppSourceProcessor is expected to find the ui_* file in the working copy.
const QString fileIncludingTheUiFile = testDataDirectory.file(_("mainwindow.cpp")); const QString fileIncludingTheUiFile = testDataDirectory.file(_("mainwindow.cpp"));
while (!mm->snapshot().document(fileIncludingTheUiFile)) while (!mm->snapshot().document(fileIncludingTheUiFile))
QCoreApplication::processEvents(); QCoreApplication::processEvents();
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include "cpppreprocessor.h" #include "cppsourceprocessor.h"
#include "cppsnapshotupdater.h" #include "cppsnapshotupdater.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
...@@ -159,25 +159,25 @@ void SnapshotUpdater::update(CppModelManager::WorkingCopy workingCopy) ...@@ -159,25 +159,25 @@ void SnapshotUpdater::update(CppModelManager::WorkingCopy workingCopy)
workingCopy.insert(editorDefinesFileName, m_editorDefines); workingCopy.insert(editorDefinesFileName, m_editorDefines);
} }
CppPreprocessor preproc(modelManager, m_snapshot); CppSourceProcessor sourceProcessor(modelManager, m_snapshot);
Snapshot globalSnapshot = modelManager->snapshot(); Snapshot globalSnapshot = modelManager->snapshot();
globalSnapshot.remove(fileInEditor()); globalSnapshot.remove(fileInEditor());
preproc.setGlobalSnapshot(globalSnapshot); sourceProcessor.setGlobalSnapshot(globalSnapshot);
preproc.setWorkingCopy(workingCopy); sourceProcessor.setWorkingCopy(workingCopy);
preproc.setIncludePaths(m_includePaths); sourceProcessor.setIncludePaths(m_includePaths);
preproc.setFrameworkPaths(m_frameworkPaths); sourceProcessor.setFrameworkPaths(m_frameworkPaths);
preproc.run(configurationFileName); sourceProcessor.run(configurationFileName);
if (!m_projectConfigFile.isEmpty()) if (!m_projectConfigFile.isEmpty())
preproc.run(m_projectConfigFile); sourceProcessor.run(m_projectConfigFile);
if (m_usePrecompiledHeaders) { if (m_usePrecompiledHeaders) {
foreach (const QString &precompiledHeader, m_precompiledHeaders) foreach (const QString &precompiledHeader, m_precompiledHeaders)
preproc.run(precompiledHeader); sourceProcessor.run(precompiledHeader);
} }
if (!m_editorDefines.isEmpty()) if (!m_editorDefines.isEmpty())
preproc.run(editorDefinesFileName); sourceProcessor.run(editorDefinesFileName);
preproc.run(m_fileInEditor); sourceProcessor.run(m_fileInEditor);
m_snapshot = preproc.snapshot(); m_snapshot = sourceProcessor.snapshot();
Snapshot newSnapshot = m_snapshot.simplified(document()); Snapshot newSnapshot = m_snapshot.simplified(document());
for (Snapshot::const_iterator i = m_snapshot.begin(), ei = m_snapshot.end(); i != ei; ++i) { for (Snapshot::const_iterator i = m_snapshot.begin(), ei = m_snapshot.end(); i != ei; ++i) {
if (Client::isInjectedFile(i.key())) if (Client::isInjectedFile(i.key()))
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
****************************************************************************/ ****************************************************************************/
#include "cpppreprocessertesthelper.h" #include "cppsourceprocessertesthelper.h"
#include <QDir> #include <QDir>
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
****************************************************************************/ ****************************************************************************/
#ifndef CPPPREPROCESSERTESTHELPER_H #ifndef CPPPSOURCEPROCESSERTESTHELPER_H
#define CPPPREPROCESSERTESTHELPER_H #define CPPPSOURCEPROCESSERTESTHELPER_H
#include "cpptools_global.h" #include "cpptools_global.h"
...@@ -56,4 +56,4 @@ public: ...@@ -56,4 +56,4 @@ public:
} // namespace Tests } // namespace Tests
} // namespace CppTools } // namespace CppTools
#endif // CPPPREPROCESSERTESTHELPER_H #endif // CPPPSOURCEPROCESSERTESTHELPER_H
#ifndef CPPPREPROCESSOR_H #ifndef CPPSOURCEPROCESSOR_H
#define CPPPREPROCESSOR_H #define CPPSOURCEPROCESSOR_H
#include "cppmodelmanagerinterface.h" #include "cppmodelmanagerinterface.h"
...@@ -19,17 +19,17 @@ namespace Internal { ...@@ -19,17 +19,17 @@ namespace Internal {
class CppModelManager; class CppModelManager;
// Documentation inside. // Documentation inside.
class CPPTOOLS_EXPORT CppPreprocessor: public CPlusPlus::Client class CPPTOOLS_EXPORT CppSourceProcessor: public CPlusPlus::Client
{ {
Q_DISABLE_COPY(CppPreprocessor) Q_DISABLE_COPY(CppSourceProcessor)
public: public:
static QString cleanPath(const QString &path); static QString cleanPath(const QString &path);
CppPreprocessor(QPointer<CppModelManager> modelManager, bool dumpFileNameWhileParsing = false); CppSourceProcessor(QPointer<CppModelManager> modelManager, bool dumpFileNameWhileParsing = false);
CppPreprocessor(QPointer<CppModelManager> modelManager, const CPlusPlus::Snapshot &snapshot, CppSourceProcessor(QPointer<CppModelManager> modelManager, const CPlusPlus::Snapshot &snapshot,
bool dumpFileNameWhileParsing = false); bool dumpFileNameWhileParsing = false);
virtual ~CppPreprocessor(); virtual ~CppSourceProcessor();
void setRevision(unsigned revision); void setRevision(unsigned revision);
void setWorkingCopy(const CppTools::CppModelManagerInterface::WorkingCopy &workingCopy); void setWorkingCopy(const CppTools::CppModelManagerInterface::WorkingCopy &workingCopy);
...@@ -82,7 +82,7 @@ protected: ...@@ -82,7 +82,7 @@ protected:
virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType type); virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType type);
private: private:
CppPreprocessor(); CppSourceProcessor();
void addFrameworkPath(const QString &frameworkPath); void addFrameworkPath(const QString &frameworkPath);
CPlusPlus::Snapshot m_snapshot; CPlusPlus::Snapshot m_snapshot;
...@@ -106,4 +106,4 @@ private: ...@@ -106,4 +106,4 @@ private:
} // namespace Internal } // namespace Internal
} // namespace CppTools } // namespace CppTools
#endif // CPPPREPROCESSOR_H #endif // CPPSOURCEPROCESSOR_H
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include "cpptoolsplugin.h" #include "cpptoolsplugin.h"
#include "cppmodelmanager.h" #include "cppmodelmanager.h"
#include "cpppreprocessertesthelper.h" #include "cppsourceprocessertesthelper.h"
#include "cpppreprocessor.h" #include "cppsourceprocessor.h"
#include "cppsnapshotupdater.h" #include "cppsnapshotupdater.h"
#include "cpptoolseditorsupport.h" #include "cpptoolseditorsupport.h"
#include "cpptoolstestcase.h" #include "cpptoolstestcase.h"
...@@ -69,9 +69,9 @@ public: ...@@ -69,9 +69,9 @@ public:
TestCase::writeFile(fileName, source); TestCase::writeFile(fileName, source);
CppPreprocessor pp((QPointer<CppModelManager>(m_cmm))); CppSourceProcessor sourceProcessor((QPointer<CppModelManager>(m_cmm)));
pp.setIncludePaths(QStringList(TestIncludePaths::directoryOfTestFile())); sourceProcessor.setIncludePaths(QStringList(TestIncludePaths::directoryOfTestFile()));
pp.run(fileName); sourceProcessor.run(fileName);
Document::Ptr document = m_cmm->document(fileName); Document::Ptr document = m_cmm->document(fileName);
QFile(fileName).remove(); QFile(fileName).remove();
...@@ -95,7 +95,7 @@ private: ...@@ -95,7 +95,7 @@ private:
}; };
/// Check: Resolved and unresolved includes are properly tracked. /// Check: Resolved and unresolved includes are properly tracked.
void CppToolsPlugin::test_cpppreprocessor_includes_resolvedUnresolved() void CppToolsPlugin::test_cppsourceprocessor_includes_resolvedUnresolved()
{ {
QByteArray source = QByteArray source =
"#include \"header.h\"\n" "#include \"header.h\"\n"
...@@ -123,7 +123,7 @@ void CppToolsPlugin::test_cpppreprocessor_includes_resolvedUnresolved() ...@@ -123,7 +123,7 @@ void CppToolsPlugin::test_cpppreprocessor_includes_resolvedUnresolved()
} }
/// Check: Avoid self-include entries due to cyclic includes. /// Check: Avoid self-include entries due to cyclic includes.
void CppToolsPlugin::test_cpppreprocessor_includes_cyclic() void CppToolsPlugin::test_cppsourceprocessor_includes_cyclic()
{ {
const QString fileName1 = TestIncludePaths::testFilePath(QLatin1String("cyclic1.h")); const QString fileName1 = TestIncludePaths::testFilePath(QLatin1String("cyclic1.h"));
const QString fileName2 = TestIncludePaths::testFilePath(QLatin1String("cyclic2.h")); const QString fileName2 = TestIncludePaths::testFilePath(QLatin1String("cyclic2.h"));
...@@ -163,7 +163,7 @@ void CppToolsPlugin::test_cpppreprocessor_includes_cyclic() ...@@ -163,7 +163,7 @@ void CppToolsPlugin::test_cpppreprocessor_includes_cyclic()
} }
/// Check: All include errors are reported as diagnostic messages. /// Check: All include errors are reported as diagnostic messages.
void CppToolsPlugin::test_cpppreprocessor_includes_allDiagnostics() void CppToolsPlugin::test_cppsourceprocessor_includes_allDiagnostics()
{ {
QByteArray source = QByteArray source =
"#include <NotResolvable1>\n" "#include <NotResolvable1>\n"
...@@ -181,7 +181,7 @@ void CppToolsPlugin::test_cpppreprocessor_includes_allDiagnostics() ...@@ -181,7 +181,7 @@ void CppToolsPlugin::test_cpppreprocessor_includes_allDiagnostics()
QCOMPARE(document->diagnosticMessages().size(), 3); QCOMPARE(document->diagnosticMessages().size(), 3);
} }
void CppToolsPlugin::test_cpppreprocessor_macroUses() void CppToolsPlugin::test_cppsourceprocessor_macroUses()
{ {
QByteArray source = QByteArray source =
"#define SOMEDEFINE 1\n" "#define SOMEDEFINE 1\n"
......
...@@ -35,12 +35,12 @@ HEADERS += \ ...@@ -35,12 +35,12 @@ HEADERS += \
cppmodelmanagersupport.h \ cppmodelmanagersupport.h \
cppmodelmanagersupportinternal.h \ cppmodelmanagersupportinternal.h \
cpppointerdeclarationformatter.h \ cpppointerdeclarationformatter.h \
cpppreprocessor.h \
cppprojectfile.h \ cppprojectfile.h \
cppqtstyleindenter.h \ cppqtstyleindenter.h \
cpprefactoringchanges.h \ cpprefactoringchanges.h \
cppsemanticinfo.h \ cppsemanticinfo.h \
cppsnapshotupdater.h \ cppsnapshotupdater.h \
cppsourceprocessor.h \
cpptools_global.h \ cpptools_global.h \
cpptoolsconstants.h \ cpptoolsconstants.h \
cpptoolseditorsupport.h \ cpptoolseditorsupport.h \
...@@ -90,12 +90,12 @@ SOURCES += \ ...@@ -90,12 +90,12 @@ SOURCES += \
cppmodelmanagersupport.cpp \ cppmodelmanagersupport.cpp \
cppmodelmanagersupportinternal.cpp \ cppmodelmanagersupportinternal.cpp \
cpppointerdeclarationformatter.cpp \ cpppointerdeclarationformatter.cpp \
cpppreprocessor.cpp \
cppprojectfile.cpp \ cppprojectfile.cpp \
cppqtstyleindenter.cpp \ cppqtstyleindenter.cpp \
cpprefactoringchanges.cpp \ cpprefactoringchanges.cpp \
cppsemanticinfo.cpp \ cppsemanticinfo.cpp \
cppsnapshotupdater.cpp \ cppsnapshotupdater.cpp \
cppsourceprocessor.cpp \
cpptoolseditorsupport.cpp \ cpptoolseditorsupport.cpp \
cpptoolsplugin.cpp \ cpptoolsplugin.cpp \
cpptoolsreuse.cpp \ cpptoolsreuse.cpp \
...@@ -118,7 +118,7 @@ FORMS += \ ...@@ -118,7 +118,7 @@ FORMS += \
equals(TEST, 1) { equals(TEST, 1) {
HEADERS += \ HEADERS += \
cpppreprocessertesthelper.h \ cppsourceprocessertesthelper.h \
cpptoolstestcase.h \ cpptoolstestcase.h \
modelmanagertesthelper.h modelmanagertesthelper.h
...@@ -129,8 +129,8 @@ equals(TEST, 1) { ...@@ -129,8 +129,8 @@ equals(TEST, 1) {
cpplocatorfilter_test.cpp \ cpplocatorfilter_test.cpp \
cppmodelmanager_test.cpp \ cppmodelmanager_test.cpp \
cpppointerdeclarationformatter_test.cpp \ cpppointerdeclarationformatter_test.cpp \
cpppreprocessertesthelper.cpp \ cppsourceprocessertesthelper.cpp \
cpppreprocessor_test.cpp \ cppsourceprocessor_test.cpp \
cpptoolstestcase.cpp \ cpptoolstestcase.cpp \
modelmanagertesthelper.cpp \ modelmanagertesthelper.cpp \
symbolsearcher_test.cpp \ symbolsearcher_test.cpp \
......
...@@ -55,12 +55,12 @@ QtcPlugin { ...@@ -55,12 +55,12 @@ QtcPlugin {
"cppmodelmanagersupport.cpp", "cppmodelmanagersupport.h", "cppmodelmanagersupport.cpp", "cppmodelmanagersupport.h",
"cppmodelmanagersupportinternal.cpp", "cppmodelmanagersupportinternal.h", "cppmodelmanagersupportinternal.cpp", "cppmodelmanagersupportinternal.h",
"cpppointerdeclarationformatter.cpp", "cpppointerdeclarationformatter.h", "cpppointerdeclarationformatter.cpp", "cpppointerdeclarationformatter.h",
"cpppreprocessor.cpp", "cpppreprocessor.h",
"cppprojectfile.cpp", "cppprojectfile.h", "cppprojectfile.cpp", "cppprojectfile.h",
"cppqtstyleindenter.cpp", "cppqtstyleindenter.h", "cppqtstyleindenter.cpp", "cppqtstyleindenter.h",
"cpprefactoringchanges.cpp", "cpprefactoringchanges.h", "cpprefactoringchanges.cpp", "cpprefactoringchanges.h",
"cppsemanticinfo.cpp", "cppsemanticinfo.h", "cppsemanticinfo.cpp", "cppsemanticinfo.h",
"cppsnapshotupdater.cpp", "cppsnapshotupdater.h", "cppsnapshotupdater.cpp", "cppsnapshotupdater.h",
"cppsourceprocessor.cpp", "cppsourceprocessor.h",
"cpptools.qrc", "cpptools.qrc",
"cpptools_global.h", "cpptools_global.h",
"cpptoolsconstants.h", "cpptoolsconstants.h",
...@@ -89,8 +89,8 @@ QtcPlugin { ...@@ -89,8 +89,8 @@ QtcPlugin {
"cpplocatorfilter_test.cpp", "cpplocatorfilter_test.cpp",
"cppmodelmanager_test.cpp", "cppmodelmanager_test.cpp",
"cpppointerdeclarationformatter_test.cpp", "cpppointerdeclarationformatter_test.cpp",
"cpppreprocessertesthelper.cpp", "cpppreprocessertesthelper.h", "cppsourceprocessertesthelper.cpp", "cppsourceprocessertesthelper.h",
"cpppreprocessor_test.cpp", "cppsourceprocessor_test.cpp",
"cpptoolstestcase.cpp", "cpptoolstestcase.h", "cpptoolstestcase.cpp", "cpptoolstestcase.h",
"modelmanagertesthelper.cpp", "modelmanagertesthelper.h", "modelmanagertesthelper.cpp", "modelmanagertesthelper.h",
"symbolsearcher_test.cpp", "symbolsearcher_test.cpp",
......
...@@ -125,10 +125,10 @@ private slots: ...@@ -125,10 +125,10 @@ private slots:
void test_format_pointerdeclaration_macros(); void test_format_pointerdeclaration_macros();
void test_format_pointerdeclaration_macros_data(); void test_format_pointerdeclaration_macros_data();
void test_cpppreprocessor_includes_resolvedUnresolved(); void test_cppsourceprocessor_includes_resolvedUnresolved();
void test_cpppreprocessor_includes_cyclic(); void test_cppsourceprocessor_includes_cyclic();
void test_cpppreprocessor_includes_allDiagnostics(); void test_cppsourceprocessor_includes_allDiagnostics();
void test_cpppreprocessor_macroUses(); void test_cppsourceprocessor_macroUses();
void test_functionutils_virtualFunctions(); void test_functionutils_virtualFunctions();
void test_functionutils_virtualFunctions_data(); void test_functionutils_virtualFunctions_data();
......
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