VCSBase: Modernize

override, auto, nullptr, member initializers.

Change-Id: Ie21b8f4a4d6673947d82619bc3de677fcea63d7f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 01:32:36 +03:00
committed by Orgad Shaneh
parent e0520794f5
commit 8f65486dfc
19 changed files with 144 additions and 189 deletions

View File

@@ -47,7 +47,7 @@ public:
Int
};
SettingMappingData() : boolSetting(0), m_type(Invalid)
SettingMappingData() : boolSetting(nullptr)
{ }
SettingMappingData(bool *setting) : boolSetting(setting), m_type(Bool)
@@ -71,7 +71,7 @@ public:
};
private:
Type m_type;
Type m_type = Invalid;
};
class VcsBaseEditorConfigPrivate
@@ -251,12 +251,12 @@ const QList<VcsBaseEditorConfig::OptionMapping> &VcsBaseEditorConfig::optionMapp
QStringList VcsBaseEditorConfig::argumentsForOption(const OptionMapping &mapping) const
{
const QAction *action = qobject_cast<const QAction *>(mapping.object);
auto action = qobject_cast<const QAction *>(mapping.object);
if (action && action->isChecked())
return mapping.options;
QStringList args;
const QComboBox *cb = qobject_cast<const QComboBox *>(mapping.object);
auto cb = qobject_cast<const QComboBox *>(mapping.object);
if (!cb)
return args;
@@ -285,14 +285,14 @@ void VcsBaseEditorConfig::updateMappedSettings()
}
case Internal::SettingMappingData::String :
{
const QComboBox *cb = qobject_cast<const QComboBox *>(optMapping.object);
auto cb = qobject_cast<const QComboBox *>(optMapping.object);
if (cb && cb->currentIndex() != -1)
*settingData.stringSetting = cb->itemData(cb->currentIndex()).toString();
break;
}
case Internal::SettingMappingData::Int:
{
const QComboBox *cb = qobject_cast<const QComboBox *>(optMapping.object);
auto cb = qobject_cast<const QComboBox *>(optMapping.object);
if (cb && cb->currentIndex() != -1)
*settingData.intSetting = cb->currentIndex();
break;