feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectManager: Use Core::Id for progress types

Browse Source 
Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2013-09-03 15:18:37 +02:00
parent 1f340d44f7
commit 98917598d3
44 changed files with 121 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/progressmanager/futureprogress.cpp
View File

@@ -66,7 +66,7 @@ public:
QWidget *m_widget;
QHBoxLayout *m_widgetLayout;
QWidget *m_statusBarWidget;
QString m_type;
Id m_type;
FutureProgress::KeepOnFinishType m_keep;
bool m_waitingForUserInteraction;
FutureProgress *m_q;
@@ -304,12 +304,12 @@ bool FutureProgress::hasError() const
return d->m_progress->hasError();
}
void FutureProgress::setType(const QString &type)
void FutureProgress::setType(Id type)
{
d->m_type = type;
}
QString FutureProgress::type() const
Id FutureProgress::type() const
{
return d->m_type;
}

5
src/plugins/coreplugin/progressmanager/futureprogress.h
View File

@@ -31,6 +31,7 @@
#define FUTUREPROGRESS_H
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <QString>
#include <QFuture>
@@ -60,8 +61,8 @@ public:
void setTitle(const QString &title);
QString title() const;
void setType(const QString &type);
QString type() const;
void setType(Id type);
Id type() const;
void setKeepOnFinish(KeepOnFinishType keepType);
bool keepOnFinish() const;

