fix #14698

src/libsumo/Helper.cpp

@@ -1454,7 +1454,7 @@ Helper::moveToXYMap(const Position& pos, double maxRouteDistance, bool mayLeaveN
                     break;
                 }
             }
-            if (onRoute == false) {
+            if (!onRoute) {
                 // search backward
                 for (int i = routePosition - 1; i >= 0; i--) {
                     const MSEdge* cand = currentRoute[i];

src/microsim/devices/MSDevice_Taxi.cpp

@@ -522,7 +522,7 @@ MSDevice_Taxi::cancelCurrentCustomers() {
                 //removed = cancelCustomer((*tIt));
 
             }
-            //if (removed == false) {
+            //if (!removed) {
             //    tIt++;
             //}
         }

src/microsim/transportables/MSPModel_JuPedSim.cpp

@@ -338,9 +338,9 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
 
         const MSEdge* const expectedEdge = stage->getEdge();
         if (found && expectedEdge->isNormal() && candidateLane->getEdge().isNormal() && &candidateLane->getEdge() != expectedEdge) {
-            const bool result = stage->moveToNextEdge(person, time, 1, nullptr);
-            UNUSED_PARAMETER(result);
-            assert(result == false); // The person has not arrived yet.
+            const bool arrived = stage->moveToNextEdge(person, time, 1, nullptr);
+            UNUSED_PARAMETER(arrived);
+            assert(!arrived); // The person has not arrived yet.
             stage->activateEntryReminders(person);
             // Adapt speed to lane's speed limit.
             JPS_CollisionFreeSpeedModelState modelState = JPS_Agent_GetCollisionFreeSpeedModelState(agent, nullptr);

src/netedit/GNEApplicationWindow.cpp

@@ -3142,12 +3142,12 @@ GNEApplicationWindow::onCmdSaveNetwork(FXObject* sender, FXSelector sel, void* p
             std::vector<GNENetworkElement*> invalidNetworkElements;
             // iterate over crossings and edges
             for (const auto& edge : myViewNet->getNet()->getAttributeCarriers()->getEdges()) {
-                if (edge.second.second->isNetworkElementValid() == false) {
+                if (!edge.second.second->isNetworkElementValid()) {
                     invalidNetworkElements.push_back(edge.second.second);
                 }
             }
             for (const auto& crossing : myViewNet->getNet()->getAttributeCarriers()->getCrossings()) {
-                if (crossing.second->isNetworkElementValid() == false) {
+                if (!crossing.second->isNetworkElementValid()) {
                     invalidNetworkElements.push_back(crossing.second);
                 }
             }

src/netedit/GNENet.cpp

@@ -1403,7 +1403,7 @@ GNENet::requireRecompute() {
 
 bool
 GNENet::isNetRecomputed() const {
-    return (myNeedRecompute == false);
+    return !myNeedRecompute;
 }
 
 
@@ -1475,7 +1475,7 @@ GNENet::joinSelectedJunctions(GNEUndoList* undoList) {
     }
 
     // use checkJunctionPosition to avoid conflicts with junction in the same position as others
-    while (checkJunctionPosition(pos) == false) {
+    while (!checkJunctionPosition(pos)) {
         pos.setx(pos.x() + 0.1);
         pos.sety(pos.y() + 0.1);
     }
@@ -1566,7 +1566,7 @@ GNENet::cleanInvalidCrossings(GNEUndoList* undoList) {
     // obtain invalid crossings
     std::vector<GNECrossing*> myInvalidCrossings;
     for (auto i = myNetCrossings.begin(); i != myNetCrossings.end(); i++) {
-        if ((*i)->getNBCrossing()->valid == false) {
+        if (!(*i)->getNBCrossing()->valid) {
             myInvalidCrossings.push_back(*i);
         }
     }

src/netedit/changes/GNEChange_Crossing.cpp

@@ -92,7 +92,7 @@ void GNEChange_Crossing::undo() {
         // add crossing of NBNode
         NBNode::Crossing* c = myJunctionParent->getNBNode()->addCrossing(myEdges, myWidth, myPriority, myCustomTLIndex, myCustomTLIndex2, myCustomShape);
         // Check if Flag "haveNetworkCrossings" has to be enabled
-        if (myJunctionParent->getNet()->getNetBuilder()->haveNetworkCrossings() == false) {
+        if (!myJunctionParent->getNet()->getNetBuilder()->haveNetworkCrossings() == false) {
             myJunctionParent->getNet()->getNetBuilder()->setHaveNetworkCrossings(true);
             // show extra information for tests
             WRITE_DEBUG("Changed flag netBuilder::haveNetworkCrossings from 'false' to 'true'");

src/netedit/dialogs/GNECalibratorFlowDialog.cpp

@@ -139,7 +139,7 @@ GNECalibratorFlowDialog::GNECalibratorFlowDialog(GNEAdditional* editedCalibrator
     initChanges();
 
     // add element if we aren't updating an existent element
-    if (myUpdatingElement == false) {
+    if (!myUpdatingElement) {
         myEditedAdditional->getNet()->getViewNet()->getUndoList()->add(new GNEChange_Additional(myEditedAdditional, true), true);
     }
 
@@ -157,7 +157,7 @@ GNECalibratorFlowDialog::onCmdAccept(FXObject*, FXSelector, void*) {
     std::string operation2 = myUpdatingElement ? ("updated") : ("created");
     std::string parentTagString = myEditedAdditional->getParentAdditionals().at(0)->getTagStr();
     std::string tagString = myEditedAdditional->getTagStr();
-    if (myCalibratorFlowValid == false) {
+    if (!myCalibratorFlowValid) {
         // write warning if netedit is running in testing mode
         WRITE_DEBUG("Opening FXMessageBox of type 'warning'");
         // open warning dialog box

src/netedit/dialogs/GNERerouterIntervalDialog.cpp

@@ -194,7 +194,7 @@ GNERerouterIntervalDialog::GNERerouterIntervalDialog(GNEAdditional* rerouterInte
     initChanges();
 
     // add element if we aren't updating an existent element
-    if (myUpdatingElement == false) {
+    if (!myUpdatingElement) {
         myEditedAdditional->getNet()->getViewNet()->getUndoList()->add(new GNEChange_Additional(myEditedAdditional, true), true);
     }
 
@@ -211,7 +211,7 @@ GNERerouterIntervalDialog::onCmdAccept(FXObject*, FXSelector, void*) {
     // set strings for dialogs
     std::string errorTitle = "Error" + toString(myUpdatingElement ? "updating" : "creating") + " " + myEditedAdditional->getTagStr() + " of " + myEditedAdditional->getParentAdditionals().at(0)->getTagStr();
     std::string operationType = myEditedAdditional->getParentAdditionals().at(0)->getTagStr() + "'s " + myEditedAdditional->getTagStr() + " cannot be " + (myUpdatingElement ? "updated" : "created") + " because ";
-    if (myBeginEndValid == false) {
+    if (!myBeginEndValid) {
         // write warning if netedit is running in testing mode
         WRITE_DEBUG("Opening FXMessageBox of type 'warning'");
         // open warning Box

src/netedit/dialogs/GNERouteDialog.cpp

@@ -74,7 +74,7 @@ GNERouteDialog::GNERouteDialog(GNEDemandElement* editedCalibratorRoute, bool upd
     initChanges();
 
     // add element if we aren't updating an existent element
-    if (myUpdatingElement == false) {
+    if (!myUpdatingElement) {
         myEditedDemandElement->getNet()->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(myEditedDemandElement, true), true);
         // Routes are created without edges
         myCalibratorRouteValid = false;
@@ -91,7 +91,7 @@ GNERouteDialog::~GNERouteDialog() {}
 
 long
 GNERouteDialog::onCmdAccept(FXObject*, FXSelector, void*) {
-    if (myCalibratorRouteValid == false) {
+    if (!myCalibratorRouteValid) {
         // write warning if netedit is running in testing mode
         WRITE_DEBUG("Opening FXMessageBox of type 'warning'");
         std::string operation1 = myUpdatingElement ? ("updating") : ("creating");

src/netedit/dialogs/GNEVariableSpeedSignDialog.cpp

@@ -157,7 +157,7 @@ GNEVariableSpeedSignDialog::onCmdSortSteps(FXObject*, FXSelector, void*) {
 
 long
 GNEVariableSpeedSignDialog::onCmdAccept(FXObject*, FXSelector, void*) {
-    if (myStepsValids == false) {
+    if (!myStepsValids) {
         // write warning if netedit is running in testing mode
         WRITE_DEBUG("Opening FXMessageBox of type 'warning'");
         // open warning Box

src/netedit/dialogs/GNEVehicleTypeDialog.cpp

@@ -1788,7 +1788,7 @@ GNEVehicleTypeDialog::GNEVehicleTypeDialog(GNEDemandElement* editedVehicleType,
     initChanges();
 
     // add element if we aren't updating an existent element
-    if (myUpdatingElement == false) {
+    if (!myUpdatingElement) {
         myEditedDemandElement->getNet()->getViewNet()->getUndoList()->add(new GNEChange_DemandElement(myEditedDemandElement, true), true);
     }
 
@@ -1808,7 +1808,7 @@ GNEVehicleTypeDialog::~GNEVehicleTypeDialog() {}
 
 long
 GNEVehicleTypeDialog::onCmdAccept(FXObject*, FXSelector, void*) {
-    if (myVehicleTypeValid == false) {
+    if (!myVehicleTypeValid) {
         // write warning if netedit is running in testing mode
         WRITE_DEBUG("Opening FXMessageBox of type 'warning'");
         std::string operation1 = myUpdatingElement ? ("updating") : ("creating");

src/netedit/elements/additional/GNEAdditionalHandler.cpp

@@ -2127,7 +2127,7 @@ GNEAdditionalHandler::checkDuplicatedID(const std::vector<SumoXMLTag> tags, cons
         auto additional = myNet->getAttributeCarriers()->retrieveAdditional(tag, id, false);
         // if additional exist, check if overwrite (delete)
         if (additional) {
-            if (myAllowUndoRedo == false) {
+            if (!myAllowUndoRedo) {
                 // only overwrite if allow undo-redo
                 return false;
             } else if (myOverwrite) {

src/netedit/elements/additional/GNEPoly.cpp

@@ -423,7 +423,7 @@ GNEPoly::openPolygon(bool allowUndo) {
 void
 GNEPoly::closePolygon(bool allowUndo) {
     // only close if shape is opened
-    if (myShape.isClosed() == false) {
+    if (!myShape.isClosed()) {
         if (allowUndo) {
             myNet->getViewNet()->getUndoList()->begin(this, "close shape");
             setAttribute(GNE_ATTR_CLOSE_SHAPE, "true", myNet->getViewNet()->getUndoList());

src/netedit/elements/demand/GNERouteHandler.cpp

@@ -3057,7 +3057,7 @@ GNERouteHandler::checkDuplicatedDemandElement(const SumoXMLTag tag, const std::s
     auto demandElement = myNet->getAttributeCarriers()->retrieveDemandElement(tag, id, false);
     // if demand exist, check if overwrite (delete)
     if (demandElement) {
-        if (myAllowUndoRedo == false) {
+        if (!myAllowUndoRedo) {
             // only overwrite if allow undo-redo
             return false;
         } else if (myOverwrite) {

src/netedit/elements/network/GNEConnection.cpp

@@ -802,7 +802,7 @@ GNEConnection::isValid(SumoXMLAttr key, const std::string& value) {
         case SUMO_ATTR_TLLINKINDEX:
         case SUMO_ATTR_TLLINKINDEX2:
             if (isAttributeEnabled(SUMO_ATTR_TLLINKINDEX) &&
-                    (getNBEdgeConnection().uncontrolled == false) &&
+                    !getNBEdgeConnection().uncontrolled &&
                     (getEdgeFrom()->getNBEdge()->getToNode()->getControllingTLS().size() > 0) &&
                     canParse<int>(value) &&
                     (parse<int>(value) >= 0 || parse<int>(value) == -1)) {

src/netedit/elements/network/GNEEdge.cpp

@@ -1413,7 +1413,7 @@ bool
 GNEEdge::isAttributeComputed(SumoXMLAttr key) const {
     switch (key) {
         case SUMO_ATTR_LENGTH:
-            return (myNBEdge->hasLoadedLength() == false);
+            return !myNBEdge->hasLoadedLength();
         case SUMO_ATTR_WIDTH:
             if (myNBEdge->hasLaneSpecificWidth()) {
                 return false;

src/netedit/elements/network/GNELane.cpp

@@ -1167,7 +1167,7 @@ GNELane::drawMarkingsAndBoundings(const GUIVisualizationSettings& s) const {
                                           separatorWidth, myDrawingConstants->getOffset() + myDrawingConstants->getDrawingWidth() + separatorWidth);
             }
             // check if we have change prohibitions
-            if ((changeLeft && changeRight) == false) {
+            if (!(changeLeft && changeRight)) {
                 // push prohibitions matrix
                 GLHelper::pushMatrix();
                 // move top
@@ -1427,7 +1427,7 @@ GNELane::setLaneColor(const GUIVisualizationSettings& s) const {
     // get inspected AC
     const GNEAttributeCarrier* inspectedAC = inspectedACs.size() > 0 ? inspectedACs.front() : nullptr;
     // we need to draw lanes with a special color if we're inspecting a Trip or Flow and this lane belongs to a via's edge.
-    if (inspectedAC && (inspectedAC->isAttributeCarrierSelected() == false) &&
+    if (inspectedAC && (!inspectedAC->isAttributeCarrierSelected()) &&
             ((inspectedAC->getTagProperty().getTag() == SUMO_TAG_TRIP) || (inspectedAC->getTagProperty().getTag() == SUMO_TAG_FLOW))) {
         // obtain attribute "via"
         std::vector<std::string> viaEdges = parse<std::vector<std::string> >(inspectedAC->getAttribute(SUMO_ATTR_VIA));

src/netedit/frames/GNEFrameAttributeModules.cpp

@@ -879,7 +879,7 @@ GNEFrameAttributeModules::AttributesEditor::showAttributeEditorModule(bool inclu
                 // declare a flag for enabled attributes
                 bool attributeEnabled = ACs.front()->isAttributeEnabled(attrProperty.getAttr());
                 // overwrite value if attribute is disabled (used by LinkIndex)
-                if (attributeEnabled == false) {
+                if (!attributeEnabled) {
                     value = ACs.front()->getAlternativeValueForDisabledAttributes(attrProperty.getAttr());
                 }
                 // for types, the following attributes must be always enabled
@@ -990,7 +990,7 @@ GNEFrameAttributeModules::AttributesEditor::refreshAttributeEditor(bool forceRef
                     attributeEnabled = true;
                 }
                 // overwrite value if attribute is disabled (used by LinkIndex)
-                if (attributeEnabled == false) {
+                if (!attributeEnabled) {
                     value = ACs.front()->getAlternativeValueForDisabledAttributes(attrProperty.getAttr());
                 }
                 // extra check for Triggered and container Triggered

src/netedit/frames/network/GNEAdditionalFrame.cpp

@@ -280,7 +280,7 @@ GNEAdditionalFrame::createPath(const bool /* useLastRoute */) {
                 // parse common attributes
                 if (buildAdditionalCommonAttributes(tagProperty)) {
                     // show warning dialogbox and stop check if input parameters are valid
-                    if (myAdditionalAttributes->areValuesValid() == false) {
+                    if (!myAdditionalAttributes->areValuesValid()) {
                         myAdditionalAttributes->showWarningMessage();
                     } else {
                         // declare additional handler
@@ -600,7 +600,7 @@ GNEAdditionalFrame::buildAdditionalOverView(const GNETagProperties& tagPropertie
         }
     }
     // show warning dialogbox and stop check if input parameters are valid
-    if (myAdditionalAttributes->areValuesValid() == false) {
+    if (!myAdditionalAttributes->areValuesValid()) {
         myAdditionalAttributes->showWarningMessage();
         return false;
     } else {

src/netedit/frames/network/GNEShapeFrame.cpp

@@ -429,7 +429,7 @@ GNEShapeFrame::processClickPolygons(const Position& clickedPosition, bool& updat
 bool
 GNEShapeFrame::processClickPOI(SumoXMLTag POITag, const Position& clickedPosition, const GNEViewNetHelper::ViewObjectsSelector& viewObjects) {
     // show warning dialogbox and stop if input parameters are invalid
-    if (myShapeAttributes->areValuesValid() == false) {
+    if (!myShapeAttributes->areValuesValid()) {
         myShapeAttributes->showWarningMessage();
         return false;
     }
@@ -460,7 +460,7 @@ GNEShapeFrame::processClickPOI(SumoXMLTag POITag, const Position& clickedPositio
 bool
 GNEShapeFrame::processClickPOIGeo(const Position& clickedPosition, const GNEViewNetHelper::ViewObjectsSelector& viewObjects) {
     // show warning dialogbox and stop if input parameters are invalid
-    if (myShapeAttributes->areValuesValid() == false) {
+    if (!myShapeAttributes->areValuesValid()) {
         myShapeAttributes->showWarningMessage();
         return false;
     }
@@ -499,7 +499,7 @@ GNEShapeFrame::processClickPOILanes(const Position& clickedPosition, const GNEVi
         return false;
     }
     // show warning dialogbox and stop if input parameters are invalid
-    if (myShapeAttributes->areValuesValid() == false) {
+    if (!myShapeAttributes->areValuesValid()) {
         myShapeAttributes->showWarningMessage();
         return false;
     }

src/netedit/frames/network/GNETAZFrame.cpp

@@ -1557,7 +1557,7 @@ GNETAZFrame::processEdgeSelection(const std::vector<GNEEdge*>& edges) {
             // iterate over edges
             for (const auto& edge : edges) {
                 // first check if edge owns a TAZEge
-                if (myCurrentTAZ->isTAZEdge(edge) == false) {
+                if (!myCurrentTAZ->isTAZEdge(edge)) {
                     // create new TAZ Sources/Sinks
                     addOrRemoveTAZMember(edge);
                 }

src/netedit/frames/network/GNETLSEditorFrame.cpp

@@ -1570,7 +1570,7 @@ GNETLSEditorFrame::TLSDefinition::onCmdCreate(FXObject*, FXSelector, void*) {
             connectionControlled = true;
         }
     }
-    if (connectionControlled == false) {
+    if (!connectionControlled) {
         // write warning if netedit is running in testing mode
         WRITE_DEBUG("Opening warning FXMessageBox 'invalid TLS'");
         // open question box

src/netedit/frames/network/GNEWireFrame.cpp

@@ -130,7 +130,7 @@ GNEWireFrame::createPath(const bool /* useLastRoute */) {
                 myBaseWire->addDoubleAttribute(SUMO_ATTR_STARTPOS, myConsecutiveLaneSelector->getLanePath().front().second);
                 myBaseWire->addDoubleAttribute(SUMO_ATTR_ENDPOS, myConsecutiveLaneSelector->getLanePath().back().second);
                 // show warning dialogbox and stop check if input parameters are valid
-                if (myWireAttributes->areValuesValid() == false) {
+                if (!myWireAttributes->areValuesValid()) {
                     myWireAttributes->showWarningMessage();
                 } else {
                     // declare additional handler
@@ -249,7 +249,7 @@ GNEWireFrame::buildWireOverView(const GNETagProperties& tagProperties) {
     myBaseWire->addDoubleAttribute(SUMO_ATTR_Y, viewPos.y());
     myBaseWire->addDoubleAttribute(SUMO_ATTR_Z, viewPos.z());
     // show warning dialogbox and stop check if input parameters are valid
-    if (myWireAttributes->areValuesValid() == false) {
+    if (!myWireAttributes->areValuesValid()) {
         myWireAttributes->showWarningMessage();
         return false;
     } else {

src/netimport/vissim/NIImporter_Vissim.cpp

@@ -307,7 +307,7 @@ NIImporter_Vissim::NIVissimXMLHandler_Streckendefinition::myEndElement(int eleme
         // FIXME: a length = 0 PosVec seems fatal -> segfault
         double length(geom.length());
 
-        if (isConnector == false) {
+        if (!isConnector) {
             // Add Edge
             std::vector<double> laneWidths;
             for (std::string& w : myElemData["width"]) {

src/netwrite/NWWriter_XML.cpp

@@ -152,7 +152,7 @@ NWWriter_XML::writeNodes(const OptionsCont& oc, const std::string& prefix, NBNod
         if (n->getRadius() != NBNode::UNSPECIFIED_RADIUS) {
             device.writeAttr(SUMO_ATTR_RADIUS, n->getRadius());
         }
-        if (n->getKeepClear() == false) {
+        if (!n->getKeepClear()) {
             device.writeAttr<bool>(SUMO_ATTR_KEEP_CLEAR, n->getKeepClear());
         }
         if (n->getRightOfWay() != RightOfWay::DEFAULT) {

src/osgview/GUIOSGView.cpp

@@ -851,7 +851,7 @@ long GUIOSGView::onRightBtnRelease(FXObject* sender, FXSelector sel, void* ptr)
 long
 GUIOSGView::onMouseMove(FXObject* sender, FXSelector sel, void* ptr) {
     // if popup exist but isn't shown, destroy it first
-    if (myPopup && (myPopup->shown() == false)) {
+    if (myPopup && !myPopup->shown()) {
         destroyPopup();
     }
 

src/utils/gui/windows/GUISUMOAbstractView.cpp

@@ -1194,7 +1194,7 @@ GUISUMOAbstractView::onMouseMove(FXObject*, FXSelector, void* ptr) {
             myPopupPosition = Position::INVALID;
             myPopup->handle(this, FXSEL(SEL_COMMAND, MID_CURSORDIALOG_FRONT), nullptr);
             destroyPopup();
-        } else if (myPopup->shown() == false) {
+        } else if (!myPopup->shown()) {
             destroyPopup();
         }
     }

src/utils/handlers/AdditionalHandler.cpp

@@ -1756,7 +1756,7 @@ AdditionalHandler::parsePOIAttributes(const SUMOSAXAttributes& attrs) {
     const std::string name = attrs.getOpt<std::string>(SUMO_ATTR_NAME, id.c_str(), parsedOk, "");
     const bool relativePath = attrs.getOpt<bool>(SUMO_ATTR_RELATIVEPATH, id.c_str(), parsedOk, Shape::DEFAULT_RELATIVEPATH);
     // check icon
-    if (SUMOXMLDefinitions::POIIcons.hasString(icon) == false) {
+    if (!SUMOXMLDefinitions::POIIcons.hasString(icon)) {
         WRITE_WARNING(TLF("Invalid icon % for POI '%', using default", icon, id));
         icon = "none";
     }