forked from qt-creator/qt-creator
Core: Cosmetics
* Remove redundant namespace qualifiers * Qt5-ify some signal/slot connections * Replace some using Core::Internal with explicit namespace scopes Change-Id: Id1aae05e2c6fc2992c2716e1f8f9e985c6e56122 Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -305,7 +305,7 @@ void ProgressManagerPrivate::init()
|
||||
{
|
||||
readSettings();
|
||||
|
||||
m_statusBarWidgetContainer = new Core::StatusBarWidget;
|
||||
m_statusBarWidgetContainer = new StatusBarWidget;
|
||||
m_statusBarWidget = new QWidget;
|
||||
QHBoxLayout *layout = new QHBoxLayout(m_statusBarWidget);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
@@ -328,7 +328,7 @@ void ProgressManagerPrivate::init()
|
||||
ToggleButton *toggleButton = new ToggleButton(m_statusBarWidget);
|
||||
layout->addWidget(toggleButton);
|
||||
m_statusBarWidgetContainer->setWidget(m_statusBarWidget);
|
||||
m_statusBarWidgetContainer->setPosition(Core::StatusBarWidget::RightCorner);
|
||||
m_statusBarWidgetContainer->setPosition(StatusBarWidget::RightCorner);
|
||||
ExtensionSystem::PluginManager::addObject(m_statusBarWidgetContainer);
|
||||
m_statusBarWidget->installEventFilter(this);
|
||||
|
||||
|
||||
@@ -55,9 +55,9 @@ public:
|
||||
static QObject *instance();
|
||||
|
||||
static FutureProgress *addTask(const QFuture<void> &future, const QString &title,
|
||||
Core::Id type, ProgressFlags flags = 0);
|
||||
Id type, ProgressFlags flags = 0);
|
||||
static FutureProgress *addTimedTask(const QFutureInterface<void> &fi, const QString &title,
|
||||
Core::Id type, int expectedSeconds, ProgressFlags flags = 0);
|
||||
Id type, int expectedSeconds, ProgressFlags flags = 0);
|
||||
static void setApplicationLabel(const QString &text);
|
||||
|
||||
public slots:
|
||||
|
||||
@@ -105,7 +105,7 @@ private:
|
||||
QList<FutureProgress *> m_taskList;
|
||||
QMap<QFutureWatcher<void> *, Id> m_runningTasks;
|
||||
QFutureWatcher<void> *m_applicationTask;
|
||||
Core::StatusBarWidget *m_statusBarWidgetContainer;
|
||||
StatusBarWidget *m_statusBarWidgetContainer;
|
||||
QWidget *m_statusBarWidget;
|
||||
QWidget *m_summaryProgressWidget;
|
||||
QHBoxLayout *m_summaryProgressLayout;
|
||||
|
||||
Reference in New Issue
Block a user