Changeset 846 for trunk/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp (modified) (19 diffs)

trunk/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -55 +55 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qcoreapplication.h>
+
 #include <QtGui/qbrush.h>
 #include <QtGui/qfont.h>
@@ -371 +372 @@
         if (!m_index.isValid()) {
             // nothing to do, the node has been removed
+
             return;
         }
@@ -476 +478 @@
 {
 public:
-    InitModelJob(QScriptDebuggerLocalsModelPrivate *model,
+    InitModelJob(QScriptDebuggerLocalsModel *model,
                  int frameIndex,
                  QScriptDebuggerCommandSchedulerInterface *scheduler)
@@ -485 +487 @@
     void start()
     {
+
+
+
+
+
         QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
         frontend.scheduleGetScopeChain(m_frameIndex);
@@ -492 +499 @@
                         int)
     {
+
+
+
+
+
         QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
+
         switch (m_state) {
         case 0: {
@@ -501 +514 @@
                 if (i > 0)
                     name.append(QString::fromLatin1(" (%0)").arg(i));
-                QModelIndex index = m_model->addTopLevelObject(name, scopeObject);
+                QModelIndex index = m->addTopLevelObject(name, scopeObject);
                 if (i == 0)
-                    m_model->emitScopeObjectAvailable(index);
+                    m->emitScopeObjectAvailable(index);
             }
             frontend.scheduleGetThisObject(m_frameIndex);
@@ -510 +523 @@
         case 1: {
             QScriptDebuggerValue thisObject = response.resultAsScriptValue();
-            m_model->addTopLevelObject(QLatin1String("this"), thisObject);
+            m->addTopLevelObject(QLatin1String("this"), thisObject);
             finish();
           } break;
@@ -517 +530 @@
 
 private:
-    QScriptDebuggerLocalsModelPrivate *m_model;
+    Qm_model;
     int m_frameIndex;
     int m_state;
@@ -528 +541 @@
     Q_D(QScriptDebuggerLocalsModel);
     d->frameIndex = frameIndex;
-    QScriptDebuggerJob *job = new InitModelJob(d, frameIndex, d->commandScheduler);
+    QScriptDebuggerJob *job = new InitModelJob(, frameIndex, d->commandScheduler);
     d->jobScheduler->scheduleJob(job);
 }
@@ -537 +550 @@
 {
 public:
-    SyncModelJob(QScriptDebuggerLocalsModelPrivate *model,
+    SyncModelJob(QScriptDebuggerLocalsModel *model,
                  int frameIndex,
                  QScriptDebuggerCommandSchedulerInterface *scheduler)
@@ -546 +559 @@
     void start()
     {
+
+
+
+
+
         QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
         frontend.scheduleGetScopeChain(m_frameIndex);
@@ -553 +571 @@
                         int)
     {
+
+
+
+
+
         QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);
         switch (m_state) {
@@ -562 +585 @@
         }   break;
         case 1: {
+
             QScriptDebuggerValue thisObject = response.resultAsScriptValue();
             m_topLevelObjects.append(thisObject);
-            bool equal = (m_topLevelObjects.size() == m_model->invisibleRootNode->children.size());
+            bool equal = (m_topLevelObjects.size() == m->invisibleRootNode->children.size());
             for (int i = 0; equal && (i < m_topLevelObjects.size()); ++i) {
                 const QScriptDebuggerValue &object = m_topLevelObjects.at(i);
-                equal = (object == m_model->invisibleRootNode->children.at(i)->property.value());
+                equal = (object == m->invisibleRootNode->children.at(i)->property.value());
             }
             if (!equal) {
@@ -573 +597 @@
                 // we could try to be more clever, i.e. figure out
                 // exactly which objects were popped/pushed
-                m_model->removeTopLevelNodes();
+                m->removeTopLevelNodes();
                 for (int j = 0; j < m_topLevelObjects.size(); ++j) {
                     const QScriptDebuggerValue &object = m_topLevelObjects.at(j);
@@ -584 +608 @@
                             name.append(QString::fromLatin1(" (%0)").arg(j));
                     }
-                    QModelIndex index = m_model->addTopLevelObject(name, object);
+                    QModelIndex index = m->addTopLevelObject(name, object);
                     if (j == 0)
-                        m_model->emitScopeObjectAvailable(index);
+                        m->emitScopeObjectAvailable(index);
                 }
             } else {
-                m_model->syncTopLevelNodes();
+                m->syncTopLevelNodes();
             }
             finish();
@@ -597 +621 @@
 
 private:
-    QScriptDebuggerLocalsModelPrivate *m_model;
+    Qm_model;
     int m_frameIndex;
     int m_state;
@@ -609 +633 @@
     Q_D(QScriptDebuggerLocalsModel);
     d->frameIndex = frameIndex;
-    QScriptDebuggerJob *job = new SyncModelJob(d, frameIndex, d->commandScheduler);
+    QScriptDebuggerJob *job = new SyncModelJob(, frameIndex, d->commandScheduler);
     d->jobScheduler->scheduleJob(job);
 }
@@ -637 +661 @@
         if (!m_index.isValid()) {
             // nothing to do, the node has been removed
+
             return;
         }