From 5354632bfb149c51160acf5f349e046c0ccdd03f Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 25 Jul 2022 00:04:04 +0200 Subject: [PATCH] Fix several clazy issues: * Mixing iterators with const_iterators [-Wclazy-strict-iterators] --- src/Gui/PrefWidgets.cpp | 2 +- src/Gui/PythonConsole.cpp | 2 +- src/Gui/Workbench.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Gui/PrefWidgets.cpp b/src/Gui/PrefWidgets.cpp index 07f41daaf3..0765983b2c 100644 --- a/src/Gui/PrefWidgets.cpp +++ b/src/Gui/PrefWidgets.cpp @@ -641,7 +641,7 @@ void PrefQuantitySpinBox::contextMenuEvent(QContextMenuEvent *event) // data structure to remember actions for values QStringList history = d->history.asStringList(); - for (QStringList::const_iterator it = history.begin();it != history.end(); ++it) { + for (QStringList::const_iterator it = history.cbegin();it != history.cend(); ++it) { QAction* action = menu->addAction(*it); action->setProperty("history_value", *it); } diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp index 66d003d5f3..7b2bb66d41 100644 --- a/src/Gui/PythonConsole.cpp +++ b/src/Gui/PythonConsole.cpp @@ -1421,7 +1421,7 @@ void PythonConsole::saveHistory() const // only save last 100 entries so we don't inflate forever... if (hist.length() > 100) hist = hist.mid(hist.length()-100); - for (QStringList::ConstIterator it = hist.begin(); it != hist.end(); ++it) + for (QStringList::ConstIterator it = hist.cbegin(); it != hist.cend(); ++it) t << *it << "\n"; f.close(); } diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index b59f9d4cb3..d17f73348e 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -468,7 +468,7 @@ std::list Workbench::listToolbars() const std::unique_ptr tb(setupToolBars()); std::list bars; QList items = tb->getItems(); - for (QList::ConstIterator item = items.begin(); item != items.end(); ++item) + for (QList::ConstIterator item = items.cbegin(); item != items.cend(); ++item) bars.push_back((*item)->command()); return bars; } @@ -479,10 +479,10 @@ std::list>> Workbench::getToolbarI std::list>> itemsList; QList items = tb->getItems(); - for (QList::ConstIterator it = items.begin(); it != items.end(); ++it) { + for (QList::ConstIterator it = items.cbegin(); it != items.cend(); ++it) { QList sub = (*it)->getItems(); std::list cmds; - for (QList::ConstIterator jt = sub.begin(); jt != sub.end(); ++jt) { + for (QList::ConstIterator jt = sub.cbegin(); jt != sub.cend(); ++jt) { cmds.push_back((*jt)->command()); } @@ -496,7 +496,7 @@ std::list Workbench::listMenus() const std::unique_ptr mb(setupMenuBar()); std::list menus; QList items = mb->getItems(); - for ( QList::ConstIterator it = items.begin(); it != items.end(); ++it ) + for ( QList::ConstIterator it = items.cbegin(); it != items.cend(); ++it ) menus.push_back((*it)->command()); return menus; } @@ -506,7 +506,7 @@ std::list Workbench::listCommandbars() const std::unique_ptr cb(setupCommandBars()); std::list bars; QList items = cb->getItems(); - for (QList::ConstIterator item = items.begin(); item != items.end(); ++item) + for (QList::ConstIterator item = items.cbegin(); item != items.cend(); ++item) bars.push_back((*item)->command()); return bars; }