Merge pull request #153 from arnetheduck/const-callback

`const` in callbacks

Author: mappu

cmd/genbindings/emitcabi.go

@@ -838,7 +838,7 @@ extern "C" {
 		}
 
 		for _, m := range c.VirtualMethods() {
-			callback := m.ReturnType.RenderTypeCabi() + " " + cabiCallbackName(c, m) + "(void*, intptr_t"
+			callback := m.ReturnType.RenderTypeCabi() + " " + cabiCallbackName(c, m) + "(" + ifv(m.IsConst, "const ", "") + cabiClassName(c.ClassName) + "*, intptr_t"
 
 			for _, p := range m.Parameters {
 				callback += ", " + p.RenderTypeCabi()
@@ -937,15 +937,7 @@ extern "C" {
 					ret.WriteString("\t\t}\n")
 
 					paramArgs := []string{}
-					if m.IsConst {
-						// We're calling a Cgo-exported function, but Cgo can't
-						// describe a const pointer to a custom class, unless
-						// it's a primitive or wrapped in a typedef.
-						// Just strip the const_cast away
-						paramArgs = append(paramArgs, "const_cast<"+overriddenClassName+"*>(this)")
-					} else {
-						paramArgs = append(paramArgs, "this")
-					}
+					paramArgs = append(paramArgs, "this")
 					paramArgs = append(paramArgs, handleVarname)
 
 					var signalCode string

qt-extras/scintillaedit/gen_ScintillaEdit.cpp

@@ -15,16 +15,16 @@
 extern "C" {
 #endif
 
-void miqt_exec_callback_QsciAbstractAPIs_UpdateAutoCompletionList(void*, intptr_t, struct miqt_array /* of struct miqt_string */ , struct miqt_array /* of struct miqt_string */ );
-void miqt_exec_callback_QsciAbstractAPIs_AutoCompletionSelected(void*, intptr_t, struct miqt_string);
-struct miqt_array /* of struct miqt_string */  miqt_exec_callback_QsciAbstractAPIs_CallTips(void*, intptr_t, struct miqt_array /* of struct miqt_string */ , int, int, struct miqt_array /* of int */ );
-bool miqt_exec_callback_QsciAbstractAPIs_Event(void*, intptr_t, QEvent*);
-bool miqt_exec_callback_QsciAbstractAPIs_EventFilter(void*, intptr_t, QObject*, QEvent*);
-void miqt_exec_callback_QsciAbstractAPIs_TimerEvent(void*, intptr_t, QTimerEvent*);
-void miqt_exec_callback_QsciAbstractAPIs_ChildEvent(void*, intptr_t, QChildEvent*);
-void miqt_exec_callback_QsciAbstractAPIs_CustomEvent(void*, intptr_t, QEvent*);
-void miqt_exec_callback_QsciAbstractAPIs_ConnectNotify(void*, intptr_t, QMetaMethod*);
-void miqt_exec_callback_QsciAbstractAPIs_DisconnectNotify(void*, intptr_t, QMetaMethod*);
+void miqt_exec_callback_QsciAbstractAPIs_UpdateAutoCompletionList(QsciAbstractAPIs*, intptr_t, struct miqt_array /* of struct miqt_string */ , struct miqt_array /* of struct miqt_string */ );
+void miqt_exec_callback_QsciAbstractAPIs_AutoCompletionSelected(QsciAbstractAPIs*, intptr_t, struct miqt_string);
+struct miqt_array /* of struct miqt_string */  miqt_exec_callback_QsciAbstractAPIs_CallTips(QsciAbstractAPIs*, intptr_t, struct miqt_array /* of struct miqt_string */ , int, int, struct miqt_array /* of int */ );
+bool miqt_exec_callback_QsciAbstractAPIs_Event(QsciAbstractAPIs*, intptr_t, QEvent*);
+bool miqt_exec_callback_QsciAbstractAPIs_EventFilter(QsciAbstractAPIs*, intptr_t, QObject*, QEvent*);
+void miqt_exec_callback_QsciAbstractAPIs_TimerEvent(QsciAbstractAPIs*, intptr_t, QTimerEvent*);
+void miqt_exec_callback_QsciAbstractAPIs_ChildEvent(QsciAbstractAPIs*, intptr_t, QChildEvent*);
+void miqt_exec_callback_QsciAbstractAPIs_CustomEvent(QsciAbstractAPIs*, intptr_t, QEvent*);
+void miqt_exec_callback_QsciAbstractAPIs_ConnectNotify(QsciAbstractAPIs*, intptr_t, QMetaMethod*);
+void miqt_exec_callback_QsciAbstractAPIs_DisconnectNotify(QsciAbstractAPIs*, intptr_t, QMetaMethod*);
 #ifdef __cplusplus
 } /* extern C */
 #endif

qt-restricted-extras/qscintilla/gen_qsciabstractapis.cpp

@@ -18,16 +18,16 @@ extern "C" {
 void miqt_exec_callback_QsciAPIs_ApiPreparationCancelled(intptr_t);
 void miqt_exec_callback_QsciAPIs_ApiPreparationStarted(intptr_t);
 void miqt_exec_callback_QsciAPIs_ApiPreparationFinished(intptr_t);
-void miqt_exec_callback_QsciAPIs_UpdateAutoCompletionList(void*, intptr_t, struct miqt_array /* of struct miqt_string */ , struct miqt_array /* of struct miqt_string */ );
-void miqt_exec_callback_QsciAPIs_AutoCompletionSelected(void*, intptr_t, struct miqt_string);
-struct miqt_array /* of struct miqt_string */  miqt_exec_callback_QsciAPIs_CallTips(void*, intptr_t, struct miqt_array /* of struct miqt_string */ , int, int, struct miqt_array /* of int */ );
-bool miqt_exec_callback_QsciAPIs_Event(void*, intptr_t, QEvent*);
-bool miqt_exec_callback_QsciAPIs_EventFilter(void*, intptr_t, QObject*, QEvent*);
-void miqt_exec_callback_QsciAPIs_TimerEvent(void*, intptr_t, QTimerEvent*);
-void miqt_exec_callback_QsciAPIs_ChildEvent(void*, intptr_t, QChildEvent*);
-void miqt_exec_callback_QsciAPIs_CustomEvent(void*, intptr_t, QEvent*);
-void miqt_exec_callback_QsciAPIs_ConnectNotify(void*, intptr_t, QMetaMethod*);
-void miqt_exec_callback_QsciAPIs_DisconnectNotify(void*, intptr_t, QMetaMethod*);
+void miqt_exec_callback_QsciAPIs_UpdateAutoCompletionList(QsciAPIs*, intptr_t, struct miqt_array /* of struct miqt_string */ , struct miqt_array /* of struct miqt_string */ );
+void miqt_exec_callback_QsciAPIs_AutoCompletionSelected(QsciAPIs*, intptr_t, struct miqt_string);
+struct miqt_array /* of struct miqt_string */  miqt_exec_callback_QsciAPIs_CallTips(QsciAPIs*, intptr_t, struct miqt_array /* of struct miqt_string */ , int, int, struct miqt_array /* of int */ );
+bool miqt_exec_callback_QsciAPIs_Event(QsciAPIs*, intptr_t, QEvent*);
+bool miqt_exec_callback_QsciAPIs_EventFilter(QsciAPIs*, intptr_t, QObject*, QEvent*);
+void miqt_exec_callback_QsciAPIs_TimerEvent(QsciAPIs*, intptr_t, QTimerEvent*);
+void miqt_exec_callback_QsciAPIs_ChildEvent(QsciAPIs*, intptr_t, QChildEvent*);
+void miqt_exec_callback_QsciAPIs_CustomEvent(QsciAPIs*, intptr_t, QEvent*);
+void miqt_exec_callback_QsciAPIs_ConnectNotify(QsciAPIs*, intptr_t, QMetaMethod*);
+void miqt_exec_callback_QsciAPIs_DisconnectNotify(QsciAPIs*, intptr_t, QMetaMethod*);
 #ifdef __cplusplus
 } /* extern C */
 #endif