qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Remove unused code 

isConcurrent is not virtual and always returns true, so we can remove
it and remove the if() on the caller side.

Change-Id: Ie750fdeddaf8c339e1fcab99ebd967e3446bd975
Reviewed-by: Michael Brasser <michael.brasser@live.com>
This commit is contained in:
Simon Hausmann 2014-12-08 15:51:47 +01:00 committed by Simon Hausmann
parent 3228864f7b
commit e04822f3c2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qml/qml/qqmlengine_p.h
View File

@ -334,10 +334,8 @@ void QQmlEnginePrivate::Locker::unlock()
void QQmlEnginePrivate::Locker::relock()
{
Q_ASSERT(!m_locked);
if (m_ep->typeLoader.isConcurrent()) {
m_ep->mutex.lock();
m_locked = true;
}
m_ep->mutex.lock();
m_locked = true;
}
/*!

2
src/qml/qml/qqmltypeloader_p.h
View File

@ -313,8 +313,6 @@ public:
void lock();
void unlock();
bool isConcurrent() const { return true; }
void load(QQmlDataBlob *, Mode = PreferSynchronous);
void loadWithStaticData(QQmlDataBlob *, const QByteArray &, Mode = PreferSynchronous);
void loadWithCachedUnit(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit, Mode mode = PreferSynchronous);