From 52b2dd157844b3ebbb5774bc72989e1e38aa2b87 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 24 Jun 2011 16:00:47 +0200
Subject: [PATCH] Better name for enum value.

Change-Id: Ic89535081fca147727d12d77e1427d8240cde6d5
Reviewed-on: http://codereview.qt.nokia.com/713
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
 src/plugins/coreplugin/progressmanager/futureprogress.cpp | 6 +++---
 src/plugins/coreplugin/progressmanager/futureprogress.h   | 2 +-
 src/plugins/coreplugin/progressmanager/progressview.cpp   | 2 +-
 src/plugins/debugger/debuggerengine.cpp                   | 2 +-
 src/plugins/valgrind/valgrindengine.cpp                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index 1d5c46bc884..5468bf23a82 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -103,7 +103,7 @@ struct FutureProgressPrivate {
 
 FutureProgressPrivate::FutureProgressPrivate(FutureProgress *q) :
     m_progress(new Internal::ProgressBar), m_widget(0), m_widgetLayout(new QHBoxLayout),
-    m_keep(FutureProgress::DontKeepOnFinish), m_waitingForUserInteraction(false),
+    m_keep(FutureProgress::HideOnFinish), m_waitingForUserInteraction(false),
     m_faderWidget(new Internal::FadeWidgetHack(q)), m_q(q), m_isFading(false)
 {
 }
@@ -259,13 +259,13 @@ void FutureProgressPrivate::tryToFadeAway()
     if (m_isFading)
         return;
     if (m_keep == FutureProgress::KeepOnFinishTillUserInteraction
-            || (m_keep == FutureProgress::DontKeepOnFinish && m_progress->hasError())) {
+            || (m_keep == FutureProgress::HideOnFinish && m_progress->hasError())) {
         m_waitingForUserInteraction = true;
         //eventfilter is needed to get user interaction
         //events to start QTimer::singleShot later
         qApp->installEventFilter(m_q);
         m_isFading = true;
-    } else if (m_keep == FutureProgress::DontKeepOnFinish) {
+    } else if (m_keep == FutureProgress::HideOnFinish) {
         QTimer::singleShot(shortNotificationTimeout, m_q, SLOT(fadeAway()));
         m_isFading = true;
     }
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h
index 362c372e9b0..9dff684840a 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.h
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.h
@@ -50,7 +50,7 @@ class CORE_EXPORT FutureProgress : public QWidget
 
 public:
     enum KeepOnFinishType {
-        DontKeepOnFinish = 0,
+        HideOnFinish = 0,
         KeepOnFinishTillUserInteraction = 1,
         KeepOnFinish = 2
     };
diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp
index 40257e0ac9d..7e13d21df5f 100644
--- a/src/plugins/coreplugin/progressmanager/progressview.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressview.cpp
@@ -75,7 +75,7 @@ FutureProgress *ProgressView::addTask(const QFuture<void> &future,
     if (flags.testFlag(ProgressManager::KeepOnFinish)) {
         progress->setKeepOnFinish(FutureProgress::KeepOnFinishTillUserInteraction);
     } else {
-        progress->setKeepOnFinish(FutureProgress::DontKeepOnFinish);
+        progress->setKeepOnFinish(FutureProgress::HideOnFinish);
     }
     connect(progress, SIGNAL(removeMe()), this, SLOT(slotRemoveTask()));
     return progress;
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index ed4c584e7b6..9a323ee6e7e 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -513,7 +513,7 @@ void DebuggerEngine::startDebugger(DebuggerRunControl *runControl)
     Core::FutureProgress *fp = Core::ICore::instance()->progressManager()
         ->addTask(d->m_progress.future(),
         tr("Launching"), _("Debugger.Launcher"));
-    fp->setKeepOnFinish(Core::FutureProgress::DontKeepOnFinish);
+    fp->setKeepOnFinish(Core::FutureProgress::HideOnFinish);
     d->m_progress.reportStarted();
 
     d->m_runControl = runControl;
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 38cee266933..e4cddcfd895 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -83,7 +83,7 @@ void ValgrindEngine::start()
 
     Core::FutureProgress *fp = Core::ICore::instance()->progressManager()->addTask(m_progress->future(),
                                                         progressTitle(), "valgrind");
-    fp->setKeepOnFinish(Core::FutureProgress::DontKeepOnFinish);
+    fp->setKeepOnFinish(Core::FutureProgress::HideOnFinish);
     m_progress->reportStarted();
     m_progressWatcher->setFuture(m_progress->future());