Update reserved words and binding constructor case (#144)

* intermediate.go: Remove dead code

* emitcabi.go: Use PascalCase consistently for binding methods

* emitc.go: Update reserved words and use PascalCase consistently for binding methods

* Update bindings and wrappers

Author: rcalixte

cmd/genbindings/emitc.go

@@ -23,8 +23,8 @@ func cComment(s string) string {
 // not language-reserved words, but binding-reserved words
 func reservedWordC(s string) bool {
 	switch s {
-	case "default", "const", "var", "len", "new", "copy", "import",
-		"int", "select", "ret", "suspend", "null", "self":
+	case "const", "copy", "default", "import", "int", "len", "new",
+		"null", "ret", "select", "self", "suspend", "var":
 		return true
 	default:
 		return false
@@ -2699,9 +2699,9 @@ func emitC(src *CppParsedHeader, headerName, packageName string) (string, error)
 
 			var ctorRet string
 			if maybeAllocCleanup == "" {
-				ctorRet = "return " + cStructName + "_new" + maybeSuffix(i) + "(" + forwarding + ");"
+				ctorRet = "return " + cStructName + "_New" + maybeSuffix(i) + "(" + forwarding + ");"
 			} else {
-				ctorRet = cStructName + "* _out = " + cStructName + "_new" + maybeSuffix(i) + "(" + forwarding + ");"
+				ctorRet = cStructName + "* _out = " + cStructName + "_New" + maybeSuffix(i) + "(" + forwarding + ");"
 				ctorRet += maybeAllocCleanup
 				ctorRet += "return _out;"
 			}

cmd/genbindings/emitcabi.go

@@ -1907,7 +1907,7 @@ extern "C" {
 				maybeEndMacro = "#endif\n"
 			}
 
-			ret.WriteString(fmt.Sprintf("%s%s %s_new%s(%s);\n%s", maybeMacro, methodPrefixName+"*", methodPrefixName, maybeSuffix(i), emitParametersCabi(ctor, ""), maybeEndMacro))
+			ret.WriteString(fmt.Sprintf("%s%s %s_New%s(%s);\n%s", maybeMacro, methodPrefixName+"*", methodPrefixName, maybeSuffix(i), emitParametersCabi(ctor, ""), maybeEndMacro))
 		}
 
 		var maybeAMacro, maybeAEndMacro string
@@ -2188,7 +2188,7 @@ func emitBindingCpp(src *CppParsedHeader, filename string) (string, error) {
 				}
 
 				ret.WriteString(fmt.Sprintf(
-					"%s* %s_new%s(%s) {\n"+
+					"%s* %s_New%s(%s) {\n"+
 						"#if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)\n"+
 						"%s"+
 						"\treturn new %s(%s);\n"+
@@ -2237,7 +2237,7 @@ func emitBindingCpp(src *CppParsedHeader, filename string) (string, error) {
 				baseReturn := "new " + virtualName + cClassName + "(" + maybeMoveCtor + forwarding + maybeCloseMoveCtor + ")"
 				ctorReturn = "\t return " + baseReturn
 
-				ret.WriteString(maybeMacro + methodPrefixName + "* " + methodPrefixName + "_new" +
+				ret.WriteString(maybeMacro + methodPrefixName + "* " + methodPrefixName + "_New" +
 					maybeSuffix(i) + "(" + emitParametersCabi(ctor, "") +
 					") {\n" + preamble + ctorReturn + ";\n}\n" + maybeEndMacro + "\n\n")
 			}

cmd/genbindings/intermediate.go

@@ -552,8 +552,8 @@ type CppClass struct {
 // C++ constructors cannot be virtual.
 func (c *CppClass) VirtualMethods() []CppMethod {
 	var ret []CppMethod
-	var retNames = make(map[string]struct{}, 0) // if name is present, a child class found it first
-	var block = slice_to_set(c.PrivateMethods)
+	retNames := make(map[string]struct{}, 0) // if name is present, a child class found it first
+	block := slice_to_set(c.PrivateMethods)
 
 	if len(c.Ctors) == 0 {
 		// This class can't be constructed
@@ -577,10 +577,6 @@ func (c *CppClass) VirtualMethods() []CppMethod {
 		retNames[c.Methods[i].CppCallTarget()] = struct{}{}
 	}
 
-	for i := range c.PrivateMethods {
-		block[c.PrivateMethods[i]] = struct{}{}
-	}
-
 	// Only allow virtual overrides for direct inherits, not all inherits
 	for _, cinfo := range c.AllInheritsClassInfo() {
 		for i := range cinfo.Class.Methods {
@@ -631,8 +627,8 @@ func (c *CppClass) VirtualMethods() []CppMethod {
 // This only considers protected methods, not protected constructor overloads.
 func (c *CppClass) ProtectedMethods() []CppMethod {
 	var ret []CppMethod
-	var retNames = make(map[string]struct{}, 0) // if name is present, a child class found it first
-	var block = slice_to_set(c.PrivateMethods)
+	retNames := make(map[string]struct{}, 0) // if name is present, a child class found it first
+	block := slice_to_set(c.PrivateMethods)
 
 	for i := range c.Methods {
 
@@ -653,10 +649,6 @@ func (c *CppClass) ProtectedMethods() []CppMethod {
 		retNames[c.Methods[i].CppCallTarget()] = struct{}{}
 	}
 
-	for i := range c.PrivateMethods {
-		block[c.PrivateMethods[i]] = struct{}{}
-	}
-
 	for _, cinfo := range c.AllInheritsClassInfo() {
 
 		for i := range cinfo.Class.Methods {

src/bluetooth/libqbluetoothaddress.c

@@ -2,19 +2,19 @@
 #include "libqbluetoothaddress.h"
 
 QBluetoothAddress* q_bluetoothaddress_new() {
-    return QBluetoothAddress_new();
+    return QBluetoothAddress_New();
 }
 
 QBluetoothAddress* q_bluetoothaddress_new2(uint64_t address) {
-    return QBluetoothAddress_new2(address);
+    return QBluetoothAddress_New2(address);
 }
 
 QBluetoothAddress* q_bluetoothaddress_new3(const char* address) {
-    return QBluetoothAddress_new3(qstring(address));
+    return QBluetoothAddress_New3(qstring(address));
 }
 
 QBluetoothAddress* q_bluetoothaddress_new4(void* other) {
-    return QBluetoothAddress_new4((QBluetoothAddress*)other);
+    return QBluetoothAddress_New4((QBluetoothAddress*)other);
 }
 
 void q_bluetoothaddress_operator_assign(void* self, void* other) {

src/bluetooth/libqbluetoothaddress.cpp

@@ -4,20 +4,20 @@
 #include "libqbluetoothaddress.hpp"
 #include "libqbluetoothaddress.hxx"
 
-QBluetoothAddress* QBluetoothAddress_new() {
+QBluetoothAddress* QBluetoothAddress_New() {
     return new QBluetoothAddress();
 }
 
-QBluetoothAddress* QBluetoothAddress_new2(unsigned long long address) {
+QBluetoothAddress* QBluetoothAddress_New2(unsigned long long address) {
     return new QBluetoothAddress(static_cast<quint64>(address));
 }
 
-QBluetoothAddress* QBluetoothAddress_new3(const libqt_string address) {
+QBluetoothAddress* QBluetoothAddress_New3(const libqt_string address) {
     QString address_QString = QString::fromUtf8(address.data, address.len);
     return new QBluetoothAddress(address_QString);
 }
 
-QBluetoothAddress* QBluetoothAddress_new4(const QBluetoothAddress* other) {
+QBluetoothAddress* QBluetoothAddress_New4(const QBluetoothAddress* other) {
     return new QBluetoothAddress(*other);
 }
 

src/bluetooth/libqbluetoothaddress.hpp

@@ -18,10 +18,10 @@ extern "C" {
 typedef struct QBluetoothAddress QBluetoothAddress;
 #endif
 
-QBluetoothAddress* QBluetoothAddress_new();
-QBluetoothAddress* QBluetoothAddress_new2(unsigned long long address);
-QBluetoothAddress* QBluetoothAddress_new3(const libqt_string address);
-QBluetoothAddress* QBluetoothAddress_new4(const QBluetoothAddress* other);
+QBluetoothAddress* QBluetoothAddress_New();
+QBluetoothAddress* QBluetoothAddress_New2(unsigned long long address);
+QBluetoothAddress* QBluetoothAddress_New3(const libqt_string address);
+QBluetoothAddress* QBluetoothAddress_New4(const QBluetoothAddress* other);
 void QBluetoothAddress_OperatorAssign(QBluetoothAddress* self, const QBluetoothAddress* other);
 bool QBluetoothAddress_IsNull(const QBluetoothAddress* self);
 void QBluetoothAddress_Clear(QBluetoothAddress* self);

src/bluetooth/libqbluetoothdevicediscoveryagent.c

@@ -8,19 +8,19 @@
 #include "libqbluetoothdevicediscoveryagent.h"
 
 QBluetoothDeviceDiscoveryAgent* q_bluetoothdevicediscoveryagent_new() {
-    return QBluetoothDeviceDiscoveryAgent_new();
+    return QBluetoothDeviceDiscoveryAgent_New();
 }
 
 QBluetoothDeviceDiscoveryAgent* q_bluetoothdevicediscoveryagent_new2(void* deviceAdapter) {
-    return QBluetoothDeviceDiscoveryAgent_new2((QBluetoothAddress*)deviceAdapter);
+    return QBluetoothDeviceDiscoveryAgent_New2((QBluetoothAddress*)deviceAdapter);
 }
 
 QBluetoothDeviceDiscoveryAgent* q_bluetoothdevicediscoveryagent_new3(void* parent) {
-    return QBluetoothDeviceDiscoveryAgent_new3((QObject*)parent);
+    return QBluetoothDeviceDiscoveryAgent_New3((QObject*)parent);
 }
 
 QBluetoothDeviceDiscoveryAgent* q_bluetoothdevicediscoveryagent_new4(void* deviceAdapter, void* parent) {
-    return QBluetoothDeviceDiscoveryAgent_new4((QBluetoothAddress*)deviceAdapter, (QObject*)parent);
+    return QBluetoothDeviceDiscoveryAgent_New4((QBluetoothAddress*)deviceAdapter, (QObject*)parent);
 }
 
 const QMetaObject* q_bluetoothdevicediscoveryagent_meta_object(void* self) {

src/bluetooth/libqbluetoothdevicediscoveryagent.cpp

@@ -13,19 +13,19 @@
 #include "libqbluetoothdevicediscoveryagent.hpp"
 #include "libqbluetoothdevicediscoveryagent.hxx"
 
-QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_new() {
+QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_New() {
     return new VirtualQBluetoothDeviceDiscoveryAgent();
 }
 
-QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_new2(const QBluetoothAddress* deviceAdapter) {
+QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_New2(const QBluetoothAddress* deviceAdapter) {
     return new VirtualQBluetoothDeviceDiscoveryAgent(*deviceAdapter);
 }
 
-QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_new3(QObject* parent) {
+QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_New3(QObject* parent) {
     return new VirtualQBluetoothDeviceDiscoveryAgent(parent);
 }
 
-QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_new4(const QBluetoothAddress* deviceAdapter, QObject* parent) {
+QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_New4(const QBluetoothAddress* deviceAdapter, QObject* parent) {
     return new VirtualQBluetoothDeviceDiscoveryAgent(*deviceAdapter, parent);
 }
 

src/bluetooth/libqbluetoothdevicediscoveryagent.hpp

@@ -26,10 +26,10 @@ typedef struct QObject QObject;
 typedef struct QTimerEvent QTimerEvent;
 #endif
 
-QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_new();
-QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_new2(const QBluetoothAddress* deviceAdapter);
-QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_new3(QObject* parent);
-QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_new4(const QBluetoothAddress* deviceAdapter, QObject* parent);
+QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_New();
+QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_New2(const QBluetoothAddress* deviceAdapter);
+QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_New3(QObject* parent);
+QBluetoothDeviceDiscoveryAgent* QBluetoothDeviceDiscoveryAgent_New4(const QBluetoothAddress* deviceAdapter, QObject* parent);
 QMetaObject* QBluetoothDeviceDiscoveryAgent_MetaObject(const QBluetoothDeviceDiscoveryAgent* self);
 void* QBluetoothDeviceDiscoveryAgent_Metacast(QBluetoothDeviceDiscoveryAgent* self, const char* param1);
 int QBluetoothDeviceDiscoveryAgent_Metacall(QBluetoothDeviceDiscoveryAgent* self, int param1, int param2, void** param3);

src/bluetooth/libqbluetoothdeviceinfo.c

@@ -4,19 +4,19 @@
 #include "libqbluetoothdeviceinfo.h"
 
 QBluetoothDeviceInfo* q_bluetoothdeviceinfo_new() {
-    return QBluetoothDeviceInfo_new();
+    return QBluetoothDeviceInfo_New();
 }
 
 QBluetoothDeviceInfo* q_bluetoothdeviceinfo_new2(void* address, const char* name, uint32_t classOfDevice) {
-    return QBluetoothDeviceInfo_new2((QBluetoothAddress*)address, qstring(name), classOfDevice);
+    return QBluetoothDeviceInfo_New2((QBluetoothAddress*)address, qstring(name), classOfDevice);
 }
 
 QBluetoothDeviceInfo* q_bluetoothdeviceinfo_new3(void* uuid, const char* name, uint32_t classOfDevice) {
-    return QBluetoothDeviceInfo_new3((QBluetoothUuid*)uuid, qstring(name), classOfDevice);
+    return QBluetoothDeviceInfo_New3((QBluetoothUuid*)uuid, qstring(name), classOfDevice);
 }
 
 QBluetoothDeviceInfo* q_bluetoothdeviceinfo_new4(void* other) {
-    return QBluetoothDeviceInfo_new4((QBluetoothDeviceInfo*)other);
+    return QBluetoothDeviceInfo_New4((QBluetoothDeviceInfo*)other);
 }
 
 bool q_bluetoothdeviceinfo_is_valid(void* self) {