[geany/geany-plugins] b2bfba: Merge pull request #381 from techee/filetype_id
Frank Lanitz
git-noreply at xxxxx
Mon Mar 7 12:03:28 UTC 2016
Branch: refs/heads/master
Author: Frank Lanitz <frank at frank.uvena.de>
Committer: Frank Lanitz <frank at frank.uvena.de>
Date: Mon, 07 Mar 2016 12:03:28 UTC
Commit: b2bfba66fb2d7389d5aab6b92d470be13b673778
https://github.com/geany/geany-plugins/commit/b2bfba66fb2d7389d5aab6b92d470be13b673778
Log Message:
-----------
Merge pull request #381 from techee/filetype_id
Replace filetype_id with GeanyFiletypeID
Modified Paths:
--------------
geanygendoc/src/ggd-file-type-manager.c
geanygendoc/src/ggd-file-type-manager.h
geanygendoc/src/ggd-file-type.c
geanygendoc/src/ggd-file-type.h
geanygendoc/src/ggd-plugin.c
geanygendoc/src/ggd-tag-utils.c
geanygendoc/src/ggd-tag-utils.h
scope/src/utils.c
Modified: geanygendoc/src/ggd-file-type-manager.c
14 lines changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -144,9 +144,9 @@ ggd_file_type_manager_get_conf_path_intern (GeanyFiletype *geany_ft,
* %NULL on error.
*/
gchar *
-ggd_file_type_manager_get_conf_path (filetype_id id,
- GgdPerms perms_req,
- GError **error)
+ggd_file_type_manager_get_conf_path (GeanyFiletypeID id,
+ GgdPerms perms_req,
+ GError **error)
{
g_return_val_if_fail (id >= 0 && id < geany->filetypes_array->len, NULL);
@@ -164,7 +164,7 @@ ggd_file_type_manager_get_conf_path (filetype_id id,
* failure.
*/
GgdFileType *
-ggd_file_type_manager_load_file_type (filetype_id id)
+ggd_file_type_manager_load_file_type (GeanyFiletypeID id)
{
GeanyFiletype *geany_ft;
GgdFileType *ft = NULL;
@@ -216,7 +216,7 @@ ggd_file_type_manager_load_file_type (filetype_id id)
* loaded.
*/
GgdFileType *
-ggd_file_type_manager_get_file_type (filetype_id id)
+ggd_file_type_manager_get_file_type (GeanyFiletypeID id)
{
GgdFileType *ft;
@@ -244,8 +244,8 @@ ggd_file_type_manager_get_file_type (filetype_id id)
* or %NULL on failure.
*/
GgdDocType *
-ggd_file_type_manager_get_doc_type (filetype_id ft,
- const gchar *docname)
+ggd_file_type_manager_get_doc_type (GeanyFiletypeID ft,
+ const gchar *docname)
{
GgdDocType *doctype = NULL;
GgdFileType *filetype;
Modified: geanygendoc/src/ggd-file-type-manager.h
16 lines changed, 8 insertions(+), 8 deletions(-)
===================================================================
@@ -34,14 +34,14 @@ GGD_BEGIN_PLUGIN_API
void ggd_file_type_manager_init (void);
void ggd_file_type_manager_uninit (void);
-void ggd_file_type_manager_add_file_type (GgdFileType *filetype);
-gchar *ggd_file_type_manager_get_conf_path (filetype_id id,
- GgdPerms perms_req,
- GError **error);
-GgdFileType *ggd_file_type_manager_load_file_type (filetype_id id);
-GgdFileType *ggd_file_type_manager_get_file_type (filetype_id ft);
-GgdDocType *ggd_file_type_manager_get_doc_type (filetype_id ft,
- const gchar *docname);
+void ggd_file_type_manager_add_file_type (GgdFileType *filetype);
+gchar *ggd_file_type_manager_get_conf_path (GeanyFiletypeID id,
+ GgdPerms perms_req,
+ GError **error);
+GgdFileType *ggd_file_type_manager_load_file_type (GeanyFiletypeID id);
+GgdFileType *ggd_file_type_manager_get_file_type (GeanyFiletypeID ft);
+GgdDocType *ggd_file_type_manager_get_doc_type (GeanyFiletypeID ft,
+ const gchar *docname);
GGD_END_PLUGIN_API
Modified: geanygendoc/src/ggd-file-type.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -48,7 +48,7 @@
* Returns: A newly created #GgdFileType.
*/
GgdFileType *
-ggd_file_type_new (filetype_id type)
+ggd_file_type_new (GeanyFiletypeID type)
{
GgdFileType *ft;
Modified: geanygendoc/src/ggd-file-type.h
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -37,8 +37,8 @@ typedef struct _GgdFileType GgdFileType;
struct _GgdFileType
{
- gint ref_count;
- filetype_id geany_ft;
+ gint ref_count;
+ GeanyFiletypeID geany_ft;
/* TODO: add support for custom environment variables, which may be used
* for tuning the templates easily (e.g. Doxygen's prefix character,
@@ -50,7 +50,7 @@ struct _GgdFileType
};
-GgdFileType *ggd_file_type_new (filetype_id type);
+GgdFileType *ggd_file_type_new (GeanyFiletypeID type);
GgdFileType *ggd_file_type_ref (GgdFileType *filetype);
void ggd_file_type_unref (GgdFileType *filetype);
void ggd_file_type_dump (const GgdFileType *filetype,
Modified: geanygendoc/src/ggd-plugin.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -96,7 +96,7 @@ gchar *GGD_OPT_environ = NULL;
/* Gets an element of GGD_OPT_doctype, falling back to GGD_OPT_doctype[0]
* (default) if the requested element is not set */
static const gchar *
-ggd_plugin_get_doctype (filetype_id id)
+ggd_plugin_get_doctype (GeanyFiletypeID id)
{
const gchar *doctype;
Modified: geanygendoc/src/ggd-tag-utils.c
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -203,7 +203,7 @@ ggd_tag_find_at_current_pos (GeanyDocument *doc)
*/
TMTag *
ggd_tag_find_parent (const GPtrArray *tags,
- filetype_id geany_ft,
+ GeanyFiletypeID geany_ft,
const TMTag *child)
{
TMTag *tag = NULL;
@@ -358,7 +358,7 @@ ggd_tag_get_type_name (const TMTag *tag)
*/
gchar *
ggd_tag_resolve_type_hierarchy (const GPtrArray *tags,
- filetype_id geany_ft,
+ GeanyFiletypeID geany_ft,
const TMTag *tag)
{
gchar *scope = NULL;
@@ -440,7 +440,7 @@ ggd_tag_find_from_name (const GPtrArray *tags,
GList *
ggd_tag_find_children_filtered (const GPtrArray *tags,
const TMTag *parent,
- filetype_id geany_ft,
+ GeanyFiletypeID geany_ft,
TMTagType filter)
{
GList *children = NULL;
@@ -477,7 +477,7 @@ ggd_tag_find_children_filtered (const GPtrArray *tags,
GList *
ggd_tag_find_children (const GPtrArray *tags,
const TMTag *parent,
- filetype_id geany_ft)
+ GeanyFiletypeID geany_ft)
{
return ggd_tag_find_children_filtered (tags, parent, geany_ft, tm_tag_max_t);
}
Modified: geanygendoc/src/ggd-tag-utils.h
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -51,17 +51,17 @@ TMTag *ggd_tag_find_from_line (const GPtrArray *tags,
gulong line);
TMTag *ggd_tag_find_at_current_pos (GeanyDocument *doc);
TMTag *ggd_tag_find_parent (const GPtrArray *tags,
- filetype_id geany_ft,
+ GeanyFiletypeID geany_ft,
const TMTag *child);
GList *ggd_tag_find_children_filtered (const GPtrArray *tags,
const TMTag *parent,
- filetype_id geany_ft,
+ GeanyFiletypeID geany_ft,
TMTagType filter);
GList *ggd_tag_find_children (const GPtrArray *tags,
const TMTag *parent,
- filetype_id geany_ft);
+ GeanyFiletypeID geany_ft);
gchar *ggd_tag_resolve_type_hierarchy (const GPtrArray *tags,
- filetype_id geany_ft,
+ GeanyFiletypeID geany_ft,
const TMTag *tag);
TMTag *ggd_tag_find_from_name (const GPtrArray *tags,
const gchar *name);
Modified: scope/src/utils.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -312,7 +312,7 @@ gboolean utils_source_filetype(GeanyFiletype *ft)
{
if (ft)
{
- static const filetype_id ft_id[] = { GEANY_FILETYPES_C, GEANY_FILETYPES_CPP,
+ static const GeanyFiletypeID ft_id[] = { GEANY_FILETYPES_C, GEANY_FILETYPES_CPP,
GEANY_FILETYPES_D, GEANY_FILETYPES_OBJECTIVEC, GEANY_FILETYPES_FORTRAN,
GEANY_FILETYPES_F77, GEANY_FILETYPES_JAVA, /* GEANY_FILETYPES_OPENCL_C, */
GEANY_FILETYPES_PASCAL, /* GEANY_FILETYPES_S, */ GEANY_FILETYPES_ASM,
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Plugins-Commits
mailing list