Added support for QGuiApplication

src/nimqml.nim

@@ -18,16 +18,12 @@ include private/qvariant.nim
 include private/qobject.nim
 include private/qqmlapplicationengine.nim
 include private/qapplication.nim
+include private/qguiapplication.nim
 include private/qurl.nim
 include private/qquickview.nim
 #include private.nimqmltypes
 #var qobjectRegistry = initTable[ptr QObjectObj, bool]()
-#include private/qvariant.nim
-#include private/qqmlcontext.nim
-#include private/qapplication.nim
 #include private/qguiapplication.nim
-#include private/qobject.nim
-#include private/qquickview.nim
 #include private/qmodelindex.nim
 #include private/qhashintbytearray.nim
 #include private/qabstractlistmodel.nim

src/private/dotherside.nim

@@ -54,6 +54,12 @@ proc dos_qapplication_exec() {.cdecl, importc.}
 proc dos_qapplication_quit() {.cdecl, importc.}
 proc dos_qapplication_delete() {.cdecl, importc.}
 
+# QGuiApplication
+proc dos_qguiapplication_create() {.cdecl, importc.}
+proc dos_qguiapplication_exec() {.cdecl, importc.}
+proc dos_qguiapplication_quit() {.cdecl, importc.}
+proc dos_qguiapplication_delete() {.cdecl, importc.}
+
 # QQmlContext
 proc dos_qqmlcontext_setcontextproperty(context: DosQQmlContext, propertyName: cstring, propertyValue: DosQVariant) {.cdecl, importc.}
 

src/private/nimqmltypes.nim

@@ -15,6 +15,10 @@ type
     ## A QApplication
     deleted: bool
 
+  QGuiApplication = ref object of RootObj ## \
+    ## A QGuiApplication
+    deleted: bool
+
   QQuickView* = ref object of RootObj ## \
     # A QQuickView
     vptr: DosQQuickView

src/private/qguiapplication.nim

@@ -1,30 +1,25 @@
-# QGuiApplication
-proc dos_qguiapplication_create() {.cdecl, importc.}
-proc dos_qguiapplication_exec() {.cdecl, importc.}
-proc dos_qguiapplication_quit() {.cdecl, importc.}
-proc dos_qguiapplication_delete() {.cdecl, importc.}
-
-proc create*(application: QGuiApplication) =
-  ## Create a new QApplication
+proc setup*(self: QGuiApplication) =
+  ## Setup a new QApplication
   dos_qguiapplication_create()
-  application.deleted = false
+  self.deleted = false
 
-proc exec*(application: QGuiApplication) =
-  ## Start the Qt event loop
-  dos_qguiapplication_exec()
-
-proc quit*(application: QGuiApplication) =
-  ## Quit the Qt event loop
-  dos_qguiapplication_quit()
-
-proc delete*(application: QGuiApplication) =
+proc delete*(self: QGuiApplication) =
   ## Delete the given QApplication
-  if not application.deleted:
-    debugMsg("QApplication", "delete")
-    dos_qguiapplication_delete()
-    application.deleted = true
+  if self.deleted:
+    return
+  debugMsg("QApplication", "delete")
+  dos_qguiapplication_delete()
+  self.deleted = true
 
 proc newQGuiApplication*(): QGuiApplication =
   ## Return a new QApplication
   new(result, delete)
-  result.create()
+  result.setup()
+
+proc exec*(self: QGuiApplication) =
+  ## Start the Qt event loop
+  dos_qguiapplication_exec()
+
+proc quit*(self: QGuiApplication) =
+  ## Quit the Qt event loop
+  dos_qguiapplication_quit()