diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-02-14 13:58:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-23 09:39:52 +0100 |
| commit | cad3ba5fd44c09455c2492548865a8743386ea18 (patch) | |
| tree | 9cbd5d37b414f0585dac61feac65f542e40c143e /src/qml/compiler/qv4compiler_p.h | |
| parent | 7dbb49bdec6e74f9d1eb096d15bdeea0881c3704 (diff) | |
Clean up our internal namespaces
QQmlJS::MASM -> QV4::JIT
QQmlJS::V4IR -> QV4::IR
Change-Id: I707e8990459114a699c200fe3c22cec3c8df1afc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4compiler_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compiler_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/compiler/qv4compiler_p.h b/src/qml/compiler/qv4compiler_p.h index 6baefae7b7..29cf82e2bc 100644 --- a/src/qml/compiler/qv4compiler_p.h +++ b/src/qml/compiler/qv4compiler_p.h @@ -60,9 +60,9 @@ struct JSClassMember; namespace Compiler { struct Q_QML_EXPORT JSUnitGenerator { - JSUnitGenerator(QQmlJS::V4IR::Module *module, int headerSize = -1); + JSUnitGenerator(IR::Module *module, int headerSize = -1); - QQmlJS::V4IR::Module *irModule; + IR::Module *irModule; int registerString(const QString &str); int getStringId(const QString &string) const; @@ -73,26 +73,26 @@ struct Q_QML_EXPORT JSUnitGenerator { uint registerIndexedGetterLookup(); uint registerIndexedSetterLookup(); - int registerRegExp(QQmlJS::V4IR::RegExp *regexp); + int registerRegExp(IR::RegExp *regexp); int registerConstant(ReturnedValue v); - void registerLineNumberMapping(QQmlJS::V4IR::Function *function, const QVector<uint> &mappings); + void registerLineNumberMapping(IR::Function *function, const QVector<uint> &mappings); - int registerJSClass(QQmlJS::V4IR::ExprList *args); + int registerJSClass(IR::ExprList *args); QV4::CompiledData::Unit *generateUnit(int *totalUnitSize = 0); // Returns bytes written - int writeFunction(char *f, int index, QQmlJS::V4IR::Function *irFunction); + int writeFunction(char *f, int index, IR::Function *irFunction); QHash<QString, int> stringToId; QStringList strings; uint stringDataSize; - QHash<QQmlJS::V4IR::Function *, uint> functionOffsets; + QHash<IR::Function *, uint> functionOffsets; QList<CompiledData::Lookup> lookups; QVector<CompiledData::RegExp> regexps; QVector<ReturnedValue> constants; - QHash<QQmlJS::V4IR::Function *, QVector<uint> > lineNumberMappingsPerFunction; + QHash<IR::Function *, QVector<uint> > lineNumberMappingsPerFunction; QList<QList<CompiledData::JSClassMember> > jsClasses; uint jsClassDataSize; uint headerSize; |