* flower/include/std-string.hh:

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

diff --git a/lily/include/main.hh b/lily/include/main.hh
index a64b82a958dfa7c9d884648f4c73baea1a6fa3c2..bd396a16f771ad6e7c64b3784df00472dac07dd1 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -17,37 +17,37 @@ void set_debug (bool);
 void do_scores ();
 void clear_scores ();
 void add_score (Score *s);
-void set_default_output (std::string s);
-std::string find_file (std::string);
+void set_default_output (string s);
+string find_file (string);
 void call_constructors ();
-std::vector<std::string> get_inclusion_names ();
-void set_inclusion_names (std::vector<std::string>);
+vector<string> get_inclusion_names ();
+void set_inclusion_names (vector<string>);
 
-extern std::string init_name_global;
+extern string init_name_global;
 
 /* options */
-extern std::vector<std::string> dump_header_fieldnames_global;
-extern std::string output_backend_global;
-extern std::string output_name_global;
+extern vector<string> dump_header_fieldnames_global;
+extern string output_backend_global;
+extern 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 std::string prefix_directory;
+extern string prefix_directory;
 extern bool use_object_keys;
 
 /*
   todo: collect in Output_option struct?
 */
-extern std::string output_format_global;
+extern string output_format_global;
 
 extern bool make_preview;
 extern bool make_print;
 
 /* misc */
-extern std::vector<std::string> failed_files;
+extern vector<string> failed_files;
 extern int exit_status_global;
 extern File_path global_path;
 extern const char *LILYPOND_DATADIR;