changeset 30899:48ef5fabe9b7

maint: Use "fcn" as preferred abbreviation for "function" in libgui/. * Logger.cc, qopengl-functions.h: Replace "func", "fun" in variable names with "fcn".
author Rik <rik@octave.org>
date Tue, 05 Apr 2022 13:33:39 -0700
parents 51a3d3a69193
children f6c74e01e294
files libgui/graphics/Logger.cc libgui/graphics/qopengl-functions.h
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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); \
   }
 
--- 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)