Fixed warnings (yglukhov#325)

editor/nakefile.nim

@@ -1,4 +1,4 @@
-import nimx.naketools
+import nimx/naketools
 
 beforeBuild = proc(b: Builder) =
     b.disableClosureCompiler = true

editor/nimxedit.nim

@@ -1,14 +1,14 @@
 import tables
 
-import nimx.matrixes
-import nimx.system_logger
-import nimx.animation
-import nimx.image
-import nimx.window
-import nimx.autotest
-import nimx.button, nimx.text_field
-import nimx.all_views
-import nimx.editor.edit_view
+import nimx/matrixes
+import nimx/system_logger
+import nimx/animation
+import nimx/image
+import nimx/window
+import nimx/autotest
+import nimx/button, nimx/text_field
+import nimx/all_views
+import nimx/editor/edit_view
 
 const isMobile = defined(ios) or defined(android)
 

nakefile.nim

@@ -1,4 +1,4 @@
-import nimx.naketools
+import nimx/naketools
 import osproc
 
 beforeBuild = proc(b: Builder) =

nimx/assets/android_asset_url_handler.nim

@@ -1,9 +1,9 @@
 import url_stream
 import jnim
-import android.ndk.aasset_manager
-import android.app.activity
-import android.content.res.asset_manager
-import android.content.context
+import android/ndk/aasset_manager
+import android/app/activity
+import android/content/res/asset_manager
+import android/content/context
 
 proc getAssetManager(): AAssetManager =
     result = currentActivity().getApplication().getAssets().getNative()

nimx/assets/asset_manager.nim

@@ -1,7 +1,7 @@
 import strutils, tables
 import variant
 import abstract_asset_bundle, asset_cache, url_stream, asset_loading, asset_loader
-import nimx.pathutils
+import nimx/pathutils
 
 type
     AssetManager* = ref object

nimx/assets/web_asset_bundle.nim

@@ -1,7 +1,7 @@
 import ospaths, strutils
 import abstract_asset_bundle, url_stream
 
-import nimx.pathutils
+import nimx/pathutils
 
 var resourceUrlMapper*: proc(p: string): string # Deprecated
 

nimx/assets/web_url_handler.nim

@@ -2,7 +2,7 @@ import url_stream
 import async_http_request except Handler
 import logging
 
-import nimx.http_request except Handler
+import nimx/http_request except Handler
 
 const web = defined(js) or defined(emscripten)
 
@@ -13,7 +13,7 @@ when web:
     import jsbind
 
     when defined(js):
-        import nimx.private.js_data_view_stream
+        import nimx/private/js_data_view_stream
 
     proc errorDesc(r: XMLHTTPRequest, url: string): URLLoadingError =
         var statusText = r.statusText
@@ -53,7 +53,7 @@ when web:
         oReq.send()
 
     when defined(emscripten):
-        import jsbind.emscripten
+        import jsbind/emscripten
 
         proc arrayBufferToString(arrayBuffer: JSObj): string {.inline.} =
             let r = EM_ASM_INT("""

nimx/autotest.nim

@@ -12,7 +12,7 @@ type UITestSuite* = ref object
 
 when defined(js) or defined(emscripten):
     when defined(emscripten):
-        import jsbind.emscripten
+        import jsbind/emscripten
 
     # When testing on Firefox, we have to use window.dump instead of console.log
     type FirefoxAutotestLogger = ref object of Logger
@@ -163,10 +163,10 @@ when false:
 var gTestsToRun: seq[string] # Test names which user wants to run
 
 when defined(js) or defined(emscripten):
-    import nimx.pathutils
+    import nimx/pathutils
 elif defined(android):
     import jnim
-    import android.app.activity, android.content.intent, android.os.base_bundle
+    import android/app/activity, android/content/intent, android/os/base_bundle
 else:
     import os
 

nimx/collection_view.nim

@@ -1,9 +1,9 @@
 import math
 
-import nimx.event
-import nimx.gesture_detector
-import nimx.types
-import nimx.view
+import nimx/event
+import nimx/gesture_detector
+import nimx/types
+import nimx/view
 
 type
     LayoutDirection* {.pure.} = enum

nimx/composition.nim

@@ -1,7 +1,7 @@
 import context, types, portable_gl, image
-import private.helper_macros
+import private/helper_macros
 import strutils, tables, hashes
-import nimsl.nimsl
+import nimsl/nimsl
 
 export portable_gl
 export context

nimx/context.nim

@@ -6,7 +6,7 @@ import font
 import image
 import math
 import portable_gl
-import nimsl.nimsl
+import nimsl/nimsl
 
 export matrixes
 
@@ -537,5 +537,5 @@ template withClippingRect*(c: GraphicsContext, r: Rect, body: typed) =
     body
     c.applyClippingRect(r, false)
 
-import private.text_drawing
+import private/text_drawing
 export text_drawing

nimx/cursor.nim

@@ -3,9 +3,9 @@ const appKit = defined(macosx) and not defined(ios)
 when defined(js) or defined(emscripten):
     import jsbind
     when defined(emscripten):
-        import jsbind.emscripten
+        import jsbind/emscripten
 elif appKit:
-    import darwin.app_kit as apkt
+    import darwin/app_kit as apkt
 else:
     import sdl2
 

nimx/drag_and_drop.nim

@@ -3,8 +3,8 @@ import types
 import class_registry
 import variant
 
-import nimx.image
-import nimx.pasteboard.pasteboard_item
+import nimx/image
+import nimx/pasteboard/pasteboard_item
 
 type DragSystem* = ref object
     rect*: Rect

nimx/editor/edit_view.nim

@@ -6,10 +6,10 @@ import inspector_panel
 import gesture_detector
 import window_event_handling
 
-import nimx.property_editors.autoresizing_mask_editor # Imported here to be registered in the propedit registry
-import nimx.serializers
-import nimx.key_commands
-import nimx.pasteboard.pasteboard
+import nimx/property_editors/autoresizing_mask_editor # Imported here to be registered in the propedit registry
+import nimx/serializers
+import nimx/key_commands
+import nimx/pasteboard/pasteboard
 
 import ui_document
 import grid_drawing

nimx/editor/grid_drawing.nim

@@ -1,5 +1,5 @@
-import nimx.context
-import nimx.types
+import nimx/context
+import nimx/types
 
 proc drawGrid*(bounds: Rect, gridSize: Size, shift = zeroSize) =
     let c = currentContext()

nimx/editor/tab_view.nim

@@ -1,8 +1,8 @@
 import math, strutils
-import nimx.view
-import nimx.context, nimx.matrixes
-import nimx.font
-import nimx.linear_layout, nimx.button, nimx.menu
+import nimx/view
+import nimx/context, nimx/matrixes
+import nimx/font
+import nimx/linear_layout, nimx/button, nimx/menu
 import nimx / [ view_event_handling, window_event_handling ]
 
 type

nimx/editor/ui_document.nim

@@ -1,9 +1,9 @@
 import json
 
-import nimx.undo_manager
-import nimx.view
-import nimx.serializers
-import nimx.resource
+import nimx/undo_manager
+import nimx/view
+import nimx/serializers
+import nimx/resource
 
 const savingAndLoadingEnabled* = not defined(js) and not defined(emscripten) and
         not defined(ios) and not defined(android)

nimx/expanding_view.nim

@@ -1,16 +1,16 @@
 import math
 
-import nimx.font
-import nimx.image
-import nimx.button
-import nimx.view
-import nimx.event
-import nimx.context
-import nimx.types
-import nimx.color
-
-import nimx.stack_view
-import nimx.common.expand_button
+import nimx/font
+import nimx/image
+import nimx/button
+import nimx/view
+import nimx/event
+import nimx/context
+import nimx/types
+import nimx/color
+
+import nimx/stack_view
+import nimx/common/expand_button
 
 const titleSize = 20.0
 const expandButtonSize = 20.0

nimx/font.nim

@@ -1,23 +1,23 @@
 import unicode, streams, logging
 
 import nimx / [ types, timer, portable_gl ]
-import nimx.private.font.font_data
+import nimx/private/font/font_data
 
 when defined(js):
-    import private.font.js_glyph_provider
+    import private/font/js_glyph_provider
     type GlyphProvider = JsGlyphProvider
 else:
-    import private.font.stb_ttf_glyph_provider
+    import private/font/stb_ttf_glyph_provider
     type GlyphProvider = StbTtfGlyphProvider
 
     import os
     import write_image_impl
 
-import private.edtaa3func # From ttf library
-import private.simple_table
+import private/edtaa3func # From ttf library
+import private/simple_table
 
 when defined(android):
-    import nimx.assets.url_stream
+    import nimx/assets/url_stream
 
 type Baseline* = enum
     bTop

nimx/formatted_text.nim

@@ -1,5 +1,5 @@
 import unicode, algorithm, strutils, sequtils
-import nimx.font, nimx.types, nimx.unistring, nimx.utils.lower_bound
+import nimx/font, nimx/types, nimx/unistring, nimx/utils/lower_bound
 
 
 type
@@ -545,7 +545,7 @@ proc trackingOfRuneAtPos*(t: FormattedText, pos: int): float32 =
 ################################################################################
 # Drawing
 ################################################################################
-import nimx.context, nimx.composition
+import nimx/context, nimx/composition
 
 
 const GRADIENT_ENABLED = (1 shl 0) # OPTION_1

nimx/gesture_detector.nim

@@ -133,7 +133,7 @@ proc getPointersCenter(arr : openarray[Event]) : Point =
     result = newPoint(0,0)
     if  arr.len > 0:
         var r = newRect(arr[0].position)
-        for i in 1..< arr.len:
+        for i in 1 ..< arr.len:
             r.union(arr[i].position)
         result = r.centerPoint()
 
@@ -164,15 +164,15 @@ method onGestEvent*(d: ScrollDetector, e: var Event) : bool =
         d.pointers.add(e)
         d.checkScroll(e)
     elif e.buttonState == bsUp:
-        for p in 0..< d.pointers.len:
+        for p in 0 ..< d.pointers.len:
             if d.pointers[p].pointerId == e.pointerId:
                 d.pointers.delete(p)
                 break
         if d.pointers.len < 1:
             result = false
         d.checkScroll(e)
     elif e.buttonState == bsUnknown:
-        for p in 0..< d.pointers.len:
+        for p in 0 ..< d.pointers.len:
             if d.pointers[p].pointerId == e.pointerId:
                 d.pointers.delete(p)
                 d.pointers.insert(e, p)
@@ -229,15 +229,15 @@ method onGestEvent*(d: ZoomGestureDetector, e: var Event) : bool =
         d.pointers.add(e)
         d.checkZoom()
     if e.buttonState == bsUp:
-        for p in 0..< d.pointers.len:
+        for p in 0 ..< d.pointers.len:
             if d.pointers[p].pointerId == e.pointerId:
                 d.pointers.delete(p)
                 break
         if d.pointers.len < 1:
             result = false
         d.checkZoom()
     if e.buttonState == bsUnknown:
-        for p in 0..< d.pointers.len:
+        for p in 0 ..< d.pointers.len:
             if d.pointers[p].pointerId == e.pointerId:
                 d.pointers.delete(p)
                 d.pointers.insert(e, p)
@@ -272,15 +272,15 @@ method onGestEvent*(d: RotateGestureDetector, e: var Event) : bool =
         d.pointers.add(e)
         d.checkRotate()
     if e.buttonState == bsUp:
-        for p in 0..< d.pointers.len:
+        for p in 0 ..< d.pointers.len:
             if d.pointers[p].pointerId == e.pointerId:
                 d.pointers.delete(p)
                 break
         if d.pointers.len < 1:
             result = false
         d.checkRotate()
     if e.buttonState == bsUnknown:
-        for p in 0..< d.pointers.len:
+        for p in 0 ..< d.pointers.len:
             if d.pointers[p].pointerId == e.pointerId:
                 d.pointers.delete(p)
                 d.pointers.insert(e, p)

nimx/horizontal_list_view.nim

@@ -2,7 +2,7 @@ import view
 export view
 
 import view_event_handling
-import nimx.gesture_detector
+import nimx/gesture_detector
 import types
 import clip_view