From: Alexis Laferrière Date: Fri, 28 Aug 2015 18:07:31 +0000 (-0400) Subject: contrib & examples: update users of mnit implementations X-Git-Tag: v0.7.8~51^2~2 X-Git-Url: http://nitlanguage.org contrib & examples: update users of mnit implementations Signed-off-by: Alexis Laferrière --- diff --git a/contrib/crazy_moles/src/moles_android.nit b/contrib/crazy_moles/src/moles_android.nit index 1da39be..edf1251 100644 --- a/contrib/crazy_moles/src/moles_android.nit +++ b/contrib/crazy_moles/src/moles_android.nit @@ -16,7 +16,7 @@ module moles_android -import mnit_android +import mnit::android import android::portrait import moles diff --git a/contrib/crazy_moles/src/moles_linux.nit b/contrib/crazy_moles/src/moles_linux.nit index 66a645a..c46b29b 100644 --- a/contrib/crazy_moles/src/moles_linux.nit +++ b/contrib/crazy_moles/src/moles_linux.nit @@ -16,7 +16,7 @@ module moles_linux -import mnit_linux +import mnit::linux import moles import effects diff --git a/contrib/friendz/src/friendz_android.nit b/contrib/friendz/src/friendz_android.nit index e0dec75..4f40ca7 100644 --- a/contrib/friendz/src/friendz_android.nit +++ b/contrib/friendz/src/friendz_android.nit @@ -11,7 +11,7 @@ module friendz_android import friendz -import mnit_android +import mnit::android import android::landscape redef class App diff --git a/contrib/friendz/src/friendz_linux.nit b/contrib/friendz/src/friendz_linux.nit index 7940843..e8ada20 100644 --- a/contrib/friendz/src/friendz_linux.nit +++ b/contrib/friendz/src/friendz_linux.nit @@ -11,7 +11,7 @@ module friendz_linux import friendz -import mnit_linux +import mnit::linux redef class Display redef fun wanted_width do return app.screen_width diff --git a/contrib/inkscape_tools/tests/app/src/s2pn_android.nit b/contrib/inkscape_tools/tests/app/src/s2pn_android.nit index d91ade5..350a5b2 100644 --- a/contrib/inkscape_tools/tests/app/src/s2pn_android.nit +++ b/contrib/inkscape_tools/tests/app/src/s2pn_android.nit @@ -15,4 +15,4 @@ # limitations under the License. import s2pn -import mnit_android +import mnit::android diff --git a/contrib/inkscape_tools/tests/app/src/s2pn_linux.nit b/contrib/inkscape_tools/tests/app/src/s2pn_linux.nit index c7ce636..7cc5cee 100644 --- a/contrib/inkscape_tools/tests/app/src/s2pn_linux.nit +++ b/contrib/inkscape_tools/tests/app/src/s2pn_linux.nit @@ -15,4 +15,4 @@ # limitations under the License. import s2pn -import mnit_linux +import mnit::linux diff --git a/contrib/mnit_test/src/simple_android.nit b/contrib/mnit_test/src/simple_android.nit index bc5e69d..6e237d6 100644 --- a/contrib/mnit_test/src/simple_android.nit +++ b/contrib/mnit_test/src/simple_android.nit @@ -19,7 +19,7 @@ module simple_android is android_manifest """""" end -import mnit_android +import mnit::android import android::portrait import serialization diff --git a/contrib/mnit_test/src/simple_linux.nit b/contrib/mnit_test/src/simple_linux.nit index c0d8d0f..1ff4235 100644 --- a/contrib/mnit_test/src/simple_linux.nit +++ b/contrib/mnit_test/src/simple_linux.nit @@ -17,7 +17,7 @@ module simple_linux import simple -import mnit_linux +import mnit::linux import test_data_store diff --git a/contrib/tinks/src/client/android_client.nit b/contrib/tinks/src/client/android_client.nit index c90e3a4..376d5a6 100644 --- a/contrib/tinks/src/client/android_client.nit +++ b/contrib/tinks/src/client/android_client.nit @@ -20,7 +20,7 @@ module android_client is android_api_target 10 end -import mnit_android +import mnit::android import android::audio import android::vibration import android::landscape diff --git a/contrib/tinks/src/client/linux_client.nit b/contrib/tinks/src/client/linux_client.nit index d464cc8..6ef6b15 100644 --- a/contrib/tinks/src/client/linux_client.nit +++ b/contrib/tinks/src/client/linux_client.nit @@ -15,7 +15,7 @@ # GNU/Linux client with config saved to `config.json` module linux_client -import mnit_linux +import mnit::linux import linux::audio import json::serialization diff --git a/examples/mnit_ballz/src/game_logic.nit b/examples/mnit_ballz/src/game_logic.nit index 38cf9e5..7ece167 100644 --- a/examples/mnit_ballz/src/game_logic.nit +++ b/examples/mnit_ballz/src/game_logic.nit @@ -16,7 +16,7 @@ module game_logic -import mnit_android +import mnit::android import android::sensors class Ball diff --git a/examples/mnit_dino/src/dino_android.nit b/examples/mnit_dino/src/dino_android.nit index be92d49..ebf1eaf 100644 --- a/examples/mnit_dino/src/dino_android.nit +++ b/examples/mnit_dino/src/dino_android.nit @@ -20,7 +20,7 @@ end import dino -import mnit_android +import mnit::android import android::portrait import android::vibration diff --git a/examples/mnit_dino/src/dino_linux.nit b/examples/mnit_dino/src/dino_linux.nit index 757cc0b..5d7f97d 100644 --- a/examples/mnit_dino/src/dino_linux.nit +++ b/examples/mnit_dino/src/dino_linux.nit @@ -18,7 +18,7 @@ module dino_linux import dino -import mnit_linux +import mnit::linux redef class ImageSet redef fun start_over_path do return "images/play_again.png" diff --git a/examples/shoot/src/shoot_android.nit b/examples/shoot/src/shoot_android.nit index 22b9b35..4de7f66 100644 --- a/examples/shoot/src/shoot_android.nit +++ b/examples/shoot/src/shoot_android.nit @@ -16,6 +16,6 @@ module shoot_android import shoot -import mnit_android +import mnit::android super diff --git a/examples/shoot/src/shoot_linux.nit b/examples/shoot/src/shoot_linux.nit index 6b80432..1587d36 100644 --- a/examples/shoot/src/shoot_linux.nit +++ b/examples/shoot/src/shoot_linux.nit @@ -16,6 +16,6 @@ module shoot_linux import shoot -import mnit_linux +import mnit::linux super diff --git a/lib/android/input_events.nit b/lib/android/input_events.nit index cbb10b1..c1709ae 100644 --- a/lib/android/input_events.nit +++ b/lib/android/input_events.nit @@ -17,7 +17,7 @@ # Pointer and hardware key events module input_events -import mnit_input +import mnit::input import android in "C header" `{ diff --git a/lib/glesv2/examples/opengles2_hello_triangle.nit b/lib/glesv2/examples/opengles2_hello_triangle.nit index 6389e09..48d49ab 100644 --- a/lib/glesv2/examples/opengles2_hello_triangle.nit +++ b/lib/glesv2/examples/opengles2_hello_triangle.nit @@ -22,7 +22,7 @@ module opengles2_hello_triangle import glesv2 import egl -import mnit_linux::sdl +import sdl import x11 if "NIT_TESTING".environ == "true" then exit(0) diff --git a/lib/mnit/android/android_app.nit b/lib/mnit/android/android_app.nit index 41ed7f8..61af9df 100644 --- a/lib/mnit/android/android_app.nit +++ b/lib/mnit/android/android_app.nit @@ -21,8 +21,8 @@ module android_app is android_manifest_activity """ """ import mnit -import android import mnit::opengles1 +import ::android intrude import ::android::input_events in "C" `{ diff --git a/lib/mnit/android/android_opengles1.nit b/lib/mnit/android/android_opengles1.nit index 71e59aa..b85db15 100644 --- a/lib/mnit/android/android_opengles1.nit +++ b/lib/mnit/android/android_opengles1.nit @@ -19,7 +19,6 @@ module android_opengles1 is ldflags "-lEGL -lGLESv1_CM" import android_app -import android in "C" `{ #include diff --git a/lib/mnit/assets.nit b/lib/mnit/assets.nit index d46b5e4..337304a 100644 --- a/lib/mnit/assets.nit +++ b/lib/mnit/assets.nit @@ -18,7 +18,7 @@ module assets import mnit_app -import mnit_display +import mnit::display # General asset interface Asset diff --git a/lib/mnit/linux/linux_app.nit b/lib/mnit/linux/linux_app.nit index 45d15c1..938bfd8 100644 --- a/lib/mnit/linux/linux_app.nit +++ b/lib/mnit/linux/linux_app.nit @@ -19,7 +19,7 @@ module linux_app import mnit import sdl import linux_opengles1 -import linux +import ::linux in "C" `{ #include diff --git a/lib/mnit/mnit_app.nit b/lib/mnit/mnit_app.nit index 9987b8c..4ae8b89 100644 --- a/lib/mnit/mnit_app.nit +++ b/lib/mnit/mnit_app.nit @@ -18,7 +18,7 @@ module mnit_app import ::app -import mnit_display +import mnit::display # An App instance serves as base to every Mnit projects. # diff --git a/lib/mnit/opengles1.nit b/lib/mnit/opengles1.nit index 3ee92fe..e2b02bc 100644 --- a/lib/mnit/opengles1.nit +++ b/lib/mnit/opengles1.nit @@ -17,7 +17,7 @@ # OpenGL ES1 general support (most of it) module opengles1 is pkgconfig("glesv1_cm", "egl") -import mnit_display +import mnit::display in "C header" `{ #include diff --git a/lib/mnit/tileset.nit b/lib/mnit/tileset.nit index c9dbb16..3193993 100644 --- a/lib/mnit/tileset.nit +++ b/lib/mnit/tileset.nit @@ -15,7 +15,7 @@ # Manage images that are tileset or glyphset (for bitmap fonts) module tileset -import mnit_display +import mnit::display # Efficiently retrieve tiles in a big image class TileSet diff --git a/lib/sdl.nit b/lib/sdl.nit index db0f700..04d9fac 100644 --- a/lib/sdl.nit +++ b/lib/sdl.nit @@ -20,7 +20,7 @@ module sdl is ldflags(exec("sdl-config", "--libs"), "-lSDL_image -lSDL_ttf") end -import mnit_display +import mnit::display import c in "C header" `{