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

trunk/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -368 +368 @@
 {
 public:
-    QScriptDebuggerScriptedConsoleCommandJobPrivate() {}
+    QScriptDebuggerScriptedConsoleCommandJobPrivate() : command(0), commandCount(0) {}
     ~QScriptDebuggerScriptedConsoleCommandJobPrivate() {}
 
@@ -411 +411 @@
         args.append(QScriptValue(engine, d->arguments.at(i)));
     QScriptDebuggerConsoleGlobalObject *global;
-#if QT_VERSION >= 0x040500
     global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().toQObject());
-#else
-    global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().scope().toQObject());
-#endif
     Q_ASSERT(global != 0);
     global->setScheduler(this);
@@ -445 +441 @@
     args.append(QScriptValue(engine, commandId));
     QScriptDebuggerConsoleGlobalObject *global;
-#if QT_VERSION >= 0x040500
     global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().toQObject());
-#else
-    global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().scope().toQObject());
-#endif
     Q_ASSERT(global != 0);
     global->setScheduler(this);
@@ -469 +461 @@
 
 /*!
-  \reimp
+  \internal
 */
 QString QScriptDebuggerScriptedConsoleCommand::name() const
@@ -478 +470 @@
 
 /*!
-  \reimp
+  \internal
 */
 QString QScriptDebuggerScriptedConsoleCommand::group() const
@@ -487 +479 @@
 
 /*!
-  \reimp
+  \internal
 */
 QString QScriptDebuggerScriptedConsoleCommand::shortDescription() const
@@ -496 +488 @@
 
 /*!
-  \reimp
+  \internal
 */
 QString QScriptDebuggerScriptedConsoleCommand::longDescription() const
@@ -505 +497 @@
 
 /*!
-  \reimp
+  \internal
 */
 QStringList QScriptDebuggerScriptedConsoleCommand::aliases() const
@@ -514 +506 @@
 
 /*!
-  \reimp
+  \internal
 */
 QStringList QScriptDebuggerScriptedConsoleCommand::seeAlso() const
@@ -523 +515 @@
 
 /*!
-  \reimp
+  \internal
 */
 QStringList QScriptDebuggerScriptedConsoleCommand::argumentTypes() const
@@ -532 +524 @@
 
 /*!
-  \reimp
+  \internal
 */
 QStringList QScriptDebuggerScriptedConsoleCommand::subCommands() const
@@ -541 +533 @@
 
 /*!
-  \reimp
+  \internal
 */
 QScriptDebuggerConsoleCommandJob *QScriptDebuggerScriptedConsoleCommand::createJob(
@@ -567 +559 @@
     QScriptValue global = engine->newQObject(cppGlobal,
                                              QScriptEngine::ScriptOwnership,
-#if QT_VERSION >= 0x040500
                                              QScriptEngine::ExcludeSuperClassContents);
-#else
-                                             QScriptEngine::ExcludeSuperClassMethods
-                                             | QScriptEngine::ExcludeSuperClassProperties);
-#endif
     {
         QScriptValueIterator it(engine->globalObject());
@@ -580 +567 @@
         }
     }
-#if QT_VERSION >= 0x040500
     engine->setGlobalObject(global);
-#else
-    engine->globalObject().setScope(global);
-    global = engine->globalObject();
-#endif
 
     cppGlobal->setMessageHandler(messageHandler);