summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-04-01 20:25:33 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-13 01:44:02 +0200
commitaec8bac3130c3c11333978b89c9fc5cf586c9bd0 (patch)
tree32870e182d7e21f6f33cf9527da3c84cdd4401cf
parent495309387313f2954ef9725078824b0972cd5ce4 (diff)
Style: Don't put an else after a return.
Change-Id: I41d031d92489e5539f293c30a6257310f2a1c657 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
-rw-r--r--src/corelib/kernel/qvariant.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index c3f8422b28..654170fabb 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2503,8 +2503,7 @@ bool QVariant::canConvert(int targetTypeId) const
if (targetTypeId == String && currentType == StringList)
return v_cast<QStringList>(&d)->count() == 1;
- else
- return qCanConvertMatrix[targetTypeId] & (1 << currentType);
+ return qCanConvertMatrix[targetTypeId] & (1 << currentType);
}
/*!