RemoteLinux: Take adavantage of new proParsingDone() signal.

Change-Id: I81aada97401a1f100f5e6c8376c297c8f2f86688
Reviewed-on: http://codereview.qt-project.org/5141
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

diff --git a/src/plugins/remotelinux/deploymentinfo.cpp b/src/plugins/remotelinux/deploymentinfo.cpp
index 656f681..38f7dfe 100644 (file)
--- a/src/plugins/remotelinux/deploymentinfo.cpp
+++ b/src/plugins/remotelinux/deploymentinfo.cpp
@@ -53,8 +53,6 @@ public:
 
     QList<DeployableFilesPerProFile *> listModels;
     const Qt4ProjectManager::Qt4BaseTarget * const target;
-    QTimer updateTimer;
-
 };
 } // namespace Internal
 
@@ -62,12 +60,7 @@ using namespace Internal;
 
 DeploymentInfo::DeploymentInfo(const Qt4BaseTarget *target) : d(new DeploymentInfoPrivate(target))
 {
-    Qt4Project * const pro = d->target->qt4Project();
-    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
-        SLOT(startTimer(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
-    d->updateTimer.setInterval(1500);
-    d->updateTimer.setSingleShot(true);
-    connect(&d->updateTimer, SIGNAL(timeout()), this, SLOT(createModels()));
+    connect (d->target->qt4Project(), SIGNAL(proParsingDone()), SLOT(createModels()));
     createModels();
 }
 
@@ -76,13 +69,6 @@ DeploymentInfo::~DeploymentInfo()
     delete d;
 }
 
-void DeploymentInfo::startTimer(Qt4ProjectManager::Qt4ProFileNode*, bool success, bool parseInProgress)
-{
-    Q_UNUSED(success)
-    if (!parseInProgress)
-        d->updateTimer.start();
-}
-
 void DeploymentInfo::createModels()
 {
     if (d->target->project()->activeTarget() != d->target)
@@ -99,18 +85,13 @@ void DeploymentInfo::createModels()
         = d->target->qt4Project()->rootQt4ProjectNode();
     if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard.
         return;
-    d->updateTimer.stop();
-    disconnect(d->target->qt4Project(),
-        SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
-        this, SLOT(startTimer(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
+    disconnect(d->target->qt4Project(), SIGNAL(proParsingDone()), this, SLOT(createModels()));
     beginResetModel();
     qDeleteAll(d->listModels);
     d->listModels.clear();
     createModels(rootNode);
     endResetModel();
-    connect(d->target->qt4Project(),
-            SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
-            this, SLOT(startTimer(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
+    connect (d->target->qt4Project(), SIGNAL(proParsingDone()), SLOT(createModels()));
 }
 
 void DeploymentInfo::createModels(const Qt4ProFileNode *proFileNode)

diff --git a/src/plugins/remotelinux/deploymentinfo.h b/src/plugins/remotelinux/deploymentinfo.h
index acb1728..5403941 100644 (file)
--- a/src/plugins/remotelinux/deploymentinfo.h
+++ b/src/plugins/remotelinux/deploymentinfo.h
@@ -65,13 +65,12 @@ public:
     DeployableFilesPerProFile *modelAt(int i) const;
 
 private slots:
-    void startTimer(Qt4ProjectManager::Qt4ProFileNode *, bool success, bool parseInProgress);
+    void createModels();
 
 private:
     virtual int rowCount(const QModelIndex &parent) const;
     virtual QVariant data(const QModelIndex &index, int role) const;
 
-    Q_SLOT void createModels();
     void createModels(const Qt4ProjectManager::Qt4ProFileNode *proFileNode);
 
     Internal::DeploymentInfoPrivate * const d;