genbindings: move 'qt_' prefix renaming into SafeMethodName()

cmd/genbindings/clang2il.go

@@ -265,10 +265,6 @@ nextMethod:
 
 			var mm CppMethod
 			mm.MethodName = methodName
-			if strings.HasPrefix(methodName, "qt_") { // Strip redundant Qt prefix, we know these are all Qt functions
-				mm.OverrideMethodName = methodName
-				mm.MethodName = methodName[3:]
-			}
 
 			if strings.Contains(methodName, `QGADGET`) {
 				log.Printf("Skipping method %q with weird QGADGET behaviour\n", mm.MethodName)

cmd/genbindings/intermediate.go

@@ -105,6 +105,14 @@ func (nm CppMethod) IsReceiverMethod() bool {
 }
 
 func (nm CppMethod) SafeMethodName() string {
+
+	tmp := nm.MethodName
+
+	// Strip redundant Qt prefix, we know these are all Qt functions
+	if strings.HasPrefix(tmp, "qt_") {
+		tmp = tmp[3:]
+	}
+
 	// Operator-overload methods have names not representable in binding
 	// languages. Replace more specific cases first
 	replacer := strings.NewReplacer(
@@ -138,8 +146,7 @@ func (nm CppMethod) SafeMethodName() string {
 		`[]`, `Subscript`,
 		`()`, `Call`,
 	)
-
+	tmp = replacer.Replace(tmp)
-	tmp := replacer.Replace(nm.MethodName)
 
 	// Also make the first letter uppercase so it becomes public in Go
 	tmp = titleCase(tmp)