Changes in src/builder.cpp [4cf323d:b59da6]

File:

• src/builder.cpp (modified) (6 diffs)

src/builder.cpp

@@ -76 +76 @@
 
 #include "bondgraph.hpp"
-#include "CommandLineParser.hpp"
 #include "config.hpp"
 #include "Helpers/Log.hpp"
@@ -85 +84 @@
 #include "UIElements/TextUI/TextUIFactory.hpp"
 #include "UIElements/CommandLineUI/CommandLineUIFactory.hpp"
+#include "UIElements/CommandLineUI/CommandLineParser.hpp"
 #ifdef USE_GUI_QT
 #include "UIElements/Qt4/QtUIFactory.hpp"
@@ -90 +90 @@
 #include "UIElements/MainWindow.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Menu/ActionMenuItem.hpp"
+//#include "Menu/ActionMenuItem.hpp"
 #include "Helpers/Verbose.hpp"
 #include "World.hpp"
@@ -96 +96 @@
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/ActionHistory.hpp"
-#include "Actions/MapOfActions.hpp"
 
 #include "Parser/ChangeTracker.hpp"
@@ -119 +118 @@
   errorLogger::purgeInstance();
   UIFactory::purgeInstance();
-  MapOfActions::purgeInstance();
+  ValueStorage::purgeInstance();
   CommandLineParser::purgeInstance();
   ActionRegistry::purgeInstance();
+  OptionRegistry::purgeInstance();
   ActionHistory::purgeInstance();
 #ifdef LOG_OBSERVER
@@ -174 +174 @@
     // handle remaining arguments by CommandLineParser
     if (argc>1) {
-      MapOfActions::getInstance().AddOptionsToParser();
-      map <std::string, std::string> ShortFormToActionMap = MapOfActions::getInstance().getShortFormToActionMap();
-      CommandLineParser::getInstance().Run(argc,argv, ShortFormToActionMap);
+      CommandLineParser::getInstance().InitializeCommandArguments();
+      CommandLineParser::getInstance().Run(argc,argv);
       DoLog(0) && (Log() << Verbose(0) << "Setting UI to CommandLine." << endl);
       UIFactory::registerFactory(new CommandLineUIFactory::description());