[gtksourceview] Rename typebuiltins -> enumtypes

From: Sébastien Wilmet <swilmet src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtksourceview] Rename typebuiltins -> enumtypes
Date: Fri, 17 Jun 2016 18:48:18 +0000 (UTC)
commit 151639fe1f080f581f319c89b0703567c585b099
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Jun 17 20:38:28 2016 +0200

    Rename typebuiltins -> enumtypes
    
    typebuiltins is less clear and less standard I think.

 build/win32/gen-enums.batin                        |   14 ++++----
 build/win32/vs10/gtksourceview.vcxprojin           |    8 ++--
 build/win32/vs9/gtksourceview.vcprojin             |    8 ++--
 docs/reference/Makefile.am                         |    2 +-
 gtksourceview/Makefile.am                          |   36 ++++++++++----------
 .../words/gtksourcecompletionwords.c               |    2 +-
 gtksourceview/gtksource.h                          |    2 +-
 gtksourceview/gtksourcebuffer.c                    |    2 +-
 gtksourceview/gtksourcebufferinputstream.c         |    2 +-
 gtksourceview/gtksourcecompletioncontext.c         |    2 +-
 gtksourceview/gtksourcefile.c                      |    2 +-
 gtksourceview/gtksourcefileloader.c                |    2 +-
 gtksourceview/gtksourcefilesaver.c                 |    2 +-
 gtksourceview/gtksourcegutterrenderer.c            |    2 +-
 gtksourceview/gtksourcesearchcontext.c             |    2 +-
 gtksourceview/gtksourceview.c                      |    2 +-
 16 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/build/win32/gen-enums.batin b/build/win32/gen-enums.batin
index 5b6bc1b..4b591ba 100644
--- a/build/win32/gen-enums.batin
+++ b/build/win32/gen-enums.batin
@@ -2,15 +2,15 @@
 
 cd ..\..\gtksourceview
 
-if exist gtksourceview-typebuiltins.h del gtksourceview-typebuiltins.h
-if exist gtksourceview-typebuiltins.c del gtksourceview-typebuiltins.c
+if exist gtksourceview-enumtypes.h del gtksourceview-enumtypes.h
+if exist gtksourceview-enumtypes.c del gtksourceview-enumtypes.c
 
 call perl %1\bin\glib-mkenums ^
 --fhead "#ifdef HAVE_CONFIG_H\n" ^
 --fhead "#include \"config.h\"\n" ^
 --fhead "#endif\n\n" ^
 --fhead "#include <glib-object.h>\n" ^
---fhead "#include \"gtksourceview-typebuiltins.h\"\n\n" ^
+--fhead "#include \"gtksourceview-enumtypes.h\"\n\n" ^
 --fprod "\n/* enumerations from \"@filename \" */" ^
 --vhead "static const G Type@Value _ enum_name@_values[] = {" ^
 --vprod "  { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," ^
@@ -21,7 +21,7 @@ call perl %1\bin\glib-mkenums ^
 --vtail "    type = g_ type@_register_static (\"@EnumName \", _ enum_name@_values);\n\n" ^
 --vtail "  return type;\n}\n\n" ^
 #include "enum.headers"
-&1> gtksourceview-typebuiltins.c
+&1> gtksourceview-enumtypes.c
 
 call perl %1\bin\glib-mkenums ^
 --fhead "#ifndef GTKSOURCEVIEW_TYPEBUILTINS_H\n" ^
@@ -33,8 +33,8 @@ call perl %1\bin\glib-mkenums ^
 --eprod "GTK_SOURCE_ENUM_EXTERN\nGType @enum_name _get_type (void);\n" ^
 --eprod "G_END_DECLS\n\n" ^
 # include "enum.headers"
-&1> gtksourceview-typebuiltins.h
+&1> gtksourceview-enumtypes.h
 
 
-call perl -p -i.tmp -e "s/GTK_TYPE_SOURCE_/GTK_SOURCE_TYPE_/g" gtksourceview-typebuiltins.h
-del gtksourceview-typebuiltins.h.tmp
+call perl -p -i.tmp -e "s/GTK_TYPE_SOURCE_/GTK_SOURCE_TYPE_/g" gtksourceview-enumtypes.h
+del gtksourceview-enumtypes.h.tmp
diff --git a/build/win32/vs10/gtksourceview.vcxprojin b/build/win32/vs10/gtksourceview.vcxprojin
index e58e7af..1c7f668 100644
--- a/build/win32/vs10/gtksourceview.vcxprojin
+++ b/build/win32/vs10/gtksourceview.vcxprojin
@@ -197,16 +197,16 @@
     <CustomBuild Include="..\gen-enums.bat">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Enumeration 
