Changeset 561 for trunk/src/scripttools/debugging/qscriptdebuggeragent.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/qscriptdebuggeragent.cpp (modified) (9 diffs)

trunk/src/scripttools/debugging/qscriptdebuggeragent.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$
 **
@@ -62 +62 @@
 
 QScriptDebuggerAgentPrivate::QScriptDebuggerAgentPrivate()
-{
-    state = NoState;
-    nextBreakpointId = 1;
-    nextContextId = 0;
-    statementCounter = 0;
+    : state(NoState), stepDepth(0), stepCount(0),
+    
+    
+    
+{
 }
 
@@ -89 +89 @@
 QScriptDebuggerAgent::QScriptDebuggerAgent(
     QScriptDebuggerBackendPrivate *backend, QScriptEngine *engine)
-#if QT_VERSION >= 0x040500
-    : QScriptEngineAgent(*new QScriptDebuggerAgentPrivate, engine)
-#else
-    : QScriptEngineAgent(engine), d_ptr(new QScriptDebuggerAgentPrivate)
-#endif
-{
-    Q_D(QScriptDebuggerAgent);
-#if QT_VERSION < 0x040500
-    d_ptr->q_ptr = this;
-#endif
+    : QScriptEngineAgent(engine), d_ptr(new QScriptDebuggerAgentPrivate())
+{
+    Q_D(QScriptDebuggerAgent);
     d->backend = backend;
 
@@ -118 +111 @@
     if (d->backend)
         d->backend->agentDestroyed(this);
-#if QT_VERSION < 0x040500
-    delete d_ptr;
-#endif
+    delete d;
 }
 
@@ -713 +704 @@
 bool QScriptDebuggerAgent::supportsExtension(Extension extension) const
 {
-#if QT_VERSION >= 0x040500
     return (extension == DebuggerInvocationRequest);
-#else
-    Q_UNUSED(extension);
-    return false;
-#endif
 }
 
@@ -728 +714 @@
 {
     Q_UNUSED(extension);
-#if QT_VERSION >= 0x040500
     Q_D(QScriptDebuggerAgent);
     Q_ASSERT(extension == DebuggerInvocationRequest);
@@ -740 +725 @@
             scriptId, lineNumber, columnNumber);
     }
-#else
-    Q_UNUSED(argument);
-#endif
     return QVariant();
 }