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

Compile fix with recent Qt dev

Browse Source 
The reasoning in 1b4766e26c did not take into account that the scope
of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with
f70905448f6 in Qt base.

Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-07-24 13:43:54 +02:00
parent 02e224fcfa
commit e3b1106afa
70 changed files with 238 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/sidebar.cpp
View File

@@ -108,9 +108,7 @@ SideBar::~SideBar()
QString SideBar::idForTitle(const QString &title) const
{
QMapIterator<QString, QPointer<SideBarItem> > iter(d->m_itemMap);
while (iter.hasNext()) {
iter.next();
for (auto iter = d->m_itemMap.cbegin(), end = d->m_itemMap.cend(); iter != end; ++iter) {
if (iter.value().data()->title() == title)
return iter.key();
}
@@ -266,11 +264,8 @@ void SideBar::saveSettings(QSettings *settings, const QString &name)
if (!currentItemId.isEmpty())
views.append(currentItemId);
}
if (views.isEmpty() && d->m_itemMap.size()) {
QMapIterator<QString, QPointer<SideBarItem> > iter(d->m_itemMap);
iter.next();
views.append(iter.key());
}
if (views.isEmpty() && !d->m_itemMap.isEmpty())
views.append(d->m_itemMap.cbegin().key());
settings->setValue(prefix + QLatin1String("Views"), views);
settings->setValue(prefix + QLatin1String("Visible"),