Fixes: - ProgressManagerInterface --> ProgressManager

Details:  - Conform to conventions.

src/plugins/coreplugin/coreimpl.cpp

@@ -94,7 +94,7 @@ EditorManager *CoreImpl::editorManager() const
     return m_mainwindow->editorManager();
 }
 
-ProgressManagerInterface *CoreImpl::progressManager() const
+ProgressManager *CoreImpl::progressManager() const
 {
     return m_mainwindow->progressManager();
 }

src/plugins/coreplugin/coreimpl.h

@@ -62,7 +62,7 @@ public:
     MessageManager *messageManager() const;
     ExtensionSystem::PluginManager *pluginManager() const;
     EditorManager *editorManager() const;
-    ProgressManagerInterface *progressManager() const;
+    ProgressManager *progressManager() const;
     ScriptManagerInterface *scriptManager() const;
     VariableManager *variableManager() const;
     VCSManager *vcsManager() const;

src/plugins/coreplugin/coreplugin.pro

@@ -116,7 +116,7 @@ HEADERS += mainwindow.h \
     progressmanager/progressview.h \
     progressmanager/progresspie.h \
     progressmanager/futureprogress.h \
-    progressmanager/progressmanagerinterface.h \
+    progressmanager/progressmanager.h \
     icontext.h \
     icore.h \
     ifile.h \

src/plugins/coreplugin/icore.cpp

@@ -98,7 +98,7 @@
 */
 
 /*!
-    \fn ProgressManagerInterface *ICore::progressManager() const
+    \fn ProgressManager *ICore::progressManager() const
     \brief Returns the application's progress manager.
 
     Use the progress manager to register a concurrent task to

src/plugins/coreplugin/icore.h

@@ -57,7 +57,7 @@ class MessageManager;
 class IEditor;
 class UniqueIDManager;
 class EditorManager;
-class ProgressManagerInterface;
+class ProgressManager;
 class ScriptManagerInterface;
 class VariableManager;
 class IContext;
@@ -87,7 +87,7 @@ public:
     virtual MessageManager *messageManager() const = 0;
     virtual ExtensionSystem::PluginManager *pluginManager() const = 0;
     virtual EditorManager *editorManager() const = 0;
-    virtual ProgressManagerInterface *progressManager() const = 0;
+    virtual ProgressManager *progressManager() const = 0;
     virtual ScriptManagerInterface *scriptManager() const = 0;
     virtual VariableManager *variableManager() const = 0;
     virtual VCSManager *vcsManager() const = 0;

src/plugins/coreplugin/mainwindow.cpp

@@ -845,7 +845,7 @@ EditorManager *MainWindow::editorManager() const
     return m_editorManager;
 }
 
-ProgressManagerInterface *MainWindow::progressManager() const
+ProgressManager *MainWindow::progressManager() const
 {
     return m_progressManager;
 }

src/plugins/coreplugin/mainwindow.h

@@ -64,7 +64,7 @@ class IContext;
 class MessageManager;
 class MimeDatabase;
 class ModeManager;
-class ProgressManagerInterface;
+class ProgressManager;
 class RightPaneWidget;
 class ScriptManagerInterface;
 class UniqueIDManager;
@@ -111,7 +111,7 @@ public:
     Core::MessageManager *messageManager() const;
     ExtensionSystem::PluginManager *pluginManager() const;
     Core::EditorManager *editorManager() const;
-    Core::ProgressManagerInterface *progressManager() const;
+    Core::ProgressManager *progressManager() const;
     Core::ScriptManagerInterface *scriptManager() const;
     Core::VariableManager *variableManager() const;
     Core::ModeManager *modeManager() const;

src/plugins/coreplugin/progressmanager/progressmanager.cpp

@@ -45,7 +45,7 @@ using namespace Core;
 using namespace Core::Internal;
 
 ProgressManagerPrivate::ProgressManagerPrivate(QObject *parent)
-  : ProgressManagerInterface(parent)
+  : ProgressManager(parent)
 {
     m_progressView = new ProgressView;
     ICore *core = CoreImpl::instance();

src/plugins/coreplugin/progressmanager/progressmanagerinterface.h → src/plugins/coreplugin/progressmanager/progressmanager.h

@@ -31,8 +31,8 @@
 **
 ***************************************************************************/
 
