GNOME.org
 

[gtksourceview] enumtypes: rename gtksourceview-enumtypes -> gtksource-enumtypes

commit 9332441b2504e5767ce1234ce14fe1d66aaf88fb
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Sep 24 15:09:18 2017 +0200

    enumtypes: rename gtksourceview-enumtypes -> gtksource-enumtypes
    
    When the namespace will be renamed, it'll become gsv-enumtypes, not
    gsvview-enumtypes.

 docs/reference/Makefile.am                         |    2 +-
 gtksourceview/Makefile.am                          |   24 ++++++++++----------
 .../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 +-
 win32/gen-enums.batin                              |   14 +++++-----
 win32/vs10/gtksourceview-4.vcxprojin               |    4 +-
 win32/vs9/gtksourceview-4.vcprojin                 |    8 +++---
 16 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 8e17d6e..6f2702d 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -28,7 +28,7 @@ CFILE_GLOB = $(top_srcdir)/gtksourceview/*.c
 # e.g. EXTRA_HFILES = $(top_srcdir}/contrib/extra.h
 EXTRA_HFILES =                                                         \
        $(top_builddir)/gtksourceview/gtksourceversion.h                \
-       $(top_builddir)/gtksourceview/gtksourceview-enumtypes.h
+       $(top_builddir)/gtksourceview/gtksource-enumtypes.h
 
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 7020c7c..7605c78 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -15,8 +15,8 @@ AM_CPPFLAGS =                                 \
        $(DEP_CFLAGS)
 
 BUILT_SOURCES =                        \
-       gtksourceview-enumtypes.c       \
-       gtksourceview-enumtypes.h       \
+       gtksource-enumtypes.c           \
+       gtksource-enumtypes.h           \
        gtksourceview-resources.c
 
 libgtksourceview_public_headers =              \
@@ -201,14 +201,14 @@ libgtksourceview_@GSV_API_VERSION@_include_HEADERS = $(libgtksourceview_public_h
 
 nodist_libgtksourceview_@GSV_API_VERSION@_include_HEADERS =    \
        gtksourceversion.h                                      \
-       gtksourceview-enumtypes.h
+       gtksource-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-enumtypes.c: stamp-gtksourceview-enumtypes.c
+gtksource-enumtypes.c: stamp-gtksource-enumtypes.c
        @true
-stamp-gtksourceview-enumtypes.c: Makefile.am $(libgtksourceview_public_headers)
+stamp-gtksource-enumtypes.c: Makefile.am $(libgtksourceview_public_headers)
        $(AM_V_GEN) (cd $(srcdir) \
         && $(GLIB_MKENUMS) \
                        --fhead "#ifdef HAVE_CONFIG_H\n" \
@@ -216,7 +216,7 @@ stamp-gtksourceview-enumtypes.c: Makefile.am $(libgtksourceview_public_headers)
                        --fhead "#endif\n\n" \
                        --fhead "#include <glib-object.h>\n" \
                        --fhead "#include \"gtksourceversion.h\"\n" \
-                       --fhead "#include \"gtksourceview-enumtypes.h\"\n\n" \
+                       --fhead "#include \"gtksource-enumtypes.h\"\n\n" \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
                        --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
                        --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
@@ -227,15 +227,15 @@ stamp-gtksourceview-enumtypes.c: Makefile.am $(libgtksourceview_public_headers)
                        --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-enumtypes.c || cp xgen-gtbec gtksourceview-enumtypes.c) \
+       && (cmp -s xgen-gtbec gtksource-enumtypes.c || cp xgen-gtbec gtksource-enumtypes.c) \
        && rm -f xgen-gtbec && echo stamp > $(@F)
 
-gtksourceview-enumtypes.h: stamp-gtksourceview-enumtypes.h
+gtksource-enumtypes.h: stamp-gtksource-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-enumtypes.h: Makefile.am $(libgtksourceview_public_headers)
+stamp-gtksource-enumtypes.h: Makefile.am $(libgtksourceview_public_headers)
        $(AM_V_GEN) (cd $(srcdir) \
         && $(GLIB_MKENUMS) \
                        --fhead "#ifndef GTKSOURCEVIEW_ENUMTYPES_H\n" \
@@ -252,7 +252,7 @@ stamp-gtksourceview-enumtypes.h: Makefile.am $(libgtksourceview_public_headers)
                        --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-enumtypes.h || cp xgen-gth gtksourceview-enumtypes.h) \
+       && (cmp -s xgen-gth gtksource-enumtypes.h || cp xgen-gth gtksource-enumtypes.h) \
        && rm -f xgen-gth && echo stamp > $(@F)
 
 EXTRA_DIST =                                   \
@@ -262,8 +262,8 @@ EXTRA_DIST =                                        \
 
 CLEANFILES =                                   \
        $(BUILT_SOURCES)                        \
-       stamp-gtksourceview-enumtypes.c         \
-       stamp-gtksourceview-enumtypes.h
+       stamp-gtksource-enumtypes.c             \
+       stamp-gtksource-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 c496bf5..a6a2e53 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
@@ -40,7 +40,7 @@
 #include "gtksourcecompletionwordsbuffer.h"
 #include "gtksourcecompletionwordsutils.h"
 #include "gtksourceview/gtksource.h"
-#include "gtksourceview/gtksourceview-enumtypes.h"
+#include "gtksourceview/gtksource-enumtypes.h"
 
 #define BUFFER_KEY "GtkSourceCompletionWordsBufferKey"
 
diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h
index c6f5d92..7831ab7 100644
--- a/gtksourceview/gtksource.h
+++ b/gtksourceview/gtksource.h
@@ -58,7 +58,7 @@
 #include <gtksourceview/gtksourceutils.h>
 #include <gtksourceview/gtksourceversion.h>
 #include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksourceview-enumtypes.h>
+#include <gtksourceview/gtksource-enumtypes.h>
 #include <gtksourceview/gtksourceautocleanups.h>
 
 #undef GTK_SOURCE_H_INSIDE
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index cff41ca..ec357af 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -44,7 +44,7 @@
 #include "gtksourcemarkssequence.h"
 #include "gtksourcesearchcontext.h"
 #include "gtksourcetag.h"
-#include "gtksourceview-enumtypes.h"
+#include "gtksource-enumtypes.h"
 
 /**
  * SECTION:buffer
diff --git a/gtksourceview/gtksourcebufferinputstream.c b/gtksourceview/gtksourcebufferinputstream.c
index 8bee920..1174222 100644
--- a/gtksourceview/gtksourcebufferinputstream.c
+++ b/gtksourceview/gtksourcebufferinputstream.c
@@ -27,7 +27,7 @@
 #include <gio/gio.h>
 #include <string.h>
 #include "gtksourcebufferinputstream.h"
-#include "gtksourceview-enumtypes.h"
+#include "gtksource-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 c34cb4c..148556d 100644
--- a/gtksourceview/gtksourcecompletioncontext.c
+++ b/gtksourceview/gtksourcecompletioncontext.c
@@ -64,7 +64,7 @@
 #endif
 
 #include "gtksourcecompletioncontext.h"
-#include "gtksourceview-enumtypes.h"
+#include "gtksource-enumtypes.h"
 #include "gtksourcecompletionprovider.h"
 #include "gtksourcecompletion.h"
 
diff --git a/gtksourceview/gtksourcefile.c b/gtksourceview/gtksourcefile.c
index ddb7aea..8d951dd 100644
--- a/gtksourceview/gtksourcefile.c
+++ b/gtksourceview/gtksourcefile.c
@@ -24,7 +24,7 @@
 
 #include "gtksourcefile.h"
 #include "gtksourceencoding.h"
-#include "gtksourceview-enumtypes.h"
+#include "gtksource-enumtypes.h"
 
 /**
  * SECTION:file
diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtksourcefileloader.c
index 2a4d18a..2f3ddfe 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-enumtypes.h"
+#include "gtksource-enumtypes.h"
 
 /**
  * SECTION:fileloader
diff --git a/gtksourceview/gtksourcefilesaver.c b/gtksourceview/gtksourcefilesaver.c
index c9d5bd1..05b5a97 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-enumtypes.h"
+#include "gtksource-enumtypes.h"
 
 /**
  * SECTION:filesaver
diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c
index 5cb0862..b9c52dd 100644
--- a/gtksourceview/gtksourcegutterrenderer.c
+++ b/gtksourceview/gtksourcegutterrenderer.c
@@ -25,7 +25,7 @@
 #include "gtksourcegutterrenderer.h"
 #include "gtksourcegutterrenderer-private.h"
 #include "gtksourcestylescheme.h"
-#include "gtksourceview-enumtypes.h"
+#include "gtksource-enumtypes.h"
 
 /**
  * SECTION:gutterrenderer
diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c
index e298d4e..7636c69 100644
--- a/gtksourceview/gtksourcesearchcontext.c
+++ b/gtksourceview/gtksourcesearchcontext.c
@@ -33,7 +33,7 @@
 #include "gtksourceutils.h"
 #include "gtksourceregion.h"
 #include "gtksourceiter.h"
-#include "gtksourceview-enumtypes.h"
+#include "gtksource-enumtypes.h"
 
 /**
  * SECTION:searchcontext
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index ff93cc3..5734b58 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -36,7 +36,7 @@
 #include "gtksourcebuffer.h"
 #include "gtksourcebuffer-private.h"
 #include "gtksourcebufferinternal.h"
-#include "gtksourceview-enumtypes.h"
+#include "gtksource-enumtypes.h"
 #include "gtksourcemark.h"
 #include "gtksourcemarkattributes.h"
 #include "gtksourcestylescheme.h"
diff --git a/win32/gen-enums.batin b/win32/gen-enums.batin
index 04a6513..c22bd56 100644
--- a/win32/gen-enums.batin
+++ b/win32/gen-enums.batin
@@ -2,15 +2,15 @@
 
 cd ..\gtksourceview
 
-if exist gtksourceview-enumtypes.h del gtksourceview-enumtypes.h
-if exist gtksourceview-enumtypes.c del gtksourceview-enumtypes.c
+if exist gtksource-enumtypes.h del gtksource-enumtypes.h
+if exist gtksource-enumtypes.c del gtksource-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-enumtypes.h\"\n\n" ^
+--fhead "#include \"gtksource-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-enumtypes.c
+&1> gtksource-enumtypes.c
 
 call perl %1\bin\glib-mkenums ^
 --fhead "#ifndef GTKSOURCEVIEW_ENUMTYPES_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-enumtypes.h
+&1> gtksource-enumtypes.h
 
 
-call perl -p -i.tmp -e "s/GTK_TYPE_SOURCE_/GTK_SOURCE_TYPE_/g" gtksourceview-enumtypes.h
-del gtksourceview-enumtypes.h.tmp
+call perl -p -i.tmp -e "s/GTK_TYPE_SOURCE_/GTK_SOURCE_TYPE_/g" gtksource-enumtypes.h
+del gtksource-enumtypes.h.tmp
diff --git a/win32/vs10/gtksourceview-4.vcxprojin b/win32/vs10/gtksourceview-4.vcxprojin
index fe3e440..2a21a75 100644
--- a/win32/vs10/gtksourceview-4.vcxprojin
+++ b/win32/vs10/gtksourceview-4.vcxprojin
@@ -187,10 +187,10 @@
     <CustomBuild Include="..\gen-enums.bat">
       <Message Condition="'$(Configuration)'=='Debug'">Generating Enumeration sources...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(GenerateEnums)</Command>
-      <Outputs 
Condition="'$(Configuration)'=='Debug'">..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
+      <Outputs 
Condition="'$(Configuration)'=='Debug'">..\..\gtksourceview\gtksource-enumtypes.c;..\..\gtksourceview\gtksource-enumtypes.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)'=='Release'">Generating Enumeration sources...</Message>
       <Command Condition="'$(Configuration)'=='Release'">$(GenerateEnums)</Command>
-      <Outputs 
Condition="'$(Configuration)'=='Release'">..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
+      <Outputs 
Condition="'$(Configuration)'=='Release'">..\..\gtksourceview\gtksource-enumtypes.c;..\..\gtksourceview\gtksource-enumtypes.h;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\gtksourceview\gtksourceview.gresource.xml">
       <Message Condition="'$(Configuration)'=='Debug'">Generating GResource sources...</Message>
diff --git a/win32/vs9/gtksourceview-4.vcprojin b/win32/vs9/gtksourceview-4.vcprojin
index 7a74659..4568ed6 100644
--- a/win32/vs9/gtksourceview-4.vcprojin
+++ b/win32/vs9/gtksourceview-4.vcprojin
@@ -245,28 +245,28 @@
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating Enumeration sources..."
                                                CommandLine="$(GenerateEnums)"
-                                               
Outputs="..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h"
+                                               
Outputs="..\..\gtksourceview\gtksource-enumtypes.c;..\..\gtksourceview\gtksource-enumtypes.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|Win32">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating Enumeration sources..."
                                                CommandLine="$(GenerateEnums)"
-                                               
Outputs="..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h"
+                                               
Outputs="..\..\gtksourceview\gtksource-enumtypes.c;..\..\gtksourceview\gtksource-enumtypes.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating Enumeration sources..."
                                                CommandLine="$(GenerateEnums)"
-                                               
Outputs="..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h"
+                                               
Outputs="..\..\gtksourceview\gtksource-enumtypes.c;..\..\gtksourceview\gtksource-enumtypes.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating Enumeration sources..."
                                                CommandLine="$(GenerateEnums)"
-                                               
Outputs="..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h"
+                                               
Outputs="..\..\gtksourceview\gtksource-enumtypes.c;..\..\gtksourceview\gtksource-enumtypes.h"
                                        />
                                </FileConfiguration>
                        </File>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]