Changeset 561 for trunk/src/scripttools/debugging/qscriptdebuggerbackend.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/scripttools/debugging/qscriptdebuggerbackend.cpp (modified) (11 diffs)

trunk/src/scripttools/debugging/qscriptdebuggerbackend.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -132 +132 @@
 
 QScriptDebuggerBackendPrivate::QScriptDebuggerBackendPrivate()
-{
-    eventReceiver = 0;
-    agent = 0;
-    commandExecutor = 0;
-    pendingEvaluateLineNumber = -1;
-    ignoreExceptions = false;
-    nextScriptValueIteratorId = 0;
-    nextScriptObjectSnapshotId = 0;
+    : agent(0), commandExecutor(0),
+        pendingEvaluateContextIndex(-1), pendingEvaluateLineNumber(-1),
+        ignoreExceptions(false),
+        nextScriptValueIteratorId(0), nextScriptObjectSnapshotId(0),
+        eventReceiver(0),
+        q_ptr(0) // q_ptr will be set later by QScriptDebuggerBackend constructor
+{
 }
 
@@ -293 +292 @@
     for (int i = 0; i < context->argumentCount(); ++i) {
         if (i > 0)
-            str.append(QLatin1String(" "));
+            str.append(QLatin1));
         str.append(context->argument(i).toString());
     }
@@ -386 +385 @@
 {
     detach();
-    delete d_ptr;
 }
 
@@ -413 +411 @@
     d->agent = new QScriptDebuggerAgent(d, engine);
     QScriptValue global = engine->globalObject();
+
     global.setProperty(QString::fromLatin1("print"), traceFunction());
 //    global.setProperty(QString::fromLatin1("qAssert"), assertFunction());
+
     global.setProperty(QString::fromLatin1("__FILE__"), fileNameFunction(),
-                       QScriptValue::PropertyGetter | QScriptValue::PropertySetter
-                       | QScriptValue::ReadOnly);
+                       QScriptValue::PropertyGetter | QScriptValue::
+    );
     global.setProperty(QString::fromLatin1("__LINE__"), lineNumberFunction(),
-                       QScriptValue::PropertyGetter | QScriptValue::PropertySetter
-                       | QScriptValue::ReadOnly);
+                       QScriptValue::PropertyGetter | QScriptValue::ReadOnly);
     engine->setAgent(d->agent);
 }
@@ -434 +433 @@
 {
     Q_D(QScriptDebuggerBackend);
-    if (!d->agent)
-        return;
-    QScriptEngine *eng = d->agent->engine();
-    if (eng && eng->agent() == d->agent) {
-        eng->setAgent(0);
-        QScriptValue global = eng->globalObject();
-        if (global.property(QString::fromLatin1("print")).strictlyEquals(traceFunction()))
-            global.setProperty(QString::fromLatin1("print"), QScriptValue());
-//        global.setProperty(QString::fromLatin1("qAssert"), QScriptValue());
-        if (global.property(QString::fromLatin1("__FILE__")).strictlyEquals(fileNameFunction()))
-            global.setProperty(QString::fromLatin1("__FILE__"), QScriptValue());
-        if (global.property(QString::fromLatin1("__LINE__")).strictlyEquals(lineNumberFunction()))
-            global.setProperty(QString::fromLatin1("__LINE__"), QScriptValue());
-        d->agent->nullifyBackendPointer();
-        d->agent = 0; // agent is owned by engine
+    if (d->agent) {
+        QScriptEngine *eng = d->agent->engine();
+        if (eng && eng->agent() == d->agent) {
+            eng->setAgent(0);
+            QScriptValue global = eng->globalObject();
+            global.setProperty(QString::fromLatin1("print"), d->origTraceFunction);
+            d->origTraceFunction = QScriptValue();
+//            global.setProperty(QString::fromLatin1("qAssert"), QScriptValue());
+            global.setProperty(QString::fromLatin1("__FILE__"), QScriptValue(),
+                               QScriptValue::PropertyGetter);
+            global.setProperty(QString::fromLatin1("__FILE__"), d->origFileNameFunction);
+            d->origFileNameFunction = QScriptValue();
+            global.setProperty(QString::fromLatin1("__LINE__"), QScriptValue(),
+                               QScriptValue::PropertyGetter);
+            global.setProperty(QString::fromLatin1("__LINE__"), d->origLineNumberFunction);
+            d->origLineNumberFunction = QScriptValue();
+            d->agent->nullifyBackendPointer();
+            d->agent = 0; // agent is owned by engine
+        }
     }
 
@@ -616 +619 @@
     {
         QScriptContext *evalContext = engine()->pushContext();
-#if QT_VERSION >= 0x040500
         QScriptValueList scopeChain = ctx->scopeChain();
         if (scopeChain.isEmpty())
@@ -622 +624 @@
         while (!scopeChain.isEmpty())
             evalContext->pushScope(scopeChain.takeLast());
-#endif
         evalContext->setActivationObject(ctx->activationObject());
         evalContext->setThisObject(ctx->thisObject());
@@ -805 +806 @@
     if (!engine())
         return 0;
-    int count = 0;
-    QScriptContext *ctx = engine()->currentContext();
-    while (ctx) {
-        ++count;
-        ctx = ctx->parentContext();
-    }
-    return count;
+    return contextIds().count();
 }