sources...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateEnums)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtksourceview\gtksourceview-typebuiltins.c;..\..\..\gtksourceview\gtksourceview-typebuiltins.h;%(Outputs)</Outputs>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Enumeration 
sources...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateEnums)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtksourceview\gtksourceview-typebuiltins.c;..\..\..\gtksourceview\gtksourceview-typebuiltins.h;%(Outputs)</Outputs>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Enumeration 
sources...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateEnums)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtksourceview\gtksourceview-typebuiltins.c;..\..\..\gtksourceview\gtksourceview-typebuiltins.h;%(Outputs)</Outputs>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Enumeration 
sources...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateEnums)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtksourceview\gtksourceview-typebuiltins.c;..\..\..\gtksourceview\gtksourceview-typebuiltins.h;%(Outputs)</Outputs>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\..\gtksourceview\gtksourceview.gresource.xml">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GResource 
sources...</Message>
diff --git a/build/win32/vs9/gtksourceview.vcprojin b/build/win32/vs9/gtksourceview.vcprojin
index 2b8eb32..1f2a4f7 100644
--- a/build/win32/vs9/gtksourceview.vcprojin
+++ b/build/win32/vs9/gtksourceview.vcprojin
@@ -245,28 +245,28 @@
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating Enumeration sources..."
                                                CommandLine="$(GenerateEnums)"
-                                               
Outputs="..\..\..\gtksourceview\gtksourceview-typebuiltins.c;..\..\..\gtksourceview\gtksourceview-typebuiltins.h"
+                                               
Outputs="..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|Win32">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating Enumeration sources..."
                                                CommandLine="$(GenerateEnums)"
-                                               
Outputs="..\..\..\gtksourceview\gtksourceview-typebuiltins.c;..\..\..\gtksourceview\gtksourceview-typebuiltins.h"
+                                               
Outputs="..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating Enumeration sources..."
                                                CommandLine="$(GenerateEnums)"
-                                               
Outputs="..\..\..\gtksourceview\gtksourceview-typebuiltins.c;..\..\..\gtksourceview\gtksourceview-typebuiltins.h"
+                                               
Outputs="..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating Enumeration sources..."
                                                CommandLine="$(GenerateEnums)"
-                                               
Outputs="..\..\..\gtksourceview\gtksourceview-typebuiltins.c;..\..\..\gtksourceview\gtksourceview-typebuiltins.h"
+                                               
Outputs="..\..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\..\gtksourceview\gtksourceview-enumtypes.h"
                                        />
                                </FileConfiguration>
                        </File>
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f74bb8f..ecdc5ce 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -53,8 +53,8 @@ IGNORE_HFILES =                                       \
        gtksourcestyle-private.h                \
        gtksourcetypes-private.h                \
        gtksourceundomanagerdefault.h           \
+       gtksourceview-enumtypes.h               \
        gtksourceview-i18n.h                    \
-       gtksourceview-typebuiltins.h            \
        gtksourceview-utils.h
 
 # Extra options to supply to gtkdoc-mkdb
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 1f55fd3..bff996f 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -15,9 +15,9 @@ AM_CPPFLAGS =                                 \
        $(DEP_CFLAGS)
 
 BUILT_SOURCES =                        \
-       gtksourceview-resources.c       \
-       gtksourceview-typebuiltins.c    \
-       gtksourceview-typebuiltins.h
+       gtksourceview-enumtypes.c       \
+       gtksourceview-enumtypes.h       \
+       gtksourceview-resources.c
 
 libgtksourceview_public_headers =              \
        gtksource.h                             \
@@ -191,16 +191,16 @@ libgtksourceview_3_0_includedir = $(includedir)/gtksourceview-3.0/gtksourceview
 
 libgtksourceview_3_0_include_HEADERS = $(libgtksourceview_public_headers)
 
-nodist_libgtksourceview_3_0_include_HEADERS = \
-       gtksourceview-typebuiltins.h \
-       gtksourceversion.h
+nodist_libgtksourceview_3_0_include_HEADERS =  \
+       gtksourceversion.h                      \
+       gtksourceview-enumtypes.h
 
 gtksourceview-resources.c: gtksourceview.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--sourcedir=$(srcdir) --generate-dependencies $(srcdir)/gtksourceview.gresource.xml)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(srcdir)/gtksourceview.gresource.xml
 
-gtksourceview-typebuiltins.c: stamp-gtksourceview-typebuiltins.c
+gtksourceview-enumtypes.c: stamp-gtksourceview-enumtypes.c
        @true
