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

Better name for enum value.

Browse Source 
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>
This commit is contained in:
con
2011-06-24 16:00:47 +02:00
committed by Eike Ziller
parent 19bdd72805
commit 52b2dd1578
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/progressmanager/futureprogress.cpp
View File

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