2009-09-22 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / src / merge.h

diff --git a/glabels2/src/merge.h b/glabels2/src/merge.h
index 5028e6ff6687610dcc2bf34b1b71026557cd1bb5..9456ca923b01ca4f453ce4bd158b2a2417744bf4 100644 (file)
--- a/glabels2/src/merge.h
+++ b/glabels2/src/merge.h
@@ -1,24 +1,23 @@
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
+ *  merge.h
+ *  Copyright (C) 2002-2009  Jim Evins <evins@snaught.com>.
  *
- *  merge.h:  document merge module header file
+ *  This file is part of gLabels.
  *
- *  Copyright (C) 2002  Jim Evins <evins@snaught.com>.
- *
- *  This program is free software; you can redistribute it and/or modify
+ *  gLabels is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  gLabels is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *  along with gLabels.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef __MERGE_H__
 #define __MERGE_H__
 
@@ -59,22 +58,24 @@ typedef struct _glMergePrivate   glMergePrivate;
 struct _glMerge {
        GObject          object;
 
-       glMergePrivate  *private;
+       glMergePrivate  *priv;
 };
 
 struct _glMergeClass {
        GObjectClass     parent_class;
 
-        GList         *(*get_key_list)   (glMerge *merge);
+        GList         *(*get_key_list)    (glMerge *merge);
+
+        gchar         *(*get_primary_key) (glMerge *merge);
 
-       void           (*open)           (glMerge *merge);
+       void           (*open)            (glMerge *merge);
 
-       void           (*close)          (glMerge *merge);
+       void           (*close)           (glMerge *merge);
 
-       glMergeRecord *(*get_record)     (glMerge *merge);
+       glMergeRecord *(*get_record)      (glMerge *merge);
 
-       void           (*copy)           (glMerge *dst_merge,
-                                         glMerge *src_merge);
+       void           (*copy)            (glMerge *dst_merge,
+                                          glMerge *src_merge);
 };
 
 
@@ -91,7 +92,7 @@ void              gl_merge_free_descriptions   (GList **descriptions);
 
 gchar            *gl_merge_description_to_name (gchar *description);
 
-GType             gl_merge_get_type            (void);
+GType             gl_merge_get_type            (void) G_GNUC_CONST;
 
 glMerge          *gl_merge_new                 (gchar             *name);
 
@@ -112,23 +113,26 @@ GList            *gl_merge_get_key_list        (glMerge           *merge);
 
 void              gl_merge_free_key_list       (GList            **keys);
 
-void              gl_merge_open                (glMerge           *merge);
-
-void              gl_merge_close               (glMerge           *merge);
-
-glMergeRecord    *gl_merge_get_record          (glMerge           *merge);
-
-void              gl_merge_free_record         (glMergeRecord    **record);
+gchar            *gl_merge_get_primary_key     (glMerge           *merge);
 
 gchar            *gl_merge_eval_key            (glMergeRecord     *record,
                                                gchar             *key);
 
-GList            *gl_merge_read_record_list    (glMerge           *merge);
+const GList      *gl_merge_get_record_list     (glMerge           *merge);
 
-void              gl_merge_free_record_list    (GList            **record_list);
-
-gint              gl_merge_count_records       (GList             *record_list);
+gint              gl_merge_get_record_count    (glMerge           *merge);
 
 G_END_DECLS
 
 #endif
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */