Index: trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc
===================================================================
--- trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc	(revision 7261)
+++ trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc	(revision 7319)
@@ -11,5 +11,5 @@
    ### File Specific:
    main-programmer: Christoph Renner
-   co-programmer: 
+   co-programmer:
 */
 
@@ -40,5 +40,5 @@
 {
   ArgTableEntry entry;
-  
+
   entry.id = id;
   entry.longOption = longOption;
@@ -47,5 +47,5 @@
   entry.argNames = argNames;
   entry.help = help;
-  
+
   if ( back )
     argTable.push_back( entry );
@@ -58,12 +58,12 @@
 {
   this->exeName = argv[0];
-  
+
   //put all args in vector
   std::vector<std::string> args;
-  
+
   for ( int i = 1; i<argc; i++ )
   {
     std::string s = argv[i];
-    
+
     if ( s.find( "=" ) == std::string::npos )
     {
@@ -88,5 +88,5 @@
       op.erase( op.find("=") );
       ar.erase( 0, ar.find("=")+1);
-      
+
       //PRINTF(0)("'%s' '%s'\n", op.c_str(), ar.c_str());
       args.push_back( op );
@@ -94,11 +94,11 @@
     }
   }
-  
+
   int i = 0;
-  
+
   ArgTable::iterator it;
   bool finish;
   bool found;
-  
+
   while ( i < args.size() )
   {
@@ -109,7 +109,7 @@
       {
         found = true;
-        
+
         int posArgs = 1;
-        
+
         while ( i + posArgs < args.size() )
         {
@@ -119,7 +119,7 @@
             posArgs++;
         }
-        
+
         posArgs--;
-        
+
         if ( it->numArgs > posArgs )
         {
@@ -127,15 +127,15 @@
           return false;
         }
-        
+
         std::vector<MultiType> argArgs;
-        
+
         for ( int j = 1; j <= it->numArgs; j++ )
           argArgs.push_back( args[i+j] );
-        
+
         if ( !cb( *it, data, args[i], argArgs ) )
           return false;
-        
+
         i += it->numArgs;
-        
+
         if ( finish )
         {
@@ -143,11 +143,11 @@
           break;
         }
-        else 
-        { 
+        else
+        {
           assert( it->numArgs == 0 );
         }
       }
     }
-    
+
     if ( !found )
     {
@@ -156,5 +156,5 @@
     }
   }
-  
+
   return true;
 }
@@ -163,8 +163,8 @@
 {
   finish = true;
-  
+
   if ( arg.length() < 2 )
     return false;
-  
+
   if ( arg[0] == '-' )
   {
@@ -172,5 +172,5 @@
     {
       arg.erase( 0, 2 );
-      
+
       if ( entry.longOption.find('%') != std::string::npos )
       {
@@ -208,20 +208,20 @@
   printf("Usage: %s [options]\n", exeName.c_str());
   printf("\n");
-  
+
   std::list<std::vector<std::string> > output;
-  
+
   for ( ArgTable::iterator it = argTable.begin(); it != argTable.end(); it++ )
   {
     output.push_back( std::vector<std::string>() );
-    
+
     SubString substr( it->argNames );
     std::string args;
-    assert( it->numArgs == substr.getCount() );
-      
+    assert( it->numArgs == substr.size() );
+
     for ( int i = 0; i<it->numArgs; i++ )
     {
       args += " [" + substr[i] + "]";
     }
-    
+
     if ( it->shortOption != '\0' )
     {
@@ -231,53 +231,53 @@
     else
       output.back().push_back( "" );
-    
+
     if ( it->longOption != "" )
     {
       output.back().push_back( "--" + it->longOption );
-      
+
       output.back().back() += args;
     }
     else
       output.back().push_back( "" );
-    
+
     output.back().push_back( it->help );
   }
-  
+
   output.push_back( std::vector<std::string>() );
   output.back().push_back( "Option" );
   output.back().push_back( "Long option" );
   output.back().push_back( "Description" );
-  
+
   output.reverse();
-  
+
   int maxShort = 0;
   int maxLong = 0;
-  
+
   std::list<std::vector<std::string> >::const_iterator it;
-  
+
   for ( it = output.begin(); it != output.end(); it++ )
   {
     if ( (*it)[0].length() > maxShort )
       maxShort = (*it)[0].length();
-    
+
     if ( (*it)[1].length() > maxLong )
       maxLong = (*it)[1].length();
   }
-  
+
   for ( it = output.begin(); it != output.end(); it++ )
   {
     printf("%s ", (*it)[0].c_str());
-    
+
     for ( int i = 0; i<maxShort-(*it)[0].length(); i++ )
       printf(" ");
-    
+
     printf("%s ", (*it)[1].c_str());
-    
+
     for ( int i = 0; i<maxLong-(*it)[1].length(); i++ )
       printf(" ");
-    
+
     printf("%s\n", (*it)[2].c_str());
   }
-  
+
   exit(0);
 }
