Analyzer: Cleanup settings handling

More flexible, less over-engineered this way.

Change-Id: I3e224a6be85d3a187056d79fd506e8cf6a32c8a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
hjk
2013-08-08 17:37:37 +02:00
parent 2d4afd0494
commit 5fa7b60b97
32 changed files with 282 additions and 632 deletions

View File

@@ -99,22 +99,21 @@ QStringList MemcheckRunControl::toolArguments() const
QStringList arguments;
arguments << QLatin1String("--gen-suppressions=all");
ValgrindBaseSettings *memcheckSettings = m_settings->subConfig<ValgrindBaseSettings>();
QTC_ASSERT(memcheckSettings, return arguments);
QTC_ASSERT(m_settings, return arguments);
if (memcheckSettings->trackOrigins())
if (m_settings->trackOrigins())
arguments << QLatin1String("--track-origins=yes");
foreach (const QString &file, memcheckSettings->suppressionFiles())
foreach (const QString &file, m_settings->suppressionFiles())
arguments << QString::fromLatin1("--suppressions=%1").arg(file);
arguments << QString::fromLatin1("--num-callers=%1").arg(memcheckSettings->numCallers());
arguments << QString::fromLatin1("--num-callers=%1").arg(m_settings->numCallers());
return arguments;
}
QStringList MemcheckRunControl::suppressionFiles() const
{
return m_settings->subConfig<ValgrindBaseSettings>()->suppressionFiles();
return m_settings->suppressionFiles();
}
void MemcheckRunControl::status(const Status &status)