diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-07 13:56:33 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 09:52:41 +0200 |
commit | b9ccb579c4c93f23e6ceeea26b07d418ad4e5562 (patch) | |
tree | e4def9e28c2b6a612531d698b31e2ec99ea451f1 /src/qml/qml/v8/qv8engine_p.h | |
parent | 51b3e8e7ef5af9ff6c40027daa3a04c58b6a4bd2 (diff) |
Remove QJS exception API
This API has been deprecated for a while. It's legacy stuff from
QtScript.
Until someone proves that QJSValue::isError() isn't sufficient to
handle JavaScript exceptions, we won't provide any additional API
for that.
Also removed QJSValuePrivate::lessThan(), which was using the
exception mechanism, but the function itself wasn't used anymore
(another remnant from the QtScript days).
Change-Id: I3dffc6a7835874153f90d25ae2a72c93ea6db39a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8engine_p.h')
-rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 09e1ae537e..ca1d29011e 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -241,29 +241,6 @@ public: virtual ~Deletable() {} }; - class Exception - { - typedef QPair<v8::Persistent<v8::Value>, v8::Persistent<v8::Message> > ValueMessagePair; - - v8::Persistent<v8::Value> m_value; - v8::Persistent<v8::Message> m_message; - QStack<ValueMessagePair> m_stack; - - Q_DISABLE_COPY(Exception) - public: - inline Exception(); - inline ~Exception(); - inline void set(v8::Handle<v8::Value> value, v8::Handle<v8::Message> message); - inline void clear(); - inline operator bool() const; - inline operator v8::Handle<v8::Value>() const; - inline int lineNumber() const; - inline QStringList backtrace() const; - - inline void push(); - inline void pop(); - }; - void initQmlGlobalObject(); void setEngine(QQmlEngine *engine); QQmlEngine *engine() { return m_engine; } @@ -352,15 +329,7 @@ public: inline void collectGarbage() { gc(); } static void gc(); - void clearExceptions(); - void setException(v8::Handle<v8::Value> value, v8::Handle<v8::Message> message = v8::Handle<v8::Message>()); v8::Handle<v8::Value> throwException(v8::Handle<v8::Value> value); - bool hasUncaughtException() const; - int uncaughtExceptionLineNumber() const; - QStringList uncaughtExceptionBacktrace() const; - v8::Handle<v8::Value> uncaughtException() const; - void saveException(); - void restoreException(); #ifdef QML_GLOBAL_HANDLE_DEBUGGING // Used for handle debugging @@ -414,8 +383,6 @@ public: QJSValue scriptValueFromInternal(v8::Handle<v8::Value>) const; - void emitSignalHandlerException(); - // used for console.time(), console.timeEnd() void startTimer(const QString &timerName); qint64 stopTimer(const QString &timerName, bool *wasRunning); @@ -477,8 +444,6 @@ protected: QStringHash<bool> m_illegalNames; - Exception m_exception; - QElapsedTimer m_time; QHash<QString, qint64> m_startedTimers; |