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

16
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
View File

@@ -276,9 +276,7 @@ void ActionContainerPrivate::addMenu(ActionContainer *before, ActionContainer *m
auto containerPrivate = static_cast<ActionContainerPrivate *>(menu);
QTC_ASSERT(containerPrivate->canBeAddedToContainer(this), return);
QMutableListIterator<Group> it(m_groups);
while (it.hasNext()) {
Group &group = it.next();
for (Group &group : m_groups) {
const int insertionPoint = group.items.indexOf(before);
if (insertionPoint >= 0) {
group.items.insert(insertionPoint, menu);
@@ -319,9 +317,7 @@ Command *ActionContainerPrivate::addSeparator(const Context &context, Id group,
void ActionContainerPrivate::clear()
{
QMutableListIterator<Group> it(m_groups);
while (it.hasNext()) {
Group &group = it.next();
for (Group &group : m_groups) {
foreach (QObject *item, group.items) {
if (auto command = qobject_cast<Command *>(item)) {
removeAction(command);
@@ -343,9 +339,7 @@ void ActionContainerPrivate::clear()
void ActionContainerPrivate::itemDestroyed()
{
QObject *obj = sender();
QMutableListIterator<Group> it(m_groups);
while (it.hasNext()) {
Group &group = it.next();
for (Group &group : m_groups) {
if (group.items.removeAll(obj) > 0)
break;
}
@@ -454,9 +448,7 @@ bool MenuActionContainer::updateInternal()
bool hasitems = false;
QList<QAction *> actions = m_menu->actions();
QListIterator<Group> it(m_groups);
while (it.hasNext()) {
const Group &group = it.next();
for (const Group &group : m_groups) {
foreach (QObject *item, group.items) {
if (auto container = qobject_cast<ActionContainerPrivate*>(item)) {
actions.removeAll(container->menu()->menuAction());