16 files changed, 25 insertions, 29 deletions
diff --git a/Examples/test-suite/cpp11_default_delete.i b/Examples/test-suite/cpp11_default_delete.i
index 79c02cddc..b5e84ed51 100644
--- a/Examples/test-suite/cpp11_default_delete.i
+++ b/Examples/test-suite/cpp11_default_delete.i
@@ -17,20 +17,20 @@ public:
 };
 
 struct A1 {
-  void func(int i) {}
+  void funk(int i) {}
   A1() = default;
   ~A1() = default;
-  void func(double i) = delete;  /* Don't cast double to int. Compiler returns an error */
+  void funk(double i) = delete;  /* Don't cast double to int. Compiler returns an error */
 private:
   A1(const A1&);
 };
 A1::A1(const A1&) = default;
 
 struct A2 {
-  void func(int i) {}
+  void funk(int i) {}
   virtual void fff(int) = delete;
   virtual ~A2() = default;
-  template<class T> void func(T) = delete;
+  template<class T> void funk(T) = delete;
 };
 
 struct trivial {
diff --git a/Examples/test-suite/cpp11_rvalue_reference2.i b/Examples/test-suite/cpp11_rvalue_reference2.i
index dd6c98d0b..9aaf4accb 100644
--- a/Examples/test-suite/cpp11_rvalue_reference2.i
+++ b/Examples/test-suite/cpp11_rvalue_reference2.i
@@ -51,7 +51,7 @@ int glob = 123;
 
 Thingy &&globalrrval = Thingy(55, std::move(glob));
 
-short && func(short &&i) { return std::move(i); }
+short && funk(short &&i) { return std::move(i); }
 Thingy getit() { return Thingy(22, std::move(glob)); }
 
 void rvalrefFunction1(int &&v = (int &&)5) {}
diff --git a/Examples/test-suite/cpp11_type_aliasing.i b/Examples/test-suite/cpp11_type_aliasing.i
index 2f6ea3aa7..abc1642c4 100644
--- a/Examples/test-suite/cpp11_type_aliasing.i
+++ b/Examples/test-suite/cpp11_type_aliasing.i
@@ -108,5 +108,5 @@ PairSubclass::data_t plus1(PairSubclass::const_ref_data_t x) { return x + 1; }
 using callback_t = int(*)(int);
 
 callback_t get_callback() { return mult2; }
-int call(callback_t func, int param) { return func(param); }
+int call(callback_t funk, int param) { return funk(param); }
 %}
