diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-21 14:20:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 13:18:28 +0200 |
| commit | a257441a420d850205a5910bc2d3c1aa67bfc3e8 (patch) | |
| tree | a8bf980a6c777e22bdceaa9d26c72f57e7c366a8 /src/declarative/qml/v8/qv8engine.cpp | |
| parent | 28fcf9485b496c986b0b8c88a194d76bec132b4c (diff) | |
Use strings more conservatively
Also adds the ability to efficiently estimate the length of, and
write out to, UTF8 from QHashedStringRef.
Change-Id: I8b6226ba41d855246ddf7d6268f8045c92ae219e
Reviewed-on: http://codereview.qt.nokia.com/3764
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qv8engine.cpp')
| -rw-r--r-- | src/declarative/qml/v8/qv8engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/v8/qv8engine.cpp b/src/declarative/qml/v8/qv8engine.cpp index 4f5caa13f4..8eaf9024ea 100644 --- a/src/declarative/qml/v8/qv8engine.cpp +++ b/src/declarative/qml/v8/qv8engine.cpp @@ -391,7 +391,7 @@ QNetworkAccessManager *QV8Engine::networkAccessManager() return QDeclarativeEnginePrivate::get(m_engine)->getNetworkAccessManager(); } -const QSet<QString> &QV8Engine::illegalNames() const +const QStringHash<bool> &QV8Engine::illegalNames() const { return m_illegalNames; } @@ -561,7 +561,7 @@ void QV8Engine::initializeGlobal(v8::Handle<v8::Object> global) v8::Local<v8::Value> names = m_getOwnPropertyNames->Call(global, 1, args); v8::Local<v8::Array> namesArray = v8::Local<v8::Array>::Cast(names); for (quint32 ii = 0; ii < namesArray->Length(); ++ii) - m_illegalNames.insert(toString(namesArray->Get(ii))); + m_illegalNames.insert(toString(namesArray->Get(ii)), true); } { |