31
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -245,7 +245,7 @@ using namespace Core::Internal;
*/
/*!
\fn void Core::ProgressManager::cancelTasks(const QString &type)
\fn void Core::ProgressManager::cancelTasks(Core::Id type)
Schedules a cancel for all running tasks of the given \a type.
Please note that the cancel functionality depends on the
@@ -254,13 +254,13 @@ using namespace Core::Internal;
*/
/*!
\fn void Core::ProgressManager::taskStarted(const QString &type)
\fn void Core::ProgressManager::taskStarted(Core::Id type)
Sent whenever a task of a given \a type is started.
*/
/*!
\fn void Core::ProgressManager::allTasksFinished(const QString &type)
\fn void Core::ProgressManager::allTasksFinished(Core::Id type)
Sent when all tasks of a \a type have finished.
*/
@@ -347,10 +347,10 @@ void ProgressManagerPrivate::init()
initInternal();
}
void ProgressManagerPrivate::doCancelTasks(const QString &type)
void ProgressManagerPrivate::doCancelTasks(Id type)
{
bool found = false;
QMap<QFutureWatcher<void> *, QString>::iterator task = m_runningTasks.begin();
QMap<QFutureWatcher<void> *, Id>::iterator task = m_runningTasks.begin();
while (task != m_runningTasks.end()) {
if (task.value() != type) {
++task;
@@ -398,7 +398,7 @@ bool ProgressManagerPrivate::eventFilter(QObject *obj, QEvent *event)
void ProgressManagerPrivate::cancelAllRunningTasks()
{
QMap<QFutureWatcher<void> *, QString>::const_iterator task = m_runningTasks.constBegin();
QMap<QFutureWatcher<void> *, Id>::const_iterator task = m_runningTasks.constBegin();
while (task != m_runningTasks.constEnd()) {
disconnect(task.key(), SIGNAL(finished()), this, SLOT(taskFinished()));
if (m_applicationTask == task.key())
@@ -412,7 +412,7 @@ void ProgressManagerPrivate::cancelAllRunningTasks()
}
FutureProgress *ProgressManagerPrivate::doAddTask(const QFuture<void> &future, const QString &title,
const QString &type, ProgressFlags flags)
Id type, ProgressFlags flags)
{
// watch
QFutureWatcher<void> *watcher = new QFutureWatcher<void>();
@@ -473,7 +473,7 @@ void ProgressManagerPrivate::taskFinished()
QFutureWatcher<void> *task = static_cast<QFutureWatcher<void> *>(taskObject);
if (m_applicationTask == task)
disconnectApplicationTask();
QString type = m_runningTasks.value(task);
Id type = m_runningTasks.value(task);
m_runningTasks.remove(task);
delete task;
updateSummaryProgressBar();
@@ -506,7 +506,7 @@ void ProgressManagerPrivate::updateSummaryProgressBar()
stopFadeOfSummaryProgress();
m_summaryProgressBar->setFinished(false);
QMapIterator<QFutureWatcher<void> *, QString> it(m_runningTasks);
QMapIterator<QFutureWatcher<void> *, Id> it(m_runningTasks);
static const int TASK_RANGE = 100;
int value = 0;
while (it.hasNext()) {
@@ -563,12 +563,12 @@ void ProgressManagerPrivate::slotRemoveTask()
{
FutureProgress *progress = qobject_cast<FutureProgress *>(sender());
QTC_ASSERT(progress, return);
QString type = progress->type();
Id type = progress->type();
removeTask(progress);
removeOldTasks(type, true);
}
void ProgressManagerPrivate::removeOldTasks(const QString &type, bool keepOne)
void ProgressManagerPrivate::removeOldTasks(const Id type, bool keepOne)
{
bool firstFound = !keepOne; // start with false if we want to keep one
QList<FutureProgress *>::iterator i = m_taskList.end();
@@ -600,7 +600,7 @@ void ProgressManagerPrivate::removeOneOldTask()
}
// no ended process, look for a task type with multiple running tasks and remove the oldest one
for (QList<FutureProgress *>::iterator i = m_taskList.begin(); i != m_taskList.end(); ++i) {
QString type = (*i)->type();
Id type = (*i)->type();
int taskCount = 0;
foreach (FutureProgress *p, m_taskList)
@@ -735,7 +735,7 @@ QObject *ProgressManager::instance()
return m_instance;
}
FutureProgress *ProgressManager::addTask(const QFuture<void> &future, const QString &title, const QString &type, ProgressFlags flags)
FutureProgress *ProgressManager::addTask(const QFuture<void> &future, const QString &title, Id type, ProgressFlags flags)
{
return m_instance->doAddTask(future, title, type, flags);
}
@@ -745,7 +745,8 @@ void ProgressManager::setApplicationLabel(const QString &text)
m_instance->doSetApplicationLabel(text);
}
void ProgressManager::cancelTasks(const QString &type)
void ProgressManager::cancelTasks(const Id type)
{
m_instance->doCancelTasks(type);
if (m_instance)
m_instance->doCancelTasks(type);
}

13
src/plugins/coreplugin/progressmanager/progressmanager.h
View File

@@ -31,6 +31,7 @@
#define PROGRESSMANAGER_H
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <QObject>
#include <QFuture>
@@ -53,20 +54,20 @@ public:
static QObject *instance();
static FutureProgress *addTask(const QFuture<void> &future, const QString &title,
const QString &type, ProgressFlags flags = 0);
Core::Id type, ProgressFlags flags = 0);
static void setApplicationLabel(const QString &text);
public slots:
static void cancelTasks(const QString &type);
static void cancelTasks(const Core::Id type);
signals:
void taskStarted(const QString &type);
void allTasksFinished(const QString &type);
void taskStarted(Core::Id type);
void allTasksFinished(Core::Id type);
protected:
virtual void doCancelTasks(const QString &type) = 0;
virtual void doCancelTasks(Core::Id type) = 0;
virtual FutureProgress *doAddTask(const QFuture<void> &future, const QString &title,
const QString &type, ProgressFlags flags = 0) = 0;
Core::Id type, ProgressFlags flags = 0) = 0;
virtual void doSetApplicationLabel(const QString &text) = 0;
private:

8
src/plugins/coreplugin/progressmanager/progressmanager_p.h
View File

@@ -58,14 +58,14 @@ public:
void init();
void cleanup();
FutureProgress *doAddTask(const QFuture<void> &future, const QString &title, const QString &type,
FutureProgress *doAddTask(const QFuture<void> &future, const QString &title, Id type,
ProgressFlags flags);
void doSetApplicationLabel(const QString &text);
ProgressView *progressView();
public slots:
void doCancelTasks(const QString &type);
void doCancelTasks(Core::Id type);
protected:
bool eventFilter(QObject *obj, QEvent *event);
@@ -94,14 +94,14 @@ private:
bool hasError() const;
bool isLastFading() const;
void removeOldTasks(const QString &type, bool keepOne = false);
void removeOldTasks(Id type, bool keepOne = false);
void removeOneOldTask();
void removeTask(FutureProgress *task);
void deleteTask(FutureProgress *task);
QPointer<ProgressView> m_progressView;
QList<FutureProgress *> m_taskList;
QMap<QFutureWatcher<void> *, QString> m_runningTasks;
QMap<QFutureWatcher<void> *, Id> m_runningTasks;
QFutureWatcher<void> *m_applicationTask;
Core::StatusBarWidget *m_statusBarWidgetContainer;
QWidget *m_statusBarWidget;