diff options
Diffstat (limited to 'src')
5 files changed, 12 insertions, 9 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index a18c2fe..663481d 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -3865,7 +3865,7 @@ QStringList QScriptEngine::availableExtensions() const } } - QStringList lst = result.toList(); + QStringList lst = result.values(); std::sort(lst.begin(), lst.end()); return lst; #endif @@ -3882,7 +3882,7 @@ QStringList QScriptEngine::availableExtensions() const QStringList QScriptEngine::importedExtensions() const { Q_D(const QScriptEngine); - QStringList lst = d->importedExtensions.toList(); + QStringList lst = d->importedExtensions.values(); std::sort(lst.begin(), lst.end()); return lst; } diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp index 7e25304..81ffb64 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent.cpp +++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp @@ -394,11 +394,13 @@ void QScriptDebuggerAgent::scriptsCheckpoint() QPair<QList<qint64>, QList<qint64> > QScriptDebuggerAgent::scriptsDelta() const { Q_D(const QScriptDebuggerAgent); - QSet<qint64> prevSet = d->previousCheckpointScripts.keys().toSet(); - QSet<qint64> currSet = d->checkpointScripts.keys().toSet(); + QList<qint64> prevKeys = d->previousCheckpointScripts.keys(); + QList<qint64> currKeys = d->checkpointScripts.keys(); + QSet<qint64> prevSet = QSet<qint64>(prevKeys.begin(), prevKeys.end()); + QSet<qint64> currSet = QSet<qint64>(currKeys.begin(), currKeys.end()); QSet<qint64> addedScriptIds = currSet - prevSet; QSet<qint64> removedScriptIds = prevSet - currSet; - return qMakePair(addedScriptIds.toList(), removedScriptIds.toList()); + return qMakePair(addedScriptIds.values(), removedScriptIds.values()); } /*! diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp index c71d0b0..ab0bc24 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp @@ -398,7 +398,7 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute( obj = obj.prototype(); } } - QStringList matchesList = matches.toList(); + QStringList matchesList = matches.values(); std::stable_sort(matchesList.begin(), matchesList.end()); response.setResult(matchesList); } break; diff --git a/src/scripttools/debugging/qscriptobjectsnapshot.cpp b/src/scripttools/debugging/qscriptobjectsnapshot.cpp index 50eee7d..c2e68ab 100644 --- a/src/scripttools/debugging/qscriptobjectsnapshot.cpp +++ b/src/scripttools/debugging/qscriptobjectsnapshot.cpp @@ -93,7 +93,8 @@ QScriptObjectSnapshot::Delta QScriptObjectSnapshot::capture(const QScriptValue & QSet<QString> prevSet; for (int i = 0; i < m_properties.size(); ++i) prevSet.insert(m_properties.at(i).name()); - QSet<QString> currSet = currProps.keys().toSet(); + QList<QString> currPropsKeys = currProps.keys(); + QSet<QString> currSet = QSet<QString>(currPropsKeys.begin(), currPropsKeys.end()); QSet<QString> removedProperties = prevSet - currSet; QSet<QString> addedProperties = currSet - prevSet; QSet<QString> maybeChangedProperties = currSet & prevSet; @@ -120,7 +121,7 @@ QScriptObjectSnapshot::Delta QScriptObjectSnapshot::capture(const QScriptValue & } } - result.removedProperties = removedProperties.toList(); + result.removedProperties = removedProperties.values(); m_properties = currProps.values(); diff --git a/src/scripttools/debugging/qscriptxmlparser.cpp b/src/scripttools/debugging/qscriptxmlparser.cpp index 2cf8c85..a29b69e 100644 --- a/src/scripttools/debugging/qscriptxmlparser.cpp +++ b/src/scripttools/debugging/qscriptxmlparser.cpp @@ -168,7 +168,7 @@ QScriptXmlParser::Result QScriptXmlParser::parse(const QString &xml) reader.readNext(); // </program> reader.readNext(); // EndDocument Q_ASSERT(reader.atEnd()); - return Result(functionsInfo, lineNumbers.toSet()); + return Result(functionsInfo, QSet<int>(lineNumbers.begin(), lineNumbers.end())); } QT_END_NAMESPACE |