Fixed warnings. Refs #12

eclipse-sumo · Jan 31, 2025 · 852998e · 852998e
1 parent 962ce28
commit 852998e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/src/microsim/MSStateHandler.cpp b/src/microsim/MSStateHandler.cpp
@@ -299,7 +299,6 @@ MSStateHandler::myStartElement(int element, const SUMOSAXAttributes& attrs) {
             bool ok;
             const std::vector<std::string>& vehIDs = attrs.get<std::vector<std::string> >(SUMO_ATTR_VALUE, nullptr, ok, false);
             std::vector<SUMOVehicle*> vehs;
-            MSVehicleControl& vc = MSNet::getInstance()->getVehicleControl();
             for (const std::string& id : vehIDs) {
                 SUMOVehicle* v = vc.getVehicle(id);
                 // vehicle could be removed due to options

diff --git a/src/netedit/GNEApplicationWindow.cpp b/src/netedit/GNEApplicationWindow.cpp
@@ -2231,7 +2231,7 @@ GNEApplicationWindow::onCmdToggleEditOptions(FXObject* sender, FXSelector sel, v
         int numericalKeyPressed = sel - FXSEL(SEL_COMMAND, MID_HOTKEY_ALT_0_TOGGLEEDITOPTION) - 1;
         // check that numericalKeyPressed is valid
         if ((numericalKeyPressed < 0) || (numericalKeyPressed > 10)) {
-            return 1;
+            return 0;
         }
         // declare a vector in which save visible menu commands
         std::vector<MFXCheckableButton*> visibleMenuCommands;
@@ -2241,21 +2241,21 @@ GNEApplicationWindow::onCmdToggleEditOptions(FXObject* sender, FXSelector sel, v
         myViewNet->getDataViewOptions().getVisibleDataMenuCommands(visibleMenuCommands);
         // now check that numericalKeyPressed isn't greater than visible view options
         if (numericalKeyPressed >= (int)visibleMenuCommands.size()) {
-            return 1;
+            return 0;
         }
         // toggle edit options
         if (GNEApplicationWindowHelper::toggleEditOptionsNetwork(myViewNet,
-                visibleMenuCommands.at(numericalKeyPressed), numericalKeyPressed, sender, sel)) {
+                visibleMenuCommands.at(numericalKeyPressed), sender, sel)) {
             return 1;
         } else if (GNEApplicationWindowHelper::toggleEditOptionsDemand(myViewNet,
-                   visibleMenuCommands.at(numericalKeyPressed), numericalKeyPressed, sender, sel)) {
+                   visibleMenuCommands.at(numericalKeyPressed), sender, sel)) {
             return 1;
         } else if (GNEApplicationWindowHelper::toggleEditOptionsData(myViewNet,
-                   visibleMenuCommands.at(numericalKeyPressed), numericalKeyPressed, sender, sel)) {
+                   visibleMenuCommands.at(numericalKeyPressed), sender, sel)) {
             return 1;
         }
     }
-    return 1;
+    return 0;
 }
 
 

diff --git a/src/netedit/GNEApplicationWindowHelper.cpp b/src/netedit/GNEApplicationWindowHelper.cpp
@@ -2341,8 +2341,7 @@ GNEApplicationWindowHelper::GNENeteditConfigHandler::loadNeteditConfig() {
 // ---------------------------------------------------------------------------
 
 bool
-GNEApplicationWindowHelper::toggleEditOptionsNetwork(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck,
-        const int numericalKeyPressed, FXObject* obj, FXSelector sel) {
+GNEApplicationWindowHelper::toggleEditOptionsNetwork(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck, FXObject* obj, FXSelector sel) {
     // finally function correspond to visibleMenuCommands[numericalKeyPressed]
     if (menuCheck == viewNet->getNetworkViewOptions().menuCheckToggleGrid) {
         // Call manually onCmdToggleShowGrid
@@ -2400,7 +2399,7 @@ GNEApplicationWindowHelper::toggleEditOptionsNetwork(GNEViewNet* viewNet, const
 
 
 bool
-GNEApplicationWindowHelper::toggleEditOptionsDemand(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck, const int numericalKeyPressed, FXObject* obj, FXSelector sel) {
+GNEApplicationWindowHelper::toggleEditOptionsDemand(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck, FXObject* obj, FXSelector sel) {
     if (menuCheck == viewNet->getDemandViewOptions().menuCheckToggleGrid) {
         // Call manually onCmdToggleShowGrid
         viewNet->onCmdToggleShowGrid(obj, sel, nullptr);
@@ -2442,7 +2441,7 @@ GNEApplicationWindowHelper::toggleEditOptionsDemand(GNEViewNet* viewNet, const M
 
 
 bool
-GNEApplicationWindowHelper::toggleEditOptionsData(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck, const int numericalKeyPressed, FXObject* obj, FXSelector sel) {
+GNEApplicationWindowHelper::toggleEditOptionsData(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck, FXObject* obj, FXSelector sel) {
     if (menuCheck == viewNet->getDataViewOptions().menuCheckToggleDrawJunctionShape) {
         // Call manually onCmdToggleDrawJunctionShape
         viewNet->onCmdToggleDrawJunctionShape(obj, sel, nullptr);

diff --git a/src/netedit/GNEApplicationWindowHelper.h b/src/netedit/GNEApplicationWindowHelper.h
@@ -1167,15 +1167,15 @@ struct GNEApplicationWindowHelper {
 
     /// @brief toggle edit options Network menu commands (called in GNEApplicationWindow::onCmdToggleEditOptions)
     static bool toggleEditOptionsNetwork(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck,
-                                         const int numericalKeyPressed, FXObject* obj, FXSelector sel);
+                                         FXObject* obj, FXSelector sel);
 
     /// @brief toggle edit options Demand menu commands (called in GNEApplicationWindow::onCmdToggleEditOptions)
     static bool toggleEditOptionsDemand(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck,
-                                        const int numericalKeyPressed, FXObject* obj, FXSelector sel);
+                                        FXObject* obj, FXSelector sel);
 
     /// @brief toggle edit options Data menu commands (called in GNEApplicationWindow::onCmdToggleEditOptions)
     static bool toggleEditOptionsData(GNEViewNet* viewNet, const MFXCheckableButton* menuCheck,
-                                      const int numericalKeyPressed, FXObject* obj, FXSelector sel);
+                                      FXObject* obj, FXSelector sel);
 
     /// @brief check if a string ends with another string
     static bool stringEndsWith(const std::string& str, const std::string& suffix);

diff --git a/src/utils/emissions/EnergyParams.cpp b/src/utils/emissions/EnergyParams.cpp
@@ -109,7 +109,7 @@ EnergyParams::~EnergyParams() {}
 
 void
 EnergyParams::setDynamicValues(const SUMOTime stopDuration, const bool parking, const SUMOTime waitingTime, const double angle) {
-    if ((stopDuration >= 0. && myStopDurationSeconds < 0.) || (stopDuration < 0. && myStopDurationSeconds >= 0.)) {
+    if ((stopDuration >= 0. && myStopDurationSeconds < 0) || (stopDuration < 0 && myStopDurationSeconds >= 0.)) {
         myStopDurationSeconds = STEPS2TIME(stopDuration);
         myAmParking = parking;
     }