Changeset 6021 for code/trunk/src/libraries/core/CommandLineParser.cc

Timestamp:

Nov 4, 2009, 12:28:59 PM (14 years ago)

Author:

rgrieder

Message:

Renamed CommandLine to CommandLineParse to avoid confusions with the class name.

File:

• code/trunk/src/libraries/core/CommandLineParser.cc (copied) (copied from code/branches/console/src/libraries/core/CommandLine.cc) (12 diffs)

code/trunk/src/libraries/core/CommandLineParser.cc

@@ -27 +27 @@
  */
 
-#include "CommandLine.h"
+#include "CommandLineParser.h"
 
 #include <algorithm>
@@ -88 +88 @@
         Destructor destroys all CommandLineArguments with it.
     */
-    CommandLine::~CommandLine()
-    {
-        CommandLine::destroyAllArguments();
+    CommandLineParser::~CommandLineParser()
+    {
+        CommandLineParser::destroyAllArguments();
     }
 
@@ -97 +97 @@
         Returns a unique instance (Meyers Singleton).
     */
-    CommandLine& CommandLine::_getInstance()
-    {
-        static CommandLine instance;
+    CommandLineParser& CommandLineParser::_getInstance()
+    {
+        static CommandLineParser instance;
         return instance;
     }
@@ -108 +108 @@
         of main. Do not use before that.
     */
-    void CommandLine::destroyAllArguments()
+    void CommandLineParser::destroyAllArguments()
     {
         for (std::map<std::string, CommandLineArgument*>::const_iterator it = _getInstance().cmdLineArgs_.begin();
@@ -127 +127 @@
         Vector of space separated strings.
     */
-    void CommandLine::_parse(const std::vector<std::string>& arguments, bool bParsingFile)
+    void CommandLineParser::_parse(const std::vector<std::string>& arguments, bool bParsingFile)
     {
         try
@@ -232 +232 @@
         {
             COUT(0) << "Could not parse command line (including additional files): " << ex.what() << std::endl;
-            COUT(0) << CommandLine::getUsageInformation() << std::endl;
+            COUT(0) << CommandLineParser::getUsageInformation() << std::endl;
             throw GeneralException("");
         }
@@ -245 +245 @@
         String containing the value
     */
-    void CommandLine::checkFullArgument(const std::string& name, const std::string& value, bool bParsingFile)
+    void CommandLineParser::checkFullArgument(const std::string& name, const std::string& value, bool bParsingFile)
     {
         std::map<std::string, CommandLineArgument*>::const_iterator it = cmdLineArgs_.find(name);
@@ -262 +262 @@
         String containing the value
     */
-    void CommandLine::checkShortcut(const std::string& shortcut, const std::string& value, bool bParsingFile)
+    void CommandLineParser::checkShortcut(const std::string& shortcut, const std::string& value, bool bParsingFile)
     {
         std::map<std::string, CommandLineArgument*>::const_iterator it = cmdLineArgsShortcut_.find(shortcut);
@@ -271 +271 @@
     }
 
-    std::string CommandLine::getUsageInformation()
-    {
-        CommandLine& inst = _getInstance();
+    std::string CommandLineParser::getUsageInformation()
+    {
+        CommandLineParser& inst = _getInstance();
         std::ostringstream infoStr;
 
@@ -315 +315 @@
         You shold of course not call this method before the command line has been parsed.
     */
-    const CommandLineArgument* CommandLine::getArgument(const std::string& name)
+    const CommandLineArgument* CommandLineParser::getArgument(const std::string& name)
     {
         std::map<std::string, CommandLineArgument*>::const_iterator it = _getInstance().cmdLineArgs_.find(name);
@@ -332 +332 @@
         Parses only the command line for CommandLineArguments.
     */
-    void CommandLine::_parseCommandLine(const std::string& cmdLine)
+    void CommandLineParser::_parseCommandLine(const std::string& cmdLine)
     {
         std::vector<std::string> args;
@@ -345 +345 @@
         Parses start.ini (or the file specified with --optionsFile) for CommandLineArguments.
     */
-    void CommandLine::_parseFile()
-    {
-        std::string filename = CommandLine::getValue("optionsFile").getString();
+    void CommandLineParser::_parseFile()
+    {
+        std::string filename = CommandLineParser::getValue("optionsFile").getString();
 
         // look for additional arguments in given file or start.ini as default