Changeset 9869 in orxonox.OLD for trunk/src/lib/parser/preferences

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/parser/preferences

Files:

• Makefile.am (modified) (1 diff)
• cmd_line_prefs_reader.h (modified) (3 diffs)
• ini_file_prefs_reader.h (modified) (1 diff)
• preferences.cc (copied) (copied from branches/new_class_id/src/lib/parser/preferences/preferences.cc)
• preferences.h (copied) (copied from branches/new_class_id/src/lib/parser/preferences/preferences.h)

trunk/src/lib/parser/preferences/Makefile.am

@@ -6 +6 @@
 libPrefsParser_a_SOURCES = \
                 cmd_line_prefs_reader.cc \
-                ini_file_prefs_reader.cc
+                ini_file_prefs_reader.cc \
+                preferences.cc
 
 
 noinst_HEADERS = \
                 cmd_line_prefs_reader.h \
-                ini_file_prefs_reader.h
+                ini_file_prefs_reader.h \
+                preferences.h

trunk/src/lib/parser/preferences/cmd_line_prefs_reader.h

@@ -7 +7 @@
 #define _CMD_LINE_PREFS_READER_H
 
-#include "stdincl.h"
 #include "debug.h"
 
@@ -45 +44 @@
 };
 
-#define REGISTER_ARG_FLAG(shortOption,longOption,section,key,description,value) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,"",value) 
+#define REGISTER_ARG_FLAG(shortOption,longOption,section,key,description,value) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,"",value)
 
-#define REGISTER_ARG_ARG(shortOption,longOption,section,key,description,argname) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,argname) 
+#define REGISTER_ARG_ARG(shortOption,longOption,section,key,description,argname) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,argname)
 
 //! A class for reading commandline arguments into Preferences
-class CmdLinePrefsReader 
+class CmdLinePrefsReader
 {
 
@@ -58 +57 @@
 
     bool parse(int argc, char** argv);
-    
+
     static bool registerArgument( const char shortOption, const std::string & longOption, const std::string & section, const std::string & key, const std::string & help,  const std::string & argName = "", const std::string & value = "%arg%" );
-    
+
     static bool asdf;
-    
+
   private:
     static bool callBack( ArgTableEntry entry, void* data, const std::string & arg, const std::vector<MultiType> & argArgs );
-    
+
     static RegistredArgs regArgs;
 

trunk/src/lib/parser/preferences/ini_file_prefs_reader.h

@@ -7 +7 @@
 #define _INI_FILE_PREFS_READER_H
 
-#include "src/lib/parser/ini_parser/ini_parser.h"
-#include "src/lib/util/preferences.h"
+#include "lib/parser/ini_parser/ini_parser.h"
+#include "lib/parser/preferences/preferences.h"