From 7aa86670f5d76284ae193ed1e1ed936b20a5c5fb Mon Sep 17 00:00:00 2001
From: Jed Barber <jjbarber@y7mail.com>
Date: Fri, 11 Nov 2016 14:45:30 +1100
Subject: Removed some superfluous with clauses

---
 src/adapad.adb          | 2 --
 src/windows-about.adb   | 4 +---
 src/windows-editor.adb  | 1 -
 src/windows-find.adb    | 5 +----
 src/windows-find.ads    | 2 --
 src/windows-replace.adb | 5 +----
 src/windows-replace.ads | 2 --
 src/windows.adb         | 7 ++-----
 8 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/adapad.adb b/src/adapad.adb
index 3868877..3a0ce97 100644
--- a/src/adapad.adb
+++ b/src/adapad.adb
@@ -1,7 +1,5 @@
 
 
-with FLTK;
-with FLTK.Widgets;
 with FLTK.Widgets.Menus;
 with FLTK.Widgets.Groups.Windows;
 with FLTK.Text_Buffers;
diff --git a/src/windows-about.adb b/src/windows-about.adb
index a0845b8..27b8373 100644
--- a/src/windows-about.adb
+++ b/src/windows-about.adb
@@ -1,6 +1,5 @@
 
 
-with FLTK.Widgets;
 with FLTK.Widgets.Groups.Windows.Double;
 with FLTK.Widgets.Boxes;
 with FLTK.Widgets.Buttons.Enter;
@@ -9,7 +8,6 @@ with FLTK.Widgets.Buttons.Enter;
 package body Windows.About is
 
 
-    package W  renames FLTK.Widgets;
     package WD renames FLTK.Widgets.Groups.Windows.Double;
     package BX renames FLTK.Widgets.Boxes;
     package EN renames FLTK.Widgets.Buttons.Enter;
@@ -61,7 +59,7 @@ package body Windows.About is
             This.Add (This.Picture);
             This.Picture.Set_Image (Logo);
             This.Add (This.Heading);
-            This.Heading.Set_Label_Size (W.Font_Size (Heading_Size));
+            This.Heading.Set_Label_Size (FLTK.Widgets.Font_Size (Heading_Size));
             This.Add (This.Blurb);
             This.Add (This.Author);
             This.Add (This.Dismiss);
diff --git a/src/windows-editor.adb b/src/windows-editor.adb
index 7f303fe..e961d4a 100644
--- a/src/windows-editor.adb
+++ b/src/windows-editor.adb
@@ -3,7 +3,6 @@
 with FLTK.Enums; use FLTK.Enums;
 with FLTK.Widgets.Groups.Windows.Double;
 with FLTK.Widgets.Groups.Text_Displays.Text_Editors;
-with FLTK.Widgets.Menus;
 with FLTK.Widgets.Menus.Menu_Bars;
 with FLTK.Text_Buffers;
 
diff --git a/src/windows-find.adb b/src/windows-find.adb
index f061ba3..4f76338 100644
--- a/src/windows-find.adb
+++ b/src/windows-find.adb
@@ -1,9 +1,7 @@
 
 
-with FLTK.Widgets;
 with FLTK.Widgets.Groups.Windows.Double;
 with FLTK.Widgets.Inputs;
-with FLTK.Widgets.Buttons;
 with FLTK.Widgets.Buttons.Enter;
 with FLTK.Widgets.Buttons.Light.Check;
 
@@ -11,7 +9,6 @@ with FLTK.Widgets.Buttons.Light.Check;
 package body Windows.Find is
 
 
-    package W  renames FLTK.Widgets;
     package WD renames FLTK.Widgets.Groups.Windows.Double;
     package IP renames FLTK.Widgets.Inputs;
     package BU renames FLTK.Widgets.Buttons;
@@ -22,7 +19,7 @@ package body Windows.Find is
 
 
     procedure Find_M
-           (Item : in out W.Widget'Class)
+           (Item : in out FLTK.Widgets.Widget'Class)
     is
         use type BU.State;
         type Find_Window_Access is access all Find_Window;
diff --git a/src/windows-find.ads b/src/windows-find.ads
index 3708d0d..5931e5f 100644
--- a/src/windows-find.ads
+++ b/src/windows-find.ads
@@ -1,9 +1,7 @@
 
 
 with FLTK.Widgets.Groups.Windows.Double;
-with FLTK.Widgets;  --  this cannot be made private and I don't know why
 private with FLTK.Widgets.Inputs;
-private with FLTK.Widgets.Buttons;
 private with FLTK.Widgets.Buttons.Enter;
 private with FLTK.Widgets.Buttons.Light.Check;
 
diff --git a/src/windows-replace.adb b/src/windows-replace.adb
index f158f7b..83e328d 100644
--- a/src/windows-replace.adb
+++ b/src/windows-replace.adb
@@ -1,9 +1,7 @@
 
 
-with FLTK.Widgets;
 with FLTK.Widgets.Groups.Windows.Double;
 with FLTK.Widgets.Inputs;
-with FLTK.Widgets.Buttons;
 with FLTK.Widgets.Buttons.Enter;
 with FLTK.Widgets.Buttons.Light.Check;
 
@@ -11,7 +9,6 @@ with FLTK.Widgets.Buttons.Light.Check;
 package body Windows.Replace is
 
 
-    package W  renames FLTK.Widgets;
     package WD renames FLTK.Widgets.Groups.Windows.Double;
     package IP renames FLTK.Widgets.Inputs;
     package BU renames FLTK.Widgets.Buttons;
@@ -22,7 +19,7 @@ package body Windows.Replace is
 
 
     procedure Replace_M
-           (Item : in out W.Widget'Class)
+           (Item : in out FLTK.Widgets.Widget'Class)
     is
         use type BU.State;
         type Replace_Window_Access is access all Replace_Window;
diff --git a/src/windows-replace.ads b/src/windows-replace.ads
index 1525859..64ff562 100644
--- a/src/windows-replace.ads
+++ b/src/windows-replace.ads
@@ -1,9 +1,7 @@
 
 
 with FLTK.Widgets.Groups.Windows.Double;
-with FLTK.Widgets;  --  this cannot be made private and I don't know why
 private with FLTK.Widgets.Inputs;
-private with FLTK.Widgets.Buttons;
 private with FLTK.Widgets.Buttons.Enter;
 private with FLTK.Widgets.Buttons.Light.Check;
 
diff --git a/src/windows.adb b/src/windows.adb
index bf070a4..3c2020d 100644
--- a/src/windows.adb
+++ b/src/windows.adb
@@ -1,6 +1,5 @@
 
 
-with FLTK.Widgets;
 with FLTK.Widgets.Groups;
 with FLTK.Widgets.Groups.Windows;
 
@@ -8,8 +7,6 @@ with FLTK.Widgets.Groups.Windows;
 package body Windows is
 
 
-    package W  renames FLTK.Widgets;
-    package G  renames FLTK.Widgets.Groups;
     package WN renames FLTK.Widgets.Groups.Windows;
 
 
@@ -19,9 +16,9 @@ package body Windows is
     --  of constantly creating and destroying them
 
     procedure Hide_CB
-           (Item : in out W.Widget'Class)
+           (Item : in out FLTK.Widgets.Widget'Class)
     is
-        P : access G.Group'Class;
+        P : access FLTK.Widgets.Groups.Group'Class;
     begin
         if Item in WN.Window'Class then
             WN.Window (Item).Hide;
-- 
cgit