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

C++: Remove hard-coded configuration file name.

Browse Source 
Change-Id: Ibe4cc69eafd14dab7707862b1068ce1e21b1d8e0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2012-11-28 09:52:19 +01:00
parent d37ee4d1ab
commit cfc1069c78
12 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -164,8 +164,6 @@ protected:
#endif // QTCREATOR_WITH_DUMP_AST
static const char pp_configuration_file[] = "<configuration>";
static const char pp_configuration[] =
"# 1 \"<configuration>\"\n"
"#define __cplusplus 1\n"
@@ -396,7 +394,7 @@ static inline void appendDirSeparatorIfNeeded(QString &path)
QString CppPreprocessor::tryIncludeFile_helper(QString &fileName, IncludeType type, unsigned *revision)
{
QFileInfo fileInfo(fileName);
if (fileName == QLatin1String(pp_configuration_file) || fileInfo.isAbsolute()) {
if (fileName == Preprocessor::configurationFileName || fileInfo.isAbsolute()) {
QString contents;
includeFile(fileName, &contents, revision);
return contents;
@@ -741,7 +739,7 @@ CppModelManager::CppModelManager(QObject *parent)
ExtensionSystem::PluginManager::addObject(m_completionAssistProvider);
m_highlightingFallback = new CppHighlightingSupportInternalFactory;
m_highlightingFactory = m_highlightingFallback;
m_internalIndexingSupport = new BuiltinIndexingSupport(pp_configuration_file);
m_internalIndexingSupport = new BuiltinIndexingSupport;
}
CppModelManager::~CppModelManager()
@@ -940,7 +938,7 @@ CppModelManager::WorkingCopy CppModelManager::buildWorkingCopyList()
// add the project configuration file
QByteArray conf(pp_configuration);
conf += definedMacros();
workingCopy.insert(QLatin1String(pp_configuration_file), QString::fromUtf8(conf));
workingCopy.insert(configurationFileName(), QString::fromUtf8(conf));
return workingCopy;
}