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

Fixes: - ProgressManagerInterface --> ProgressManager

Browse Source 
Details:  - Conform to conventions.
This commit is contained in:
con
2009-01-13 14:16:36 +01:00
parent 5f3faaff19
commit 281c462d24
18 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();

12
src/plugins/coreplugin/progressmanager/progressmanagerinterface.h → src/plugins/coreplugin/progressmanager/progressmanager.h
View File

@@ -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

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

@@ -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:

4
src/plugins/coreplugin/progressmanager/progressview.cpp
View File

@@ -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;
}

4
src/plugins/coreplugin/progressmanager/progressview.h
View File

@@ -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();