forked from qt-creator/qt-creator
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:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user