From eefaf0c4d0a108a9ea99de93d360fbdff5815295 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Fri, 30 May 2014 12:57:49 +0200
Subject: [PATCH] ProgressManager: Hide some internally used function from .h
interface.
The indirection of the "virtual + implementation inheritance" pattern is
kind of subset of the "static" pattern, no need to have both.
Change-Id: I4e2c2742dae94819ee05c7925c02b954a8c6294b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
.../coreplugin/progressmanager/progressmanager.cpp | 8 ++++----
src/plugins/coreplugin/progressmanager/progressmanager.h | 6 ------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index c274cdc18f5..f45845cd143 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -264,6 +264,8 @@ using namespace Core::Internal;
Sent when all tasks of a \a type have finished.
*/
+static ProgressManagerPrivate *m_instance = 0;
+
ProgressManagerPrivate::ProgressManagerPrivate()
: m_applicationTask(0),
m_currentStatusDetailsWidget(0),
@@ -271,6 +273,7 @@ ProgressManagerPrivate::ProgressManagerPrivate()
m_progressViewPinned(false),
m_hovered(false)
{
+ m_instance = this;
m_progressView = new ProgressView;
// withDelay, so the statusBarWidget has the chance to get the enter event
connect(m_progressView, SIGNAL(hoveredChanged(bool)), this, SLOT(updateVisibilityWithDelay()));
@@ -284,6 +287,7 @@ ProgressManagerPrivate::~ProgressManagerPrivate()
ExtensionSystem::PluginManager::removeObject(m_statusBarWidgetContainer);
delete m_statusBarWidgetContainer;
cleanup();
+ m_instance = 0;
}
void ProgressManagerPrivate::readSettings()
@@ -717,16 +721,12 @@ void ToggleButton::paintEvent(QPaintEvent *event)
}
-static ProgressManager *m_instance = 0;
-
ProgressManager::ProgressManager()
{
- m_instance = this;
}
ProgressManager::~ProgressManager()
{
- m_instance = 0;
}
QObject *ProgressManager::instance()
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h
index 32031f71a4e..392d710762c 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.h
@@ -66,12 +66,6 @@ signals:
void taskStarted(Core::Id type);
void allTasksFinished(Core::Id type);
-protected:
- virtual void doCancelTasks(Core::Id type) = 0;
- virtual FutureProgress *doAddTask(const QFuture<void> &future, const QString &title,
- Core::Id type, ProgressFlags flags = 0) = 0;
- virtual void doSetApplicationLabel(const QString &text) = 0;
-
private:
ProgressManager();
~ProgressManager();
--
GitLab