forked from qt-creator/qt-creator
Header cleanup in coreplugin, part 1
This commit is contained in:
@@ -33,31 +33,23 @@
|
||||
#include <coreplugin/core_global.h>
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QScopedPointer>
|
||||
|
||||
#include <QtCore/QFuture>
|
||||
#include <QtCore/QFutureWatcher>
|
||||
#include <QtGui/QWidget>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QProgressBar;
|
||||
class QHBoxLayout;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Core {
|
||||
|
||||
namespace Internal {
|
||||
class ProgressBar;
|
||||
class FadeWidgetHack;
|
||||
} // namespace Internal
|
||||
struct FutureProgressPrivate;
|
||||
|
||||
class CORE_EXPORT FutureProgress : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
FutureProgress(QWidget *parent = 0);
|
||||
~FutureProgress();
|
||||
explicit FutureProgress(QWidget *parent = 0);
|
||||
virtual ~FutureProgress();
|
||||
|
||||
bool eventFilter(QObject *object, QEvent *);
|
||||
virtual bool eventFilter(QObject *object, QEvent *);
|
||||
|
||||
void setFuture(const QFuture<void> &future);
|
||||
QFuture<void> future() const;
|
||||
@@ -65,16 +57,16 @@ public:
|
||||
void setTitle(const QString &title);
|
||||
QString title() const;
|
||||
|
||||
void setType(const QString &type) {m_type = type; }
|
||||
QString type() const { return m_type; }
|
||||
void setType(const QString &type);
|
||||
QString type() const;
|
||||
|
||||
void setKeepOnFinish(bool keep) { m_keep = keep; }
|
||||
bool keepOnFinish() const { return m_keep; }
|
||||
void setKeepOnFinish(bool keep);
|
||||
bool keepOnFinish() const;
|
||||
|
||||
bool hasError() const;
|
||||
|
||||
void setWidget(QWidget *widget);
|
||||
QWidget *widget() const { return m_widget; }
|
||||
QWidget *widget() const;
|
||||
|
||||
signals:
|
||||
void clicked();
|
||||
@@ -96,14 +88,7 @@ private slots:
|
||||
void fadeAway();
|
||||
|
||||
private:
|
||||
QFutureWatcher<void> m_watcher;
|
||||
Internal::ProgressBar *m_progress;
|
||||
QWidget *m_widget;
|
||||
QHBoxLayout *m_widgetLayout;
|
||||
QString m_type;
|
||||
bool m_keep;
|
||||
bool m_waitingForUserInteraction;
|
||||
Internal::FadeWidgetHack *m_faderWidget;
|
||||
QScopedPointer<FutureProgressPrivate> d;
|
||||
};
|
||||
|
||||
} // namespace Core
|
||||
|
||||
Reference in New Issue
Block a user