Q831-010 Remove ineffective use clauses.

Change-Id: I55f327171303977aa6d6208e8308b51a7eb38743

ada_module/core/src/ada_semantic_tree-entity_iteration.adb

@@ -190,7 +190,6 @@ package body Ada_Semantic_Tree.Entity_Iteration is
    ----------
 
    procedure Next (It : in out Semantic_Tree_Iterator) is
-      use Language.Tree.Database.File_Set;
 
       procedure Next_All_Access;
       procedure Next_Referenced_Entity;

ada_module/core/src/ada_semantic_tree-interfaces.adb

@@ -60,9 +60,8 @@ package body Ada_Semantic_Tree.Interfaces is
    ------------------------
 
    procedure Register_Assistant (Db : Construct_Database_Access) is
-      use Tree_Annotations_Pckg;
-
       Import_Key : Construct_Annotations_Pckg.Annotation_Key;
+
    begin
       Get_Annotation_Key
         (Get_Construct_Annotation_Key_Registry (Db).all,

ada_module/core/src/ada_semantic_tree-lang.adb

@@ -1382,10 +1382,9 @@ package body Ada_Semantic_Tree.Lang is
      (Db : Construct_Database_Access)
       return Construct_Annotations_Pckg.Annotation_Key
    is
-      use Construct_Annotations_Pckg;
-
       Assistant : constant Database_Assistant_Access :=
                     Get_Assistant (Db, Ada_Assistant_Id);
+
    begin
       return Ada_Assistant (Assistant.all).Ada_Ref_Key;
    end Get_Ref_Key;

ada_module/core/src/ada_semantic_tree-parts.adb

@@ -114,12 +114,10 @@ package body Ada_Semantic_Tree.Parts is
    ------------------------
 
    procedure Register_Assistant (Db : Construct_Database_Access) is
-      use Construct_Annotations_Pckg;
-      use Tree_Annotations_Pckg;
-
       Ada_Part_Entity_Key : Construct_Annotations_Pckg.Annotation_Key;
+
    begin
-      Get_Annotation_Key
+      Construct_Annotations_Pckg.Get_Annotation_Key
         (Get_Construct_Annotation_Key_Registry (Db).all,
          Ada_Part_Entity_Key);
 
@@ -154,8 +152,8 @@ package body Ada_Semantic_Tree.Parts is
    is
       pragma Unreferenced (Assistant, Old_Tree);
 
-      use Tree_Annotations_Pckg;
-      It    : Unit_Iterator;
+      It : Unit_Iterator;
+
    begin
       if Kind /= Minor_Change then
          --  If this is not a minor change, then the entities relations may
@@ -764,23 +762,24 @@ package body Ada_Semantic_Tree.Parts is
       Assistant : Ada_Part_Db_Assistant'Class)
       return Ada_Relation_Access
    is
-      use Tree_Annotations_Pckg;
-      use Construct_Annotations_Pckg;
+      use type Language.Tree.Construct_Annotations_Pckg.Annotation;
 
       It                  : Construct_Tree_Iterator;
       Relation_Annotation : Construct_Annotations_Pckg.Annotation;
+
    begin
       --  Then, extract the relation from the annotations.
 
       It := To_Construct_Tree_Iterator (Entity);
 
-      Get_Annotation
+      Construct_Annotations_Pckg.Get_Annotation
         (Get_Annotation_Container (Get_Tree (Get_File (Entity)), It).all,
          Assistant.Parts_Key,
          Relation_Annotation);
 
       if Relation_Annotation = Construct_Annotations_Pckg.Null_Annotation then
          return null;
+
       else
          return Ada_Relation_Annotation
            (Relation_Annotation.Other_Val.all).Relation;

ada_module/core/src/ada_semantic_tree-units.adb

@@ -268,7 +268,6 @@ package body Ada_Semantic_Tree.Units is
    ----------
 
    procedure Next (It : in out Unit_Iterator) is
-      use File_Set;
    begin
       if It.Unit_Cursor /= Persistent_Entity_List.No_Element then
          It.Unit_Cursor := Next (It.Unit_Cursor);
@@ -291,7 +290,6 @@ package body Ada_Semantic_Tree.Units is
    ---------
 
    function Get (It : Unit_Iterator) return Entity_Access is
-      use File_Set;
    begin
       if It.Unit_Cursor /= Persistent_Entity_List.No_Element then
          return To_Entity_Access (Element (It.Unit_Cursor));
@@ -350,7 +348,6 @@ package body Ada_Semantic_Tree.Units is
    ------------
 
    function At_End (It : Unit_Iterator) return Boolean is
-      use File_Set;
    begin
       return It.Unit_Cursor = Persistent_Entity_List.No_Element
         and then At_End (It.Db_Iterator);

ada_module/core/src/ada_semantic_tree-units.ads

@@ -206,7 +206,6 @@ private
 
    package Unit_Set_Pckg is new
      Ada.Containers.Ordered_Sets (Unit_Access);
-   use Unit_Set_Pckg;
 
    package Persistent_Entity_List is new
      Ada.Containers.Ordered_Sets (Entity_Persistent_Access);

ada_module/core/src/ada_semantic_tree-visibility.adb

@@ -53,7 +53,6 @@ package body Ada_Semantic_Tree.Visibility is
    ------------------------
 
    procedure Register_Assistant (Db : Construct_Database_Access) is
-      use Construct_Annotations_Pckg;
    begin
       Register_Assistant
         (Db, Ada_Visibility_Id, new Ada_Visibibility_Assistant);
@@ -99,8 +98,6 @@ package body Ada_Semantic_Tree.Visibility is
       --  reasonable to delay it until the first Is_Public_Visible call is
       --  made.
 
-      use Construct_Annotations_Pckg;
-
       Tree : constant Construct_Tree := Get_Tree (File);
 
       procedure Add_Scope

ada_module/ui/src/ada_naming_editors.adb

@@ -15,7 +15,7 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Strings.Fixed;          use Ada.Strings.Fixed;
+with Ada.Strings.Fixed;
 with Ada.Strings.Unbounded;      use Ada.Strings.Unbounded;
 with Ada.Unchecked_Deallocation;
 with GNAT.Strings;               use GNAT.Strings;
@@ -185,8 +185,6 @@ package body Ada_Naming_Editors is
    procedure On_Standard_Scheme_Changed
      (Object : access Gtk_Widget_Record'Class)
    is
-      use Widget_List;
-
       E     : constant Ada_Naming_Editor := Ada_Naming_Editor (Object);
       Value : Gint;
 

browsers/src/browsers-dependency_items.adb

@@ -262,12 +262,14 @@ package body Browsers.Dependency_Items is
      (Self : not null access File_Item_Record)
       return XML_Utils.Node_Ptr
    is
-      N : constant Node_Ptr := new Node;
+      N : constant XML_Utils.Node_Ptr := new XML_Utils.Node;
+
    begin
       N.Tag := new String'("file");
-      Set_Attribute (N, "file", Self.Source.Display_Full_Name);
-      Set_Attribute
+      XML_Utils.Set_Attribute (N, "file", Self.Source.Display_Full_Name);
+      XML_Utils.Set_Attribute
         (N, "project", Self.Project.Project_Path.Display_Full_Name);
+
       return N;
    end Save_To_XML;
 
@@ -281,7 +283,7 @@ package body Browsers.Dependency_Items is
    is
    begin
       if Self.Explicit then
-         Set_Attribute (Node, "explicit", "1");
+         XML_Utils.Set_Attribute (Node, "explicit", "1");
       end if;
    end Save_To_XML;
 
@@ -297,9 +299,9 @@ package body Browsers.Dependency_Items is
       Newly_Added : Boolean;
    begin
       Self.Find_Or_Create_File
-        (Filename => Create (+Get_Attribute (Node, "file")),
+        (Filename => Create (+XML_Utils.Get_Attribute (Node, "file")),
          Project  => Get_Project_Tree (Self.Kernel).Project_From_Path
-         (Create (+Get_Attribute (Node, "project"))),
+         (Create (+XML_Utils.Get_Attribute (Node, "project"))),
          Item     => It,
          Newly_Added => Newly_Added);
       return It;
@@ -317,7 +319,7 @@ package body Browsers.Dependency_Items is
    begin
       Self.Add_Link
         (File_Item (From), File_Item (To),
-         Explicit => Get_Attribute (Node, "explicit") = "1");
+         Explicit => XML_Utils.Get_Attribute (Node, "explicit") = "1");
    end Load_From_XML;
 
    ---------------------

browsers/src/browsers-elaborations.adb

@@ -15,7 +15,6 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Containers;
 with Ada.Strings.Fixed;
 with Ada.Strings.Unbounded;     use Ada.Strings.Unbounded;
 with Browsers.Canvas;           use Browsers.Canvas;
@@ -183,8 +182,6 @@ package body Browsers.Elaborations is
      (Kernel : Kernel_Handle;
       Cycle  : Elaboration_Cycles.Cycle)
    is
-      use type Ada.Containers.Count_Type;
-
       Browser : constant Elaboration_Browser :=
         Elaboration_Views.Get_Or_Create_View (Kernel, Focus => True);
       Styles : constant access Browser_Styles :=
@@ -363,9 +360,10 @@ package body Browsers.Elaborations is
       Status : Integer)
    is
       pragma Unreferenced (Self, Category, Target, Mode, Shadow, Background);
-      use type Ada.Containers.Count_Type;
+
       Cycle   : Elaboration_Cycles.Cycle renames Last_Elaboration_Cycle;
       Show : constant Boolean := Get_Pref (Auto_Show_Preference);
+
    begin
       if Show
         and then Status /= 0

browsers/src/browsers-entities.adb

@@ -315,13 +315,15 @@ package body Browsers.Entities is
    is
       Decl : constant General_Entity_Declaration :=
         Self.Entity.Element.Get_Declaration;
-      N : constant Node_Ptr := new Node;
+      N    : constant XML_Utils.Node_Ptr := new XML_Utils.Node;
+
    begin
       N.Tag := new String'("entity");
-      Set_Attribute (N, "name", To_String (Decl.Name));
-      Set_Attribute (N, "file", Decl.Loc.File.Display_Full_Name);
-      Set_Attribute (N, "line", Decl.Loc.Line'Img);
-      Set_Attribute (N, "col",  Decl.Loc.Column'Img);
+      XML_Utils.Set_Attribute (N, "name", To_String (Decl.Name));
+      XML_Utils.Set_Attribute (N, "file", Decl.Loc.File.Display_Full_Name);
+      XML_Utils.Set_Attribute (N, "line", Decl.Loc.Line'Img);
+      XML_Utils.Set_Attribute (N, "col",  Decl.Loc.Column'Img);
+
       return N;
    end Save_To_XML;
 
@@ -331,12 +333,12 @@ package body Browsers.Entities is
 
    overriding procedure Save_To_XML
      (Self : not null access Entity_Link_Record;
-      Node : not null XML_Utils.Node_Ptr)
-   is
+      Node : not null XML_Utils.Node_Ptr) is
    begin
-      Set_Attribute (Node, "name", To_String (Self.Name));
+      XML_Utils.Set_Attribute (Node, "name", To_String (Self.Name));
+
       if Self.Parent_Link then
-         Set_Attribute (Node, "parent", "1");
+         XML_Utils.Set_Attribute (Node, "parent", "1");
       end if;
    end Save_To_XML;
 
@@ -350,13 +352,15 @@ package body Browsers.Entities is
    is
       E : constant Root_Entity'Class :=
         Self.Kernel.Databases.Get_Entity
-          (Name => Get_Attribute (Node, "name"),
+          (Name => XML_Utils.Get_Attribute (Node, "name"),
            Loc  =>
-             (File    => Create (+Get_Attribute (Node, "file")),
+             (File    => Create (+XML_Utils.Get_Attribute (Node, "file")),
               Project => <>,
-              Line    => Integer'Value (Get_Attribute (Node, "line")),
+              Line    =>
+                Integer'Value (XML_Utils.Get_Attribute (Node, "line")),
               Column  =>
-                Visible_Column_Type'Value (Get_Attribute (Node, "col"))));
+                Visible_Column_Type'Value
+                  (XML_Utils.Get_Attribute (Node, "col"))));
       It : Type_Item;
       Newly_Added : Boolean;
    begin
@@ -374,10 +378,12 @@ package body Browsers.Entities is
       From, To : not null access GPS_Item_Record'Class)
    is
       pragma Unreferenced (Self);
+
    begin
-      Add_Link (Type_Item (From), Type_Item (To),
-                Link_Name   => Get_Attribute (Node, "name"),
-                Parent_Link => Get_Attribute (Node, "parent") = "1");
+      Add_Link
+        (Type_Item (From), Type_Item (To),
+         Link_Name   => XML_Utils.Get_Attribute (Node, "name"),
+         Parent_Link => XML_Utils.Get_Attribute (Node, "parent") = "1");
    end Load_From_XML;
 
    -----------------
@@ -890,10 +896,10 @@ package body Browsers.Entities is
    ----------------
 
    procedure Add_Fields (Item : not null access Type_Item_Record'Class) is
-      use Entity_Arrays;
-      B     : constant Type_Browser := Type_Browser (Item.Browser);
-      S     : constant access Browser_Styles := B.Get_View.Get_Styles;
+      B        : constant Type_Browser := Type_Browser (Item.Browser);
+      S        : constant access Browser_Styles := B.Get_View.Get_Styles;
       Literals : Xref.Entity_Array := Item.Entity.Element.Literals;
+
    begin
       if Literals'Length /= 0 then
          for F in Literals'Range loop

browsers/src/browsers-projects.adb

@@ -82,7 +82,6 @@ package body Browsers.Projects is
       Position               => Position_Automatic,
       Group                  => Group_Default);
    subtype Project_Browser is Project_Views.View_Access;
-   use type Project_Browser;
 
    procedure Examine_Project_Hierarchy
      (Browser   : not null access Project_Browser_Record'Class;
@@ -200,10 +199,12 @@ package body Browsers.Projects is
      (Self : not null access Project_Item_Record)
       return XML_Utils.Node_Ptr
    is
-      N : constant Node_Ptr := new Node;
+      N : constant XML_Utils.Node_Ptr := new XML_Utils.Node;
+
    begin
       N.Tag := new String'("project");
-      Set_Attribute (N, "path", Self.Path.Display_Full_Name);
+      XML_Utils.Set_Attribute (N, "path", Self.Path.Display_Full_Name);
+
       return N;
    end Save_To_XML;
 
@@ -213,11 +214,10 @@ package body Browsers.Projects is
 
    overriding procedure Save_To_XML
      (Self : not null access Project_Link_Record;
-      Node : not null XML_Utils.Node_Ptr)
-   is
+      Node : not null XML_Utils.Node_Ptr) is
    begin
       if Self.Limited_With then
-         Set_Attribute (Node, "limited_with", "1");
+         XML_Utils.Set_Attribute (Node, "limited_with", "1");
       end if;
    end Save_To_XML;
 
@@ -231,7 +231,8 @@ package body Browsers.Projects is
    is
       P : constant Project_Type :=
         Get_Project_Tree (Self.Kernel).Project_From_Path
-        (Create (+Get_Attribute (Node, "path")));
+        (Create (+XML_Utils.Get_Attribute (Node, "path")));
+
    begin
       return Self.Add_Project_If_Not_Present (P);
    end Load_From_XML;
@@ -247,7 +248,7 @@ package body Browsers.Projects is
    begin
       Self.Add_Link_If_Not_Present
         (Project_Item (From), Project_Item (To),
-         Limited_With => Get_Attribute (Node, "limited_with") = "1");
+         Limited_With => XML_Utils.Get_Attribute (Node, "limited_with") = "1");
    end Load_From_XML;
 
    --------------------

browsers/src/browsers.adb

@@ -20,7 +20,6 @@ with GPS.Kernel.Preferences;   use GPS.Kernel.Preferences;
 with Gdk.RGBA;                 use Gdk.RGBA;
 with Gdk.Types;                use Gdk.Types;
 with Glib.Object;              use Glib, Glib.Object;
-with Gtk.Enums;                use Gtk.Enums;
 with Gtkada.Canvas_View.Views; use Gtkada.Canvas_View.Views;
 with Gtkada.Canvas_View;       use Gtkada.Canvas_View;
 with Pango.Enums;              use Pango.Enums;

browsers/src/browsers.ads

@@ -17,8 +17,8 @@
 
 with Glib;
 with Gtkada.Canvas_View;
-with Gtkada.Style;        use Gtkada.Style;
-with XML_Utils;           use XML_Utils;
+with Gtkada.Style; use Gtkada.Style;
+with XML_Utils;
 
 package Browsers is