-stamp-gtksourceview-typebuiltins.c: Makefile.am $(libgtksourceview_public_headers)
+stamp-gtksourceview-enumtypes.c: Makefile.am $(libgtksourceview_public_headers)
        $(AM_V_GEN) (cd $(srcdir) \
         && $(GLIB_MKENUMS) \
                        --fhead "#ifdef HAVE_CONFIG_H\n" \
@@ -208,7 +208,7 @@ stamp-gtksourceview-typebuiltins.c: Makefile.am $(libgtksourceview_public_header
                        --fhead "#endif\n\n" \
                        --fhead "#include <glib-object.h>\n" \
                        --fhead "#include \"gtksourceversion.h\"\n" \
-                       --fhead "#include \"gtksourceview-typebuiltins.h\"\n\n" \
+                       --fhead "#include \"gtksourceview-enumtypes.h\"\n\n" \
                        --fprod "\n/* enumerations from \"@filename \" */" \
                        --vhead "static const G Type@Value _ enum_name@_values[] = {" \
                        --vprod "  { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
@@ -219,20 +219,20 @@ stamp-gtksourceview-typebuiltins.c: Makefile.am $(libgtksourceview_public_header
                        --vtail "    type = g_ type@_register_static (\"@EnumName \", _ 
enum_name@_values);\n\n" \
                        --vtail "  return type;\n}\n\n" \
                $(libgtksourceview_public_headers) ) > xgen-gtbec \
-       && (cmp -s xgen-gtbec gtksourceview-typebuiltins.c || cp xgen-gtbec gtksourceview-typebuiltins.c) \
+       && (cmp -s xgen-gtbec gtksourceview-enumtypes.c || cp xgen-gtbec gtksourceview-enumtypes.c) \
        && rm -f xgen-gtbec && echo stamp > $(@F)
 
-gtksourceview-typebuiltins.h: stamp-gtksourceview-typebuiltins.h
+gtksourceview-enumtypes.h: stamp-gtksourceview-enumtypes.h
        @true
 
 # FIXME: we have to sed the file because glib-mkenums does
 #        not recognize GTK_SOURCE as the prefix but instead GTK
-stamp-gtksourceview-typebuiltins.h: Makefile.am $(libgtksourceview_public_headers)
+stamp-gtksourceview-enumtypes.h: Makefile.am $(libgtksourceview_public_headers)
        $(AM_V_GEN) (cd $(srcdir) \
         && $(GLIB_MKENUMS) \
-                       --fhead "#ifndef GTKSOURCEVIEW_TYPEBUILTINS_H\n" \
-                       --fhead "#define GTKSOURCEVIEW_TYPEBUILTINS_H\n\n" \
-                       --ftail "#endif /* GTKSOURCEVIEW_TYPEBUILTINS_H */\n" \
+                       --fhead "#ifndef GTKSOURCEVIEW_ENUMTYPES_H\n" \
+                       --fhead "#define GTKSOURCEVIEW_ENUMTYPES_H\n\n" \
+                       --ftail "#endif /* GTKSOURCEVIEW_ENUMTYPES_H */\n" \
                        --fprod "#include <gtksourceview/@filename@>\n" \
                        --eprod "G_BEGIN_DECLS\n" \
                        --eprod "#define GTK_TYPE_ ENUMSHORT@ @enum_name _get_type()\n" \
@@ -241,7 +241,7 @@ stamp-gtksourceview-typebuiltins.h: Makefile.am $(libgtksourceview_public_header
                        --eprod "G_END_DECLS\n\n" \
                $(libgtksourceview_public_headers) ) > xgen-gth \
        && $(SED) -e 's/GTK_TYPE_SOURCE_/GTK_SOURCE_TYPE_/' <xgen-gth >xgen-gth.temp && mv xgen-gth.temp 
xgen-gth \
-       && (cmp -s xgen-gth gtksourceview-typebuiltins.h || cp xgen-gth gtksourceview-typebuiltins.h) \
+       && (cmp -s xgen-gth gtksourceview-enumtypes.h || cp xgen-gth gtksourceview-enumtypes.h) \
        && rm -f xgen-gth && echo stamp > $(@F)
 
 EXTRA_DIST =                                   \
@@ -251,8 +251,8 @@ EXTRA_DIST =                                        \
 
 CLEANFILES =                                   \
        $(BUILT_SOURCES)                        \
-       stamp-gtksourceview-typebuiltins.h      \
-       stamp-gtksourceview-typebuiltins.c
+       stamp-gtksourceview-enumtypes.c         \
+       stamp-gtksourceview-enumtypes.h
 
 libgtksourcecompletionwords_files =    \
        ./completion-providers/words/gtksourcecompletionwords.h \
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c 
b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
index 5b44587..8300490 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
@@ -39,7 +39,7 @@
 #include "gtksourcecompletionwordsbuffer.h"
 #include "gtksourcecompletionwordsutils.h"
 #include "gtksourceview/gtksource.h"
-#include "gtksourceview/gtksourceview-typebuiltins.h"
+#include "gtksourceview/gtksourceview-enumtypes.h"
 #include "gtksourceview/gtksourceview-i18n.h"
 
 #include <string.h>
diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h
index 915e1e5..7d4fffe 100644
--- a/gtksourceview/gtksource.h
+++ b/gtksourceview/gtksource.h
@@ -56,7 +56,7 @@
 #include <gtksourceview/gtksourceutils.h>
 #include <gtksourceview/gtksourceversion.h>
 #include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksourceview-typebuiltins.h>
+#include <gtksourceview/gtksourceview-enumtypes.h>
 #include <gtksourceview/gtksourceautocleanups.h>
 
 #endif /* GTK_SOURCE_H */
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index b53c0f4..9190479 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -46,7 +46,7 @@
 #include "gtksourcesearchcontext.h"
 #include "gtksourcetag.h"
 #include "gtksourceview-i18n.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 
 /**
  * SECTION:buffer
diff --git a/gtksourceview/gtksourcebufferinputstream.c b/gtksourceview/gtksourcebufferinputstream.c
index 53ad375..fea2ae2 100644
--- a/gtksourceview/gtksourcebufferinputstream.c
+++ b/gtksourceview/gtksourcebufferinputstream.c
@@ -28,7 +28,7 @@
 #include <gio/gio.h>
 #include <string.h>
 #include "gtksourcebufferinputstream.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 
 /* NOTE: never use async methods on this stream, the stream is just
  * a wrapper around GtkTextBuffer api so that we can use GIO Stream
diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c
index b892848..4958ca1 100644
--- a/gtksourceview/gtksourcecompletioncontext.c
+++ b/gtksourceview/gtksourcecompletioncontext.c
@@ -65,7 +65,7 @@
 #endif
 
 #include "gtksourcecompletioncontext.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 #include "gtksourcecompletionprovider.h"
 #include "gtksourceview-i18n.h"
 #include "gtksourcecompletion.h"
diff --git a/gtksourceview/gtksourcefile.c b/gtksourceview/gtksourcefile.c
index 7d1b111..7207659 100644
--- a/gtksourceview/gtksourcefile.c
+++ b/gtksourceview/gtksourcefile.c
@@ -25,7 +25,7 @@
 
 #include "gtksourcefile.h"
 #include "gtksourceencoding.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 #include "gtksourceview-i18n.h"
 
 /**
diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtksourcefileloader.c
index 951900c..0376b9b 100644
--- a/gtksourceview/gtksourcefileloader.c
+++ b/gtksourceview/gtksourcefileloader.c
@@ -32,7 +32,7 @@
 #include "gtksourcebufferoutputstream.h"
 #include "gtksourceencoding.h"
 #include "gtksourceencoding-private.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 #include "gtksourceview-i18n.h"
 
 /**
diff --git a/gtksourceview/gtksourcefilesaver.c b/gtksourceview/gtksourcefilesaver.c
index b342d0b..dd75e09 100644
--- a/gtksourceview/gtksourcefilesaver.c
+++ b/gtksourceview/gtksourcefilesaver.c
@@ -32,7 +32,7 @@
 #include "gtksourceencoding.h"
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 #include "gtksourceview-i18n.h"
 
 /**
diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c
index 7e0c787..510f8d9 100644
--- a/gtksourceview/gtksourcegutterrenderer.c
+++ b/gtksourceview/gtksourcegutterrenderer.c
@@ -26,7 +26,7 @@
 #include "gtksourcegutterrenderer.h"
 #include "gtksourcegutterrenderer-private.h"
 #include "gtksourcestylescheme.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 #include "gtksourceview-i18n.h"
 
 /**
diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c
index 04f568f..15afaff 100644
--- a/gtksourceview/gtksourcesearchcontext.c
+++ b/gtksourceview/gtksourcesearchcontext.c
@@ -33,7 +33,7 @@
 #include "gtksourceregion.h"
 #include "gtksourceiter.h"
 #include "gtksourceview-i18n.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 
 #include <string.h>
 
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index 368dfc2..7da924f 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -37,7 +37,7 @@
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
 #include "gtksourceview-i18n.h"
-#include "gtksourceview-typebuiltins.h"
+#include "gtksourceview-enumtypes.h"
 #include "gtksourcemark.h"
 #include "gtksourcemarkattributes.h"
 #include "gtksourcestylescheme.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]