Package renames for avoiding name clashes and abbreviations

10 files changed, 58 insertions, 58 deletions

diff --git a/src/fltk-dialogs.adb b/src/fltk-asks.adb
index 59137f2..880c4c8 100644
--- a/src/fltk-dialogs.adb
+++ b/src/fltk-asks.adb
@@ -14,7 +14,7 @@ use type
     Interfaces.C.Strings.chars_ptr;
 
 
-package body FLTK.Dialogs is
+package body FLTK.Asks is
 
 
     procedure dialog_fl_alert
@@ -341,5 +341,5 @@ begin
     Wrapper (Icon_Box).Needs_Dealloc := False;
 
 
-end FLTK.Dialogs;
+end FLTK.Asks;
 
diff --git a/src/fltk-dialogs.ads b/src/fltk-asks.ads
index 9574e4f..cfe0522 100644
--- a/src/fltk-dialogs.ads
+++ b/src/fltk-asks.ads
@@ -10,7 +10,7 @@ with
     FLTK.Widgets.Groups.Color_Choosers;
 
 
-package FLTK.Dialogs is
+package FLTK.Asks is
 
 
     type Beep_Kind is
@@ -133,5 +133,5 @@ private
     pragma Inline (Set_Message_Title_Default);
 
 
-end FLTK.Dialogs;
+end FLTK.Asks;
 
diff --git a/src/fltk-widgets-inputs-float.adb b/src/fltk-widgets-inputs-floating_point.adb
index 248b9ad..68b7fe6 100644
--- a/src/fltk-widgets-inputs-float.adb
+++ b/src/fltk-widgets-inputs-floating_point.adb
@@ -13,7 +13,7 @@ use type
     Interfaces.C.Strings.chars_ptr;
 
 
-package body FLTK.Widgets.Inputs.Float is
+package body FLTK.Widgets.Inputs.Floating_Point is
 
 
     procedure float_input_set_draw_hook
@@ -117,7 +117,7 @@ package body FLTK.Widgets.Inputs.Float is
 
     function Get_Value
            (This : in Float_Input)
-        return Standard.Float
+        return Long_Float
     is
         Ptr : Interfaces.C.Strings.chars_ptr := fl_input_get_value (This.Void_Ptr);
     begin
@@ -126,7 +126,7 @@ package body FLTK.Widgets.Inputs.Float is
         then
             return 0.0;
         else
-            return Standard.Float'Value (Interfaces.C.Strings.Value (Ptr));
+            return Long_Float'Value (Interfaces.C.Strings.Value (Ptr));
         end if;
     end Get_Value;
 
@@ -150,5 +150,5 @@ package body FLTK.Widgets.Inputs.Float is
     end Handle;
 
 
-end FLTK.Widgets.Inputs.Float;
+end FLTK.Widgets.Inputs.Floating_Point;
 
diff --git a/src/fltk-widgets-inputs-float.ads b/src/fltk-widgets-inputs-floating_point.ads
index 6e009a4..dcc19de 100644
--- a/src/fltk-widgets-inputs-float.ads
+++ b/src/fltk-widgets-inputs-floating_point.ads
@@ -4,7 +4,7 @@
 --  Released into the public domain
 
 
-package FLTK.Widgets.Inputs.Float is
+package FLTK.Widgets.Inputs.Floating_Point is
 
 
     type Float_Input is new Input with private;
@@ -29,7 +29,7 @@ package FLTK.Widgets.Inputs.Float is
 
     function Get_Value
            (This : in Float_Input)
-        return Standard.Float;
+        return Long_Float;
 
 
 
@@ -68,5 +68,5 @@ private
     pragma Inline (Handle);
 
 
-end FLTK.Widgets.Inputs.Float;
+end FLTK.Widgets.Inputs.Floating_Point;
 
diff --git a/src/fltk-widgets-inputs-integer.adb b/src/fltk-widgets-inputs-whole_number.adb
index 401ca7c..0709506 100644
--- a/src/fltk-widgets-inputs-integer.adb
+++ b/src/fltk-widgets-inputs-whole_number.adb
@@ -13,7 +13,7 @@ use type
     Interfaces.C.Strings.chars_ptr;
 
 
-package body FLTK.Widgets.Inputs.Integer is
+package body FLTK.Widgets.Inputs.Whole_Number is
 
 
     procedure int_input_set_draw_hook