diff --git a/Examples/test-suite/java/java_director_assumeoverride_runme.java b/Examples/test-suite/java/java_director_assumeoverride_runme.java
index e876a79c9..6c4d6918e 100644
--- a/Examples/test-suite/java/java_director_assumeoverride_runme.java
+++ b/Examples/test-suite/java/java_director_assumeoverride_runme.java
@@ -18,7 +18,7 @@ public class java_director_assumeoverride_runme {
   public static void main(String argv[]) {
     OverrideMe overrideMe = new MyOverrideMe();
 
-    // MyOverrideMe doesn't actually override func(), but because assumeoverride
+    // MyOverrideMe doesn't actually override funk(), but because assumeoverride
     // was set to true, the C++ side will believe it was overridden.
     if (!java_director_assumeoverride.isFuncOverridden(overrideMe)) {
       throw new RuntimeException ( "isFuncOverridden()" );
diff --git a/Examples/test-suite/java_director_assumeoverride.i b/Examples/test-suite/java_director_assumeoverride.i
index cddebb4d7..f0eb37049 100644
--- a/Examples/test-suite/java_director_assumeoverride.i
+++ b/Examples/test-suite/java_director_assumeoverride.i
@@ -4,7 +4,7 @@
 class OverrideMe {
 public:
   virtual ~OverrideMe() {}
-  virtual void func() {};
+  virtual void funk() {};
 };
 
 #include "java_director_assumeoverride_wrap.h"
@@ -23,7 +23,7 @@ bool isFuncOverridden(OverrideMe* f) {
 class OverrideMe {
 public:
   virtual ~OverrideMe();
-  virtual void func();
+  virtual void funk();
 };
 
 bool isFuncOverridden(OverrideMe* f);
diff --git a/Examples/test-suite/javascript/null_pointer_runme.js b/Examples/test-suite/javascript/null_pointer_runme.js
index 7c0d61244..8a9b61186 100644
--- a/Examples/test-suite/javascript/null_pointer_runme.js
+++ b/Examples/test-suite/javascript/null_pointer_runme.js
@@ -1,6 +1,6 @@
 var null_pointer = require("null_pointer");
 
-if (!null_pointer.func(null)) {
+if (!null_pointer.funk(null)) {
   throw new Error("Javascript 'null' should be converted into NULL.");
 }
 
diff --git a/Examples/test-suite/name_warnings.i b/Examples/test-suite/name_warnings.i
index 3455c03bf..0b62ec5d7 100644
--- a/Examples/test-suite/name_warnings.i
+++ b/Examples/test-suite/name_warnings.i
@@ -40,9 +40,7 @@ namespace std
 #endif
     
     virtual ~A() {}
-#ifndef SWIGGO // func is a keyword in Go.
-    virtual int func() = 0;
-#endif
+    virtual int funk() = 0;
   private:
      typedef complex False;
   };
diff --git a/Examples/test-suite/null_pointer.i b/Examples/test-suite/null_pointer.i
index 0da827f99..f40d6929f 100644
--- a/Examples/test-suite/null_pointer.i
+++ b/Examples/test-suite/null_pointer.i
@@ -1,11 +1,9 @@
 %module null_pointer
 
-%warnfilter(SWIGWARN_PARSE_KEYWORD) func; // 'func' is a Go keyword, renamed as 'Xfunc'
-
 %inline {
   struct A {};
   
-  bool func(A* a) {
+  bool funk(A* a) {
     return !a;
   }
 
diff --git a/Examples/test-suite/octave/null_pointer_runme.m b/Examples/test-suite/octave/null_pointer_runme.m
index 9d55d8be2..72362f451 100644
--- a/Examples/test-suite/octave/null_pointer_runme.m
+++ b/Examples/test-suite/octave/null_pointer_runme.m
@@ -5,4 +5,4 @@ endif
 
 null_pointer;
 
-assert(func([]));
+assert(funk([]));
diff --git a/Examples/test-suite/octave/octave_cell_deref_runme.m b/Examples/test-suite/octave/octave_cell_deref_runme.m
index d00d17282..0a45999d3 100644
--- a/Examples/test-suite/octave/octave_cell_deref_runme.m
+++ b/Examples/test-suite/octave/octave_cell_deref_runme.m
@@ -5,8 +5,8 @@ endif
 
 octave_cell_deref;
 
-assert(func("hello"));
-assert(func({"hello"}));
+assert(funk("hello"));
+assert(funk({"hello"}));
 
 c = func2();
 assert(strcmp(c{1}, "hello"));
diff --git a/Examples/test-suite/octave_cell_deref.i b/Examples/test-suite/octave_cell_deref.i
index 2e92ec4de..272ba7c99 100644
--- a/Examples/test-suite/octave_cell_deref.i
+++ b/Examples/test-suite/octave_cell_deref.i
@@ -1,7 +1,7 @@
 %module octave_cell_deref
 
 %inline {
-  bool func(const char* s) {
+  bool funk(const char* s) {
     return !strcmp("hello",s);
   }
 
diff --git a/Examples/test-suite/python/python_append_runme.py b/Examples/test-suite/python/python_append_runme.py
index 6675f3509..ce5514dff 100644
--- a/Examples/test-suite/python/python_append_runme.py
+++ b/Examples/test-suite/python/python_append_runme.py
@@ -9,7 +9,7 @@ if is_python_builtin():
     exit(0)
 
 t = Test()
-t.func()
+t.funk()
 if is_new_style_class(Test):
     t.static_func()
 else:
diff --git a/Examples/test-suite/python_append.i b/Examples/test-suite/python_append.i
index 2a71b5784..049494319 100644
--- a/Examples/test-suite/python_append.i
+++ b/Examples/test-suite/python_append.i
@@ -17,11 +17,11 @@ def clearstaticpath():
     staticfuncpath = None
 %}
 
-%pythonappend Test::func %{
+%pythonappend Test::funk %{
 funcpath = os.path.dirname(funcpath)
 %}
 
-%pythonprepend Test::func %{
+%pythonprepend Test::funk %{
 global funcpath
 funcpath = mypath
 %}
@@ -46,7 +46,7 @@ import os.path
 class Test {
 public:
   static void static_func() {};
-  void func() {};
+  void funk() {};
 };
 
 #ifdef SWIGPYTHON_BUILTIN
diff --git a/Examples/test-suite/scilab/null_pointer_runme.sci b/Examples/test-suite/scilab/null_pointer_runme.sci
index 2c693d259..dab59acf8 100644
--- a/Examples/test-suite/scilab/null_pointer_runme.sci
+++ b/Examples/test-suite/scilab/null_pointer_runme.sci
@@ -2,6 +2,6 @@ exec("swigtest.start", -1);
 
 p = getnull();
 checkequal(SWIG_this(p), 0, "SWIG_this(p)");
-checkequal(func(p), %T, "func(p)");
+checkequal(funk(p), %T, "funk(p)");
 
 exec("swigtest.quit", -1);
diff --git a/Examples/test-suite/simutry.i b/Examples/test-suite/simutry.i
index addea14db..ad45da425 100644
--- a/Examples/test-suite/simutry.i
+++ b/Examples/test-suite/simutry.i
@@ -23,7 +23,7 @@ namespace simuPOP
     {
     }
     
-    virtual int func() const 
+    virtual int funk() const 
     { return m_pop.m_a; }
   };
 
@@ -32,7 +32,7 @@ namespace simuPOP
   struct DerivedOperator: public Operator<Pop>
   {
     DerivedOperator(int a):Operator<Pop>(a){}
-    virtual int func() const 
+    virtual int funk() const 
     { return 2*this->m_pop.m_a; }
   };
 
@@ -90,7 +90,7 @@ namespace simuPOP
   void test( const std::vector< Operator<pop>*>& para)
   {
     for( size_t i =0; i < para.size(); ++i)
-    para[i]->func();
+    para[i]->funk();
   }
 }
 }
diff --git a/Examples/test-suite/tcl/null_pointer_runme.tcl b/Examples/test-suite/tcl/null_pointer_runme.tcl
index be99c7166..7ed87c153 100644
--- a/Examples/test-suite/tcl/null_pointer_runme.tcl
+++ b/Examples/test-suite/tcl/null_pointer_runme.tcl
@@ -3,7 +3,7 @@ if [ catch { load ./null_pointer[info sharedlibextension] null_pointer} err_msg
 }
 
 set a [A]
-if {[func $a] != 0} {
+if {[funk $a] != 0} {
     puts stderr "null_pointer test 1 failed"
     exit 1
 }