Changed System.Address to Integer_Address

1 files changed, 21 insertions, 24 deletions

diff --git a/src/fltk-widgets-clocks.adb b/src/fltk-widgets-clocks.adb
index cf83757..736fd73 100644
--- a/src/fltk-widgets-clocks.adb
+++ b/src/fltk-widgets-clocks.adb
@@ -2,24 +2,19 @@
 
 with
 
-    Interfaces.C.Strings,
-    System;
-
-use type
-
-    System.Address;
+    Interfaces.C.Strings;
 
 
 package body FLTK.Widgets.Clocks is
 
 
     procedure clock_output_set_draw_hook
-           (W, D : in System.Address);
+           (W, D : in Storage.Integer_Address);
     pragma Import (C, clock_output_set_draw_hook, "clock_output_set_draw_hook");
     pragma Inline (clock_output_set_draw_hook);
 
     procedure clock_output_set_handle_hook
-           (W, H : in System.Address);
+           (W, H : in Storage.Integer_Address);
     pragma Import (C, clock_output_set_handle_hook, "clock_output_set_handle_hook");
     pragma Inline (clock_output_set_handle_hook);
 
@@ -29,12 +24,12 @@ package body FLTK.Widgets.Clocks is
     function new_fl_clock_output
            (X, Y, W, H : in Interfaces.C.int;
             Text       : in Interfaces.C.char_array)
-        return System.Address;
+        return Storage.Integer_Address;
     pragma Import (C, new_fl_clock_output, "new_fl_clock_output");
     pragma Inline (new_fl_clock_output);
 
     procedure free_fl_clock_output
-           (F : in System.Address);
+           (F : in Storage.Integer_Address);
     pragma Import (C, free_fl_clock_output, "free_fl_clock_output");
     pragma Inline (free_fl_clock_output);
 
@@ -42,19 +37,19 @@ package body FLTK.Widgets.Clocks is
 
 
     function fl_clock_output_get_hour
-           (C : in System.Address)
+           (C : in Storage.Integer_Address)
         return Interfaces.C.int;
     pragma Import (C, fl_clock_output_get_hour, "fl_clock_output_get_hour");
     pragma Inline (fl_clock_output_get_hour);
 
     function fl_clock_output_get_minute
-           (C : in System.Address)
+           (C : in Storage.Integer_Address)
         return Interfaces.C.int;
     pragma Import (C, fl_clock_output_get_minute, "fl_clock_output_get_minute");
     pragma Inline (fl_clock_output_get_minute);
 
     function fl_clock_output_get_second
-           (C : in System.Address)
+           (C : in Storage.Integer_Address)
         return Interfaces.C.int;
     pragma Import (C, fl_clock_output_get_second, "fl_clock_output_get_second");
     pragma Inline (fl_clock_output_get_second);
@@ -63,19 +58,19 @@ package body FLTK.Widgets.Clocks is
 
 
     function fl_clock_output_get_value
-           (C : in System.Address)
+           (C : in Storage.Integer_Address)
         return Interfaces.C.unsigned_long;
     pragma Import (C, fl_clock_output_get_value, "fl_clock_output_get_value");
     pragma Inline (fl_clock_output_get_value);
 
     procedure fl_clock_output_set_value
-           (C : in System.Address;
+           (C : in Storage.Integer_Address;
             V : in Interfaces.C.unsigned_long);
     pragma Import (C, fl_clock_output_set_value, "fl_clock_output_set_value");
     pragma Inline (fl_clock_output_set_value);
 
     procedure fl_clock_output_set_value2
-           (C       : in System.Address;
+           (C       : in Storage.Integer_Address;
             H, M, S : in Interfaces.C.int);
     pragma Import (C, fl_clock_output_set_value2, "fl_clock_output_set_value2");
     pragma Inline (fl_clock_output_set_value2);
@@ -84,18 +79,18 @@ package body FLTK.Widgets.Clocks is
 
 
     procedure fl_clock_output_draw
-           (W : in System.Address);
+           (W : in Storage.Integer_Address);
     pragma Import (C, fl_clock_output_draw, "fl_clock_output_draw");
     pragma Inline (fl_clock_output_draw);
 
     procedure fl_clock_output_draw2
-           (C          : in System.Address;
+           (C          : in Storage.Integer_Address;
             X, Y, W, H : in Interfaces.C.int);
     pragma Import (C, fl_clock_output_draw2, "fl_clock_output_draw2");
     pragma Inline (fl_clock_output_draw2);
 
     function fl_clock_output_handle
-           (W : in System.Address;
+           (W : in Storage.Integer_Address;
             E : in Interfaces.C.int)
         return Interfaces.C.int;
     pragma Import (C, fl_clock_output_handle, "fl_clock_output_handle");
@@ -107,11 +102,11 @@ package body FLTK.Widgets.Clocks is
     procedure Finalize
            (This : in out Clock) is
     begin
-        if  This.Void_Ptr /= System.Null_Address and then
+        if  This.Void_Ptr /= Null_Pointer and then
             This in Clock'Class
         then
             free_fl_clock_output (This.Void_Ptr);
-            This.Void_Ptr := System.Null_Address;
+            This.Void_Ptr := Null_Pointer;
         end if;
         Finalize (Widget (This));
     end Finalize;
@@ -135,9 +130,11 @@ package body FLTK.Widgets.Clocks is
                         Interfaces.C.To_C (Text));
                 fl_widget_set_user_data
                        (This.Void_Ptr,
-                        Widget_Convert.To_Address (This'Unchecked_Access));
-                clock_output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
-                clock_output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address);
+                        Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access)));
+                clock_output_set_draw_hook
+                    (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address));
+                clock_output_set_handle_hook
+                    (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address));
                 fl_widget_set_label (This.Void_Ptr, Interfaces.C.To_C (Text));
             end return;
         end Create;