@@ -115,7 +115,7 @@ package body FLTK.Widgets.Inputs.Integer is
 
     function Get_Value
            (This : in Integer_Input)
-        return Standard.Integer
+        return Long_Integer
     is
         Ptr : Interfaces.C.Strings.chars_ptr := fl_input_get_value (This.Void_Ptr);
     begin
@@ -124,7 +124,7 @@ package body FLTK.Widgets.Inputs.Integer is
         then
             return 0;
         else
-            return Standard.Integer'Value (Interfaces.C.Strings.Value (Ptr));
+            return Long_Integer'Value (Interfaces.C.Strings.Value (Ptr));
         end if;
     end Get_Value;
 
@@ -148,5 +148,5 @@ package body FLTK.Widgets.Inputs.Integer is
     end Handle;
 
 
-end FLTK.Widgets.Inputs.Integer;
+end FLTK.Widgets.Inputs.Whole_Number;
 
diff --git a/src/fltk-widgets-inputs-integer.ads b/src/fltk-widgets-inputs-whole_number.ads
index fb76662..d9a9787 100644
--- a/src/fltk-widgets-inputs-integer.ads
+++ b/src/fltk-widgets-inputs-whole_number.ads
@@ -4,7 +4,7 @@
 --  Released into the public domain
 
 
-package FLTK.Widgets.Inputs.Integer is
+package FLTK.Widgets.Inputs.Whole_Number is
 
 
     type Integer_Input is new Input with private;
@@ -29,7 +29,7 @@ package FLTK.Widgets.Inputs.Integer is
 
     function Get_Value
            (This : in Integer_Input)
-        return Standard.Integer;
+        return Long_Integer;
 
 
 
@@ -68,5 +68,5 @@ private
     pragma Inline (Handle);
 
 
-end FLTK.Widgets.Inputs.Integer;
+end FLTK.Widgets.Inputs.Whole_Number;
 
diff --git a/src/fltk-widgets-valuators-sliders-hor_fill.adb b/src/fltk-widgets-valuators-sliders-horizontal_fill.adb
index 1b0e7ea..e14e230 100644
--- a/src/fltk-widgets-valuators-sliders-hor_fill.adb
+++ b/src/fltk-widgets-valuators-sliders-horizontal_fill.adb
@@ -9,7 +9,7 @@ with
     Interfaces.C.Strings;
 
 
-package body FLTK.Widgets.Valuators.Sliders.Hor_Fill is
+package body FLTK.Widgets.Valuators.Sliders.Horizontal_Fill is
 
 
     procedure hor_fill_slider_set_draw_hook
@@ -56,14 +56,14 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Fill is
 
 
     procedure Extra_Final
-           (This : in out Hor_Fill_Slider) is
+           (This : in out Horizontal_Fill_Slider) is
     begin
         Extra_Final (Slider (This));
     end Extra_Final;
 
 
     procedure Finalize
-           (This : in out Hor_Fill_Slider) is
+           (This : in out Horizontal_Fill_Slider) is
     begin
         Extra_Final (This);
         if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
@@ -76,7 +76,7 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Fill is
 
 
     procedure Extra_Init
