diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-01 16:19:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-03 09:24:41 +0200 |
| commit | 7d9780b6308e15dcd4adcb65d7b516666c285f54 (patch) | |
| tree | 94c598d4aba187293dace67011dbcaf8347ef8b7 /src/qml/jsapi | |
| parent | 8abf7f5876a48c0879bce628597533c7b6eca9a0 (diff) | |
Cleanup exception handling
The code in the Exception class operates entirely on the engine's data,
so move it into ExecutionEngine instead. This eliminates the need for
a QV4::Exception class and catches and old code that tries to still do
catch (Exception &) instead of catch (...)
Change-Id: Ie608bec6af652038aca6c9423c225a4d7eb13b39
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 1 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 1 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsvalueiterator.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index d42cabd81c..107ac98cd1 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -49,7 +49,6 @@ #include "private/qv4mm_p.h" #include "private/qv4globalobject_p.h" #include "private/qv4script_p.h" -#include "private/qv4exception_p.h" #include <QtCore/qdatetime.h> #include <QtCore/qmetaobject.h> diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index ba94afadc6..29734fda92 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -54,7 +54,6 @@ #include "qv4regexpobject_p.h" #include "private/qv8engine_p.h" #include <private/qv4mm_p.h> -#include <private/qv4exception_p.h> #include <private/qv4scopedvalue_p.h> QV4::ReturnedValue QJSValuePrivate::getValue(QV4::ExecutionEngine *e) diff --git a/src/qml/jsapi/qjsvalueiterator.cpp b/src/qml/jsapi/qjsvalueiterator.cpp index fd5f709e14..dcf7c4755b 100644 --- a/src/qml/jsapi/qjsvalueiterator.cpp +++ b/src/qml/jsapi/qjsvalueiterator.cpp @@ -44,7 +44,6 @@ #include "qjsvalue_p.h" #include "private/qv4string_p.h" #include "private/qv4object_p.h" -#include "private/qv4exception_p.h" QT_BEGIN_NAMESPACE |