Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace break with return in QSettingsPrivate::variantToString()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-25 21:51:08 +00:00
parent c05d3b9b1c
commit e4bd089f5a
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/core/io/qsettings.cpp
View file

@ -346,21 +346,17 @@ void QSettingsPrivate::notify()
QString QSettingsPrivate::variantToString(const QVariant &v) QString QSettingsPrivate::variantToString(const QVariant &v)
{ {
QString result;
switch (v.type()) { switch (v.type()) {
case QVariant::Invalid: case QVariant::Invalid: {
result = QLatin1String("@Invalid()"); return QLatin1String("@Invalid()");
break; }
case QVariant::ByteArray: { case QVariant::ByteArray: {
QByteArray a = v.toByteArray(); QByteArray a = v.toByteArray();
result = QLatin1String("@ByteArray("); QString result = QLatin1String("@ByteArray(");
result += QString::fromAscii(a.constData(), a.size()); result += QString::fromAscii(a.constData(), a.size());
result += QLatin1Char(')'); result += QLatin1Char(')');
break; return result;
} }
case QVariant::String: case QVariant::String:
case QVariant::LongLong: case QVariant::LongLong:
case QVariant::ULongLong: case QVariant::ULongLong:
@ -369,15 +365,15 @@ QString QSettingsPrivate::variantToString(const QVariant &v)
case QVariant::Bool: case QVariant::Bool:
case QVariant::Double: case QVariant::Double:
case QVariant::KeySequence: { case QVariant::KeySequence: {
result = v.toString(); QString result = v.toString();
if (result.startsWith(QLatin1Char('@'))) if (result.startsWith(QLatin1Char('@')))
result.prepend(QLatin1Char('@')); result.prepend(QLatin1Char('@'));
break; return result;
} }
#ifndef QT_NO_GEOM_VARIANT #ifndef QT_NO_GEOM_VARIANT
case QVariant::Rect: { case QVariant::Rect: {
QRect r = qvariant_cast<QRect>(v); QRect r = qvariant_cast<QRect>(v);
result += QLatin1String("@Rect("); QString result = QLatin1String("@Rect(");
result += QString::number(r.x()); result += QString::number(r.x());
result += QLatin1Char(' '); result += QLatin1Char(' ');
result += QString::number(r.y()); result += QString::number(r.y());
@ -386,25 +382,25 @@ QString QSettingsPrivate::variantToString(const QVariant &v)
result += QLatin1Char(' '); result += QLatin1Char(' ');
result += QString::number(r.height()); result += QString::number(r.height());
result += QLatin1Char(')'); result += QLatin1Char(')');
break; return result;
} }
case QVariant::Size: { case QVariant::Size: {
QSize s = qvariant_cast<QSize>(v); QSize s = qvariant_cast<QSize>(v);
result += QLatin1String("@Size("); QString result = QLatin1String("@Size(");
result += QString::number(s.width()); result += QString::number(s.width());
result += QLatin1Char(' '); result += QLatin1Char(' ');
result += QString::number(s.height()); result += QString::number(s.height());
result += QLatin1Char(')'); result += QLatin1Char(')');
break; return result;
} }
case QVariant::Point: { case QVariant::Point: {
QPoint p = qvariant_cast<QPoint>(v); QPoint p = qvariant_cast<QPoint>(v);
result += QLatin1String("@Point("); QString result = QLatin1String("@Point(");
result += QString::number(p.x()); result += QString::number(p.x());
result += QLatin1Char(' '); result += QLatin1Char(' ');
result += QString::number(p.y()); result += QString::number(p.y());
result += QLatin1Char(')'); result += QLatin1Char(')');
break; return result;
} }
#endif // !QT_NO_GEOM_VARIANT #endif // !QT_NO_GEOM_VARIANT
@ -416,17 +412,17 @@ QString QSettingsPrivate::variantToString(const QVariant &v)
s << v; s << v;
} }
result = QLatin1String("@Variant("); QString result = QLatin1String("@Variant(");
result += QString::fromAscii(a.constData(), a.size()); result += QString::fromAscii(a.constData(), a.size());
result += QLatin1Char(')'); result += QLatin1Char(')');
return result;
#else #else
Q_ASSERT(!"QSettings: Cannot save custom types without QDataStream support"); Q_ASSERT(!"QSettings: Cannot save custom types without QDataStream support");
return QString();
#endif #endif
break;
} }
} }
return QString();
return result;
} }