-           (This       : in out Hor_Fill_Slider;
+           (This       : in out Horizontal_Fill_Slider;
             X, Y, W, H : in     Integer;
             Text       : in     String) is
     begin
@@ -89,9 +89,9 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Fill is
         function Create
                (X, Y, W, H : in Integer;
                 Text       : in String := "")
-            return Hor_Fill_Slider is
+            return Horizontal_Fill_Slider is
         begin
-            return This : Hor_Fill_Slider do
+            return This : Horizontal_Fill_Slider do
                 This.Void_Ptr := new_fl_hor_fill_slider
                        (Interfaces.C.int (X),
                         Interfaces.C.int (Y),
@@ -112,14 +112,14 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Fill is
 
 
     procedure Draw
-           (This : in out Hor_Fill_Slider) is
+           (This : in out Horizontal_Fill_Slider) is
     begin
         fl_hor_fill_slider_draw (This.Void_Ptr);
     end Draw;
 
 
     function Handle
-           (This  : in out Hor_Fill_Slider;
+           (This  : in out Horizontal_Fill_Slider;
             Event : in     Event_Kind)
         return Event_Outcome is
     begin
@@ -128,5 +128,5 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Fill is
     end Handle;
 
 
-end FLTK.Widgets.Valuators.Sliders.Hor_Fill;
+end FLTK.Widgets.Valuators.Sliders.Horizontal_Fill;
 
diff --git a/src/fltk-widgets-valuators-sliders-hor_fill.ads b/src/fltk-widgets-valuators-sliders-horizontal_fill.ads
index b4142c3..9047552 100644
--- a/src/fltk-widgets-valuators-sliders-hor_fill.ads
+++ b/src/fltk-widgets-valuators-sliders-horizontal_fill.ads
@@ -4,12 +4,12 @@
 --  Released into the public domain
 
 
-package FLTK.Widgets.Valuators.Sliders.Hor_Fill is
+package FLTK.Widgets.Valuators.Sliders.Horizontal_Fill is
 
 
-    type Hor_Fill_Slider is new Slider with private;
+    type Horizontal_Fill_Slider is new Slider with private;
 
-    type Hor_Fill_Slider_Reference (Data : not null access Hor_Fill_Slider'Class) is
+    type Horizontal_Fill_Slider_Reference (Data : not null access Horizontal_Fill_Slider'Class) is
         limited null record with Implicit_Dereference => Data;
 
 
@@ -20,7 +20,7 @@ package FLTK.Widgets.Valuators.Sliders.Hor_Fill is
         function Create
                (X, Y, W, H : in Integer;
                 Text       : in String := "")
-            return Hor_Fill_Slider;
+            return Horizontal_Fill_Slider;
 
     end Forge;
 
@@ -28,10 +28,10 @@ package FLTK.Widgets.Valuators.Sliders.Hor_Fill is
 
 
     procedure Draw
-           (This : in out Hor_Fill_Slider);
+           (This : in out Horizontal_Fill_Slider);
 
     function Handle
-           (This  : in out Hor_Fill_Slider;
+           (This  : in out Horizontal_Fill_Slider;
             Event : in     Event_Kind)
         return Event_Outcome;
 
@@ -39,19 +39,19 @@ package FLTK.Widgets.Valuators.Sliders.Hor_Fill is
 private
 
 
-    type Hor_Fill_Slider is new Slider with null record;
+    type Horizontal_Fill_Slider is new Slider with null record;
 
     overriding procedure Finalize
-           (This : in out Hor_Fill_Slider);
+           (This : in out Horizontal_Fill_Slider);
 
     procedure Extra_Init
-           (This       : in out Hor_Fill_Slider;
+           (This       : in out Horizontal_Fill_Slider;
             X, Y, W, H : in     Integer;
             Text       : in     String)
     with Inline;
 
     procedure Extra_Final
-           (This : in out Hor_Fill_Slider)
+           (This : in out Horizontal_Fill_Slider)
     with Inline;
 
 
@@ -59,5 +59,5 @@ private
     pragma Inline (Handle);
 
 
-end FLTK.Widgets.Valuators.Sliders.Hor_Fill;
+end FLTK.Widgets.Valuators.Sliders.Horizontal_Fill;
 
diff --git a/src/fltk-widgets-valuators-sliders-hor_nice.adb b/src/fltk-widgets-valuators-sliders-horizontal_nice.adb
index f6a0751..f6b8e90 100644
--- a/src/fltk-widgets-valuators-sliders-hor_nice.adb
+++ b/src/fltk-widgets-valuators-sliders-horizontal_nice.adb
@@ -9,7 +9,7 @@ with
     Interfaces.C.Strings;
 
 
-package body FLTK.Widgets.Valuators.Sliders.Hor_Nice is
+package body FLTK.Widgets.Valuators.Sliders.Horizontal_Nice is
 
 
     procedure hor_nice_slider_set_draw_hook
@@ -56,14 +56,14 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Nice is
 
 
     procedure Extra_Final
-           (This : in out Hor_Nice_Slider) is
+           (This : in out Horizontal_Nice_Slider) is
     begin
         Extra_Final (Slider (This));
     end Extra_Final;
 
 
     procedure Finalize
-           (This : in out Hor_Nice_Slider) is
+           (This : in out Horizontal_Nice_Slider) is
     begin
         Extra_Final (This);
         if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
@@ -76,7 +76,7 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Nice is
 
 
     procedure Extra_Init
-           (This       : in out Hor_Nice_Slider;
+           (This       : in out Horizontal_Nice_Slider;
             X, Y, W, H : in     Integer;
             Text       : in     String) is
     begin
@@ -89,9 +89,9 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Nice is
         function Create
                (X, Y, W, H : in Integer;
                 Text       : in String := "")
-            return Hor_Nice_Slider is
+            return Horizontal_Nice_Slider is
         begin
-            return This : Hor_Nice_Slider do
+            return This : Horizontal_Nice_Slider do
                 This.Void_Ptr := new_fl_hor_nice_slider
                        (Interfaces.C.int (X),
                         Interfaces.C.int (Y),
@@ -112,14 +112,14 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Nice is
 
 
     procedure Draw
-           (This : in out Hor_Nice_Slider) is
+           (This : in out Horizontal_Nice_Slider) is
     begin
         fl_hor_nice_slider_draw (This.Void_Ptr);
     end Draw;
 
 
     function Handle
-           (This  : in out Hor_Nice_Slider;
+           (This  : in out Horizontal_Nice_Slider;
             Event : in     Event_Kind)
         return Event_Outcome is
     begin
@@ -128,5 +128,5 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Nice is
     end Handle;
 
 
-end FLTK.Widgets.Valuators.Sliders.Hor_Nice;
+end FLTK.Widgets.Valuators.Sliders.Horizontal_Nice;
 
diff --git a/src/fltk-widgets-valuators-sliders-hor_nice.ads b/src/fltk-widgets-valuators-sliders-horizontal_nice.ads
index 9ebb06b..f2af349 100644
--- a/src/fltk-widgets-valuators-sliders-hor_nice.ads
+++ b/src/fltk-widgets-valuators-sliders-horizontal_nice.ads
@@ -4,12 +4,12 @@
 --  Released into the public domain
 
 
-package FLTK.Widgets.Valuators.Sliders.Hor_Nice is
+package FLTK.Widgets.Valuators.Sliders.Horizontal_Nice is
 
 
-    type Hor_Nice_Slider is new Slider with private;
+    type Horizontal_Nice_Slider is new Slider with private;
 
-    type Hor_Nice_Slider_Reference (Data : not null access Hor_Nice_Slider'Class) is
+    type Horizontal_Nice_Slider_Reference (Data : not null access Horizontal_Nice_Slider'Class) is
         limited null record with Implicit_Dereference => Data;
 
 
@@ -20,7 +20,7 @@ package FLTK.Widgets.Valuators.Sliders.Hor_Nice is
         function Create
                (X, Y, W, H : in Integer;
                 Text       : in String := "")
-            return Hor_Nice_Slider;
+            return Horizontal_Nice_Slider;
 
     end Forge;
 
@@ -28,10 +28,10 @@ package FLTK.Widgets.Valuators.Sliders.Hor_Nice is
 
 
     procedure Draw
-           (This : in out Hor_Nice_Slider);
+           (This : in out Horizontal_Nice_Slider);
 
     function Handle
-           (This  : in out Hor_Nice_Slider;
+           (This  : in out Horizontal_Nice_Slider;
             Event : in     Event_Kind)
         return Event_Outcome;
 
@@ -39,19 +39,19 @@ package FLTK.Widgets.Valuators.Sliders.Hor_Nice is
 private
 
 
-    type Hor_Nice_Slider is new Slider with null record;
+    type Horizontal_Nice_Slider is new Slider with null record;
 
     overriding procedure Finalize
-           (This : in out Hor_Nice_Slider);
+           (This : in out Horizontal_Nice_Slider);
 
     procedure Extra_Init
-           (This       : in out Hor_Nice_Slider;
+           (This       : in out Horizontal_Nice_Slider;
             X, Y, W, H : in     Integer;
             Text       : in     String)
     with Inline;
 
     procedure Extra_Final
-           (This : in out Hor_Nice_Slider)
+           (This : in out Horizontal_Nice_Slider)
     with Inline;
 
 
@@ -59,5 +59,5 @@ private
     pragma Inline (Handle);
 
 
-end FLTK.Widgets.Valuators.Sliders.Hor_Nice;
+end FLTK.Widgets.Valuators.Sliders.Horizontal_Nice;