Fix #34 allowing compilation with ORC or ARC (#37)

Author: filcuc

examples/abstractitemmodel/mylistmodel.nim

@@ -9,17 +9,19 @@ QtObject:
     MyListModel* = ref object of QAbstractListModel
       names*: seq[string]
 
+  proc delete(self: MyListModel)
+  proc setup(self: MyListModel)
+  proc newMyListModel*(): MyListModel =
+    new(result, delete)
+    result.names = @["John", "Max", "Paul", "Anna"]
+    result.setup
+
   proc delete(self: MyListModel) =
     self.QAbstractListModel.delete
 
   proc setup(self: MyListModel) =
     self.QAbstractListModel.setup
 
-  proc newMyListModel*(): MyListModel =
-    new(result, delete)
-    result.names = @["John", "Max", "Paul", "Anna"]
-    result.setup
-
   method rowCount(self: MyListModel, index: QModelIndex = nil): int =
     return self.names.len
 

examples/charts/mylistmodel.nim

@@ -1,4 +1,4 @@
-import NimQml, Tables, random
+import NimQml, Tables, std/random
 
 type
   Point = object
@@ -12,11 +12,11 @@ QtObject:
       maxX: int
       maxY: int
 
-  proc delete(self: MyListModel) =
-    self.QAbstractTableModel.delete
-
-  proc setup(self: MyListModel) =
-    self.QAbstractTableModel.setup
+  proc delete(self: MyListModel)
+  proc setup(self: MyListModel)
+  proc newMyListModel*(): MyListModel =
+    new(result, delete)
+    result.setup
 
   method rowCount(self: MyListModel, index: QModelIndex = nil): int =
     return self.points.len
@@ -57,7 +57,7 @@ QtObject:
     let pos = self.points.len
     self.beginInsertRows(newQModelIndex(), pos, pos)
     let x = self.maxX + 1
-    let y = random(50)
+    let y = rand(50)
     if x > self.maxX:
       self.maxX = x
       self.maxXChanged(x)
@@ -67,10 +67,12 @@ QtObject:
     self.points.add(Point(x: x, y: y))
     self.endInsertRows()
 
-  proc newMyListModel*(): MyListModel =
-    new(result, delete)
-    result.setup
-    result.points = @[]
-    result.maxX = 0
-    result.maxY = 50
-    result.addRandomPoint()
+  proc delete(self: MyListModel) =
+    self.QAbstractTableModel.delete
+
+  proc setup(self: MyListModel) =
+    self.QAbstractTableModel.setup
+    self.points = @[]
+    self.maxX = 0
+    self.maxY = 50
+    self.addRandomPoint()

examples/connections/main.nim

@@ -5,17 +5,19 @@ QtObject:
   type Contact* = ref object of QObject
     name: string
 
+  proc delete*(self: Contact)
+  proc setup(self: Contact)
+  proc newContact(): Contact =
+    new(result, delete)
+    result.name = ""
+    result.setup
+
   proc delete*(self: Contact) =
     self.QObject.delete
 
   proc setup(self: Contact) =
     self.QObject.setup
 
-  proc newContact(): Contact =
-    new(result, delete)
-    result.name = ""
-    result.setup
-
   proc name*(self: Contact): string {.slot.} =
     result = self.name
 

examples/contactapp/contactlist.nim

@@ -10,20 +10,22 @@ QtObject:
     ContactList* = ref object of QAbstractListModel
       contacts*: seq[Contact]
 
+  proc delete(self: ContactList)
+  proc setup(self: ContactList)
+  proc newContactList*(): ContactList =
+    new(result, delete)
+    result.contacts = @[]
+    result.setup
+
+  proc setup(self: ContactList) =
+    self.QAbstractListModel.setup
+
   proc delete(self: ContactList) =
     self.QAbstractListModel.delete
     for contact in self.contacts:
       contact.delete
     self.contacts = @[]
 
-  proc setup(self: ContactList) =
-    self.QAbstractListModel.setup
-
-  proc newContactList*(): ContactList =
-    new(result, delete)
-    result.contacts = @[]
-    result.setup
-
   method rowCount(self: ContactList, index: QModelIndex = nil): int =
     return self.contacts.len
 

examples/slotsandproperties/contact.nim

@@ -4,17 +4,19 @@ QtObject:
   type Contact* = ref object of QObject
     m_name: string
 
+  proc delete*(self: Contact)
+  proc setup(self: Contact)
+  proc newContact*(): Contact =
+    new(result, delete)
+    result.m_name = "InitialName"
+    result.setup
+
   proc delete*(self: Contact) =
     self.QObject.delete
 
   proc setup(self: Contact) =
     self.QObject.setup
 
