Restructure code

txfly · Oct 12, 2018 · ff5a811 · ff5a811
1 parent 35f761c
commit ff5a811
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 9 deletions.
diff --git a/application/enum.go → application-enum.go b/application/enum.go → application-enum.go
@@ -1,4 +1,4 @@
-package application
+package qamel
 
 // FontWeight is the weight for thickness of the font.
 // Qt uses a weighting scale from 0 to 99 similar to,

diff --git a/application/application.cpp → application.cpp b/application/application.cpp → application.cpp
@@ -56,6 +56,7 @@ void App_SetOrganizationDomain(void* ptr, char* domain) {
     app->setOrganizationDomain(QString(domain));
 }
 
-int App_Exec() {
-    return QGuiApplication::exec();
+int App_Exec(void* ptr) {
+    QGuiApplication *app = static_cast<QGuiApplication*>(ptr);
+    return app->exec();
 }
diff --git a/application/application.go → application.go b/application/application.go → application.go
@@ -1,4 +1,4 @@
-package application
+package qamel
 
 // #include <stdlib.h>
 // #include <stdbool.h>
@@ -122,7 +122,7 @@ func (app Application) SetOrganizationDomain(domain string) {
 // then returns the value that was set to exit() (which is 0 if exit() is
 // called via quit()).
 func (app Application) Exec() int {
-	return int(int32(C.App_Exec()))
+	return int(int32(C.App_Exec(app.ptr)))
 }
 
 func sliceToChars(src []string) **C.char {

diff --git a/application/application.h → application.h b/application/application.h → application.h
@@ -22,7 +22,7 @@ void App_SetApplicationName(void* ptr, char* name);
 void App_SetApplicationVersion(void* ptr, char* version);
 void App_SetOrganizationName(void* ptr, char* name);
 void App_SetOrganizationDomain(void* ptr, char* domain);
-int App_Exec();
+int App_Exec(void* ptr);
 
 #ifdef __cplusplus
 }

diff --git a/engine/engine.cpp → engine.cpp b/engine/engine.cpp → engine.cpp
diff --git a/engine/engine.go → engine.go b/engine/engine.go → engine.go
@@ -1,4 +1,4 @@
-package engine
+package qamel
 
 // #include <stdlib.h>
 // #include <stdbool.h>

diff --git a/engine/engine.h → engine.h b/engine/engine.h → engine.h
diff --git a/viewer/enum.go → viewer-enum.go b/viewer/enum.go → viewer-enum.go
@@ -1,4 +1,4 @@
-package viewer
+package qamel
 
 // ResizeMode specifies how to resize the view.
 type ResizeMode int

diff --git a/viewer/viewer.cpp → viewer.cpp b/viewer/viewer.cpp → viewer.cpp
@@ -138,3 +138,5 @@ void Viewer_ClearComponentCache(void* ptr) {
 void Viewer_Reload(void* ptr) {
     QMetaObject::invokeMethod(static_cast<QamelView*>(ptr), "reload");
 }
+
+#include "moc.h"
diff --git a/viewer/viewer.go → viewer.go b/viewer/viewer.go → viewer.go
@@ -1,4 +1,4 @@
-package viewer
+package qamel
 
 // #include <stdlib.h>
 // #include <stdbool.h>

diff --git a/viewer/viewer.h → viewer.h b/viewer/viewer.h → viewer.h