Commit 5f3faaff authored by con's avatar con
Browse files

Fixes: - ProgressManager --> ProgressManagerPrivate

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