diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-02 11:56:55 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-02 11:56:55 +0200 |
| commit | e56118cc1e633e2d08e626c1de7b0bd3a2be584e (patch) | |
| tree | 2b153fbdc8c0a00db999e71f1a545755835aaf08 /src/plugins/clearcase | |
| parent | 97631c25df2779f8eab71ef53ea12dbe0215ce85 (diff) | |
| parent | fd0b383932452ae20fa83e9224d473014dedc841 (diff) | |
| download | qt-creator-e56118cc1e633e2d08e626c1de7b0bd3a2be584e.tar.gz | |
Merge remote-tracking branch 'origin/3.4'
Conflicts:
src/libs/extensionsystem/pluginview.cpp
Change-Id: I316199fe0a257cb085668ccb183b1590555278f2
Diffstat (limited to 'src/plugins/clearcase')
| -rw-r--r-- | src/plugins/clearcase/clearcasesync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp index 2cd4de67f3..a86ff669f6 100644 --- a/src/plugins/clearcase/clearcasesync.cpp +++ b/src/plugins/clearcase/clearcasesync.cpp @@ -80,8 +80,8 @@ void ClearCaseSync::invalidateStatus(const QDir &viewRootDir, void ClearCaseSync::invalidateStatusAllFiles() { - const StatusMap::ConstIterator send = m_statusMap->end(); - for (StatusMap::ConstIterator it = m_statusMap->begin(); it != send; ++it) + const StatusMap::ConstIterator send = m_statusMap->constEnd(); + for (StatusMap::ConstIterator it = m_statusMap->constBegin(); it != send; ++it) m_plugin->setStatus(it.key(), FileStatus::Unknown, false); } |