Silence compiler warning about some shadowed symbols by explicitly qualifying them.

plugins/tptp/tptp_printer.ml

@@ -71,7 +71,7 @@ let rec print_type info fmt ty = match ty.ty_node with
           | Some ty -> print_type info fmt ty
           | None ->
               let ts = complex_type ty in let cty = ty_app ts [] in
-              let us = sprintf "@[<hov 2>tff(%s, type,@ %a:@ $tType).@]@\n@\n"
+              let us = Pp.sprintf "@[<hov 2>tff(%s, type,@ %a:@ $tType).@]@\n@\n"
                 (id_unique pr_printer ts.ts_name) print_symbol ts.ts_name in
               info.info_srt := Mty.add ty cty !(info.info_srt);
               info.info_urg := us :: !(info.info_urg);

src/ide/gconfig.ml

@@ -196,7 +196,7 @@ let load_altern alterns (_,section) =
 
 let load_config config original_config =
   let main = get_main config in
-  let ide  = match get_section config "ide" with
+  let ide  = match Whyconf.get_section config "ide" with
     | None -> default_ide
     | Some s -> load_ide s
   in
@@ -294,7 +294,7 @@ let save_config t =
   let ide = set_string ide "iconset" t.iconset in
   let ide = set_string ide "default_editor" t.default_editor in
   let ide = set_stringl ide "hidden_prover" t.hidden_provers in
-  let config = set_section config "ide" ide in
+  let config = Whyconf.set_section config "ide" ide in
   Whyconf.save_config config
 
 let read_config conf_file extra_files =

src/ide/gmain.ml

@@ -85,7 +85,7 @@ let () =
 
 let () = Gconfig.read_config !opt_config !opt_extra
 
-let () = C.load_plugins (get_main ())
+let () = C.load_plugins (Gconfig.get_main ())
 
 let () =
   Debug.Args.set_flags_selected ();
@@ -113,7 +113,7 @@ let () =
   Gconfig.init ()
 
 let (why_lang, any_lang) =
-  let main = get_main () in
+  let main = Gconfig.get_main () in
   let load_path = Filename.concat (datadir main) "lang" in
   let languages_manager =
     GSourceView2.source_language_manager ~default:true
@@ -164,7 +164,7 @@ let source_text fname =
 (* loading WhyIDE configuration *)
 (********************************)
 
-let loadpath = (C.loadpath (get_main ())) @ List.rev !includes
+let loadpath = (C.loadpath (Gconfig.get_main ())) @ List.rev !includes
 
 let gconfig =
   let c = Gconfig.config () in
@@ -1225,7 +1225,7 @@ let save_session () =
 
 
 let exit_function ?(destroy=false) () =
-  save_config ();
+  Gconfig.save_config ();
   if not !session_needs_saving then GMain.quit () else
   match (Gconfig.config ()).saving_policy with
     | 0 -> save_session (); GMain.quit ()

src/main.ml

@@ -370,7 +370,7 @@ let () = try
       | Some s -> [MAstr s]
       | None -> []
     in
-    add_meta task meta args
+    Task.add_meta task meta args
   in
   opt_task := List.fold_left add_meta !opt_task !opt_metas
 

src/printer/cvc3.ml

@@ -68,7 +68,7 @@ let rec print_type info fmt ty = match ty.ty_node with
           | Some ty -> print_type info fmt ty
           | None ->
               let ts = complex_type ty in let cty = ty_app ts [] in
-              let us = sprintf "%a: TYPE;@\n@\n" print_ident ts.ts_name in
+              let us = Pp.sprintf "%a: TYPE;@\n@\n" print_ident ts.ts_name in
               info.complex_type := Mty.add ty cty !(info.complex_type);
               info.urg_output := us :: !(info.urg_output);
               print_type info fmt cty

src/printer/smtv1.ml

@@ -61,7 +61,7 @@ let rec print_type info fmt ty = match ty.ty_node with
           | Some ty -> print_type info fmt ty
           | None ->
               let ts = complex_type ty in let cty = ty_app ts [] in
-              let us = sprintf
+              let us = Pp.sprintf
                 ":extrasorts (%a)@\n@\n" print_ident ts.ts_name in
               info.complex_type := Mty.add ty cty !(info.complex_type);
               info.urg_output := us :: !(info.urg_output);

src/printer/yices.ml

@@ -73,7 +73,7 @@ let rec print_type info fmt ty = match ty.ty_node with
           | Some ty -> print_type info fmt ty
           | None ->
               let ts = complex_type ty in let cty = ty_app ts [] in
-              let us = sprintf
+              let us = Pp.sprintf
                 "(define-type %a)@\n@\n" print_ident ts.ts_name in
               info.complex_type := Mty.add ty cty !(info.complex_type);
               info.urg_output := us :: !(info.urg_output);