Changeset 6021 for code/trunk/src

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/trunk/src

Files:

• libraries/core/CMakeLists.txt (modified) (1 diff)
• libraries/core/CommandLine.cc (deleted)
• libraries/core/CommandLine.h (deleted)
• libraries/core/CommandLineParser.cc (copied) (copied from code/branches/console/src/libraries/core/CommandLine.cc) (12 diffs)
• libraries/core/CommandLineParser.h (copied) (copied from code/branches/console/src/libraries/core/CommandLine.h) (6 diffs)
• libraries/core/Core.cc (modified) (5 diffs)
• libraries/core/CorePrereqs.h (modified) (1 diff)
• libraries/core/Game.cc (modified) (1 diff)
• libraries/core/PathConfig.cc (modified) (3 diffs)
• libraries/core/input/InputManager.cc (modified) (2 diffs)
• orxonox/LevelManager.cc (modified) (2 diffs)
• orxonox/Main.cc (modified) (2 diffs)
• orxonox/gamestates/GSClient.cc (modified) (2 diffs)
• orxonox/gamestates/GSDedicated.cc (modified) (4 diffs)
• orxonox/gamestates/GSDedicatedClient.cc (modified) (4 diffs)
• orxonox/gamestates/GSServer.cc (modified) (2 diffs)

code/trunk/src/libraries/core/CMakeLists.txt

@@ -40 +40 @@
   CommandEvaluation.cc
   CommandExecutor.cc
-  CommandLine.cc
+  CommandLineParser.cc
   ConsoleCommand.cc
   ConsoleCommandCompilation.cc

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

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

@@ -38 +38 @@
 #define SetCommandLineArgument(name, defaultValue) \
     orxonox::CommandLineArgument& CmdArgumentDummyBoolVar##name \