-#ifndef PROGRESSMANAGERINTERFACE_H
-#define PROGRESSMANAGERINTERFACE_H
+#ifndef PROGRESSMANAGER_H
+#define PROGRESSMANAGER_H
 
 #include <coreplugin/core_global.h>
 #include <coreplugin/progressmanager/futureprogress.h>
@@ -43,14 +43,14 @@
 
 namespace Core {
 
-class CORE_EXPORT ProgressManagerInterface : public QObject
+class CORE_EXPORT ProgressManager : public QObject
 {
     Q_OBJECT
 public:
     enum PersistentType { CloseOnSuccess, KeepOnFinish };
 
-    ProgressManagerInterface(QObject *parent = 0) : QObject(parent) {}
-    virtual ~ProgressManagerInterface() {}
+    ProgressManager(QObject *parent = 0) : QObject(parent) {}
+    virtual ~ProgressManager() {}
 
     virtual FutureProgress *addTask(const QFuture<void> &future, const QString &title, const QString &type, PersistentType persistency = KeepOnFinish) = 0;
 
@@ -60,4 +60,4 @@ public slots:
 
 } // namespace Core
 
-#endif //PROGRESSMANAGERINTERFACE_H
+#endif //PROGRESSMANAGER_H

src/plugins/coreplugin/progressmanager/progressmanager_p.h

@@ -34,7 +34,7 @@
 #ifndef PROGRESSMANAGER_P_H
 #define PROGRESSMANAGER_P_H
 
-#include "progressmanagerinterface.h"
+#include "progressmanager.h"
 
 #include <QtCore/QPointer>
 #include <QtCore/QList>
@@ -45,7 +45,7 @@ namespace Internal {
 
 class ProgressView;
 
-class ProgressManagerPrivate : public Core::ProgressManagerInterface
+class ProgressManagerPrivate : public Core::ProgressManager
 {
     Q_OBJECT
 public:

src/plugins/coreplugin/progressmanager/progressview.cpp

@@ -62,7 +62,7 @@ ProgressView::~ProgressView()
 FutureProgress *ProgressView::addTask(const QFuture<void> &future,
                                       const QString &title,
                                       const QString &type,
-                                      ProgressManagerInterface::PersistentType persistency)
+                                      ProgressManager::PersistentType persistency)
 {
     removeOldTasks(type);
     if (m_taskList.size() == 3)
@@ -73,7 +73,7 @@ FutureProgress *ProgressView::addTask(const QFuture<void> &future,
     m_layout->insertWidget(0, progress);
     m_taskList.append(progress);
     m_type.insert(progress, type);
-    m_keep.insert(progress, (persistency == ProgressManagerInterface::KeepOnFinish));
+    m_keep.insert(progress, (persistency == ProgressManager::KeepOnFinish));
     connect(progress, SIGNAL(finished()), this, SLOT(slotFinished()));
     return progress;
 }

src/plugins/coreplugin/progressmanager/progressview.h

@@ -34,7 +34,7 @@
 #ifndef PROGRESSVIEW_H
 #define PROGRESSVIEW_H
 
-#include "progressmanagerinterface.h"
+#include "progressmanager.h"
 
 #include <QtCore/QFuture>
 #include <QtGui/QWidget>
@@ -59,7 +59,7 @@ public:
     FutureProgress *addTask(const QFuture<void> &future,
                             const QString &title,
                             const QString &type,
-                            ProgressManagerInterface::PersistentType persistency);
+                            ProgressManager::PersistentType persistency);
 
 private slots:
     void slotFinished();

src/plugins/cpptools/cppmodelmanager.cpp

@@ -49,7 +49,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/progressmanager/progressmanagerinterface.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 
 #include <utils/qtcassert.h>
 
@@ -606,7 +606,7 @@ QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles
         if (sourceFiles.count() > 1) {
             m_core->progressManager()->addTask(result, tr("Indexing"),
                             CppTools::Constants::TASK_INDEX,
-                            Core::ProgressManagerInterface::CloseOnSuccess);
+                            Core::ProgressManager::CloseOnSuccess);
         }
         return result;
     }

