*** empty log message ***

[lilypond.git] / lily / include / main.hh

diff --git a/lily/include/main.hh b/lily/include/main.hh
index a54ff5a39d66f732c6b41e46558f58969c30ebfa..d79b608c3e93c6111fb2c267b3c5f1f2cfdc7d17 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -10,43 +10,44 @@
 
 #include "lily-proto.hh"
 #include "array.hh"
+#include "std-string.hh"
 
 void debug_init ();
 void set_debug (bool);
 void do_scores ();
 void clear_scores ();
 void add_score (Score *s);
-void set_default_output (String s);
-String find_file (String);
+void set_default_output (std::string s);
+std::string find_file (std::string);
 void call_constructors ();
-Array<String> get_inclusion_names ();
-void set_inclusion_names (Array<String>);
+Array<std::string> get_inclusion_names ();
+void set_inclusion_names (Array<std::string>);
 
-extern String init_name_global;
+extern std::string init_name_global;
 
 /* options */
-extern Array<String> dump_header_fieldnames_global;
-extern String output_backend_global;
-extern String output_name_global;
+extern Array<std::string> dump_header_fieldnames_global;
+extern std::string output_backend_global;
+extern std::string output_name_global;
 extern bool be_safe_global;
 extern bool be_verbose_global;
 extern bool do_internal_type_checking_global;
 extern bool is_pango_format_global;
 extern bool is_TeX_format_global;
 extern bool point_and_click_global;
-extern String prefix_directory;
+extern std::string prefix_directory;
 extern bool use_object_keys;
 
 /*
   todo: collect in Output_option struct?
 */
-extern String output_format_global;
+extern std::string output_format_global;
 
 extern bool make_preview;
 extern bool make_print;
 
 /* misc */
-extern Array<String> failed_files;
+extern Array<std::string> failed_files;
 extern int exit_status_global;
 extern File_path global_path;
 extern const char *LILYPOND_DATADIR;