[geany/geany] f9ea9c: Merge pull request #1093 from kugel-/api-tmtag

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Wed, 29 Jun 2016 15:45:51 UTC
Commit:      f9ea9c4e26d16aa6a394de5c245a6d3b24f6e3f8
             https://github.com/geany/geany/commit/f9ea9c4e26d16aa6a394de5c245a6d3b24f6e3f8

Log Message:
-----------
Merge pull request #1093 from kugel-/api-tmtag

Properly expose TMTag which already contains documented members.


Modified Paths:
--------------
    doc/Doxyfile.in
    doc/Makefile.am
    tagmanager/src/tm_source_file.h
    tagmanager/src/tm_tag.h
    tagmanager/src/tm_workspace.h

Modified: doc/Doxyfile.in
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -798,6 +798,7 @@ INPUT                  = @top_srcdir@/src/ \
                          @top_srcdir@/tagmanager/src/tm_source_file.h \
                          @top_srcdir@/tagmanager/src/tm_workspace.c \
                          @top_srcdir@/tagmanager/src/tm_workspace.h \
+                         @top_srcdir@/tagmanager/src/tm_tag.h \
                          @top_srcdir@/tagmanager/src/tm_parser.h
 
 # This tag can be used to specify the character encoding of the source files


Modified: doc/Makefile.am
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -100,7 +100,9 @@ doxygen_dependencies = \
 	$(top_srcdir)/src/*.[ch] \
 	$(top_srcdir)/plugins/geanyplugin.h \
 	$(top_srcdir)/tagmanager/src/tm_source_file.[ch] \
-	$(top_srcdir)/tagmanager/src/tm_workspace.[ch]
+	$(top_srcdir)/tagmanager/src/tm_workspace.[ch] \
+	$(top_srcdir)/tagmanager/src/tm_tag.h \
+	$(top_srcdir)/tagmanager/src/tm_parser.h
 
 Doxyfile.stamp: Doxyfile $(doxygen_dependencies)
 	$(AM_V_GEN)$(DOXYGEN) Doxyfile && echo "" > $@


Modified: tagmanager/src/tm_source_file.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -33,7 +33,7 @@ typedef struct TMSourceFile
 	TMParserType lang; /* Programming language used */
 	char *file_name; /**< Full file name (inc. path) */
 	char *short_name; /**< Just the name of the file (without the path) */
-	GPtrArray *tags_array; /**< Sorted tag array obtained by parsing the object */
+	GPtrArray *tags_array; /**< Sorted tag array obtained by parsing the object. @elementtype{TMTag} */
 } TMSourceFile;
 
 GType tm_source_file_get_type(void);


Modified: tagmanager/src/tm_tag.h
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -80,7 +80,10 @@ typedef enum
 #define TAG_IMPL_VIRTUAL 'v' /**< Virtual implementation */
 #define TAG_IMPL_UNKNOWN 'x' /**< Unknown implementation */
 
-typedef struct _TMTag
+/**
+ * The TMTag structure represents a single tag in the tag manager.
+ **/
+typedef struct TMTag
 {
 	char *name; /**< Name of tag */
 	TMTagType type; /**< Tag Type */


Modified: tagmanager/src/tm_workspace.h
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -25,10 +25,10 @@ G_BEGIN_DECLS
  **/
 typedef struct TMWorkspace
 {
-	GPtrArray *global_tags; /**< Global tags loaded at startup */
-	GPtrArray *source_files; /**< An array of TMSourceFile pointers */
-	GPtrArray *tags_array; /**< Sorted tags from all source files 
-		(just pointers to source file tags, the tag objects are owned by the source files) */
+	GPtrArray *global_tags; /**< Global tags loaded at startup. @elementtype{TMTag} */
+	GPtrArray *source_files; /**< An array of TMSourceFile pointers. @elementtype{TMSourceFile} */
+	GPtrArray *tags_array; /**< Sorted tags from all source files
+		(just pointers to source file tags, the tag objects are owned by the source files). @elementtype{TMTag} */
 	GPtrArray *typename_array; /* Typename tags for syntax highlighting (pointers owned by source files) */
 	GPtrArray *global_typename_array; /* Like above for global tags */
 } TMWorkspace;



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).