-    = orxonox::CommandLine::addArgument(#name, defaultValue, false)
+    = orxonox::CommandLineParser::addArgument(#name, defaultValue, false)
 #define SetCommandLineOnlyArgument(name, defaultValue) \
     orxonox::CommandLineArgument& CmdArgumentDummyBoolVar##name \
-    = orxonox::CommandLine::addArgument(#name, defaultValue, true)
+    = orxonox::CommandLineParser::addArgument(#name, defaultValue, true)
 #define SetCommandLineSwitch(name) \
     orxonox::CommandLineArgument& CmdArgumentDummyBoolVar##name \
-    = orxonox::CommandLine::addArgument(#name, false, false)
+    = orxonox::CommandLineParser::addArgument(#name, false, false)
 #define SetCommandLineOnlySwitch(name) \
     orxonox::CommandLineArgument& CmdArgumentDummyBoolVar##name \
-    = orxonox::CommandLine::addArgument(#name, false, true)
+    = orxonox::CommandLineParser::addArgument(#name, false, true)
 
 
@@ -67 +67 @@
 
         Retrieving an argument is possible with the getCommandLineArgument function of the
-        CommandLine class. It is a Singleton, but the public interface is static.
+        CommandLineParser class. It is a Singleton, but the public interface is static.
     */
     class _CoreExport CommandLineArgument
     {
-        friend class CommandLine;
+        friend class CommandLineParser;
 
     public:
@@ -137 +137 @@
         CommandLineArgument
     */
-    class _CoreExport CommandLine
+    class _CoreExport CommandLineParser
     {
     public:
@@ -167 +167 @@
     private:
         //! Constructor initialises bFirstTimeParse_ with true.
-        CommandLine() : bFirstTimeParse_(true) { }
+        CommandLineParser() : bFirstTimeParse_(true) { }
         //! Undefined copy constructor
-        CommandLine(const CommandLine& instance);
-        ~CommandLine();
-
-        static CommandLine& _getInstance();
+        CommandLineParser(const CommandLineParser& instance);
+        ~CommandLineParser();
+
+        static CommandLineParser& _getInstance();
 
         void _parseCommandLine(const std::string& cmdLine);
@@ -194 +194 @@
 
     template <>
-    inline void CommandLine::getValue<std::string>(const std::string& name, std::string* value)
+    inline void CommandLineParser::getValue<std::string>(const std::string& name, std::string* value)
     {
         *value = getArgument(name)->getValue().getString();
@@ -209 +209 @@
     */
     template <class T>
-    CommandLineArgument& CommandLine::addArgument(const std::string& name, T defaultValue, bool bCommandLineOnly)
+    CommandLineArgument& CommandLineParser::addArgument(const std::string& name, T defaultValue, bool bCommandLineOnly)
     {
         OrxAssert(!_getInstance().existsArgument(name),

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

@@ -54 +54 @@
 #include "PathConfig.h"
 #include "CommandExecutor.h"
-#include "CommandLine.h"
+#include "CommandLineParser.h"
 #include "ConfigFileManager.h"
 #include "ConfigValueIncludes.h"
@@ -216 +216 @@
 
         // Parse command line arguments AFTER the modules have been loaded (static code!)
-        CommandLine::parseCommandLine(cmdLine);
+        CommandLineParser::parseCommandLine(cmdLine);
 
         // Set configurable paths like log, config and media
@@ -230 +230 @@
 
         // Parse additional options file now that we know its path
-        CommandLine::parseFile();
+        CommandLineParser::parseFile();
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
@@ -236 +236 @@
         // do this after ogre has initialised. Somehow Ogre changes the settings again (not through
         // the timer though).
-        int limitToCPU = CommandLine::getValue("limitToCPU");
+        int limitToCPU = CommandLineParser::getValue("limitToCPU");
         if (limitToCPU > 0)
             setThreadAffinity(static_cast<unsigned int>(limitToCPU));
@@ -244 +244 @@
         this->configFileManager_.reset(new ConfigFileManager());
         this->configFileManager_->setFilename(ConfigFileType::Settings,
-            CommandLine::getValue("settingsFile").getString());
+            CommandLineParser::getValue("settingsFile").getString());
 
         // Required as well for the config values

code/trunk/src/libraries/core/CorePrereqs.h

@@ -116 +116 @@
     class ClassTreeMaskObjectIterator;
     class CommandEvaluation;
-    class CommandLine;
+    class CommandLineParser;
     class CommandLineArgument;
     class ConfigFile;

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

@@ -44 +44 @@
 #include "util/Sleep.h"
 #include "util/SubString.h"
-#include "CommandLine.h"
+#include "CommandLineParser.h"
 #include "ConsoleCommand.h"
 #include "Core.h"

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

@@ -54 +54 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
-#include "CommandLine.h"
+#include "CommandLineParser.h"
 
 // Boost 1.36 has some issues with deprecated functions that have been omitted
@@ -186 +186 @@
 
             // Check for data path override by the command line
-            if (!CommandLine::getArgument("externalDataPath")->hasDefaultValue())
-                externalDataPath_ = CommandLine::getValue("externalDataPath").getString();
+            if (!CommandLineParser::getArgument("externalDataPath")->hasDefaultValue())
+                externalDataPath_ = CommandLineParser::getValue("externalDataPath").getString();
             else
                 externalDataPath_ = specialConfig::externalDataDevDirectory;
@@ -224 +224 @@
 
         // Option to put all the config and log files in a separate folder
-        if (!CommandLine::getArgument("writingPathSuffix")->hasDefaultValue())
-        {
-            std::string directory(CommandLine::getValue("writingPathSuffix").getString());
+        if (!CommandLineParser::getArgument("writingPathSuffix")->hasDefaultValue())
+        {
+            std::string directory(CommandLineParser::getValue("writingPathSuffix").getString());
             configPath_ = configPath_ / directory;
             logPath_    = logPath_    / directory;

code/trunk/src/libraries/core/input/InputManager.cc

@@ -48 +48 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/Functor.h"
 #include "core/GraphicsManager.h"
@@ -170 +170 @@
         if (mouseMode_ == MouseMode::Exclusive || GraphicsManager::getInstance().isFullScreen())
         {
-            if (CommandLine::getValue("keyboard_no_grab").getBool())
+            if (CommandLineParser::getValue("keyboard_no_grab").getBool())
                 paramList.insert(std::make_pair("x11_keyboard_grab", "false"));
             else

code/trunk/src/orxonox/LevelManager.cc

@@ -32 +32 @@
 #include <OgreResourceGroupManager.h>
 
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
@@ -53 +53 @@
 
         // check override
-        if (!CommandLine::getArgument("level")->hasDefaultValue())
+        if (!CommandLineParser::getArgument("level")->hasDefaultValue())
         {
-            ModifyConfigValue(defaultLevelName_, tset, CommandLine::getValue("level").getString());
+            ModifyConfigValue(defaultLevelName_, tset, CommandLineParser::getValue("level").getString());
         }
     }

code/trunk/src/orxonox/Main.cc

@@ -36 +36 @@
 #include "OrxonoxPrereqs.h"
 
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/Game.h"
 #include "core/LuaState.h"
@@ -76 +76 @@
 
         // Some development hacks (not really, but in the future, this calls won't make sense anymore)
-        if (CommandLine::getValue("standalone").getBool())
+        if (CommandLineParser::getValue("standalone").getBool())
             Game::getInstance().requestStates("graphics, standalone, level");
-        else if (CommandLine::getValue("server").getBool())
+        else if (CommandLineParser::getValue("server").getBool())
             Game::getInstance().requestStates("graphics, server, level");
-        else if (CommandLine::getValue("client").getBool())
+        else if (CommandLineParser::getValue("client").getBool())
             Game::getInstance().requestStates("graphics, client, level");
-        else if (CommandLine::getValue("dedicated").getBool())
+        else if (CommandLineParser::getValue("dedicated").getBool())
             Game::getInstance().requestStates("dedicated, level");
-        else if (CommandLine::getValue("dedicatedClient").getBool())
+        else if (CommandLineParser::getValue("dedicatedClient").getBool())
             Game::getInstance().requestStates("dedicatedClient, level");
-        else if (CommandLine::getValue("console").getBool())
+        else if (CommandLineParser::getValue("console").getBool())
             Game::getInstance().requestStates("ioConsole");
         else

code/trunk/src/orxonox/gamestates/GSClient.cc

@@ -31 +31 @@
 #include "util/Clock.h"
 #include "util/Exception.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/Game.h"
 #include "core/GameMode.h"
@@ -56 +56 @@
         GameMode::setIsClient(true);
 
-        this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
+        this->client_ = new Client(CommandLineParser::getValue("ip").getString(), CommandLineParser::getValue("port"));
 
         if(!client_->establishConnection())

code/trunk/src/orxonox/gamestates/GSDedicated.cc

@@ -36 +36 @@
 #include "util/Debug.h"
 #include "util/Sleep.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParse.h"
 #include "core/CommandExecutor.h"
 #include "core/Game.h"
@@ -81 +81 @@
 #endif
 
-        this->server_ = new Server(CommandLine::getValue("port"));
+        this->server_ = new Server(CommandLineParser::getValue("port"));
         COUT(0) << "Loading scene in server mode" << std::endl;
 
@@ -91 +91 @@
         this->server_->close();
         delete this->server_;
-        
+
         closeThread_ = true;
 #ifdef ORXONOX_PLATFORM_UNIX
@@ -138 +138 @@
                         escapeChar = 2;
                         continue;
-                    }
+}
                     else if ( escapeChar == 2 )
                     {

code/trunk/src/orxonox/gamestates/GSDedicatedClient.cc

@@ -37 +37 @@
 #include "util/Exception.h"
 #include "util/Sleep.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/CommandExecutor.h"
 #include "core/Game.h"
@@ -80 +80 @@
 #endif
 
-        this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
+        this->client_ = new Client(CommandLineParser::getValue("ip").getString(), CommandLine::getValue("port"));
         COUT(0) << "Loading scene in client mode" << std::endl;
 
@@ -93 +93 @@
     void GSDedicatedClient::deactivate()
     {
-        if( this->client_ )
+        if (this->client_)
         {
             this->client_->closeConnection();
             delete this->client_;
         }
-        
+
         closeThread_ = true;
 #ifdef ORXONOX_PLATFORM_UNIX
@@ -143 +143 @@
                         escapeChar = 2;
                         continue;
-                    }
+}
                     else if ( escapeChar == 2 )
                     {

code/trunk/src/orxonox/gamestates/GSServer.cc

@@ -30 +30 @@
 
 #include "util/Debug.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/Game.h"
 #include "core/GameMode.h"
@@ -55 +55 @@
         GameMode::setHasServer(true);
 
-        this->server_ = new Server(CommandLine::getValue("port"));
+        this->server_ = new Server(CommandLineParser::getValue("port"));
         COUT(0) << "Loading scene in server mode" << std::endl;