# HG changeset patch
# User Rik <rik@octave.org>
# Date 1649190819 25200
# Node ID 48ef5fabe9b7cff998f25f09d783436d6e5256e0
# Parent  51a3d3a69193f47d78a85a216c7c3c0209577f37
maint: Use "fcn" as preferred abbreviation for "function" in libgui/.

* Logger.cc, qopengl-functions.h:
Replace "func", "fun" in variable names with "fcn".

diff -r 51a3d3a69193 -r 48ef5fabe9b7 libgui/graphics/Logger.cc
--- a/libgui/graphics/Logger.cc	Tue Apr 05 13:20:48 2022 -0700
+++ b/libgui/graphics/Logger.cc	Tue Apr 05 13:33:39 2022 -0700
@@ -65,13 +65,13 @@
     return s_instance;
   }
 
-#define STATIC_LOGGER(fun) \
-  void Logger::fun (const char *fmt, ...) \
+#define STATIC_LOGGER(fcn) \
+  void Logger::fcn (const char *fmt, ...) \
   { \
     QMutexLocker lock (s_mutex); \
     va_list vl; \
     va_start (vl, fmt); \
-    instance ()->fun ## V (fmt, vl); \
+    instance ()->fcn ## V (fmt, vl); \
     va_end (vl); \
   }
 
diff -r 51a3d3a69193 -r 48ef5fabe9b7 libgui/graphics/qopengl-functions.h
--- a/libgui/graphics/qopengl-functions.h	Tue Apr 05 13:20:48 2022 -0700
+++ b/libgui/graphics/qopengl-functions.h	Tue Apr 05 13:33:39 2022 -0700
@@ -63,9 +63,9 @@
 
 #if defined (HAVE_QOPENGLFUNCTIONS_1_1)
 
-    void glAlphaFunc (GLenum func, GLclampf ref)
+    void glAlphaFunc (GLenum fcn, GLclampf ref)
     {
-      m_glfcns.glAlphaFunc (func, ref);
+      m_glfcns.glAlphaFunc (fcn, ref);
     }
 
     void glBegin (GLenum mode)
@@ -150,9 +150,9 @@
       m_glfcns.glDeleteTextures (n, textures);
     }
 
-    void glDepthFunc (GLenum func)
+    void glDepthFunc (GLenum fcn)
     {
-      m_glfcns.glDepthFunc (func);
+      m_glfcns.glDepthFunc (fcn);
     }
 
     void glDisable (GLenum cap)