-  proc newContact*(): Contact =
-    new(result, delete)
-    result.m_name = "InitialName"
-    result.setup
-
   proc getName*(self: Contact): string {.slot.} =
     result = self.m_name
 

src/nimqml.nim

@@ -1,3 +1,6 @@
+import locks
+import tables
+
 ## NimQml aims to provide binding to the QML for the Nim programming language
 
 template debugMsg(message: string) =
@@ -10,6 +13,7 @@ template debugMsg(typeName: string, procName: string) =
 include "nimqml/private/nimqmlmacros.nim"
 include "nimqml/private/dotherside.nim"
 include "nimqml/private/nimqmltypes.nim"
+include "nimqml/private/constructors.nim"
 include "nimqml/private/qvariant.nim"
 include "nimqml/private/lambdainvoker.nim"
 include "nimqml/private/qmetaobjectconnection.nim"

src/nimqml/private/constructors.nim

@@ -0,0 +1,207 @@
+############# QObject #############
+proc setup*(self: QObject) 
+proc delete*(self: QObject) =
+  debugMsg("QObject", "delete")
+  ## Delete a QObject
+  if not self.owner or self.vptr.isNil:
+    return
+  dos_qobject_delete(self.vptr)
+  self.vptr.resetToNil
+
+proc newQObject*(): QObject =
+  ## Return a new QObject
+  new(result, delete)
+  result.setup()
+
+############# QAbstractItemModel #############
+proc setup*(self: QAbstractItemModel)
+proc delete*(self: QAbstractItemModel)
+proc newQAbstractItemModel*(): QAbstractItemModel =
+  ## Return a new QAbstractItemModel
+  debugMsg("QAbstractItemModel", "new")
+  new(result, delete)
+  result.setup()
+
+############# QAbstractListModel #############
+proc setup*(self: QAbstractListModel)
+proc delete*(self: QAbstractListModel)
+proc newQAbstractListModel*(): QAbstractListModel =
+  ## Return a new QAbstractListModel
+  debugMsg("QAbstractListModel", "new")
+  new(result, delete)
+  result.setup()
+
+############# QAbstractTableModel #############
+proc setup*(self: QAbstractTableModel)
+proc delete*(self: QAbstractTableModel)
+proc newQAbstractTableModel*(): QAbstractTableModel =
+  ## Return a new QAbstractTableModel
+  debugMsg("QAbstractTableModel", "new")
+  new(result, delete)
+  result.setup()
+
+############# QVariant #############
+proc setup*(variant: QVariant)
+proc setup*(variant: QVariant, value: int)
+proc setup*(variant: QVariant, value: bool)
+proc setup*(variant: QVariant, value: string)
+proc setup*(variant: QVariant, value: QObject)
+proc setup*(variant: QVariant, value: DosQVariant, takeOwnership: Ownership)
+proc setup*(variant: QVariant, value: cfloat)
+proc setup*(variant: QVariant, value: cdouble)
+proc setup*(variant: QVariant, value: QVariant)
+proc delete*(variant: QVariant)
+
+proc newQVariant*(): QVariant =
+  ## Return a new QVariant
+  new(result, delete)
+  result.setup()
+
+proc newQVariant*(value: int): QVariant =
+  ## Return a new QVariant given a cint
+  new(result, delete)
+  result.setup(value)
+
+proc newQVariant*(value: bool): QVariant =
+  ## Return a new QVariant given a bool
+  new(result, delete)
+  result.setup(value)
+
+proc newQVariant*(value: string): QVariant =
+  ## Return a new QVariant given a string
+  new(result, delete)
+  result.setup(value)
+
+proc newQVariant*(value: QObject): QVariant =
+  ## Return a new QVariant given a QObject
+  new(result, delete)
+  result.setup(value)
+
+proc newQVariant(value: DosQVariant, takeOwnership: Ownership): QVariant =
+  ## Return a new QVariant given a raw QVariant pointer
+  new(result, delete)
+  result.setup(value, takeOwnership)
+
+proc newQVariant*(value: QVariant): QVariant =
+  ## Return a new QVariant given another QVariant
+  new(result, delete)
+  result.setup(value)
+
+proc newQVariant*(value: cfloat): QVariant =
+  ## Return a new QVariant given a float
+  new(result, delete)
+  result.setup(value)
+
+############# QUrl #############
+proc setup*(self: QUrl, url: string, mode: QUrlParsingMode)
+proc delete*(self: QUrl)
+proc newQUrl*(url: string, mode: QUrlParsingMode = QUrlParsingMode.Tolerant): QUrl =
+  ## Create a new QUrl
+  new(result, delete)
+  result.setup(url, mode)
+
+############# QQuickView #############
+proc setup*(self: QQuickView)
+proc delete*(self: QQuickView)
+proc newQQuickView*(): QQuickView =
+  ## Return a new QQuickView
+  new(result, delete)
+  result.setup()
+
+############# QQmlApplicationEngine #############
+proc setup*(self: QQmlApplicationEngine)
+proc delete*(self: QQmlApplicationEngine)
+proc newQQmlApplicationEngine*(): QQmlApplicationEngine =
+  ## Return a new QQmlApplicationEngine
+  new(result, delete)
+  result.setup()
+
+############# QModelIndex #############
+proc setup*(self: QModelIndex)
+proc setup(self: QModelIndex, other: DosQModelIndex, takeOwnership: Ownership)
+proc delete*(self: QModelIndex)
+
+proc newQModelIndex*(): QModelIndex =
+  ## Return a new QModelIndex
+  new(result, delete)
+  result.setup()
+
+proc newQModelIndex(vptr: DosQModelIndex, takeOwnership: Ownership): QModelIndex =
+  ## Return a new QModelIndex given a raw index
+  new(result, delete)
+  result.setup(vptr, takeOwnership)  
+
+############# QMetaObjectConnection #############
+proc delete*(self: QMetaObjectConnection)
+proc new*(typ: type QMetaObjectConnection, vptr: DosQMetaObjectConnection): QMetaObjectConnection =
+  new(result, delete)
+  result.vptr = vptr  
+
+############# QMetaObject #############
+proc setup(superClass: QMetaObject,
+           className: string,
+           signals: seq[SignalDefinition],
+           slots: seq[SlotDefinition],
+           properties: seq[PropertyDefinition]): DosQMetaObject
+proc delete*(metaObject: QMetaObject)
+
+proc newQObjectMetaObject*(): QMetaObject =
+  ## Create the QMetaObject of QObject
+  debugMsg("QMetaObject", "newQObjectMetaObject")
+  new(result, delete)
+  result.vptr = dos_qobject_qmetaobject()
+
+proc newQAbstractItemModelMetaObject*(): QMetaObject =
+  ## Create the QMetaObject of QAbstractItemModel
+  debugMsg("QMetaObject", "newQAbstractItemModelMetaObject")
+  new(result, delete)
+  result.vptr = dos_qabstractitemmodel_qmetaobject()
+
+proc newQAbstractListModelMetaObject*(): QMetaObject =
+  ## Create the QMetaObject of QAbstractListModel
+  debugMsg("QMetaObject", "newQAbstractListModelMetaObject")
+  new(result, delete)
+  result.vptr = dos_qabstractlistmodel_qmetaobject()
+
+proc newQAbstractTableModelMetaObject*(): QMetaObject =
+  ## Create the QMetaObject of QAbstractTableModel
+  debugMsg("QMetaObject", "newQAbstractItemTableMetaObject")
+  new(result, delete)
+  result.vptr = dos_qabstracttablemodel_qmetaobject()
+
+proc newQMetaObject*(superClass: QMetaObject, className: string,
+                     signals: seq[SignalDefinition],
+                     slots: seq[SlotDefinition],
+                     properties: seq[PropertyDefinition]): QMetaObject =
+  ## Create a new QMetaObject
+  debugMsg("QMetaObject", "newQMetaObject" & className)
+  new(result, delete)
+  result.signals = signals
+  result.slots = slots
+  result.properties = properties
+  result.vptr = setup(superClass, className, signals, slots, properties)
+
+############# QHashIntByteArray #############
+proc setup*(self: QHashIntByteArray)
+proc delete*(self: QHashIntByteArray)
+proc newQHashIntQByteArray*(): QHashIntByteArray =
+  ## Create a new QHashIntQByteArray
+  new(result, delete)
+  result.setup()
+
+############# QGuiApplication #############
+proc setup*(self: QGuiApplication)
+proc delete*(self: QGuiApplication)
+proc newQGuiApplication*(): QGuiApplication =
+  ## Return a new QApplication
+  new(result, delete)
+  result.setup()
+
+############# LambdaInvoker #############
+proc new(typ: type LambdaInvoker): LambdaInvoker =
+  ## Create the lambda invoker
+  new(result)
+  result.id = 0
+  result.lock.initLock()
+  result.lambdas = initTable[int, LambdaInvokerProc]()
+