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

remove bool return value from IRunConfigurationAspect::fromMap

Browse Source 
Change-Id: I9f909b2209eaf5e81b1475d87219ae63e2741075
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
hjk
2012-02-22 12:36:39 +01:00
committed by hjk
parent b1b431f21f
commit c5879f843d
6 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/valgrind/valgrindsettings.cpp
View File

@@ -106,7 +106,7 @@ QVariantMap ValgrindBaseSettings::defaults() const
return map;
}
bool ValgrindBaseSettings::fromMap(const QVariantMap &map)
void ValgrindBaseSettings::fromMap(const QVariantMap &map)
{
// General
setIfPresent(map, QLatin1String(valgrindExeC), &m_valgrindExecutable);
@@ -132,7 +132,6 @@ bool ValgrindBaseSettings::fromMap(const QVariantMap &map)
&m_visualisationMinimumInclusiveCostRatio);
emit changed();
return true;
}
QVariantMap ValgrindBaseSettings::toMap() const
@@ -311,7 +310,7 @@ QVariantMap ValgrindGlobalSettings::defaults() const
return map;
}
bool ValgrindGlobalSettings::fromMap(const QVariantMap &map)
void ValgrindGlobalSettings::fromMap(const QVariantMap &map)
{
ValgrindBaseSettings::fromMap(map);
@@ -325,8 +324,6 @@ bool ValgrindGlobalSettings::fromMap(const QVariantMap &map)
if (map.contains(QLatin1String(callgrindCostFormatC)))
m_costFormat = static_cast<CostDelegate::CostFormat>(map.value(QLatin1String(callgrindCostFormatC)).toInt());
setIfPresent(map, QLatin1String(callgrindCycleDetectionC), &m_detectCycles);
return true;
}
QVariantMap ValgrindGlobalSettings::toMap() const
@@ -441,15 +438,13 @@ QVariantMap ValgrindProjectSettings::defaults() const
return map;
}
bool ValgrindProjectSettings::fromMap(const QVariantMap &map)
void ValgrindProjectSettings::fromMap(const QVariantMap &map)
{
ValgrindBaseSettings::fromMap(map);
// Memcheck
setIfPresent(map, addedSuppressionFilesC, &m_addedSuppressionFiles);
setIfPresent(map, removedSuppressionFilesC, &m_disabledGlobalSuppressionFiles);
return true;
}
QVariantMap ValgrindProjectSettings::toMap() const

6
src/plugins/valgrind/valgrindsettings.h
View File

@@ -57,7 +57,7 @@ public:
virtual QVariantMap toMap() const;
virtual QVariantMap defaults() const;
virtual bool fromMap(const QVariantMap &map);
virtual void fromMap(const QVariantMap &map);
virtual QString id() const;
virtual QString displayName() const;
@@ -176,7 +176,7 @@ public:
QWidget *createConfigWidget(QWidget *parent);
QVariantMap toMap() const;
QVariantMap defaults() const;
bool fromMap(const QVariantMap &map);
void fromMap(const QVariantMap &map);
/*
* Global memcheck settings
@@ -231,7 +231,7 @@ public:
QWidget *createConfigWidget(QWidget *parent);
QVariantMap toMap() const;
QVariantMap defaults() const;
bool fromMap(const QVariantMap &map);
void fromMap(const QVariantMap &map);
/**
* Per-project memcheck settings, saves a diff to the global suppression files list