Deprecate FileIO use

Fixes issue #110

Project.toml

@@ -17,7 +17,7 @@ jlqml_jll = "6b5019fb-a83d-5b4e-a9f7-678a36c28df7"
 [compat]
 ColorTypes = "0.10"
 CxxWrap = "0.11"
-FileIO = "1.3"
+FileIO = "~1.3"
 MacroTools = "0.5"
 Observables = "0.3"
 Requires = "1.0"

example/board.jl

@@ -23,7 +23,7 @@ cols = 3
 qml_file = joinpath(dirname(@__FILE__), "qml", "board.qml")
 
 # create the app, with cols and emojiModel exposed as QML context properties
-load(qml_file,cols=cols,emojiModel=emojiModel)
+loadqml(qml_file,cols=cols,emojiModel=emojiModel)
 
 # Start the GUI
 exec()

example/canvas.jl

@@ -40,7 +40,7 @@ function paint_circle(buffer)
     return
 end
 
-load(qmlfile,
+loadqml(qmlfile,
      parameters=JuliaPropertyMap("diameter" => diameter),
      paint_cfunction = CxxWrap.@safe_cfunction(paint_circle, Cvoid, 
                                                (Array{UInt32,1}, Int32, Int32)))

example/canvas_alpha.jl

@@ -54,7 +54,7 @@ function paint_square(buffer::Array{UInt32, 1}, width32::Int32, height32::Int32)
     return
 end
 
-load(qmlfile,
+loadqml(qmlfile,
      parameters=JuliaPropertyMap("diameter" => diameter, "alpha" => alpha),
      circle_cfunction = CxxWrap.@safe_cfunction(paint_circle, Cvoid, (Array{UInt32,1}, Int32, Int32)),
      square_cfunction = CxxWrap.@safe_cfunction(paint_square, Cvoid, (Array{UInt32,1}, Int32, Int32)))

example/canvas_and_gr.jl

@@ -111,7 +111,7 @@ onany(amplitude, frequency, invert_sin, diameter) do amp, freq, inv, dia
     end
 end
 
-load(qmlfile,
+loadqml(qmlfile,
      parameters = JuliaPropertyMap(
      "invert_sin"       => invert_sin,
      "amplitude"        => amplitude,

example/canvas_twice.jl

@@ -54,7 +54,7 @@ function paint_square(buffer::Array{UInt32, 1}, width32::Int32, height32::Int32)
     return
 end
 
-load(qmlfile,
+loadqml(qmlfile,
      parameters=JuliaPropertyMap("diameter" => diameter, "side" => side),
      circle_cfunction = CxxWrap.@safe_cfunction(paint_circle, Cvoid, (Array{UInt32,1}, Int32, Int32)),
      square_cfunction = CxxWrap.@safe_cfunction(paint_square, Cvoid, (Array{UInt32,1}, Int32, Int32)))

example/checkboxes.jl

@@ -30,7 +30,7 @@ end
 
 @qmlfunction plot_diagram
 
-load(joinpath(dirname(Base.source_path()), "qml", "checkboxes.qml"))
+loadqml(joinpath(dirname(Base.source_path()), "qml", "checkboxes.qml"))
 exec()
 
 return

example/colors.jl

@@ -1,6 +1,6 @@
 using QML
 
-load(joinpath(dirname(Base.source_path()), "qml", "tutorial.qml"))
+loadqml(joinpath(dirname(Base.source_path()), "qml", "tutorial.qml"))
 exec()
 
 return

example/drag.jl

@@ -1,5 +1,5 @@
 using QML
 
 @qmlfunction println
-load(joinpath(dirname(@__FILE__), "qml", "drag.qml"))
+loadqml(joinpath(dirname(@__FILE__), "qml", "drag.qml"))
 exec()

example/filedialog.jl

@@ -19,5 +19,5 @@ end
 
 @qmlfunction singlefile multifile
 
-load(joinpath(dirname(Base.source_path()), "qml", "filedialog.qml"))
+loadqml(joinpath(dirname(Base.source_path()), "qml", "filedialog.qml"))
 exec()

example/fizzbuzz.jl

@@ -36,5 +36,5 @@ end
 @qmlfunction do_fizzbuzz
 
 qmlfile = joinpath(dirname(Base.source_path()), "qml", "fizzbuzz.qml")
-load(qmlfile, fizzbuzz=JuliaPropertyMap("message" => Observable(""), "count" => 0, "success" => false))
+loadqml(qmlfile, fizzbuzz=JuliaPropertyMap("message" => Observable(""), "count" => 0, "success" => false))
 exec()

example/gltriangle.jl

@@ -106,7 +106,7 @@ function render()
 end
 
 # Pass the triangle as a context property
-load(joinpath(dirname(@__FILE__), "qml", "gltriangle.qml"),
+loadqml(joinpath(dirname(@__FILE__), "qml", "gltriangle.qml"),
     cornersModel=ListModel(corners),
     render_triangle=@safe_cfunction(render, Cvoid, ()))
 exec()

example/gr.jl

@@ -30,7 +30,7 @@ function paint(p::CxxPtr{QPainter}, item::CxxPtr{JuliaPaintedItem})
   return
 end
 
-load(qmlfile,
+loadqml(qmlfile,
   paint_cfunction = @safe_cfunction(paint, Cvoid, (CxxPtr{QPainter}, CxxPtr{JuliaPaintedItem})),
   parameters = JuliaPropertyMap("frequency" => f, "amplitude" => A))
 exec()

example/grid.jl

@@ -17,7 +17,7 @@ end
 qml_file = joinpath(dirname(@__FILE__), "qml", "grid.qml")
 
 # create the app, with cols and emojiModel exposed as QML context properties
-load(qml_file, cols=3, emojiModel=ListModel(emoji))
+loadqml(qml_file, cols=3, emojiModel=ListModel(emoji))
 
 # Start the GUI
 exec()

example/gui.jl

@@ -39,7 +39,7 @@ end
 qml_file = joinpath(dirname(@__FILE__), "qml", "gui.qml")
 
 # Load the QML file
-load(qml_file, guiproperties = JuliaPropertyMap("timer" => QTimer(), "oldcounter" => oldcounter, "bg_counter" => bg_counter_slow))
+loadqml(qml_file, guiproperties = JuliaPropertyMap("timer" => QTimer(), "oldcounter" => oldcounter, "bg_counter" => bg_counter_slow))
 
 # Run the application
 exec()

example/image.jl

@@ -9,7 +9,7 @@ function test_display(d::JuliaDisplay)
 end
 @qmlfunction test_display
 
-load(joinpath(dirname(@__FILE__), "qml", "image.qml"))
+loadqml(joinpath(dirname(@__FILE__), "qml", "image.qml"))
 
 
 # Run the application

example/makie.jl

@@ -17,7 +17,7 @@ function render_function(screen)
   display(screen, cat)
 end
 
-load(joinpath(dirname(@__FILE__), "qml", "makie.qml"),
+loadqml(joinpath(dirname(@__FILE__), "qml", "makie.qml"),
   cat = JuliaPropertyMap("angle" => catangle),
   render_callback = @safe_cfunction(render_function, Cvoid, (Any,))
 )

example/observable.jl

@@ -10,7 +10,7 @@ on(output) do x
   println("Output changed to ", x)
 end
 
-load(qml_file, observables = JuliaPropertyMap("input" => input, "output" => output))
+loadqml(qml_file, observables = JuliaPropertyMap("input" => input, "output" => output))
 
 if isinteractive()
   exec_async()

example/plot.jl

@@ -37,7 +37,7 @@ end
 @qmlfunction plotsin init_backend
 
 qml_file = joinpath(dirname(@__FILE__), "qml", "plot.qml")
-load(qml_file)
+loadqml(qml_file)
 
 # Run the application
 exec()

example/progressbar.jl

@@ -135,7 +135,7 @@ end
 simtypes = ListModel(first.(simulation_types))
 
 # All arguments after qmlfile are context properties:
-load(
+loadqml(
   qmlfile,
   timer=timer,
   simulationTypes=simtypes,

example/repl-background.jl

@@ -3,7 +3,7 @@ using QML
 qml_file = joinpath(dirname(@__FILE__), "qml", "repl-background.qml")
 
 @qmlfunction pushdisplay
-load(qml_file)
+loadqml(qml_file)
 exec_async()
 
 using GR

example/sketch.jl

@@ -17,7 +17,7 @@ on(x) do px
   nb_moves[] += 1
 end
 
-load(qmlfile, position=JuliaPropertyMap("x" => x, "y" =>y))
+loadqml(qmlfile, position=JuliaPropertyMap("x" => x, "y" =>y))
 exec()
 
 """

example/tableview.jl

@@ -47,7 +47,7 @@ end
 
 # Load QML after setting context properties, to avoid errors on initialization
 qml_file = joinpath(dirname(@__FILE__), "qml", "tableview.qml")
-load(qml_file, properties=JuliaPropertyMap("years" => years), nuclidesModel=nuclidesModel)
+loadqml(qml_file, properties=JuliaPropertyMap("years" => years), nuclidesModel=nuclidesModel)
 
 # Run the application
 exec()

example/text.jl

@@ -6,7 +6,7 @@ fromfunction() = "From function call"
 @qmlfunction fromfunction
 
 # All keyword arguments to load are added as context properties on the QML side
-load(qmlfile, fromcontext="From context property")
+loadqml(qmlfile, fromcontext="From context property")
 exec()
 
 """

src/QML.jl

@@ -1,7 +1,7 @@
 module QML
 
 export QVariant, QString, QUrl
-export QQmlContext, root_context, load, qt_prefix_path, set_source, engine, QByteArray, to_string, QQmlComponent, set_data, create, QQuickItem, content_item, QTimer, context_property, emit, JuliaDisplay, JuliaCanvas, init_application, qmlcontext, init_qmlapplicationengine, init_qmlengine, init_qquickview, exec, exec_async, ListModel, addrole, setconstructor, removerole, setrole, roles, QVariantMap
+export QQmlContext, root_context, loadqml, qt_prefix_path, set_source, engine, QByteArray, to_string, QQmlComponent, set_data, create, QQuickItem, content_item, QTimer, context_property, emit, JuliaDisplay, JuliaCanvas, init_application, qmlcontext, init_qmlapplicationengine, init_qmlengine, init_qquickview, exec, exec_async, ListModel, addrole, setconstructor, removerole, setrole, roles, QVariantMap
 export JuliaPropertyMap
 export QStringList, QVariantList
 export QPainter, device, width, height, logicalDpiX, logicalDpiY, QQuickWindow, effectiveDevicePixelRatio, window, JuliaPaintedItem
@@ -48,19 +48,24 @@ function load_qml(qmlfilename, engine)
 end
 
 """
-    function load(qml_file::String; properties...)
+    function loadqml(qmlfilename; properties...)
 
 Load a QML file, creating a [`QML.QQmlApplicationEngine`](@ref), and setting the context
 `properties` supplied in the keyword arguments. Will create and return a
 `QQmlApplicationEngine`. See the example for [`QML.QQmlApplicationEngine`](@ref).
 """
-function FileIO.load(f::FileIO.File{format"QML"}; kwargs...)
+function loadqml(qmlfilename; kwargs...)
   qml_engine = init_qmlapplicationengine()
   ctx = root_context(CxxRef(qml_engine))
   for (key,value) in kwargs
     set_context_property(ctx, String(key), value)
   end
-  return load_qml(filename(f), qml_engine)
+  return load_qml(qmlfilename, qml_engine)
+end
+
+function FileIO.load(f::FileIO.File{format"QML"}; kwargs...)
+  Base.depwarn("load(qmlfile;...) is deprecated, please use loadqml(qmlfile;...)", :load)
+  return loadqml(filename(f))
 end
 
 @static if Sys.iswindows()
@@ -215,7 +220,7 @@ julia> mktempdir() do folder
            }
          }
          \""")
-         load(path; observables = JuliaPropertyMap("output" => output))
+         loadqml(path; observables = JuliaPropertyMap("output" => output))
          exec()
        end
 ```
@@ -364,7 +369,7 @@ julia> mktempdir() do folder
               }
           }
           \""")
-          load(path)
+          loadqml(path)
           exec()
         end
 ```
@@ -407,7 +412,7 @@ julia> mktempdir() do folder
             }
           }
           \""")
-          load(path)
+          loadqml(path)
           exec()
         end
 ```
@@ -595,7 +600,7 @@ julia> mktempdir() do folder
               }
             }
           \""")
-          load(path; fruits = fruits)
+          loadqml(path; fruits = fruits)
           exec()
         end
 ```
@@ -675,7 +680,7 @@ julia> mktempdir() do folder
             }
           }
           \""")
-          load(path; array_model = array_model)
+          loadqml(path; array_model = array_model)
           exec()
         end
 
@@ -794,7 +799,7 @@ julia> mktempdir() do folder
             }
           }
           \""")
-          load(path; array_model = array_model)
+          loadqml(path; array_model = array_model)
           exec()
         end
 ```

src/docs.jl

@@ -162,7 +162,7 @@ julia> mktempdir() do folder
             }
           }
           \""")
-          load(path)
+          loadqml(path)
           exec()
         end
 
@@ -231,7 +231,7 @@ julia> mktempdir() do folder
             }
           }
           \""")
-          load(path; greeting = "Hello, World!")
+          loadqml(path; greeting = "Hello, World!")
           exec()
         end
 ```
@@ -365,7 +365,7 @@ julia> mktempdir() do folder
               }
           }
           \""")
-          load(path, timer=QTimer())
+          loadqml(path, timer=QTimer())
           exec()
         end
 ```

test/badqml.jl

@@ -4,7 +4,7 @@ using Test
 qmlfile = joinpath(dirname(@__FILE__), "qml", "badqml.qml")
 
 try
-    load(qmlfile)
+    loadqml(qmlfile)
     exec()
 catch e
     @test e.msg == "Failed to load QML file $qmlfile"

test/functions.jl

@@ -71,7 +71,7 @@ set_state2 = TestModuleFunction.set_state2
 qmlfunction("unexported_return_two", UnExported.return_two)
 qmlfunction("unexported_check", UnExported.check)
 
-load(joinpath(dirname(@__FILE__), "qml", "functions.qml"))
+loadqml(joinpath(dirname(@__FILE__), "qml", "functions.qml"))
 exec()
 
 @test typeof(call_results1[1]) == Bool

test/julia_arrays.jl

@@ -47,7 +47,7 @@ custom_list = [ListElem("a",1), ListElem("b", 2)]
 custom_model = ListModel(custom_list)
 
 @qmlfunction get_array
-load(qml_file,
+loadqml(qml_file,
   arrays=arrays,
   array_model=array_model,
   array_model2=array_model2,

test/julia_object.jl

@@ -40,7 +40,7 @@ qml_file = joinpath(dirname(@__FILE__), "qml", "julia_object.qml")
 observed_object = Observable(JuliaTestType(0,InnerType(0.0)))
 @qmlfunction modify_julia_object replace_julia_object julia_object_check geta getx logx
 
-load(qml_file, objects=JuliaPropertyMap("julia_object" => JuliaTestType(1, InnerType(2.0)), "observed_object" => observed_object))
+loadqml(qml_file, objects=JuliaPropertyMap("julia_object" => JuliaTestType(1, InnerType(2.0)), "observed_object" => observed_object))
 
 # Run the application
 exec()

test/julia_signal.jl

@@ -27,7 +27,7 @@ end
 # absolute path in case working dir is overridden
 qml_file = joinpath(dirname(@__FILE__), "qml", "julia_signal.qml")
 
-load(qml_file)
+loadqml(qml_file)
 
 # Run the application
 exec()

test/listviews.jl

@@ -36,7 +36,7 @@ removerole_c() = removerole(tablemodel, "c")
 setrole_a() = setrole(tablemodel, 1, "abc", (x::TableItem) -> x.a*x.b*x.c)
 
 @qmlfunction testfail removerole_b removerole_c setrole_a
-load(qml_file, array_model=array_model, array_model2=array_model2, tablemodel=tablemodel)
+loadqml(qml_file, array_model=array_model, array_model2=array_model2, tablemodel=tablemodel)
 
 exec()
 

test/properties.jl

@@ -20,5 +20,5 @@ end
 @qmlfunction check_property check_pi
 qmlfile = joinpath(dirname(@__FILE__), "qml", "properties.qml")
 
-load(qmlfile, properties=propmap)
+loadqml(qmlfile, properties=propmap)
 exec()

test/qml_propertymap.jl

@@ -78,7 +78,7 @@ ob[] = expected_ob
 @test propmap["ob"][] == expected_ob
 
 # Load the QML file, setting the property map as context object
-load(qml_file; propmap=propmap)
+loadqml(qml_file; propmap=propmap)
 
 # Run the application
 exec()