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

VcsBaseClientSetting, check the type before returning from the union

Browse Source 
Change-Id: Ic40b88e1cf9b731509edc6636c1e0bdb5f053529
Reviewed-on: http://codereview.qt-project.org/6234
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Daniel Teske
2011-10-06 13:12:22 +02:00
parent 368726d6f2
commit d8ac419ef5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,21 +282,21 @@ bool *VCSBaseClientSettings::boolPointer(const QString &key)
QString *VCSBaseClientSettings::stringPointer(const QString &key)
{
if (hasKey(key))
if (hasKey(key) && valueType(key) == QVariant::String)
return d->m_valueHash[key].m_comp.strPtr;
return 0;
}
int VCSBaseClientSettings::intValue(const QString &key, int defaultValue) const
{
if (hasKey(key))
if (hasKey(key) && valueType(key) == QVariant::Int)
return d->m_valueHash[key].m_comp.intValue;
return defaultValue;
}
bool VCSBaseClientSettings::boolValue(const QString &key, bool defaultValue) const
{
if (hasKey(key))
if (hasKey(key) && valueType(key) == QVariant::Bool)
return d->m_valueHash[key].m_comp.boolValue;
return defaultValue;
}