* configure.in: Test for and accept lmodern if EC fonts not found.

[lilypond.git] / flower / include / getopt-long.hh

diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh
index a0992c98e6f0e03ccfc7ff91f27061ff85bcce55..8233114ed7674858734ca540e572fca7893a92d7 100644 (file)
--- a/flower/include/getopt-long.hh
+++ b/flower/include/getopt-long.hh
@@ -1,25 +1,30 @@
 #ifndef GETOPT_LONG_HH
 #define GETOPT_LONG_HH
 
-#include <ostream.h> /* gcc 3.0 */
+#include <cstdio>
+
 #include "string.hh"
 
 /**
-  a struct this for initialising the commandline options.
- */
+   a struct this for initialising the commandline options.
+*/
 struct Long_option_init {
-  char const * take_arg_sz_;
-  char const * longname_sz_;
-  char        shortname_ch_;
+  char const * take_arg_str0_;
+  char const * longname_str0_;
+
+  /*
+    = 0: don't take short version.
+  */
+  char shortname_char_;
 
-  char const * help_sz_;
+  char const * help_str0_;
   
-  String str () const;
+  String to_string () const;
   String str_for_help () const;
   //   NO constructor!
 
   static int compare (Long_option_init const&,Long_option_init const&);
-  static String table_str (Long_option_init *); 
+  static String table_string (Long_option_init *); 
 };
 
 
@@ -36,13 +41,13 @@ class Getopt_long {
 
   /// the option info.
   const Long_option_init *option_a_;
-  int table_len_i_;
+  int table_len_;
     
-  /// if doing short option, arg_value_ch_a_a_[optind][optindind] is processed next.
-  int argument_index_i_;
+  /// if doing short option, arg_value_char_a_a_[optind][optindind] is processed next.
+  int argument_index_;
 
   /// the option found
-  const Long_option_init *found_option_l_;
+  const Long_option_init *found_option_;
 
 
 public: 
@@ -52,21 +57,21 @@ public:
                  E_ILLEGALARG } ;
 
   /// argument. Set to 0 if not present
-  char const * optional_argument_ch_C_;
+  char const * optional_argument_str0_;
 
   /// current error status
   Errorcod error_;
 
-  /// arg_value_ch_a_a_[array_index_i_] will be processed next.
-  int array_index_i_;
+  /// arg_value_char_a_a_[array_index_] will be processed next.
+  int array_index_;
 
   /// the arguments
-  char **arg_value_ch_a_a_;
+  char **arg_value_char_a_a_;
 
   /// the arg. count
-  int argument_count_i_;
+  int argument_count_;
 
-  ostream *error_ostream_l_;
+  FILE *error_out_;
 
 public:
   /// get ready for processing next error.
@@ -81,7 +86,7 @@ public:
 
 
   /// return an integer (with err. detect)
-  long argument_to_i ();
+  long get_argument_index ();
  
     
   /**
@@ -90,7 +95,7 @@ public:
     if #os# is null, then do not report nor abort, just set #error#
     */
        
-  void seterror (ostream *os);
+  void seterror (FILE *os);
 
   /// construct: pass arguments and option info.
   Getopt_long (int c,  char **v, Long_option_init *lo);