Commit 5f3faaff authored by con's avatar con

Fixes: - ProgressManager --> ProgressManagerPrivate

parent c9889120
......@@ -112,7 +112,7 @@ HEADERS += mainwindow.h \
dialogs/openwithdialog.h \
dialogs/iwizard.h \
dialogs/ioptionspage.h \
progressmanager/progressmanager.h \
progressmanager/progressmanager_p.h \
progressmanager/progressview.h \
progressmanager/progresspie.h \
progressmanager/futureprogress.h \
......
......@@ -49,7 +49,7 @@
#include "newdialog.h"
#include "outputpane.h"
#include "plugindialog.h"
#include "progressmanager.h"
#include "progressmanager_p.h"
#include "progressview.h"
#include "shortcutsettings.h"
#include "vcsmanager.h"
......@@ -118,7 +118,7 @@ MainWindow::MainWindow() :
m_actionManager(new ActionManagerPrivate(this, m_uniqueIDManager)),
m_editorManager(0),
m_fileManager(new FileManager(m_coreImpl, this)),
m_progressManager(new ProgressManager()),
m_progressManager(new ProgressManagerPrivate()),
m_scriptManager(new ScriptManager(this, m_coreImpl)),
m_variableManager(new VariableManager(this)),
m_vcsManager(new VCSManager()),
......
......@@ -80,7 +80,7 @@ class FancyTabWidget;
class GeneralSettings;
class NavigationWidget;
class OutputPane;
class ProgressManager;
class ProgressManagerPrivate;
class ShortcutSettings;
class ViewManager;
class VersionDialog;
......@@ -180,7 +180,7 @@ private:
EditorManager *m_editorManager;
FileManager *m_fileManager;
MessageManager *m_messageManager;
ProgressManager *m_progressManager;
ProgressManagerPrivate *m_progressManager;
ScriptManagerInterface *m_scriptManager;
VariableManager *m_variableManager;
VCSManager *m_vcsManager;
......
......@@ -31,7 +31,7 @@
**
***************************************************************************/
#include "progressmanager.h"
#include "progressmanager_p.h"
#include "progressview.h"
#include "coreimpl.h"
#include "baseview.h"
......@@ -44,7 +44,7 @@
using namespace Core;
using namespace Core::Internal;
ProgressManager::ProgressManager(QObject *parent)
ProgressManagerPrivate::ProgressManagerPrivate(QObject *parent)
: ProgressManagerInterface(parent)
{
m_progressView = new ProgressView;
......@@ -52,15 +52,15 @@ ProgressManager::ProgressManager(QObject *parent)
connect(core, SIGNAL(coreAboutToClose()), this, SLOT(cancelAllRunningTasks()));
}
ProgressManager::~ProgressManager()
ProgressManagerPrivate::~ProgressManagerPrivate()
{
}
void ProgressManager::init()
void ProgressManagerPrivate::init()
{
}
void ProgressManager::cancelTasks(const QString &type)
void ProgressManagerPrivate::cancelTasks(const QString &type)
{
QMap<QFutureWatcher<void> *, QString>::iterator task = m_runningTasks.begin();
while (task != m_runningTasks.end()) {
......@@ -75,7 +75,7 @@ void ProgressManager::cancelTasks(const QString &type)
}
}
void ProgressManager::cancelAllRunningTasks()
void ProgressManagerPrivate::cancelAllRunningTasks()
{
QMap<QFutureWatcher<void> *, QString>::const_iterator task = m_runningTasks.constBegin();
while (task != m_runningTasks.constEnd()) {
......@@ -87,7 +87,7 @@ void ProgressManager::cancelAllRunningTasks()
m_runningTasks.clear();
}
FutureProgress *ProgressManager::addTask(const QFuture<void> &future, const QString &title, const QString &type, PersistentType persistency)
FutureProgress *ProgressManagerPrivate::addTask(const QFuture<void> &future, const QString &title, const QString &type, PersistentType persistency)
{
QFutureWatcher<void> *watcher = new QFutureWatcher<void>();
m_runningTasks.insert(watcher, type);
......@@ -96,12 +96,12 @@ FutureProgress *ProgressManager::addTask(const QFuture<void> &future, const QStr
return m_progressView->addTask(future, title, type, persistency);
}
QWidget *ProgressManager::progressView()
QWidget *ProgressManagerPrivate::progressView()
{
return m_progressView;
}
void ProgressManager::taskFinished()
void ProgressManagerPrivate::taskFinished()
{
QObject *taskObject = sender();
QTC_ASSERT(taskObject, return);
......
......@@ -31,8 +31,8 @@
**
***************************************************************************/
#ifndef PROGRESSMANAGER_H
#define PROGRESSMANAGER_H
#ifndef PROGRESSMANAGER_P_H
#define PROGRESSMANAGER_P_H
#include "progressmanagerinterface.h"
......@@ -45,12 +45,12 @@ namespace Internal {
class ProgressView;
class ProgressManager : public Core::ProgressManagerInterface
class ProgressManagerPrivate : public Core::ProgressManagerInterface
{
Q_OBJECT
public:
ProgressManager(QObject *parent = 0);
~ProgressManager();
ProgressManagerPrivate(QObject *parent = 0);
~ProgressManagerPrivate();
void init();
FutureProgress *addTask(const QFuture<void> &future, const QString &title, const QString &type, PersistentType persistency);
......@@ -71,4 +71,4 @@ private:
} // namespace Internal
} // namespace Core
#endif // PROGRESSMANAGER_H
#endif // PROGRESSMANAGER_P_H
......@@ -49,7 +49,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/progressmanager/progressmanagerinterface.h>
#include <utils/qtcassert.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment