Swaps correct_args_if_called_as_method globally

Author: BekaValentine

python/ql/src/Expressions/CallArgs.qll

@@ -117,7 +117,7 @@ predicate wrong_args_objectapi(Call call, FunctionObject func, int limit, string
  * Implies nothing about whether `call` could call `func`.
  */
  bindingset[call, func]
-predicate correct_args_if_called_as_method(Call call, FunctionObject func) {
+predicate correct_args_if_called_as_method_objectapi(Call call, FunctionObject func) {
     arg_count_objectapi(call)+1 >= func.minParameters()
     and
     arg_count_objectapi(call) < func.maxParameters()

python/ql/src/Expressions/WrongNumberArgumentsInCall.ql

@@ -22,7 +22,7 @@ where
     too_few_args_objectapi(call, func, limit) and too = "too few arguments" and should = "no fewer than "
 ) and
 not func.isAbstract() and
-not exists(FunctionObject overridden | func.overrides(overridden) and correct_args_if_called_as_method(call, overridden))
+not exists(FunctionObject overridden | func.overrides(overridden) and correct_args_if_called_as_method_objectapi(call, overridden))
 /* The semantics of `__new__` can be a bit subtle, so we simply exclude `__new__` methods */
 and not func.getName() = "__new__"
 

python/ql/src/Functions/IncorrectlyOverriddenMethod.ql

@@ -15,7 +15,7 @@ import Expressions.CallArgs
 from Call call, FunctionObject func, FunctionObject overridden, string problem
 where
 func.overrides(overridden) and (
-    wrong_args_objectapi(call, func, _, problem) and correct_args_if_called_as_method(call, overridden)
+    wrong_args_objectapi(call, func, _, problem) and correct_args_if_called_as_method_objectapi(call, overridden)
     or
     exists(string name | 
         illegally_named_parameter_objectapi(call, func, name) and problem = "an argument named '" + name + "'" and

python/ql/src/Functions/IncorrectlySpecifiedOverriddenMethod.ql

@@ -18,7 +18,7 @@ where
 not func.getName() = "__init__" and
 overriding.overrides(func) and
 call = overriding.getAMethodCall().getNode() and
-correct_args_if_called_as_method(call, overriding) and
+correct_args_if_called_as_method_objectapi(call, overriding) and
 (
     arg_count_objectapi(call)+1 < func.minParameters() and problem = "too few arguments"
     or