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

ISettingsAspect: consolidate data copying in base implementation

Browse Source 
Change-Id: I1eec0f54d05b3f7d8679060faccc14ec8a3777f6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
hjk
2013-08-12 15:21:22 +02:00
parent 8ea14767af
commit 742c1a714d
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/analyzerbase/analyzersettings.cpp
View File

@@ -46,6 +46,15 @@ static const char useGlobalC[] = "Analyzer.Project.UseGlobal";
namespace Analyzer { namespace Analyzer {
ISettingsAspect *ISettingsAspect::clone() const
{
ISettingsAspect *other = create();
QVariantMap data;
toMap(data);
other->fromMap(data);
return other;
}
AnalyzerRunConfigurationAspect::AnalyzerRunConfigurationAspect(ISettingsAspect *projectSettings, AnalyzerRunConfigurationAspect::AnalyzerRunConfigurationAspect(ISettingsAspect *projectSettings,
ISettingsAspect *globalSettings) ISettingsAspect *globalSettings)
{ {

6
src/plugins/analyzerbase/analyzersettings.h
View File

@@ -59,8 +59,10 @@ public:
/// Create a configuration widget for this settings aspect. /// Create a configuration widget for this settings aspect.
virtual QWidget *createConfigWidget(QWidget *parent) = 0; virtual QWidget *createConfigWidget(QWidget *parent) = 0;
/// Clones the object. /// "Virtual default constructor"
virtual ISettingsAspect *clone() = 0; virtual ISettingsAspect *create() const = 0;
/// "Virtual copy constructor"
ISettingsAspect *clone() const;
}; };

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

@@ -282,15 +282,6 @@ void ValgrindGlobalSettings::fromMap(const QVariantMap &map)
setIfPresent(map, QLatin1String(callgrindShortenTemplates), &m_shortenTemplates); setIfPresent(map, QLatin1String(callgrindShortenTemplates), &m_shortenTemplates);
} }
ISettingsAspect *ValgrindGlobalSettings::clone()
{
ValgrindGlobalSettings *other = new ValgrindGlobalSettings;
QVariantMap data;
toMap(data);
other->fromMap(data);
return other;
}
void ValgrindGlobalSettings::toMap(QVariantMap &map) const void ValgrindGlobalSettings::toMap(QVariantMap &map) const
{ {
ValgrindBaseSettings::toMap(map); ValgrindBaseSettings::toMap(map);
@@ -461,15 +452,6 @@ void ValgrindProjectSettings::fromMap(const QVariantMap &map)
setIfPresent(map, QLatin1String(removedSuppressionFilesC), &m_disabledGlobalSuppressionFiles); setIfPresent(map, QLatin1String(removedSuppressionFilesC), &m_disabledGlobalSuppressionFiles);
} }
ISettingsAspect *ValgrindProjectSettings::clone()
{
ValgrindProjectSettings *other = new ValgrindProjectSettings;
QVariantMap data;
toMap(data);
other->fromMap(data);
return other;
}
void ValgrindProjectSettings::toMap(QVariantMap &map) const void ValgrindProjectSettings::toMap(QVariantMap &map) const
{ {
ValgrindBaseSettings::toMap(map); ValgrindBaseSettings::toMap(map);

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

@@ -170,7 +170,8 @@ public:
QWidget *createConfigWidget(QWidget *parent); QWidget *createConfigWidget(QWidget *parent);
void toMap(QVariantMap &map) const; void toMap(QVariantMap &map) const;
void fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map);
virtual ISettingsAspect *clone(); ISettingsAspect *create() const { return new ValgrindGlobalSettings; }
/* /*
* Global memcheck settings * Global memcheck settings
@@ -230,7 +231,7 @@ public:
QWidget *createConfigWidget(QWidget *parent); QWidget *createConfigWidget(QWidget *parent);
void toMap(QVariantMap &map) const; void toMap(QVariantMap &map) const;
void fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map);
virtual ISettingsAspect *clone(); ISettingsAspect *create() const { return new ValgrindProjectSettings; }
/** /**
* Per-project memcheck settings, saves a diff to the global suppression files list * Per-project memcheck settings, saves a diff to the global suppression files list