Formatting clean up.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@221 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/template.h b/glabels2/src/template.h
index e124b936a531ca4f78faff5c224fba0a13727af6..da3707165117fbf39b058960b87211c201fcb19d 100644 (file)
--- a/glabels2/src/template.h
+++ b/glabels2/src/template.h
@@ -27,6 +27,7 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 
+G_BEGIN_DECLS
 
 /*
  *   Template Label Structure
@@ -133,32 +134,34 @@ typedef struct {
 } glTemplateOrigin;
 
 
-extern void                 gl_template_init                (void);
+void                 gl_template_init                (void);
 
-extern GList               *gl_template_get_page_size_list  (void);
-extern void                 gl_template_free_page_size_list (GList **sizes);
+GList               *gl_template_get_page_size_list  (void);
+void                 gl_template_free_page_size_list (GList            **sizes);
 
-extern GList               *gl_template_get_name_list       (const gchar *page_size);
-extern void                 gl_template_free_name_list      (GList **names);
+GList               *gl_template_get_name_list       (const gchar       *page_size);
+void                 gl_template_free_name_list      (GList            **names);
 
-extern glTemplate          *gl_template_from_name           (const gchar *name);
+glTemplate          *gl_template_from_name           (const gchar       *name);
 
-extern glTemplate          *gl_template_dup                 (const glTemplate *orig);
-extern void                 gl_template_free                (glTemplate **template);
+glTemplate          *gl_template_dup                 (const glTemplate  *orig);
+void                 gl_template_free                (glTemplate       **template);
 
-extern glTemplate          *gl_template_xml_parse_sheet     (xmlNodePtr sheet_node);
+glTemplate          *gl_template_xml_parse_sheet     (xmlNodePtr         sheet_node);
 
-extern void                 gl_template_xml_add_sheet       (const glTemplate *template,
-                                                            xmlNodePtr root,
-                                                            xmlNsPtr ns);
+void                 gl_template_xml_add_sheet       (const glTemplate  *template,
+                                                     xmlNodePtr         root,
+                                                     xmlNsPtr           ns);
 
-extern gchar               *gl_template_get_label_size_desc (const glTemplate *template);
-extern void                 gl_template_get_label_size      (const glTemplate *template,
-                                                            gdouble *w,
-                                                            gdouble *h);
+gchar               *gl_template_get_label_size_desc (const glTemplate  *template);
+void                 gl_template_get_label_size      (const glTemplate  *template,
+                                                     gdouble           *w,
+                                                     gdouble           *h);
 
-extern gint                 gl_template_get_n_labels        (const glTemplate *template);
-extern glTemplateOrigin    *gl_template_get_origins         (const glTemplate *template);
-extern gchar               *gl_template_get_layout_desc     (const glTemplate *template);
+gint                 gl_template_get_n_labels        (const glTemplate  *template);
+glTemplateOrigin    *gl_template_get_origins         (const glTemplate  *template);
+gchar               *gl_template_get_layout_desc     (const glTemplate  *template);
+
+G_END_DECLS
 
 #endif

diff --git a/glabels2/src/text-node.h b/glabels2/src/text-node.h
index 2cd8509d25be9a2915b34be9f9f49867687a9ef2..937f188fef6db2e6d841446ab1b89fa4db69c186 100644 (file)
--- a/glabels2/src/text-node.h
+++ b/glabels2/src/text-node.h
@@ -25,24 +25,28 @@
 #include <gnome.h>
 #include "merge.h"
 
+G_BEGIN_DECLS
+
 typedef struct {
        gboolean field_flag;
        gchar *data;
 } glTextNode;
 
-extern gchar *gl_text_node_expand              (glTextNode * text_node,
-                                               glMergeRecord * record);
-extern glTextNode *gl_text_node_new_from_text  (gchar * text);
-extern glTextNode *gl_text_node_dup            (glTextNode * text_node);
-extern void gl_text_node_free                  (glTextNode ** text_node);
+gchar      *gl_text_node_expand              (glTextNode     *text_node,
+                                             glMergeRecord  *record);
+glTextNode *gl_text_node_new_from_text       (gchar          *text);
+glTextNode *gl_text_node_dup                 (glTextNode     *text_node);
+void        gl_text_node_free                (glTextNode    **text_node);
 
-extern gchar *gl_text_node_lines_expand        (GList * lines,
-                                               glMergeRecord * record);
-extern GList *gl_text_node_lines_new_from_text (gchar * text);
-extern GList *gl_text_node_lines_dup           (GList *lines);
-extern void   gl_text_node_lines_free          (GList ** lines);
+gchar      *gl_text_node_lines_expand        (GList          *lines,
+                                             glMergeRecord  *record);
+GList      *gl_text_node_lines_new_from_text (gchar          *text);
+GList      *gl_text_node_lines_dup           (GList          *lines);
+void        gl_text_node_lines_free          (GList         **lines);
 
 /* debug function */
-extern void gl_text_node_lines_print (GList * lines );
+void        gl_text_node_lines_print         (GList          *lines);
+
+G_END_DECLS
 
 #endif