Changes in src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp [2f429e:f130d4]

File:

• src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp

@@ -36 +36 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include <string>
-
 #include "CommandLineUI/Query/CommandLineQuery.hpp"
 #include "CommandLineUI/CommandLineParser.hpp"
@@ -56 +54 @@
   // TODO: vector of ints and removing first is not correctly implemented yet. How to remove from a vector?
   periodentafel *periode = World::getInstance().getPeriode();
+  int Z = -1;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    std::string argument("none");
     try {
-      argument = CommandLineParser::getInstance().vm[getTitle()].as< std::string >();
-      try {
-        int Z = -1;
-        Z = boost::lexical_cast<int>(argument);
-        temp = periode->FindElement(Z);
-      } catch(boost::bad_lexical_cast &e) {
-        temp = periode->FindElement(argument);
-      }
+      Z = CommandLineParser::getInstance().vm[getTitle()].as< int >();
     } catch(boost::bad_any_cast &e) {
+      Z = -1;
       return false;
     }
+    temp = periode->FindElement(Z);
     ASSERT(temp != NULL, "Invalid element specified in ElementCommandLineQuery");
     return true;