summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlvme.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-26 05:31:09 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-26 05:31:09 (GMT)
commit3aff93a5bba79bdf45f13e4c9f8c66c9a9ed47b4 (patch)
treefcd1594b02cd0df98bbe213496207f2be268e677 /src/declarative/qml/qmlvme.cpp
parent4c1cdb0bf25847a8ebf42cf573faf5b2386000b9 (diff)
downloadQt-3aff93a5bba79bdf45f13e4c9f8c66c9a9ed47b4.zip
Qt-3aff93a5bba79bdf45f13e4c9f8c66c9a9ed47b4.tar.gz
Qt-3aff93a5bba79bdf45f13e4c9f8c66c9a9ed47b4.tar.bz2
Remove Try*Object instructions
Diffstat (limited to 'src/declarative/qml/qmlvme.cpp')
-rw-r--r--src/declarative/qml/qmlvme.cpp42
1 files changed, 0 insertions, 42 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index a5cc649..2a5a042 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -92,9 +92,7 @@ Q_DECLARE_PERFORMANCE_LOG(QFxCompiler) {
Q_DECLARE_PERFORMANCE_METRIC(InstrStoreBinding);
Q_DECLARE_PERFORMANCE_METRIC(InstrStoreCompiledBinding);
Q_DECLARE_PERFORMANCE_METRIC(InstrStoreValueSource);
- Q_DECLARE_PERFORMANCE_METRIC(InstrTryBeginObject);
Q_DECLARE_PERFORMANCE_METRIC(InstrBeginObject);
- Q_DECLARE_PERFORMANCE_METRIC(InstrTryCompleteObject);
Q_DECLARE_PERFORMANCE_METRIC(InstrCompleteObject);
Q_DECLARE_PERFORMANCE_METRIC(InstrAssignObject);
Q_DECLARE_PERFORMANCE_METRIC(InstrAssignObjectList);
@@ -138,9 +136,7 @@ Q_DEFINE_PERFORMANCE_LOG(QFxCompiler, "QFxCompiler") {
Q_DEFINE_PERFORMANCE_METRIC(InstrStoreBinding, "StoreBinding");
Q_DEFINE_PERFORMANCE_METRIC(InstrStoreCompiledBinding, "StoreCompiledBinding");
Q_DEFINE_PERFORMANCE_METRIC(InstrStoreValueSource, "StoreValueSource");
- Q_DEFINE_PERFORMANCE_METRIC(InstrTryBeginObject, "TryBeginObject");
Q_DEFINE_PERFORMANCE_METRIC(InstrBeginObject, "BeginObject");
- Q_DEFINE_PERFORMANCE_METRIC(InstrTryCompleteObject, "TryCompleteObject");
Q_DEFINE_PERFORMANCE_METRIC(InstrCompleteObject, "CompleteObject");
Q_DEFINE_PERFORMANCE_METRIC(InstrAssignObject, "AssignObject");
Q_DEFINE_PERFORMANCE_METRIC(InstrAssignObjectList, "AssignObjectList");
@@ -403,25 +399,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
}
break;
- case QmlInstruction::TryBeginObject:
- {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
- QFxCompilerTimer<QFxCompiler::InstrTryBeginObject> cc;
-#endif
- QObject *target = stack.top();
- QmlParserStatus *status =
- qobject_cast<QmlParserStatus *>(target);
-
- if (status) {
- instr.type = QmlInstruction::BeginObject;
- instr.begin.castValue = int(reinterpret_cast<char *>(status) - reinterpret_cast<char *>(target));
- --ii;
- } else {
- instr.type = QmlInstruction::NoOp;
- }
- }
- break;
-
case QmlInstruction::BeginObject:
{
#ifdef Q_ENABLE_PERFORMANCE_LOG
@@ -436,25 +413,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
}
break;
- case QmlInstruction::TryCompleteObject:
- {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
- QFxCompilerTimer<QFxCompiler::InstrTryCompleteObject> cc;
-#endif
- QObject *target = stack.top();
- QmlParserStatus *status =
- qobject_cast<QmlParserStatus *>(target);
-
- if (status) {
- instr.type = QmlInstruction::CompleteObject;
- instr.complete.castValue = int(reinterpret_cast<char *>(status) - reinterpret_cast<char *>(target));
- --ii;
- } else {
- instr.type = QmlInstruction::NoOp;
- }
- }
- break;
-
case QmlInstruction::CompleteObject:
{
#ifdef Q_ENABLE_PERFORMANCE_LOG