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

Aspects: Remove keys with default values

Browse Source 
It was done for some of the types, but not all. This reduces a lot of noise
from the output file.

Change-Id: I64a99e7725ad7cca1f0d90dc296c58c71334ecff
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2020-11-09 15:04:37 +02:00
committed by Orgad Shaneh
parent e41f3eb607
commit 836fbed090
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libs/utils/aspects.cpp
View File

@@ -131,6 +131,16 @@ void BaseAspect::addToLayout(LayoutBuilder &)
{ {
} }
void BaseAspect::saveToMap(QVariantMap &data, const QVariant &value, const QVariant &defaultValue) const
{
if (settingsKey().isEmpty())
return;
if (value == defaultValue)
data.remove(settingsKey());
else
data.insert(settingsKey(), value);
}
/*! /*!
Retrieves the internal value of this BaseAspect from a \c QVariantMap. Retrieves the internal value of this BaseAspect from a \c QVariantMap.
@@ -411,8 +421,7 @@ void StringAspect::fromMap(const QVariantMap &map)
*/ */
void StringAspect::toMap(QVariantMap &map) const void StringAspect::toMap(QVariantMap &map) const
{ {
if (!settingsKey().isEmpty()) saveToMap(map, d->m_value, QString());
map.insert(settingsKey(), d->m_value);
if (d->m_checker) if (d->m_checker)
d->m_checker->toMap(map); d->m_checker->toMap(map);
} }
@@ -830,8 +839,7 @@ void BoolAspect::fromMap(const QVariantMap &map)
*/ */
void BoolAspect::toMap(QVariantMap &data) const void BoolAspect::toMap(QVariantMap &data) const
{ {
if (!settingsKey().isEmpty()) saveToMap(data, d->m_value, d->m_defaultValue);
data.insert(settingsKey(), d->m_value);
} }
bool BoolAspect::defaultValue() const bool BoolAspect::defaultValue() const
@@ -957,8 +965,7 @@ void SelectionAspect::fromMap(const QVariantMap &map)
*/ */
void SelectionAspect::toMap(QVariantMap &data) const void SelectionAspect::toMap(QVariantMap &data) const
{ {
if (!settingsKey().isEmpty()) saveToMap(data, d->m_value, d->m_defaultValue);
data.insert(settingsKey(), d->m_value);
} }
void SelectionAspect::setVisibleDynamic(bool visible) void SelectionAspect::setVisibleDynamic(bool visible)
@@ -1083,10 +1090,7 @@ void IntegerAspect::fromMap(const QVariantMap &map)
*/ */
void IntegerAspect::toMap(QVariantMap &data) const void IntegerAspect::toMap(QVariantMap &data) const
{ {
if (d->m_value != d->m_defaultValue) saveToMap(data, d->m_value, d->m_defaultValue);
data.insert(settingsKey(), d->m_value);
else
data.remove(settingsKey());
} }
qint64 IntegerAspect::value() const qint64 IntegerAspect::value() const
@@ -1234,8 +1238,7 @@ void StringListAspect::fromMap(const QVariantMap &map)
*/ */
void StringListAspect::toMap(QVariantMap &data) const void StringListAspect::toMap(QVariantMap &data) const
{ {
if (!settingsKey().isEmpty()) saveToMap(data, d->m_value, QStringList());
data.insert(settingsKey(), d->m_value);
} }
QStringList StringListAspect::value() const QStringList StringListAspect::value() const

1
src/libs/utils/aspects.h
View File

@@ -84,6 +84,7 @@ signals:
protected: protected:
virtual void setVisibleDynamic(bool visible) { Q_UNUSED(visible) } // TODO: Better name? Merge with setVisible() somehow? virtual void setVisibleDynamic(bool visible) { Q_UNUSED(visible) } // TODO: Better name? Merge with setVisible() somehow?
void saveToMap(QVariantMap &data, const QVariant &value, const QVariant &defaultValue) const;
Utils::Id m_id; Utils::Id m_id;
QString m_displayName; QString m_displayName;