From 6efb4ef1249cd5bfb90cc41feac6d036ecd4c45a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Tue, 12 Jan 2016 14:00:48 -0500 Subject: [PATCH] lib/mnit: rename `Asset` to `MnitAsset` to fix conflict with `app::Asset` MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- lib/mnit/assets.nit | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/mnit/assets.nit b/lib/mnit/assets.nit index 337304a..b58c0be 100644 --- a/lib/mnit/assets.nit +++ b/lib/mnit/assets.nit @@ -21,24 +21,24 @@ import mnit_app import mnit::display # General asset -interface Asset +interface MnitAsset end # An String is an asset, returned from a text file redef class String - super Asset + super MnitAsset end # An Image is an asset redef interface Image - super Asset + super MnitAsset end redef class App # Load a genereal asset from file name # Will find the file within the assets/ directory # Crashes if file not found - fun load_asset( id: String ): Asset + fun load_asset( id: String ): MnitAsset do var asset = try_loading_asset( id ) if asset == null then # error @@ -63,5 +63,5 @@ redef class App end # Load an assets without error if not found - fun try_loading_asset( id: String ): nullable Asset is abstract + fun try_loading_asset( id: String ): nullable MnitAsset is abstract end -- 1.7.9.5