Changeset 7254 in orxonox.OLD for branches/preferences/src/lib

Timestamp:

Mar 29, 2006, 4:50:51 PM (19 years ago)

Author:

rennerc

Message:

option -l/—license is now handled in orxonox.cc

Location:

branches/preferences/src/lib/parser/preferences

Files:

• cmd_line_prefs_reader.cc (modified) (4 diffs)
• cmd_line_prefs_reader.h (modified) (2 diffs)

branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.cc

@@ -71 +71 @@
       cbd->parser->showHelp();
       return true;
-    case ID_LICENSE:
-      PRINT(0)(ORXONOX_LICENSE_SHORT);
-      return true;
   }
   
-  if ( entry.id >= ID_LAST && entry.id - ID_LAST < regArgs.size() )
+  if ( entry.id >= ID_PREFS && entry.id - ID_PREFS < regArgs.size() )
   {
-    if ( regArgs[entry.id - ID_LAST].value == "%arg%" )
+    if ( regArgs[entry.id - ID_PREFS].value == "%arg%" )
     {
       assert( argArgs.size() == 1 );
       
       cbd->iniEntries.push_back( IniEntry() );
-      cbd->iniEntries.back().section = regArgs[entry.id - ID_LAST].section;
-      cbd->iniEntries.back().key = regArgs[entry.id - ID_LAST].key;
+      cbd->iniEntries.back().section = regArgs[entry.id - ID_PREFS].section;
+      cbd->iniEntries.back().key = regArgs[entry.id - ID_PREFS].key;
       cbd->iniEntries.back().value = argArgs[0].getString();
     }
@@ -90 +87 @@
     {
       cbd->iniEntries.push_back( IniEntry() );
-      cbd->iniEntries.back().section = regArgs[entry.id - ID_LAST].section;
-      cbd->iniEntries.back().key = regArgs[entry.id - ID_LAST].key;
-      cbd->iniEntries.back().value = regArgs[entry.id - ID_LAST].value;
+      cbd->iniEntries.back().section = regArgs[entry.id - ID_PREFS].section;
+      cbd->iniEntries.back().key = regArgs[entry.id - ID_PREFS].key;
+      cbd->iniEntries.back().value = regArgs[entry.id - ID_PREFS].value;
     }
   }
@@ -109 +106 @@
   
   parser.add( ID_HELP, "help", 'h', 0, "", "Shows this help");
-  parser.add( ID_LICENSE, "license", 'l', 0, "", "Prints the licence and exit");
   
   for ( int i = 0; i<regArgs.size(); i++ )
@@ -115 +111 @@
     if ( regArgs[i].value == "%arg%" )
     {
-      parser.add( ID_LAST + i, regArgs[i].longOption, regArgs[i].shortOption, 1, regArgs[i].argName, regArgs[i].help );
+      parser.add( ID_PREFS + i, regArgs[i].longOption, regArgs[i].shortOption, 1, regArgs[i].argName, regArgs[i].help );
     }
     else
     {
-      parser.add( ID_LAST + i, regArgs[i].longOption, regArgs[i].shortOption, 0, "", regArgs[i].help );
+      parser.add( ID_PREFS + i, regArgs[i].longOption, regArgs[i].shortOption, 0, "", regArgs[i].help );
     }
   }

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

@@ -9 +9 @@
 #include "stdincl.h"
 #include "debug.h"
-#include "globals.h"
 
 #include "src/lib/parser/cmdline_parser/cmdline_parser.h"
@@ -43 +42 @@
   ID_SET_INI = 1,
   ID_HELP,
-  ID_LICENSE,
-  ID_LAST
+  ID_PREFS
 };