1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFutureInterface: remove unused member variable 'pendingResults'

Browse Source 
Change-Id: I059580831ed29a53186272283aa7695c57539eed
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2013-09-19 15:46:34 +02:00 committed by The Qt Project
parent eec9567111
commit ef5455429f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/thread/qfutureinterface.cpp
View File

@ -432,7 +432,7 @@ bool QFutureInterfaceBase::derefT() const
QFutureInterfaceBasePrivate::QFutureInterfaceBasePrivate(QFutureInterfaceBase::State initialState) QFutureInterfaceBasePrivate::QFutureInterfaceBasePrivate(QFutureInterfaceBase::State initialState)
: refCount(1), m_progressValue(0), m_progressMinimum(0), m_progressMaximum(0), : refCount(1), m_progressValue(0), m_progressMinimum(0), m_progressMaximum(0),
state(initialState), pendingResults(0), state(initialState),
manualProgress(false), m_expectedResultCount(0), runnable(0) manualProgress(false), m_expectedResultCount(0), runnable(0)
{ {
progressTime.invalidate(); progressTime.invalidate();

1
src/corelib/thread/qfutureinterface_p.h
View File

@ -163,7 +163,6 @@ public:
QFutureInterfaceBase::State state; QFutureInterfaceBase::State state;
QElapsedTimer progressTime; QElapsedTimer progressTime;
QWaitCondition pausedWaitCondition; QWaitCondition pausedWaitCondition;
int pendingResults;
QtPrivate::ResultStoreBase m_results; QtPrivate::ResultStoreBase m_results;
bool manualProgress; bool manualProgress;
int m_expectedResultCount; int m_expectedResultCount;