mnit: remove virtual type IE

There is no point in having specific input-event virtual type.
Most places do not even use IE but directly InputEvent.

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/lib/mnit/mnit_app.nit b/lib/mnit/mnit_app.nit
index db147f7..79c1ad2 100644 (file)
--- a/lib/mnit/mnit_app.nit
+++ b/lib/mnit/mnit_app.nit
@@ -25,7 +25,6 @@ import mnit_display
 # This class is redefed by plateforme modules and so
 # App can be specialized directly in the user app.
 redef class App
-       type IE: InputEvent
        type D: Display
        type I: Image
 

diff --git a/lib/mnit_android/android_app.nit b/lib/mnit_android/android_app.nit
index b10745f..7054153 100644 (file)
--- a/lib/mnit_android/android_app.nit
+++ b/lib/mnit_android/android_app.nit
@@ -206,7 +206,6 @@ extern class AndroidKeyEvent in "C" `{AInputEvent *`}
 end
 
 redef class App
-       redef type IE: AndroidInputEvent
        redef type D: Opengles1Display
 
        redef fun init_window

diff --git a/lib/mnit_display.nit b/lib/mnit_display.nit
index f04dadc..86b6b8d 100644 (file)
--- a/lib/mnit_display.nit
+++ b/lib/mnit_display.nit
@@ -100,9 +100,6 @@ end
 interface Display
        super Sized
        super Drawable
-
-       # InputEvent type associated to this display type
-       type IE: InputEvent
 end
 
 # General drawable display image

diff --git a/lib/mnit_linux/linux_app.nit b/lib/mnit_linux/linux_app.nit
index 4b599ed..b071182 100644 (file)
--- a/lib/mnit_linux/linux_app.nit
+++ b/lib/mnit_linux/linux_app.nit
@@ -25,7 +25,6 @@ in "C" `{
 `}
 
 redef class App
-       redef type IE: SDLInputEvent
        redef type D: Opengles1Display
        redef type I: Opengles1Image
 

diff --git a/lib/sdl.nit b/lib/sdl.nit
index 318b4a6..6863cfc 100644 (file)
--- a/lib/sdl.nit
+++ b/lib/sdl.nit
@@ -92,10 +92,10 @@ extern class SDLDisplay `{SDL_Surface *`}
                SDL_FillRect(recv, NULL, SDL_MapRGB(recv->format,ri,gi,bi));
        `}
 
-       fun events: Sequence[IE]
+       fun events: Sequence[SDLInputEvent]
        do
                var new_event: nullable Object = null
-               var events = new List[IE]
+               var events = new List[SDLInputEvent]
                loop
                        new_event = poll_event
                        if new_event != null then # new_event isa Event then #
@@ -107,7 +107,7 @@ extern class SDLDisplay `{SDL_Surface *`}
                return events
        end
 
-       private fun poll_event: nullable IE import SDLKeyEvent, SDLMouseButtonEvent, SDLMouseMotionEvent, SDLQuitEvent, NativeString.to_s, SDLMouseButtonEvent.as(nullable IE), SDLMouseMotionEvent.as(nullable IE), SDLKeyEvent.as(nullable IE), SDLQuitEvent.as(nullable IE) `{
+       private fun poll_event: nullable SDLInputEvent import SDLKeyEvent, SDLMouseButtonEvent, SDLMouseMotionEvent, SDLQuitEvent, NativeString.to_s, SDLMouseButtonEvent.as(nullable SDLInputEvent), SDLMouseMotionEvent.as(nullable SDLInputEvent), SDLKeyEvent.as(nullable SDLInputEvent), SDLQuitEvent.as(nullable SDLInputEvent) `{
                SDL_Event event;
 
                SDL_PumpEvents();
@@ -122,7 +122,7 @@ extern class SDLDisplay `{SDL_Surface *`}
                                                   SDL_GetKeyName(event.key.keysym.sym));
        #endif
 
-                                       return SDLKeyEvent_as_nullable_IE(
+                                       return SDLKeyEvent_as_nullable_SDLInputEvent(
                                                        new_SDLKeyEvent(NativeString_to_s(
                                                                SDL_GetKeyName(event.key.keysym.sym)),
                                                                event.type==SDL_KEYDOWN));
@@ -134,7 +134,7 @@ extern class SDLDisplay `{SDL_Surface *`}
                                                   event.motion.x, event.motion.y);
        #endif
 
-                                       return SDLMouseMotionEvent_as_nullable_IE(
+                                       return SDLMouseMotionEvent_as_nullable_SDLInputEvent(
                                                        new_SDLMouseMotionEvent(event.motion.x, event.motion.y,
                                                                event.motion.xrel, event.motion.yrel, SDL_GetMouseState(NULL, NULL)&SDL_BUTTON(1)));
 
@@ -144,7 +144,7 @@ extern class SDLDisplay `{SDL_Surface *`}
                                        printf("Mouse button \"%d\" pressed at (%d,%d)\n",
                                                   event.button.button, event.button.x, event.button.y);
        #endif
-                                       return SDLMouseButtonEvent_as_nullable_IE(
+                                       return SDLMouseButtonEvent_as_nullable_SDLInputEvent(
                                                        new_SDLMouseButtonEvent(event.button.x, event.button.y,
                                                                event.button.button, event.type == SDL_MOUSEBUTTONDOWN));
 
@@ -152,11 +152,11 @@ extern class SDLDisplay `{SDL_Surface *`}
        #ifdef DEBUG
                                        printf("Quit event\n");
        #endif
-                                       return SDLQuitEvent_as_nullable_IE(new_SDLQuitEvent());
+                                       return SDLQuitEvent_as_nullable_SDLInputEvent(new_SDLQuitEvent());
                        }
                }
 
-               return null_InputEvent();
+               return null_SDLInputEvent();
        `}
 
        # Set the position of the cursor to x,y