Revert "Code model: Update on changes from the versioning system."

This reverts commit 7aa2411693.
It breaks the code model updates completely. So reverting this change
until we have the right thing.

Reviewed-by: Roberto Raggi

src/plugins/cpptools/cppmodelmanager.cpp

@@ -595,8 +595,6 @@ Document::Ptr CppPreprocessor::switchDocument(Document::Ptr doc)
 
 void CppTools::CppModelManagerInterface::updateModifiedSourceFiles()
 {
-    if (isIndexing())
-        return;
     const Snapshot snapshot = this->snapshot();
     QStringList sourceFiles;
 
@@ -632,8 +630,7 @@ CppTools::CppModelManagerInterface *CppTools::CppModelManagerInterface::instance
 */
 
 CppModelManager::CppModelManager(QObject *parent)
-    : CppModelManagerInterface(parent),
-      m_indexing(false)
+    : CppModelManagerInterface(parent)
 {
     m_findReferences = new CppFindReferences(this);
 
@@ -678,11 +675,6 @@ CppModelManager::CppModelManager(QObject *parent)
 
     connect(m_core->editorManager(), SIGNAL(editorAboutToClose(Core::IEditor *)),
         this, SLOT(editorAboutToClose(Core::IEditor *)));
-
-    connect(m_core->progressManager(), SIGNAL(taskStarted(QString)),
-            this, SLOT(onTaskStarted(QString)));
-    connect(m_core->progressManager(), SIGNAL(allTasksFinished(QString)),
-            this, SLOT(onAllTasksFinished(QString)));
 }
 
 CppModelManager::~CppModelManager()
@@ -879,7 +871,7 @@ QStringList CppModelManager::includesInPath(const QString &path) const
 
 QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles)
 {
-    if (!m_indexing && !sourceFiles.isEmpty() && qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) {
+    if (! sourceFiles.isEmpty() && qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) {
         const QMap<QString, QString> workingCopy = buildWorkingCopyList();
 
         CppPreprocessor *preproc = new CppPreprocessor(this);
@@ -905,7 +897,7 @@ QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles
 
         m_synchronizer.addFuture(result);
 
-        if (sourceFiles.count() > 1) {            
+        if (sourceFiles.count() > 1) {
             m_core->progressManager()->addTask(result, tr("Indexing"),
                             CppTools::Constants::TASK_INDEX,
                             Core::ProgressManager::CloseOnSuccess);
@@ -1399,31 +1391,4 @@ void CppModelManager::GC()
     protectSnapshot.unlock();
 }
 
-bool CppModelManager::isIndexing() const
-{
-    return m_indexing;
-}
 
-void CppModelManager::setIndexing(bool v)
-{
-    if (m_indexing == v)
-        return;
-    m_indexing = v;
-    if (v) {
-        emit indexingStarted();
-    } else {
-        emit indexingFinished();
-    }
-}
-
-void CppModelManager::onTaskStarted(const QString &type)
-{
-    if (type == QLatin1String(CppTools::Constants::TASK_INDEX))
-        setIndexing(true);
-}
-
-void CppModelManager::onAllTasksFinished(const QString &type)
-{
-    if (type == QLatin1String(CppTools::Constants::TASK_INDEX))
-        setIndexing(false);
-}

src/plugins/cpptools/cppmodelmanager.h

@@ -111,8 +111,6 @@ public:
     void setHeaderSuffixes(const QStringList &suffixes)
     { m_headerSuffixes = suffixes; }
 
-    virtual bool isIndexing() const;
-
 Q_SIGNALS:
     void projectPathChanged(const QString &projectPath);
 
@@ -131,8 +129,6 @@ private Q_SLOTS:
     void onProjectAdded(ProjectExplorer::Project *project);
     void postEditorUpdate();
     void updateEditorSelections();
-    void onTaskStarted(const QString &type);
-    void onAllTasksFinished(const QString &type);
 
 private:
     QMap<QString, QString> buildWorkingCopyList();
@@ -179,13 +175,10 @@ private:
                       CppPreprocessor *preproc,
                       QStringList files);
 
-    void setIndexing(bool);
-
 private:
     Core::ICore *m_core;
     CPlusPlus::Snapshot m_snapshot;
 
-    bool m_indexing;
     // cache
     bool m_dirty;
     QStringList m_projectFiles;

src/plugins/cpptools/cppmodelmanagerinterface.h

@@ -102,12 +102,6 @@ public:
     virtual void renameUsages(CPlusPlus::Symbol *symbol) = 0;
     virtual void findUsages(CPlusPlus::Symbol *symbol) = 0;
 
-    virtual bool isIndexing() const = 0;
-
-signals:
-    void indexingStarted();
-    void indexingFinished();
-
 public Q_SLOTS:
     void updateModifiedSourceFiles();
     virtual void updateSourceFiles(const QStringList &sourceFiles) = 0;    

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -47,7 +47,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/vcsmanager.h>
 #include <cppeditor/cppeditorconstants.h>
 
 #include <QtCore/QtConcurrentRun>
@@ -98,11 +97,6 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
 
     // Objects
     m_modelManager = new CppModelManager(this);
-    Core::VCSManager *vcsManager = core->vcsManager();
-    connect(vcsManager, SIGNAL(repositoryChanged(QString)),
-            m_modelManager, SLOT(updateModifiedSourceFiles()));
-    connect(vcsManager, SIGNAL(filesChanged(QStringList)),
-            m_modelManager, SLOT(updateModifiedSourceFiles()));
     addAutoReleasedObject(m_modelManager);
 
     m_completion = new CppCodeCompletion(m_modelManager);