aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvme_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-03-06 16:55:09 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-07 15:33:19 +0100
commit99efe4309379482fce5c231885883e359bf85290 (patch)
treedbb9333a547fa1939bd63bd64136611e9fe82968 /src/qml/qml/qqmlvme_p.h
parent9fc17c08e5635cf112c6194e6c24af2a9c7caf00 (diff)
Remove old compiler and VME
This removes the bulk of the code. A few smaller cleanups remain, to be done in smaller changes as they move code around. Additionally the "optimize" option of qqmlbundle was removed. It called QQmlScript::Parser::preparseData, which however was not implemented and always returned an empty QByteArray. Therefore "optimize" would not do anything and the class is gone now :) Change-Id: I0c265e756704cb53c5250be1f69e4a3e1b6e64d5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme_p.h')
-rw-r--r--src/qml/qml/qqmlvme_p.h57
1 files changed, 0 insertions, 57 deletions
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index cde8c0c6c4..f6476d77e0 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -55,7 +55,6 @@
#include "qqmlerror.h"
#include <private/qbitfield_p.h>
-#include "qqmlinstruction_p.h"
#include <private/qrecursionwatcher_p.h>
#include <QtCore/QStack>
@@ -122,67 +121,12 @@ private:
class Q_QML_PRIVATE_EXPORT QQmlVME
{
- Q_DECLARE_TR_FUNCTIONS(QQmlVME)
public:
- QQmlVME() : data(0), componentAttached(0) {}
- QQmlVME(void *data) : data(data), componentAttached(0) {}
-
- void *data;
- QQmlComponentAttached *componentAttached;
- QList<QQmlEnginePrivate::FinalizeCallback> finalizeCallbacks;
-
- void init(QQmlContextData *, QQmlCompiledData *, int start,
- QQmlContextData * = 0);
- bool initDeferred(QObject *);
- void reset();
-
- QObject *execute(QList<QQmlError> *errors, const QQmlInstantiationInterrupt & = QQmlInstantiationInterrupt());
- QQmlContextData *complete(const QQmlInstantiationInterrupt & = QQmlInstantiationInterrupt());
-
static void enableComponentComplete();
static void disableComponentComplete();
static bool componentCompleteEnabled();
private:
- friend class QQmlVMEGuard;
-
- QObject *run(QList<QQmlError> *errors, const QQmlInstantiationInterrupt &
-#ifdef QML_THREADED_VME_INTERPRETER
- , void *const**storeJumpTable = 0
-#endif
- );
-
-#ifdef QML_THREADED_VME_INTERPRETER
- static void *const*instructionJumpTable();
- friend class QQmlCompiledData;
-#endif
-
- QQmlEngine *engine;
- QRecursionNode recursion;
-
-#ifdef QML_ENABLE_TRACE
- QQmlCompiledData *rootComponent;
-#endif
-
- QFiniteStack<QObject *> objects;
- QFiniteStack<QQmlVMETypes::List> lists;
-
- QFiniteStack<QQmlAbstractBinding *> bindValues;
- QFiniteStack<QQmlParserStatus *> parserStatus;
-#ifdef QML_ENABLE_TRACE
- QFiniteStack<QQmlData *> parserStatusData;
-#endif
- QQmlVmeProfiler profiler;
-
- QQmlGuardedContextData rootContext;
- QQmlGuardedContextData creationContext;
-
- typedef QQmlVMETypes::State State;
- QStack<State> states;
-
- static void blank(QFiniteStack<QQmlParserStatus *> &);
- static void blank(QFiniteStack<QQmlAbstractBinding *> &);
-
static bool s_enableComponentComplete;
};
@@ -195,7 +139,6 @@ public:
QQmlVMEGuard();
~QQmlVMEGuard();
- void guard(QQmlVME *);
void guard(QQmlObjectCreator *);
void clear();