src/plugins/git/gitclient.cpp

@@ -43,7 +43,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
-#include <coreplugin/progressmanager/progressmanagerinterface.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <texteditor/itexteditor.h>
 #include <utils/qtcassert.h>
@@ -999,7 +999,7 @@ void GitCommand::execute(const QStringList &arguments,
     Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
     core->progressManager()->addTask(task, taskName
                             , QLatin1String("Git.action")
-                            , Core::ProgressManagerInterface::CloseOnSuccess);
+                            , Core::ProgressManager::CloseOnSuccess);
 }
 
 void GitCommand::run(const QStringList &arguments,

src/plugins/projectexplorer/buildmanager.cpp

@@ -40,7 +40,7 @@
 #include "projectexplorer.h"
 #include "taskwindow.h"
 
-#include <coreplugin/progressmanager/progressmanagerinterface.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
@@ -178,7 +178,7 @@ void BuildManager::startBuildQueue()
 {
     if (!m_running) {
         // Progress Reporting
-        Core::ProgressManagerInterface *progressManager =
+        Core::ProgressManager *progressManager =
                 ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->progressManager();
         m_progressFutureInterface = new QFutureInterface<void>;
         m_progressWatcher.setFuture(m_progressFutureInterface->future());

src/plugins/projectexplorer/session.cpp

@@ -45,7 +45,7 @@
 #include <coreplugin/filemanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/progressmanager/progressmanagerinterface.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/modemanager.h>
 
 #include <texteditor/itexteditor.h>
@@ -161,7 +161,7 @@ bool SessionFile::load(const QString &fileName)
 
     m_core->progressManager()->addTask(future.future(), tr("Session"),
        QLatin1String("ProjectExplorer.SessionFile.Load"),
-       Core::ProgressManagerInterface::CloseOnSuccess);
+       Core::ProgressManager::CloseOnSuccess);
 
     const QStringList &keys = reader.restoreValue(QLatin1String("valueKeys")).toStringList();
     foreach (const QString &key, keys) {

src/plugins/quickopen/quickopenplugin.cpp

@@ -48,7 +48,7 @@
 #include <coreplugin/baseview.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/progressmanager/progressmanagerinterface.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <qtconcurrent/QtConcurrentTools>
 
@@ -246,7 +246,7 @@ void QuickOpenPlugin::refresh(QList<IQuickOpenFilter*> filters)
         filters = m_filter;
     QFuture<void> task = QtConcurrent::run(&IQuickOpenFilter::refresh, filters);
     Core::FutureProgress *progress = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()
-            ->progressManager()->addTask(task, tr("Indexing"), Constants::TASK_INDEX, Core::ProgressManagerInterface::CloseOnSuccess);
+            ->progressManager()->addTask(task, tr("Indexing"), Constants::TASK_INDEX, Core::ProgressManager::CloseOnSuccess);
     connect(progress, SIGNAL(finished()), this, SLOT(saveSettings()));
 }
 

src/plugins/texteditor/basefilefind.cpp

@@ -34,7 +34,7 @@
 #include "basefilefind.h"
 
 #include <coreplugin/stylehelper.h>
-#include <coreplugin/progressmanager/progressmanagerinterface.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <find/textfindconstants.h>
 #include <texteditor/itexteditor.h>