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

trunk/src/scripttools/debugging/qscriptdebuggerlocalsmodel.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$
 **
@@ -54 +54 @@
 
 #include <QtCore/qdebug.h>
+#include <QtCore/qcoreapplication.h>
 #include <QtGui/qbrush.h>
 #include <QtGui/qfont.h>
@@ -137 +138 @@
 
     void deleteObjectSnapshots(const QList<qint64> &snapshotIds);
+    void deleteAllObjectSnapshots();
 
     QScriptDebuggerJobSchedulerInterface *jobScheduler;
@@ -239 +241 @@
     for (int i = 0; i < snapshotIds.size(); ++i)
         frontend.scheduleDeleteScriptObjectSnapshot(snapshotIds.at(i));
+}
+
+void QScriptDebuggerLocalsModelPrivate::deleteAllObjectSnapshots()
+{
+    QList<qint64> snapshotIds;
+    for (int i = 0; i < invisibleRootNode->children.count(); ++i)
+        snapshotIds += findSnapshotIdsRecursively(invisibleRootNode->children.at(i));
+    deleteObjectSnapshots(snapshotIds);
 }
 
@@ -443 +453 @@
 QScriptDebuggerLocalsModel::~QScriptDebuggerLocalsModel()
 {
-    Q_D(QScriptDebuggerLocalsModel);
-    QList<qint64> snapshotIds;
-    for (int i = 0; i < d->invisibleRootNode->children.count(); ++i)
-        snapshotIds += findSnapshotIdsRecursively(d->invisibleRootNode->children.at(i));
-    QScriptDebuggerCommandSchedulerFrontend frontend(d->commandScheduler, 0);
-    for (int j = 0; j < snapshotIds.size(); ++j)
-        frontend.scheduleDeleteScriptObjectSnapshot(snapshotIds.at(j));
 }
 
@@ -808 +811 @@
             if (node->property.value().type() == QScriptDebuggerValue::StringValue) {
                 // escape
-                str.replace(QLatin1String("\""), QLatin1String("\\\""));
+                str.replace(QLatin1Char('\"'), QLatin1String("\\\""));
                 str.prepend(QLatin1Char('\"'));
                 str.append(QLatin1Char('\"'));
@@ -867 +870 @@
         if (role == Qt::DisplayRole) {
             if (section == 0)
-                return QObject::tr("Name");
+                return QCoreApplication::translate("QScriptDebuggerLocalsModel", "Name");
             else if (section == 1)
-                return QObject::tr("Value");
+                return QCoreApplication::translate("QScriptDebuggerLocalsModel", "Value");
         }
     }