genbindings: fixes for signed char, pointer+reference types

cmd/genbindings/emitcabi.go

@@ -64,11 +64,10 @@ func (p CppParameter) RenderTypeCabi() string {
 		}
 	}
 
-	if p.ByRef {
-		ret += "*"
-	}
 	if p.Pointer {
 		ret += strings.Repeat("*", p.PointerCount)
+	} else if p.ByRef {
+		ret += "*"
 	}
 
 	return ret // ignore const
@@ -242,6 +241,8 @@ func emitParametersCABI2CppForwarding(params []CppParameter) (preamble string, f
 				preamble += "\tfor(size_t i = 0; i < " + p.ParameterName + "_len; ++i) {\n"
 				if listType.QtClassType() && !listType.Pointer {
 					preamble += "\t\t" + p.ParameterName + "_QList.push_back(*(" + p.ParameterName + "[i]));\n"
+				} else if listType.IsFlagType() {
+					preamble += "\t\t" + p.ParameterName + "_QList.push_back(static_cast<" + listType.RenderTypeQtCpp() + ">(" + p.ParameterName + "[i]));\n"
 				} else {
 					preamble += "\t\t" + p.ParameterName + "_QList.push_back(" + p.ParameterName + "[i]);\n"
 				}
@@ -277,10 +278,18 @@ func emitParametersCABI2CppForwarding(params []CppParameter) (preamble string, f
 			}
 
 		} else if p.ByRef {
-			// We changed RenderTypeCabi() to render this as a pointer
-			// Need to dereference so we can pass as reference to the actual Qt C++ function
-			//tmp = append(tmp, "*"+p.ParameterName)
-			tmp = append(tmp, "*"+p.ParameterName)
+			if p.Pointer {
+				// By ref and by pointer
+				// This happens for QDataStream &QDataStream::operator>>(char *&s)
+				// We are only using one level of indirection
+				tmp = append(tmp, p.ParameterName)
+			} else {
+				// By ref and not by pointer
+				// We changed RenderTypeCabi() to render this as a pointer
+				// Need to dereference so we can pass as reference to the actual Qt C++ function
+				//tmp = append(tmp, "*"+p.ParameterName)
+				tmp = append(tmp, "*"+p.ParameterName)
+			}
 
 		} else if p.QtClassType() && !p.Pointer {
 			// CABI takes all Qt types by pointer, even if C++ wants them by value

cmd/genbindings/emitgo.go

@@ -112,6 +112,9 @@ func (p CppParameter) parameterTypeCgo() string {
 	if strings.HasPrefix(tmp, "unsigned ") {
 		tmp = "u" + tmp[9:] // Cgo uses uchar, uint instead of full name
 	}
+	if strings.HasPrefix(tmp, "signed ") {
+		tmp = "s" + tmp[7:] // Cgo uses schar
+	}
 	tmp = strings.Replace(tmp, `long long`, `longlong`, -1)
 	return "C." + strings.Replace(tmp, " ", "_", -1)
 }

cmd/genbindings/intermediate.go

@@ -150,7 +150,7 @@ func (p CppParameter) IntType() bool {
 	case "int", "unsigned int", "uint",
 		"short", "unsigned short", "ushort", "qint16", "quint16",
 		"qint8", "quint8",
-		"unsigned char", "uchar",
+		"unsigned char", "signed char", "uchar",
 		"long", "unsigned long", "ulong", "qint32", "quint32",
 		"longlong", "ulonglong", "qlonglong", "qulonglong", "qint64", "quint64", "int64_t", "uint64_t", "long long", "unsigned long long",
 		"qintptr", "quintptr", "uintptr_t", "intptr_t",