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

13
src/plugins/cpptools/builtinindexingsupport.cpp
View File

@@ -16,8 +16,7 @@ namespace {
static void parse(QFutureInterface<void> &future,
CppPreprocessor *preproc,
QStringList files,
const char *pp_configuration_file)
QStringList files)
{
if (files.isEmpty())
return;
@@ -53,8 +52,7 @@ static void parse(QFutureInterface<void> &future,
future.setProgressRange(0, files.size());
QString conf = QLatin1String(pp_configuration_file);
const QString conf = CPlusPlus::CppModelManagerInterface::configurationFileName();
bool processingHeaders = false;
for (int i = 0; i < files.size(); ++i) {
@@ -163,9 +161,8 @@ private:
} // anonymous namespace
BuiltinIndexingSupport::BuiltinIndexingSupport(const char *pp_configuration_file)
: m_pp_configuration_file(pp_configuration_file)
, m_revision(0)
BuiltinIndexingSupport::BuiltinIndexingSupport()
: m_revision(0)
{
m_synchronizer.setCancelOnWait(true);
m_dumpFileNameWhileParsing = !qgetenv("QTCREATOR_DUMP_FILENAME_WHILE_PARSING").isNull();
@@ -186,7 +183,7 @@ QFuture<void> BuiltinIndexingSupport::refreshSourceFiles(const QStringList &sour
preproc->setFrameworkPaths(mgr->frameworkPaths());
preproc->setWorkingCopy(workingCopy);
QFuture<void> result = QtConcurrent::run(&parse, preproc, sourceFiles, m_pp_configuration_file);
QFuture<void> result = QtConcurrent::run(&parse, preproc, sourceFiles);
if (m_synchronizer.futures().size() > 10) {
QList<QFuture<void> > futures = m_synchronizer.futures();