projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d2864ff
)
Removed extra detach calls from QJsonArray::takeAt
author
Denis Dzyubenko
<denis.dzyubenko@nokia.com>
Wed, 6 Jun 2012 09:43:26 +0000
(11:43 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Wed, 29 Aug 2012 05:56:01 +0000
(07:56 +0200)
Change-Id: I5711ec6b03e3979eca61f62004a7c6f0eaae79e0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
src/corelib/json/qjsonarray.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/json/qjsonarray.cpp
b/src/corelib/json/qjsonarray.cpp
index
d5ca066
..
2fcb7a6
100644
(file)
--- a/
src/corelib/json/qjsonarray.cpp
+++ b/
src/corelib/json/qjsonarray.cpp
@@
-377,13
+377,8
@@
QJsonValue QJsonArray::takeAt(int i)
if (!a || i < 0 || i >= (int)a->length)
return QJsonValue(QJsonValue::Undefined);
- detach();
-
QJsonValue v(d, a, a->at(i));
- v.detach();
-
- removeAt(i);
-
+ removeAt(i); // detaches
return v;
}