status-im/dotherside
2
0
Fork 0
mirror of https://github.com/status-im/dotherside.git synced 2025-02-08 02:33:37 +00:00
Code Issues Projects Releases Wiki Activity

Fixed emit arguments types

Browse Source
This commit is contained in:
Filippo Cucchetto 2015-01-11 12:58:35 +01:00
parent d1c2dbc224
commit df1e3ec72e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Nim/NimQml/NimQml.nim
View File

@ -235,12 +235,18 @@ proc newQApplication*(): QApplication =
# QObject # QObject
type RawQVariantArray {.unchecked.} = array[0..0, RawQVariant] type RawQVariantArray {.unchecked.} = array[0..0, RawQVariant]
type RawQVariantArrayPtr = ptr RawQVariantArray type RawQVariantArrayPtr = ptr RawQVariantArray
type RawQVariantSeq = seq[RawQVariant]
proc toVariantSeq(args: RawQVariantArrayPtr, numArgs: cint): seq[QVariant] = proc toVariantSeq(args: RawQVariantArrayPtr, numArgs: cint): seq[QVariant] =
result = @[] result = @[]
for i in 0..numArgs-1: for i in 0..numArgs-1:
result.add(newQVariant(args[i])) result.add(newQVariant(args[i]))
proc toRawVariantSeq(args: openarray[QVariant]): RawQVariantSeq =
result = @[]
for variant in args:
result.add(variant.data)
proc delete(sequence: seq[QVariant]) = proc delete(sequence: seq[QVariant]) =
for variant in sequence: for variant in sequence:
variant.delete variant.delete
@ -256,7 +262,7 @@ proc dos_qobject_create(qobject: var RawQObject, nimobject: ptr QObjectObj, qobj
proc dos_qobject_delete(qobject: RawQObject) {.cdecl, dynlib:"libDOtherSide.so", importc.} proc dos_qobject_delete(qobject: RawQObject) {.cdecl, dynlib:"libDOtherSide.so", importc.}
proc dos_qobject_slot_create(qobject: RawQObject, slotName: cstring, argumentsCount: cint, argumentsMetaTypes: ptr cint, slotIndex: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} proc dos_qobject_slot_create(qobject: RawQObject, slotName: cstring, argumentsCount: cint, argumentsMetaTypes: ptr cint, slotIndex: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.}
proc dos_qobject_signal_create(qobject: RawQObject, signalName: cstring, argumentsCount: cint, argumentsMetaTypes: ptr cint, signalIndex: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} proc dos_qobject_signal_create(qobject: RawQObject, signalName: cstring, argumentsCount: cint, argumentsMetaTypes: ptr cint, signalIndex: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.}
proc dos_qobject_signal_emit(qobject: RawQObject, signalName: cstring, argumentsCount: cint, arguments: ptr QVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.} proc dos_qobject_signal_emit(qobject: RawQObject, signalName: cstring, argumentsCount: cint, arguments: ptr RawQVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.}
proc dos_qobject_property_create(qobject: RawQObject, propertyName: cstring, propertyType: cint, readSlot: cstring, writeSlot: cstring, notifySignal: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} proc dos_qobject_property_create(qobject: RawQObject, propertyName: cstring, propertyType: cint, readSlot: cstring, writeSlot: cstring, notifySignal: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.}
method onSlotCalled*(nimobject: QObject, slotName: string, args: openarray[QVariant]) = method onSlotCalled*(nimobject: QObject, slotName: string, args: openarray[QVariant]) =
@ -338,8 +344,8 @@ proc registerProperty*(qobject: QObject,
proc emit*(qobject: QObject, signalName: string, args: openarray[QVariant] = []) = proc emit*(qobject: QObject, signalName: string, args: openarray[QVariant] = []) =
## Emit the signal with the given name and values ## Emit the signal with the given name and values
if args.len > 0: if args.len > 0:
var copy = @args var copy = args.toRawVariantSeq
dos_qobject_signal_emit(qobject.data, signalName, args.len.cint, addr(copy[0])) dos_qobject_signal_emit(qobject.data, signalName, copy.len.cint, addr(copy[0]))
else: else:
dos_qobject_signal_emit(qobject.data, signalName, 0, nil) dos_qobject_signal_emit(qobject.data, signalName, 0, nil)