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

VCSBase: Modernize

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/vcsbase/vcsbaseclientsettings.cpp
View File

@@ -48,10 +48,7 @@ public:
bool boolValue;
};
SettingValue() :
m_type(QVariant::Invalid)
{
}
SettingValue() = default;
explicit SettingValue(const QVariant &v) :
m_type(v.type())
@@ -100,7 +97,7 @@ public:
QString stringValue(const QString &defaultString = QString()) const
{
if (type() == QVariant::String && m_comp.strPtr != 0)
if (type() == QVariant::String && m_comp.strPtr != nullptr)
return *(m_comp.strPtr);
return defaultString;
}
@@ -121,9 +118,9 @@ public:
private:
void deleteInternalString()
{
if (m_type == QVariant::String && m_comp.strPtr != 0) {
if (m_type == QVariant::String && m_comp.strPtr != nullptr) {
delete m_comp.strPtr;
m_comp.strPtr = 0;
m_comp.strPtr = nullptr;
}
}
@@ -131,11 +128,11 @@ private:
{
if (type() == QVariant::String) {
const QString *otherString = other.m_comp.strPtr;
m_comp.strPtr = new QString(otherString != 0 ? *otherString : QString());
m_comp.strPtr = new QString(otherString != nullptr ? *otherString : QString());
}
}
QVariant::Type m_type;
QVariant::Type m_type = QVariant::Invalid;
};
bool operator==(const SettingValue &lhs, const SettingValue &rhs)
@@ -285,21 +282,21 @@ int *VcsBaseClientSettings::intPointer(const QString &key)
{
if (hasKey(key))
return &(d->m_valueHash[key].m_comp.intValue);
return 0;
return nullptr;
}
bool *VcsBaseClientSettings::boolPointer(const QString &key)
{
if (hasKey(key))
return &(d->m_valueHash[key].m_comp.boolValue);
return 0;
return nullptr;
}
QString *VcsBaseClientSettings::stringPointer(const QString &key)
{
if (hasKey(key) && valueType(key) == QVariant::String)
return d->m_valueHash[key].m_comp.strPtr;
return 0;
return nullptr;
}
int VcsBaseClientSettings::intValue(const QString &key, int defaultValue) const