From e09d8aaba6d05061b92b8f6ef2a023d1bcfcbeef Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 14 Aug 2023 19:40:21 +0200 Subject: [PATCH] Gui: modernize C++: use range-based for loop --- src/Gui/AutoSaver.cpp | 26 +++++++----- src/Gui/CommandTest.cpp | 8 ++-- src/Gui/DAGView/DAGModel.cpp | 4 +- src/Gui/DlgActivateWindowImp.cpp | 8 ++-- src/Gui/DlgCustomizeImp.cpp | 4 +- src/Gui/DlgKeyboardImp.cpp | 11 +++-- src/Gui/DlgUnitsCalculatorImp.cpp | 4 +- src/Gui/Document.cpp | 4 +- src/Gui/DocumentPyImp.cpp | 4 +- src/Gui/DownloadManager.cpp | 8 ++-- src/Gui/Flag.cpp | 9 ++-- src/Gui/GLPainter.cpp | 10 ++--- src/Gui/GraphvizView.cpp | 10 ++--- src/Gui/Inventor/MarkerBitmaps.cpp | 6 +-- src/Gui/Language/Translator.cpp | 10 ++--- src/Gui/MergeDocuments.cpp | 4 +- src/Gui/PrefWidgets.cpp | 6 +-- src/Gui/PythonConsole.cpp | 4 +- src/Gui/PythonDebugger.cpp | 34 +++++++-------- src/Gui/Selection.cpp | 3 +- src/Gui/SelectionObject.cpp | 4 +- src/Gui/SelectionView.cpp | 32 +++++++------- src/Gui/SoDatumLabel.cpp | 42 +++++++++--------- src/Gui/SoFCColorBar.cpp | 20 ++++----- src/Gui/SoFCOffscreenRenderer.cpp | 16 +++---- src/Gui/Splashscreen.cpp | 6 +-- src/Gui/TaskView/TaskDialog.cpp | 6 +-- src/Gui/TaskView/TaskSelectLinkProperty.cpp | 4 +- src/Gui/TaskView/TaskView.cpp | 22 +++++----- src/Gui/TaskView/TaskWatcher.cpp | 7 ++- src/Gui/TextureMapping.cpp | 4 +- src/Gui/ToolBoxManager.cpp | 22 +++++----- src/Gui/View3DInventor.cpp | 4 +- src/Gui/View3DInventorExamples.cpp | 4 +- src/Gui/View3DInventorViewer.cpp | 28 ++++++------ src/Gui/View3DPy.cpp | 4 +- src/Gui/View3DViewerPy.cpp | 4 +- src/Gui/ViewProvider.cpp | 5 +-- src/Gui/ViewProviderDocumentObject.cpp | 4 +- src/Gui/WidgetFactory.cpp | 4 +- src/Gui/WorkbenchManager.cpp | 8 ++-- src/Gui/propertyeditor/PropertyItem.cpp | 47 ++++++++++----------- 42 files changed, 234 insertions(+), 240 deletions(-) diff --git a/src/Gui/AutoSaver.cpp b/src/Gui/AutoSaver.cpp index e88cd1f9ae..74086a8ea8 100644 --- a/src/Gui/AutoSaver.cpp +++ b/src/Gui/AutoSaver.cpp @@ -53,9 +53,12 @@ using namespace Gui; namespace sp = std::placeholders; AutoSaver* AutoSaver::self = nullptr; +const int AutoSaveTimeout = 900000; AutoSaver::AutoSaver(QObject* parent) - : QObject(parent), timeout(900000), compressed(true) + : QObject(parent) + , timeout(AutoSaveTimeout) + , compressed(true) { //NOLINTBEGIN App::GetApplication().signalNewDocument.connect(std::bind(&AutoSaver::slotCreateDocument, this, sp::_1)); @@ -69,8 +72,9 @@ AutoSaver::~AutoSaver() AutoSaver* AutoSaver::instance() { - if (!self) + if (!self) { self = new AutoSaver(QApplication::instance()); + } return self; } @@ -88,11 +92,11 @@ void AutoSaver::setTimeout(int ms) timeout = Base::clamp(ms, 0, 3600000); // between 0 and 60 min // go through the attached documents and apply the new timeout - for (std::map::iterator it = saverMap.begin(); it != saverMap.end(); ++it) { - if (it->second->timerId > 0) - killTimer(it->second->timerId); + for (auto & it : saverMap) { + if (it.second->timerId > 0) + killTimer(it.second->timerId); int id = timeout > 0 ? startTimer(timeout) : 0; - it->second->timerId = id; + it.second->timerId = id; } } @@ -227,15 +231,15 @@ void AutoSaver::saveDocument(const std::string& name, AutoSaveProperty& saver) void AutoSaver::timerEvent(QTimerEvent * event) { int id = event->timerId(); - for (std::map::iterator it = saverMap.begin(); it != saverMap.end(); ++it) { - if (it->second->timerId == id) { + for (auto & it : saverMap) { + if (it.second->timerId == id) { try { - saveDocument(it->first, *it->second); - it->second->touched.clear(); + saveDocument(it.first, *it.second); + it.second->touched.clear(); break; } catch (...) { - Base::Console().Error("Failed to auto-save document '%s'\n", it->first.c_str()); + Base::Console().Error("Failed to auto-save document '%s'\n", it.first.c_str()); } } } diff --git a/src/Gui/CommandTest.cpp b/src/Gui/CommandTest.cpp index 21b3e71e4e..b2f42206f0 100644 --- a/src/Gui/CommandTest.cpp +++ b/src/Gui/CommandTest.cpp @@ -75,11 +75,11 @@ void Std_TestQM::activated(int iMsg) if (!files.empty()) { Translator::instance()->activateLanguage("English"); QList i18n = qApp->findChildren(); - for (QList::Iterator it = i18n.begin(); it != i18n.end(); ++it) - qApp->removeTranslator(*it); - for (QStringList::Iterator it = files.begin(); it != files.end(); ++it) { + for (QTranslator* it : i18n) + qApp->removeTranslator(it); + for (const QString& it : files) { auto translator = new QTranslator(qApp); - if (translator->load(*it)) { + if (translator->load(it)) { qApp->installTranslator(translator); } else { diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 225488cb89..5b9833924d 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -933,9 +933,9 @@ void Model::mousePressEvent(QGraphicsSceneMouseEvent* event) QPointF currentPickPoint = event->scenePos(); QGraphicsLineItem intersectionLine(QLineF(lastPick, currentPickPoint)); QListselection = collidingItems(&intersectionLine); - for (auto currentItem = selection.begin(); currentItem != selection.end(); ++currentItem) + for (auto currentItem : selection) { - auto rect = dynamic_cast(*currentItem); + auto rect = dynamic_cast(currentItem); if (!rect) continue; const GraphLinkRecord &selectionRecord = findRecord(rect, *graphLink); Gui::Selection().addSelection(selectionRecord.DObject->getDocument()->getName(), diff --git a/src/Gui/DlgActivateWindowImp.cpp b/src/Gui/DlgActivateWindowImp.cpp index e134bfe65d..1a7abd4829 100644 --- a/src/Gui/DlgActivateWindowImp.cpp +++ b/src/Gui/DlgActivateWindowImp.cpp @@ -63,14 +63,14 @@ DlgActivateWindowImp::DlgActivateWindowImp(QWidget* parent, Qt::WindowFlags fl) QWidget* activeWnd = getMainWindow()->activeWindow(); - for (QList::Iterator it = windows.begin(); it != windows.end(); ++it) { + for (QWidget* it : windows) { auto item = new QTreeWidgetItem(ui->treeWidget); - QString title = (*it)->windowTitle(); + QString title = it->windowTitle(); title.replace(QLatin1String("[*]"), QLatin1String("")); - if ((*it)->isWindowModified()) + if (it->isWindowModified()) title += QLatin1String("*"); item->setText(0, title); - if (*it == activeWnd) + if (it == activeWnd) active = item; } diff --git a/src/Gui/DlgCustomizeImp.cpp b/src/Gui/DlgCustomizeImp.cpp index 858267a30b..516ee8466f 100644 --- a/src/Gui/DlgCustomizeImp.cpp +++ b/src/Gui/DlgCustomizeImp.cpp @@ -83,9 +83,9 @@ DlgCustomizeImp::DlgCustomizeImp(QWidget* parent, Qt::WindowFlags fl) // make sure that pages are ready to create GetWidgetFactorySupplier(); - for (QList::Iterator it = _pages.begin(); it!=_pages.end(); ++it) + for (const QByteArray& it : _pages) { - addPage(WidgetFactory().createWidget((*it).constData())); + addPage(WidgetFactory().createWidget(it.constData())); } customLayout->addWidget(tabWidget, 0, 0); diff --git a/src/Gui/DlgKeyboardImp.cpp b/src/Gui/DlgKeyboardImp.cpp index 5f754d5af5..f5f81e174a 100644 --- a/src/Gui/DlgKeyboardImp.cpp +++ b/src/Gui/DlgKeyboardImp.cpp @@ -348,8 +348,7 @@ void DlgCustomKeyboardImp::populatePriorityList(QTreeWidget *priorityList, auto actionList = ShortcutManager::instance()->getActionsByShortcut(sc); QTreeWidgetItem *currentItem = nullptr; - for (size_t i=0; ifindData(it->first) < 0) { - combo->addItem(it->second); - combo->setItemData(combo->count()-1, QVariant(it->first), Qt::UserRole); + for (const auto & it : groupMap) { + if (combo->findData(it.first) < 0) { + combo->addItem(it.second); + combo->setItemData(combo->count()-1, QVariant(it.first), Qt::UserRole); } } } diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/DlgUnitsCalculatorImp.cpp index 13641e3227..a215f98fab 100644 --- a/src/Gui/DlgUnitsCalculatorImp.cpp +++ b/src/Gui/DlgUnitsCalculatorImp.cpp @@ -124,8 +124,8 @@ DlgUnitsCalculator::DlgUnitsCalculator( QWidget* parent, Qt::WindowFlags fl ) << Base::Unit::VolumeFlowRate << Base::Unit::VolumetricThermalExpansionCoefficient << Base::Unit::Work; - for (QList::iterator it = units.begin(); it != units.end(); ++it) { - ui->unitsBox->addItem(it->getTypeString()); + for (const Base::Unit& it : units) { + ui->unitsBox->addItem(it.getTypeString()); } ui->quantitySpinBox->setValue(1.0); diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index db0fe27d18..69a78a07c7 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -2438,8 +2438,8 @@ void Document::handleChildren3D(ViewProvider* viewProvider, bool deleting) backGroup->addChild(childBackNode); // cycling to all views of the document to remove the viewprovider from the viewer itself - for (std::list::iterator vIt = d->baseViews.begin();vIt != d->baseViews.end();++vIt) { - auto activeView = dynamic_cast(*vIt); + for (Gui::BaseView* vIt : d->baseViews) { + auto activeView = dynamic_cast(vIt); if (activeView && activeView->getViewer()->hasViewProvider(ChildViewProvider)) { // @Note hasViewProvider() // remove the viewprovider serves the purpose of detaching the inventor nodes from the diff --git a/src/Gui/DocumentPyImp.cpp b/src/Gui/DocumentPyImp.cpp index 0d105081ff..b947a61c66 100644 --- a/src/Gui/DocumentPyImp.cpp +++ b/src/Gui/DocumentPyImp.cpp @@ -269,8 +269,8 @@ PyObject* DocumentPy::mdiViewsOfType(PyObject *args) PY_TRY { std::list views = getDocumentPtr()->getMDIViewsOfType(type); Py::List list; - for (auto it = views.begin(); it != views.end(); ++it) - list.append(Py::asObject((*it)->getPyObject())); + for (auto it : views) + list.append(Py::asObject(it->getPyObject())); return Py::new_reference_to(list); } PY_CATCH; diff --git a/src/Gui/DownloadManager.cpp b/src/Gui/DownloadManager.cpp index 786eca7632..37e96ee386 100644 --- a/src/Gui/DownloadManager.cpp +++ b/src/Gui/DownloadManager.cpp @@ -114,13 +114,13 @@ QUrl DownloadManager::redirectUrl(const QUrl& url) const if (url.host() == QLatin1String("www.dropbox.com")) { QUrlQuery urlQuery(url); QList< QPair > query = urlQuery.queryItems(); - for (QList< QPair >::iterator it = query.begin(); it != query.end(); ++it) { - if (it->first == QLatin1String("dl")) { - if (it->second == QLatin1String("0\r\n")) { + for (const auto & it : query) { + if (it.first == QLatin1String("dl")) { + if (it.second == QLatin1String("0\r\n")) { urlQuery.removeQueryItem(QLatin1String("dl")); urlQuery.addQueryItem(QLatin1String("dl"), QLatin1String("1\r\n")); } - else if (it->second == QLatin1String("0")) { + else if (it.second == QLatin1String("0")) { urlQuery.removeQueryItem(QLatin1String("dl")); urlQuery.addQueryItem(QLatin1String("dl"), QLatin1String("1")); } diff --git a/src/Gui/Flag.cpp b/src/Gui/Flag.cpp index d5cae36f34..c1df3397fb 100644 --- a/src/Gui/Flag.cpp +++ b/src/Gui/Flag.cpp @@ -254,8 +254,7 @@ void FlagLayout::setGeometry(const QRect &rect) QLayout::setGeometry(rect); // left side - for (int i = 0; i < list.size(); ++i) { - ItemWrapper *wrapper = list.at(i); + for (ItemWrapper *wrapper : list) { QLayoutItem *item = wrapper->item; Position position = wrapper->position; @@ -275,8 +274,7 @@ void FlagLayout::setGeometry(const QRect &rect) // right side topHeight = 0; bottomHeight = 0; - for (int i = 0; i < list.size(); ++i) { - ItemWrapper *wrapper = list.at(i); + for (ItemWrapper *wrapper : list) { QLayoutItem *item = wrapper->item; Position position = wrapper->position; @@ -318,8 +316,7 @@ QSize FlagLayout::calculateSize(SizeType sizeType) const { QSize totalSize; - for (int i = 0; i < list.size(); ++i) { - ItemWrapper *wrapper = list.at(i); + for (ItemWrapper *wrapper : list) { QSize itemSize; if (sizeType == MinimumSize) diff --git a/src/Gui/GLPainter.cpp b/src/Gui/GLPainter.cpp index ad5a786999..934931b14d 100644 --- a/src/Gui/GLPainter.cpp +++ b/src/Gui/GLPainter.cpp @@ -429,8 +429,8 @@ void Polyline::paintGL() if (closed && !stippled) { glBegin(GL_LINE_LOOP); - for (std::vector::iterator it = _cNodeVector.begin(); it != _cNodeVector.end(); ++it) { - glVertex2i(it->x(), it->y()); + for (const QPoint& it : _cNodeVector) { + glVertex2i(it.x(), it.y()); } glEnd(); @@ -439,10 +439,10 @@ void Polyline::paintGL() glBegin(GL_LINES); QPoint start = _cNodeVector.front(); - for (std::vector::iterator it = _cNodeVector.begin(); it != _cNodeVector.end(); ++it) { + for (const QPoint& it : _cNodeVector) { glVertex2i(start.x(), start.y()); - start = *it; - glVertex2i(it->x(), it->y()); + start = it; + glVertex2i(it.x(), it.y()); } glEnd(); diff --git a/src/Gui/GraphvizView.cpp b/src/Gui/GraphvizView.cpp index c01abd26ff..a2820ad0d1 100644 --- a/src/Gui/GraphvizView.cpp +++ b/src/Gui/GraphvizView.cpp @@ -455,16 +455,16 @@ bool GraphvizView::onMsg(const char* pMsg,const char**) //formatMap << qMakePair(tr("VRML format (*.vrml)"), QString::fromLatin1("vrml")); QStringList filter; - for (QList< QPair >::iterator it = formatMap.begin(); it != formatMap.end(); ++it) - filter << it->first; + for (const auto & it : formatMap) + filter << it.first; QString selectedFilter; QString fn = Gui::FileDialog::getSaveFileName(this, tr("Export graph"), QString(), filter.join(QLatin1String(";;")), &selectedFilter); if (!fn.isEmpty()) { QString format; - for (QList< QPair >::iterator it = formatMap.begin(); it != formatMap.end(); ++it) { - if (selectedFilter == it->first) { - format = it->second; + for (const auto & it : formatMap) { + if (selectedFilter == it.first) { + format = it.second; break; } } diff --git a/src/Gui/Inventor/MarkerBitmaps.cpp b/src/Gui/Inventor/MarkerBitmaps.cpp index 3dfd0fe4e1..73baf47772 100644 --- a/src/Gui/Inventor/MarkerBitmaps.cpp +++ b/src/Gui/Inventor/MarkerBitmaps.cpp @@ -559,9 +559,9 @@ int MarkerBitmaps::getMarkerIndex(const std::string& name, int px) std::list MarkerBitmaps::getSupportedSizes(const std::string& name) { std::list sizes; - for (std::map::iterator it = markerIndex.begin(); it != markerIndex.end(); ++it) { - if (it->first.first == name) - sizes.push_back(it->first.second); + for (const auto & it : markerIndex) { + if (it.first.first == name) + sizes.push_back(it.first.second); } return sizes; } diff --git a/src/Gui/Language/Translator.cpp b/src/Gui/Language/Translator.cpp index f8350fc052..9457021d3b 100644 --- a/src/Gui/Language/Translator.cpp +++ b/src/Gui/Language/Translator.cpp @@ -345,8 +345,8 @@ void Translator::refresh() std::map::iterator tld = d->mapLanguageTopLevelDomain.find(d->activatedLanguage); if (tld == d->mapLanguageTopLevelDomain.end()) return; // no language activated - for (QStringList::iterator it = d->paths.begin(); it != d->paths.end(); ++it) { - QDir dir(*it); + for (const QString& it : d->paths) { + QDir dir(it); installQMFiles(dir, tld->second.c_str()); } } @@ -356,9 +356,9 @@ void Translator::refresh() */ void Translator::removeTranslators() { - for (std::list::iterator it = d->translators.begin(); it != d->translators.end(); ++it) { - qApp->removeTranslator(*it); - delete *it; + for (QTranslator* it : d->translators) { + qApp->removeTranslator(it); + delete it; } d->translators.clear(); diff --git a/src/Gui/MergeDocuments.cpp b/src/Gui/MergeDocuments.cpp index 4c01453495..09502d673c 100644 --- a/src/Gui/MergeDocuments.cpp +++ b/src/Gui/MergeDocuments.cpp @@ -113,8 +113,8 @@ MergeDocuments::importObjects(std::istream& input) void MergeDocuments::importObject(const std::vector& o, Base::XMLReader & r) { objects = o; - for (std::vector::iterator it = objects.begin(); it != objects.end(); ++it) { - Gui::ViewProvider* vp = document->getViewProvider(*it); + for (auto it : objects) { + Gui::ViewProvider* vp = document->getViewProvider(it); if (vp) vp->hide(); } Restore(r); diff --git a/src/Gui/PrefWidgets.cpp b/src/Gui/PrefWidgets.cpp index 0b573116c7..3b86963b76 100644 --- a/src/Gui/PrefWidgets.cpp +++ b/src/Gui/PrefWidgets.cpp @@ -703,9 +703,9 @@ void PrefQuantitySpinBox::contextMenuEvent(QContextMenuEvent *event) // data structure to remember actions for values QStringList history = d->history.asStringList(); - for (QStringList::const_iterator it = history.cbegin();it != history.cend(); ++it) { - QAction* action = menu->addAction(*it); - action->setProperty("history_value", *it); + for (const auto & it : history) { + QAction* action = menu->addAction(it); + action->setProperty("history_value", it); } // add the save value portion of the menu diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp index 8a7e73cee9..35ceaef52b 100644 --- a/src/Gui/PythonConsole.cpp +++ b/src/Gui/PythonConsole.cpp @@ -887,8 +887,8 @@ void PythonConsole::runSource(const QString& line) PySys_SetObject("stdout", default_stdout); PySys_SetObject("stderr", default_stderr); d->interactive = false; - for (QStringList::Iterator it = d->statements.begin(); it != d->statements.end(); ++it) { - printStatement(*it); + for (const auto & it : d->statements) { + printStatement(it); } d->statements.clear(); } diff --git a/src/Gui/PythonDebugger.cpp b/src/Gui/PythonDebugger.cpp index 9d065196e8..258cb8f627 100644 --- a/src/Gui/PythonDebugger.cpp +++ b/src/Gui/PythonDebugger.cpp @@ -45,8 +45,8 @@ Breakpoint::Breakpoint() Breakpoint::Breakpoint(const Breakpoint& rBp) { setFilename(rBp.filename()); - for (std::set::const_iterator it = rBp._linenums.begin(); it != rBp._linenums.end(); ++it) - _linenums.insert(*it); + for (int it : rBp._linenums) + _linenums.insert(it); } Breakpoint& Breakpoint::operator= (const Breakpoint& rBp) @@ -55,8 +55,8 @@ Breakpoint& Breakpoint::operator= (const Breakpoint& rBp) return *this; setFilename(rBp.filename()); _linenums.clear(); - for (std::set::const_iterator it = rBp._linenums.begin(); it != rBp._linenums.end(); ++it) - _linenums.insert(*it); + for (int it : rBp._linenums) + _linenums.insert(it); return *this; } @@ -88,10 +88,10 @@ bool Breakpoint::checkLine(int line) int Breakpoint::lineIndex(int ind)const { int i = 0; - for (std::set::const_iterator it = _linenums.begin(); it != _linenums.end(); ++it) + for (int it : _linenums) { if (ind == i++) - return *it; + return it; } return -1; } @@ -320,7 +320,7 @@ namespace Gui { class PythonDebuggerPy : public Py::PythonExtension { public: - PythonDebuggerPy(PythonDebugger* d) : dbg(d), depth(0) { } + explicit PythonDebuggerPy(PythonDebugger* d) : dbg(d), depth(0) { } ~PythonDebuggerPy() override {} PythonDebugger* dbg; int depth; @@ -329,7 +329,7 @@ public: class RunningState { public: - RunningState(bool& s) : state(s) + explicit RunningState(bool& s) : state(s) { state = true; } ~RunningState() { state = false; } @@ -350,7 +350,7 @@ struct PythonDebuggerP { PyObject* pydbg; std::vector bps; - PythonDebuggerP(PythonDebugger* that) : + explicit PythonDebuggerP(PythonDebugger* that) : init(false), trystop(false), running(false) { out_o = nullptr; @@ -388,9 +388,9 @@ PythonDebugger::~PythonDebugger() Breakpoint PythonDebugger::getBreakpoint(const QString& fn) const { - for (std::vector::const_iterator it = d->bps.begin(); it != d->bps.end(); ++it) { - if (fn == it->filename()) { - return *it; + for (const Breakpoint& it : d->bps) { + if (fn == it.filename()) { + return it; } } @@ -399,14 +399,14 @@ Breakpoint PythonDebugger::getBreakpoint(const QString& fn) const bool PythonDebugger::toggleBreakpoint(int line, const QString& fn) { - for (std::vector::iterator it = d->bps.begin(); it != d->bps.end(); ++it) { - if (fn == it->filename()) { - if (it->checkLine(line)) { - it->removeLine(line); + for (Breakpoint& it : d->bps) { + if (fn == it.filename()) { + if (it.checkLine(line)) { + it.removeLine(line); return false; } else { - it->addLine(line); + it.addLine(line); return true; } } diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp index 067e349500..88444ab2dc 100644 --- a/src/Gui/Selection.cpp +++ b/src/Gui/Selection.cpp @@ -1150,8 +1150,7 @@ bool SelectionSingleton::addSelection(const SelectionObject& obj, bool clearPres } else if (!subNames.empty()) { bool ok = true; - for (std::size_t i=0; i::const_iterator it = SubNames.begin();it!=SubNames.end();++it) - str << "'" << *it << "',"; + for(const auto & it : SubNames) + str << "'" << it << "',"; str << "])"; return str.str(); } diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp index ce592d3658..42fa833843 100644 --- a/src/Gui/SelectionView.cpp +++ b/src/Gui/SelectionView.cpp @@ -202,21 +202,21 @@ void SelectionView::onSelectionChanged(const SelectionChanges &Reason) // remove all items selectionView->clear(); std::vector objs = Gui::Selection().getSelection(Reason.pDocName, ResolveMode::NoResolve); - for (std::vector::iterator it = objs.begin(); it != objs.end(); ++it) { + for (const auto & it : objs) { // save as user data QStringList list; - list << QString::fromLatin1(it->DocName); - list << QString::fromLatin1(it->FeatName); + list << QString::fromLatin1(it.DocName); + list << QString::fromLatin1(it.FeatName); // build name - str << it->DocName; + str << it.DocName; str << "#"; - str << it->FeatName; - App::Document* doc = App::GetApplication().getDocument(it->DocName); - App::DocumentObject* obj = doc->getObject(it->FeatName); - if (it->SubName && it->SubName[0] != '\0') { + str << it.FeatName; + App::Document* doc = App::GetApplication().getDocument(it.DocName); + App::DocumentObject* obj = doc->getObject(it.FeatName); + if (it.SubName && it.SubName[0] != '\0') { str << "."; - str << it->SubName; + str << it.SubName; auto subObj = obj->getSubObject(Reason.pSubName); if(subObj) obj = subObj; @@ -280,20 +280,20 @@ void SelectionView::search(const QString& text) if (doc) { objects = doc->getObjects(); selectionView->clear(); - for (std::vector::iterator it = objects.begin(); it != objects.end(); ++it) { - QString label = QString::fromUtf8((*it)->Label.getValue()); + for (auto it : objects) { + QString label = QString::fromUtf8(it->Label.getValue()); if (label.contains(text,Qt::CaseInsensitive)) { - searchList.push_back(*it); + searchList.push_back(it); // save as user data QString selObject; QTextStream str(&selObject); QStringList list; list << QString::fromLatin1(doc->getName()); - list << QString::fromLatin1((*it)->getNameInDocument()); + list << QString::fromLatin1(it->getNameInDocument()); // build name str << QString::fromUtf8(doc->Label.getValue()); str << "#"; - str << (*it)->getNameInDocument(); + str << it->getNameInDocument(); str << " ("; str << label; str << ")"; @@ -312,8 +312,8 @@ void SelectionView::validateSearch() App::Document* doc = App::GetApplication().getActiveDocument(); if (doc) { Gui::Selection().clearSelection(); - for (std::vector::iterator it = searchList.begin(); it != searchList.end(); ++it) { - Gui::Selection().addSelection(doc->getName(),(*it)->getNameInDocument(),nullptr); + for (auto it : searchList) { + Gui::Selection().addSelection(doc->getName(),it->getNameInDocument(),nullptr); } } } diff --git a/src/Gui/SoDatumLabel.cpp b/src/Gui/SoDatumLabel.cpp index a2cde08acd..86388aaf87 100644 --- a/src/Gui/SoDatumLabel.cpp +++ b/src/Gui/SoDatumLabel.cpp @@ -664,11 +664,11 @@ void SoDatumLabel::GLRender(SoGLRenderAction * action) corners.push_back(textOffset - dir * (this->imgWidth / 2 + margin) - normal * margin); float minX = p1[0], minY = p1[1], maxX = p1[0] , maxY = p1[1]; - for (std::vector::const_iterator it=corners.begin(); it != corners.end(); ++it) { - minX = ((*it)[0] < minX) ? (*it)[0] : minX; - minY = ((*it)[1] < minY) ? (*it)[1] : minY; - maxX = ((*it)[0] > maxX) ? (*it)[0] : maxX; - maxY = ((*it)[1] > maxY) ? (*it)[1] : maxY; + for (SbVec3f it : corners) { + minX = (it[0] < minX) ? it[0] : minX; + minY = (it[1] < minY) ? it[1] : minY; + maxX = (it[0] > maxX) ? it[0] : maxX; + maxY = (it[1] > maxY) ? it[1] : maxY; } //Store the bounding box this->bbox.setBounds(SbVec3f(minX, minY, 0.f), SbVec3f (maxX, maxY, 0.f)); @@ -750,11 +750,11 @@ void SoDatumLabel::GLRender(SoGLRenderAction * action) corners.push_back(pnt2); float minX = p1[0], minY = p1[1], maxX = p1[0] , maxY = p1[1]; - for (std::vector::const_iterator it=corners.begin(); it != corners.end(); ++it) { - minX = ((*it)[0] < minX) ? (*it)[0] : minX; - minY = ((*it)[1] < minY) ? (*it)[1] : minY; - maxX = ((*it)[0] > maxX) ? (*it)[0] : maxX; - maxY = ((*it)[1] > maxY) ? (*it)[1] : maxY; + for (SbVec3f it : corners) { + minX = (it[0] < minX) ? it[0] : minX; + minY = (it[1] < minY) ? it[1] : minY; + maxX = (it[0] > maxX) ? it[0] : maxX; + maxY = (it[1] > maxY) ? it[1] : maxY; } //Store the bounding box this->bbox.setBounds(SbVec3f(minX, minY, 0.f), SbVec3f (maxX, maxY, 0.f)); @@ -852,11 +852,11 @@ void SoDatumLabel::GLRender(SoGLRenderAction * action) corners.push_back(img4); float minX = pnt1[0], minY = pnt1[1], maxX = pnt1[0] , maxY = pnt1[1]; - for (std::vector::const_iterator it=corners.begin(); it != corners.end(); ++it) { - minX = ((*it)[0] < minX) ? (*it)[0] : minX; - minY = ((*it)[1] < minY) ? (*it)[1] : minY; - maxX = ((*it)[0] > maxX) ? (*it)[0] : maxX; - maxY = ((*it)[1] > maxY) ? (*it)[1] : maxY; + for (SbVec3f it : corners) { + minX = (it[0] < minX) ? it[0] : minX; + minY = (it[1] < minY) ? it[1] : minY; + maxX = (it[0] > maxX) ? it[0] : maxX; + maxY = (it[1] > maxY) ? it[1] : maxY; } //Store the bounding box this->bbox.setBounds(SbVec3f(minX, minY, 0.f), SbVec3f (maxX, maxY, 0.f)); @@ -910,11 +910,11 @@ void SoDatumLabel::GLRender(SoGLRenderAction * action) corners.push_back(p2); float minX = p1[0], minY = p1[1], maxX = p1[0] , maxY = p1[1]; - for (std::vector::iterator it=corners.begin(); it != corners.end(); ++it) { - minX = ((*it)[0] < minX) ? (*it)[0] : minX; - minY = ((*it)[1] < minY) ? (*it)[1] : minY; - maxX = ((*it)[0] > maxX) ? (*it)[0] : maxX; - maxY = ((*it)[1] > maxY) ? (*it)[1] : maxY; + for (SbVec3f it : corners) { + minX = (it[0] < minX) ? it[0] : minX; + minY = (it[1] < minY) ? it[1] : minY; + maxX = (it[0] > maxX) ? it[0] : maxX; + maxY = (it[1] > maxY) ? it[1] : maxY; } //Store the bounding box this->bbox.setBounds(SbVec3f(minX, minY, 0.f), SbVec3f (maxX, maxY, 0.f)); @@ -1029,4 +1029,4 @@ void SoDatumLabel::setPoints(SbVec3f p1, SbVec3f p2) verts[0] = p1; verts[1] = p2; pnts.finishEditing(); -} \ No newline at end of file +} diff --git a/src/Gui/SoFCColorBar.cpp b/src/Gui/SoFCColorBar.cpp index 71e9c19497..9214b9dc73 100644 --- a/src/Gui/SoFCColorBar.cpp +++ b/src/Gui/SoFCColorBar.cpp @@ -157,7 +157,7 @@ namespace Gui { class SoFCColorBarProxyObject : public QObject { public: - SoFCColorBarProxyObject(SoFCColorBar* b) + explicit SoFCColorBarProxyObject(SoFCColorBar* b) : QObject(nullptr), bar(b) {} ~SoFCColorBarProxyObject() override {} void customEvent(QEvent *) override @@ -190,8 +190,8 @@ SoFCColorBar::SoFCColorBar() _colorBars.push_back( new SoFCColorGradient ); _colorBars.push_back( new SoFCColorLegend ); - for (std::vector::const_iterator it = _colorBars.begin(); it != _colorBars.end(); ++it) - pColorMode->addChild( *it ); + for (auto it : _colorBars) + pColorMode->addChild(it); pColorMode->whichChild = 0; } @@ -227,14 +227,14 @@ void SoFCColorBar::setViewportSize( const SbVec2s& size ) void SoFCColorBar::setRange( float fMin, float fMax, int prec ) { - for (std::vector::const_iterator it = _colorBars.begin(); it != _colorBars.end(); ++it) - (*it)->setRange(fMin, fMax, prec); + for (auto it : _colorBars) + it->setRange(fMin, fMax, prec); } void SoFCColorBar::setOutsideGrayed (bool bVal) { - for (std::vector::const_iterator it = _colorBars.begin(); it != _colorBars.end(); ++it) - (*it)->setOutsideGrayed(bVal); + for (auto it : _colorBars) + it->setOutsideGrayed(bVal); } bool SoFCColorBar::isVisible (float fVal) const @@ -318,10 +318,10 @@ void SoFCColorBar::handleEvent (SoHandleEventAction *action) SoFCColorBarBase* current = getActiveBar(); QMenu menu; int i=0; - for (std::vector::const_iterator it = _colorBars.begin(); it != _colorBars.end(); ++it) { - QAction* item = menu.addAction(QObject::tr((*it)->getColorBarName())); + for (auto it : _colorBars) { + QAction* item = menu.addAction(QObject::tr(it->getColorBarName())); item->setCheckable(true); - item->setChecked((*it) == current); + item->setChecked(it == current); item->setData(QVariant(i++)); } diff --git a/src/Gui/SoFCOffscreenRenderer.cpp b/src/Gui/SoFCOffscreenRenderer.cpp index edf07964e6..1771a4be29 100644 --- a/src/Gui/SoFCOffscreenRenderer.cpp +++ b/src/Gui/SoFCOffscreenRenderer.cpp @@ -140,9 +140,9 @@ void SoFCOffscreenRenderer::writeToImageFile(const char* filename, const char* c bool supported = false; QByteArray format; QList qtformats = QImageWriter::supportedImageFormats(); - for (QList::Iterator it = qtformats.begin(); it != qtformats.end(); ++it) { - if (file.hasExtension((*it).data())) { - format = *it; + for (const auto & it : qtformats) { + if (file.hasExtension(it.data())) { + format = it; supported = true; break; } @@ -243,10 +243,10 @@ QStringList SoFCOffscreenRenderer::getWriteImageFiletypeInfo() // add now all further QImage formats QList qtformats = QImageWriter::supportedImageFormats(); - for (QList::Iterator it = qtformats.begin(); it != qtformats.end(); ++it) { + for (const auto & it : qtformats) { // not supported? then append - if (!isWriteSupported((*it).data()) && formats.indexOf(QLatin1String(*it)) == -1) - formats << QLatin1String(*it); + if (!isWriteSupported(it.data()) && formats.indexOf(QLatin1String(it)) == -1) + formats << QLatin1String(it); } // now add PostScript and SGI RGB @@ -740,8 +740,8 @@ QStringList SoQtOffscreenRenderer::getWriteImageFiletypeInfo() const QList qtformats = QImageWriter::supportedImageFormats(); QStringList formats; - for (QList::Iterator it = qtformats.begin(); it != qtformats.end(); ++it) { - formats << QLatin1String(*it); + for (const auto & it : qtformats) { + formats << QLatin1String(it); } formats.sort(); return formats; diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp index 8d4b48017e..473d451e11 100644 --- a/src/Gui/Splashscreen.cpp +++ b/src/Gui/Splashscreen.cpp @@ -733,9 +733,9 @@ void AboutDialog::showLibraryInformation() QTextStream out(&html); out << "" << "

" << msg << "

\n\n\n"; diff --git a/src/Gui/TaskView/TaskDialog.cpp b/src/Gui/TaskView/TaskDialog.cpp index 8a9e90847f..b28f18c663 100644 --- a/src/Gui/TaskView/TaskDialog.cpp +++ b/src/Gui/TaskView/TaskDialog.cpp @@ -48,9 +48,9 @@ TaskDialog::TaskDialog() TaskDialog::~TaskDialog() { - for (std::vector::iterator it=Content.begin();it!=Content.end();++it) { - delete *it; - *it = 0; + for (auto it : Content) { + delete it; + it = nullptr; } } diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.cpp b/src/Gui/TaskView/TaskSelectLinkProperty.cpp index 20627d4f2d..22094e2c8a 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.cpp +++ b/src/Gui/TaskView/TaskSelectLinkProperty.cpp @@ -129,9 +129,9 @@ void TaskSelectLinkProperty::activate() std::string ObjName = StartObject->getNameInDocument(); std::string DocName = StartObject->getDocument()->getName(); - for (std::vector::const_iterator it = StartValueBuffer.begin();it!=StartValueBuffer.end();++it) + for (const auto & it : StartValueBuffer) { - Gui::Selection().addSelection(DocName.c_str(),ObjName.c_str(),it->c_str()); + Gui::Selection().addSelection(DocName.c_str(),ObjName.c_str(),it.c_str()); } } diff --git a/src/Gui/TaskView/TaskView.cpp b/src/Gui/TaskView/TaskView.cpp index 97e56f92e8..e1c8b14a27 100644 --- a/src/Gui/TaskView/TaskView.cpp +++ b/src/Gui/TaskView/TaskView.cpp @@ -604,8 +604,8 @@ void TaskView::updateWatcher() void TaskView::addTaskWatcher(const std::vector &Watcher) { // remove and delete the old set of TaskWatcher - for (std::vector::iterator it=ActiveWatcher.begin();it!=ActiveWatcher.end();++it) - delete *it; + for (TaskWatcher* tw : ActiveWatcher) + delete tw; ActiveWatcher = Watcher; addTaskWatcher(); @@ -622,10 +622,10 @@ void TaskView::clearTaskWatcher() void TaskView::addTaskWatcher() { // add all widgets for all watcher to the task view - for (std::vector::iterator it=ActiveWatcher.begin();it!=ActiveWatcher.end();++it){ - std::vector &cont = (*it)->getWatcherContent(); - for (std::vector::iterator it2=cont.begin();it2!=cont.end();++it2){ - taskPanel->addWidget(*it2); + for (TaskWatcher* tw : ActiveWatcher) { + std::vector &cont = tw->getWatcherContent(); + for (QWidget* w : cont) { + taskPanel->addWidget(w); } } @@ -668,11 +668,11 @@ void TaskView::removeTaskWatcher() } // remove all widgets - for (std::vector::iterator it=ActiveWatcher.begin();it!=ActiveWatcher.end();++it) { - std::vector &cont = (*it)->getWatcherContent(); - for (std::vector::iterator it2=cont.begin();it2!=cont.end();++it2) { - (*it2)->hide(); - taskPanel->removeWidget(*it2); + for (TaskWatcher* tw : ActiveWatcher) { + std::vector &cont = tw->getWatcherContent(); + for (QWidget* w : cont) { + w->hide(); + taskPanel->removeWidget(w); } } diff --git a/src/Gui/TaskView/TaskWatcher.cpp b/src/Gui/TaskView/TaskWatcher.cpp index 6cba74287f..e0754148f7 100644 --- a/src/Gui/TaskView/TaskWatcher.cpp +++ b/src/Gui/TaskView/TaskWatcher.cpp @@ -50,11 +50,10 @@ TaskWatcher::TaskWatcher(const char* Filter) TaskWatcher::~TaskWatcher() { - for (std::vector::iterator it=Content.begin();it!=Content.end();++it){ - delete(*it); - *it = 0; + for (auto it : Content) { + delete it; + it = nullptr; } - } //==== implementer =========================================================================== diff --git a/src/Gui/TextureMapping.cpp b/src/Gui/TextureMapping.cpp index ef026f0f11..7335eb8bda 100644 --- a/src/Gui/TextureMapping.cpp +++ b/src/Gui/TextureMapping.cpp @@ -64,8 +64,8 @@ TextureMapping::TextureMapping(QWidget* parent, Qt::WindowFlags fl) // add all supported QImage formats QStringList formats; QList qtformats = QImageReader::supportedImageFormats(); - for (QList::Iterator it = qtformats.begin(); it != qtformats.end(); ++it) { - formats << QString::fromLatin1("*.%1").arg(QLatin1String(*it)); + for (const auto & it : qtformats) { + formats << QString::fromLatin1("*.%1").arg(QLatin1String(it)); } ui->fileChooser->setFilter(tr("Image files (%1)").arg(formats.join(QLatin1String(" ")))); diff --git a/src/Gui/ToolBoxManager.cpp b/src/Gui/ToolBoxManager.cpp index 716846afbe..e59204bb97 100644 --- a/src/Gui/ToolBoxManager.cpp +++ b/src/Gui/ToolBoxManager.cpp @@ -83,40 +83,40 @@ void ToolBoxManager::setup( ToolBarItem* toolBar ) const CommandManager& mgr = Application::Instance->commandManager(); QList items = toolBar->getItems(); - for ( QList::Iterator item = items.begin(); item != items.end(); ++item ) + for ( auto item : items ) { auto bar = new QToolBar(); bar->setOrientation(Qt::Vertical); bar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - std::string toolbarName = (*item)->command(); - bar->setObjectName(QString::fromLatin1((*item)->command().c_str())); + std::string toolbarName = item->command(); + bar->setObjectName(QString::fromLatin1(item->command().c_str())); bar->setWindowTitle(QObject::tr(toolbarName.c_str())); // i18n _toolBox->addItem( bar, bar->windowTitle() ); - QList subitems = (*item)->getItems(); - for ( QList::Iterator subitem = subitems.begin(); subitem != subitems.end(); ++subitem ) + QList subitems = item->getItems(); + for (auto subitem : subitems) { - if ( (*subitem)->command() == "Separator" ) { + if ( subitem->command() == "Separator" ) { //bar->addSeparator(); } else { - mgr.addTo((*subitem)->command().c_str(), bar); + mgr.addTo(subitem->command().c_str(), bar); } } // Now set the right size policy for each tool button QList tool = bar->findChildren(); - for (QList::Iterator it = tool.begin(); it != tool.end(); ++it) { - (*it)->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + for (auto it : tool) { + it->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); // When setting the horizontal size policy but no icon is set we use the following trick // to make the button text left aligned. - QIcon icon = (*it)->icon(); + QIcon icon = it->icon(); if (icon.isNull()) { // Create an icon filled with the button color int size = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize); QPixmap p(size, size); p.fill(Qt::transparent); - (*it)->setIcon(p); + it->setIcon(p); } } } diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index d436c49c38..04bd6c4c91 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -775,8 +775,8 @@ void View3DInventor::setCurrentViewMode(ViewMode newmode) _viewer->getGLWidget()->setFocusProxy(nullptr); qApp->removeEventFilter(this); QList acts = this->actions(); - for (QList::Iterator it = acts.begin(); it != acts.end(); ++it) - this->removeAction(*it); + for (QAction* it : acts) + this->removeAction(it); // Step two auto mdi = qobject_cast(parentWidget()); diff --git a/src/Gui/View3DInventorExamples.cpp b/src/Gui/View3DInventorExamples.cpp index 10c7f28f8c..5e111d0edf 100644 --- a/src/Gui/View3DInventorExamples.cpp +++ b/src/Gui/View3DInventorExamples.cpp @@ -284,8 +284,8 @@ void LightManip(SoSeparator * root) const char * pointlightnames[3] = { "RedLight", "GreenLight", "BlueLight" }; SoSearchAction sa; - for (int i = 0; i < 3; i++) { - sa.setName( pointlightnames[i] ); + for (const char* name : pointlightnames) { + sa.setName(name); sa.setInterest( SoSearchAction::FIRST ); sa.setSearchingAll( false ); sa.apply( root ); diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index 7390409394..dedff5e8fb 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -1805,9 +1805,9 @@ std::list View3DInventorViewer::getGraphicsItems() const std::list View3DInventorViewer::getGraphicsItemsOfType(const Base::Type& type) const { std::list items; - for (std::list::const_iterator it = this->graphicsItems.begin(); it != this->graphicsItems.end(); ++it) { - if ((*it)->isDerivedFrom(type)) - items.push_back(*it); + for (auto it : this->graphicsItems) { + if (it->isDerivedFrom(type)) + items.push_back(it); } return items; @@ -2131,8 +2131,8 @@ void View3DInventorViewer::renderFramebuffer() printDimension(); navigation->redraw(); - for (std::list::iterator it = this->graphicsItems.begin(); it != this->graphicsItems.end(); ++it) - (*it)->paintGL(); + for (auto it : this->graphicsItems) + it->paintGL(); if (naviCubeEnabled) naviCube->drawNaviCube(); @@ -2163,8 +2163,8 @@ void View3DInventorViewer::renderGLImage() printDimension(); navigation->redraw(); - for (std::list::iterator it = this->graphicsItems.begin(); it != this->graphicsItems.end(); ++it) - (*it)->paintGL(); + for (auto it : this->graphicsItems) + it->paintGL(); if (naviCubeEnabled) naviCube->drawNaviCube(); @@ -2223,8 +2223,8 @@ void View3DInventorViewer::renderScene() } catch (const Base::MemoryException&) { // FIXME: If this exception appears then the background and camera position get broken somehow. (Werner 2006-02-01) - for (std::set::iterator it = _ViewProviderSet.begin(); it != _ViewProviderSet.end(); ++it) - (*it)->hide(); + for (auto it : _ViewProviderSet) + it->hide(); inherited::actualRedraw(); QMessageBox::warning(parentWidget(), QObject::tr("Out of memory"), @@ -2260,8 +2260,8 @@ void View3DInventorViewer::renderScene() printDimension(); navigation->redraw(); - for (std::list::iterator it = this->graphicsItems.begin(); it != this->graphicsItems.end(); ++it) - (*it)->paintGL(); + for (auto it : this->graphicsItems) + it->paintGL(); //fps rendering if (fpsEnabled) { @@ -2365,9 +2365,9 @@ void View3DInventorViewer::selectAll() { std::vector objs; - for (std::set::iterator it = _ViewProviderSet.begin(); it != _ViewProviderSet.end(); ++it) { - if ((*it)->getTypeId().isDerivedFrom(ViewProviderDocumentObject::getClassTypeId())) { - auto vp = static_cast(*it); + for (auto it : _ViewProviderSet) { + if (it->getTypeId().isDerivedFrom(ViewProviderDocumentObject::getClassTypeId())) { + auto vp = static_cast(it); App::DocumentObject* obj = vp->getObject(); if (obj) objs.push_back(obj); diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp index 48c2bdc881..a08fc8c44e 100644 --- a/src/Gui/View3DPy.cpp +++ b/src/Gui/View3DPy.cpp @@ -236,8 +236,8 @@ View3DInventorPy::View3DInventorPy(View3DInventor *vi) View3DInventorPy::~View3DInventorPy() { Base::PyGILStateLocker lock; - for (std::list::iterator it = callbacks.begin(); it != callbacks.end(); ++it) - Py_DECREF(*it); + for (auto it : callbacks) + Py_DECREF(it); } View3DInventor* View3DInventorPy::getView3DIventorPtr() diff --git a/src/Gui/View3DViewerPy.cpp b/src/Gui/View3DViewerPy.cpp index abe03b58fb..5ae4a4cb74 100644 --- a/src/Gui/View3DViewerPy.cpp +++ b/src/Gui/View3DViewerPy.cpp @@ -113,8 +113,8 @@ View3DInventorViewerPy::View3DInventorViewerPy(View3DInventorViewer *vi) View3DInventorViewerPy::~View3DInventorViewerPy() { Base::PyGILStateLocker lock; - for (std::list::iterator it = callbacks.begin(); it != callbacks.end(); ++it) - Py_DECREF(*it); + for (auto it : callbacks) + Py_DECREF(it); } diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp index 007c483f55..db2ce67d65 100644 --- a/src/Gui/ViewProvider.cpp +++ b/src/Gui/ViewProvider.cpp @@ -412,9 +412,8 @@ SoNode* ViewProvider::getDisplayMaskMode(const char* type) const std::vector ViewProvider::getDisplayMaskModes() const { std::vector types; - for (std::map::const_iterator it = _sDisplayMaskModes.begin(); - it != _sDisplayMaskModes.end(); ++it) - types.push_back( it->first ); + for (const auto & it : _sDisplayMaskModes) + types.push_back( it.first ); return types; } diff --git a/src/Gui/ViewProviderDocumentObject.cpp b/src/Gui/ViewProviderDocumentObject.cpp index 61aab4022d..8286f6a214 100644 --- a/src/Gui/ViewProviderDocumentObject.cpp +++ b/src/Gui/ViewProviderDocumentObject.cpp @@ -346,8 +346,8 @@ void ViewProviderDocumentObject::attach(App::DocumentObject *pcObj) // We must collect the const char* of the strings and give it to PropertyEnumeration, // but we are still responsible for them, i.e. the property class must not delete the literals. //for (auto it = aDisplayModesArray.begin(); it != aDisplayModesArray.end(); ++it) { - for (std::vector::iterator it = aDisplayModesArray.begin(); it != aDisplayModesArray.end(); ++it) { - aDisplayEnumsArray.push_back( it->c_str() ); + for (const auto & it : aDisplayModesArray) { + aDisplayEnumsArray.push_back( it.c_str() ); } aDisplayEnumsArray.push_back(nullptr); // null termination DisplayMode.setEnums(&(aDisplayEnumsArray[0])); diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp index 994d05347e..419aed81aa 100644 --- a/src/Gui/WidgetFactory.cpp +++ b/src/Gui/WidgetFactory.cpp @@ -409,8 +409,8 @@ PyResource::PyResource() : myDlg(nullptr) PyResource::~PyResource() { delete myDlg; - for (std::vector::iterator it = mySignals.begin(); it != mySignals.end(); ++it) { - SignalConnect* sc = *it; + for (auto it : mySignals) { + SignalConnect* sc = it; delete sc; } } diff --git a/src/Gui/WorkbenchManager.cpp b/src/Gui/WorkbenchManager.cpp index 6830f7275b..83dd266154 100644 --- a/src/Gui/WorkbenchManager.cpp +++ b/src/Gui/WorkbenchManager.cpp @@ -54,8 +54,8 @@ WorkbenchManager::WorkbenchManager() : _activeWorkbench(nullptr) WorkbenchManager::~WorkbenchManager() { - for (std::map::iterator it = _workbenches.begin(); it != _workbenches.end(); ++it) { - Workbench* wb = it->second; + for (auto & it : _workbenches) { + Workbench* wb = it.second; delete wb; } @@ -132,7 +132,7 @@ Workbench* WorkbenchManager::active() const std::list WorkbenchManager::workbenches() const { std::list wb; - for (std::map::const_iterator it = _workbenches.begin(); it != _workbenches.end(); ++it) - wb.push_back(it->first); + for (const auto & it : _workbenches) + wb.push_back(it.first); return wb; } diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index 5c1056a4a5..861355c5a7 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -176,11 +176,10 @@ void PropertyItem::setPropertyData(const std::vector& items) void PropertyItem::updateData() { bool ro = true; - for (std::vector::const_iterator it = propertyItems.begin(); - it != propertyItems.end(); ++it) { - App::PropertyContainer* parent = (*it)->getContainer(); + for (auto it : propertyItems) { + App::PropertyContainer* parent = it->getContainer(); if (parent) - ro &= (parent->isReadOnly(*it) || (*it)->testStatus(App::Property::ReadOnly)); + ro &= (parent->isReadOnly(it) || it->testStatus(App::Property::ReadOnly)); } this->setReadOnly(ro); } @@ -294,8 +293,8 @@ int PropertyItem::columnCount() const void PropertyItem::setReadOnly(bool ro) { readonly = ro; - for (QList::iterator it = childItems.begin(); it != childItems.end(); ++it) - (*it)->setReadOnly(ro); + for (auto it : childItems) + it->setReadOnly(ro); } bool PropertyItem::isReadOnly() const @@ -303,11 +302,11 @@ bool PropertyItem::isReadOnly() const return readonly; } -void PropertyItem::setLinked(bool l) +void PropertyItem::setLinked(bool value) { - linked = l; - for (QList::iterator it = childItems.begin(); it != childItems.end(); ++it) - (*it)->setLinked(l); + linked = value; + for (auto it : childItems) + it->setLinked(value); } bool PropertyItem::isLinked() const @@ -540,9 +539,7 @@ void PropertyItem::setPropertyValue(const QString& value) // intermediate changes caused by property change that may potentially // invalidate the current property array. std::ostringstream ss; - for (std::vector::const_iterator it = propertyItems.begin(); - it != propertyItems.end(); ++it) { - auto prop = *it; + for (auto prop : propertyItems) { App::PropertyContainer* parent = prop->getContainer(); if (!parent || parent->isReadOnly(prop) || prop->testStatus(App::Property::ReadOnly)) continue; @@ -2833,8 +2830,8 @@ void PropertyEnumItem::setValue(const QVariant& value) QStringList values = value.toStringList(); QTextStream str(&data); str << "["; - for (QStringList::Iterator it = values.begin(); it != values.end(); ++it) { - QString text(*it); + for (const auto & it : values) { + QString text(it); text.replace(QString::fromUtf8("'"),QString::fromUtf8("\\'")); std::string pystr = Base::Tools::escapedUnicodeFromUtf8(text.toUtf8()); @@ -3051,8 +3048,8 @@ QVariant PropertyStringListItem::value(const App::Property* prop) const assert(prop && prop->getTypeId().isDerivedFrom(App::PropertyStringList::getClassTypeId())); QStringList list; const std::vector& value = (static_cast(prop))->getValues(); - for (auto jt = value.begin(); jt != value.end(); ++jt ) { - list << QString::fromUtf8((*jt).c_str()); + for (const auto & jt : value) { + list << QString::fromUtf8(jt.c_str()); } return QVariant(list); @@ -3070,8 +3067,8 @@ void PropertyStringListItem::setValue(const QVariant& value) #endif str << "["; - for (QStringList::Iterator it = values.begin(); it != values.end(); ++it) { - QString text(*it); + for (const auto & it : values) { + QString text(it); std::string pystr = Base::Interpreter().strToPython(text.toUtf8().constData()); str << "\"" << QString::fromUtf8(pystr.c_str()) << "\", "; } @@ -3130,8 +3127,8 @@ QVariant PropertyFloatListItem::value(const App::Property* prop) const QStringList list; const std::vector& value = static_cast(prop)->getValues(); - for (std::vector::const_iterator jt = value.begin(); jt != value.end(); ++jt) { - list << QString::number(*jt, 'f', decimals()); + for (double jt : value) { + list << QString::number(jt, 'f', decimals()); } return QVariant(list); @@ -3145,8 +3142,8 @@ void PropertyFloatListItem::setValue(const QVariant& value) QString data; QTextStream str(&data); str << "["; - for (QStringList::Iterator it = values.begin(); it != values.end(); ++it) { - str << *it << ","; + for (const auto & it : values) { + str << it << ","; } str << "]"; if (data == QString::fromUtf8("[,]")) @@ -3205,8 +3202,8 @@ QVariant PropertyIntegerListItem::value(const App::Property* prop) const QStringList list; const std::vector& value = static_cast(prop)->getValues(); - for (auto jt = value.begin(); jt != value.end(); ++jt) { - list << QString::number(*jt); + for (long jt : value) { + list << QString::number(jt); } return QVariant(list);