Issue 4550 (2/2) Avoid "using namespace std;" in included files

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

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 9bad23f902d9600f84a5f97b219b0f6f843633bd..5d72793c9ff0c3e4f7d88795395726ee76316f7b 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,31 +29,32 @@ void do_scores ();
 void clear_scores ();
 void add_score (Score *s);
 void call_constructors ();
-vector<string> get_inclusion_names ();
-void set_inclusion_names (vector<string>);
+std::vector<std::string> get_inclusion_names ();
+void set_inclusion_names (std::vector<std::string>);
 
-extern string init_name_global;
+extern std::string init_name_global;
 
 /* options */
-extern vector<string> dump_header_fieldnames_global;
-extern vector<string> start_environment_global;
-extern string output_backend_global;
-extern string output_name_global;
+extern std::vector<std::string> dump_header_fieldnames_global;
+extern std::vector<std::string> start_environment_global;
+extern std::string output_backend_global;
+extern std::string output_name_global;
+extern bool bigpdfs;
 extern bool be_safe_global;
 extern bool do_internal_type_checking_global;
-extern string lilypond_datadir;
+extern std::string lilypond_datadir;
 extern bool use_object_keys;
 extern bool strict_infinity_checking;
-extern string init_scheme_code_global;
-extern string init_scheme_variables_global;
+extern std::string init_scheme_code_global;
+extern std::string init_scheme_variables_global;
 
 /*
   todo: collect in Output_option struct?
 */
-extern string output_format_global;
+extern std::string output_format_global;
 
 /* misc */
-extern vector<string> failed_files;
+extern std::vector<std::string> failed_files;
 extern int exit_status_global;
 extern File_path global_path;
 extern const char *LILYPOND_DATADIR;