GNOME.org
 

[libgit2-glib/wip/development] Rename MergeTreeOptions to MergeOptions

commit bca6248a9c81ea1e250262a5f9ececf2e97b0c22
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Apr 26 21:55:23 2014 +0200

    Rename MergeTreeOptions to MergeOptions

 libgit2-glib/Makefile.am                           |    4 +-
 ...t-merge-tree-options.c => ggit-merge-options.c} |   64 ++++++++++----------
 ...t-merge-tree-options.h => ggit-merge-options.h} |   30 +++++-----
 libgit2-glib/ggit-types.h                          |    4 +-
 libgit2-glib/ggit.h                                |    2 +-
 5 files changed, 52 insertions(+), 52 deletions(-)
---
diff --git a/libgit2-glib/Makefile.am b/libgit2-glib/Makefile.am
index c6c8e7a..2de3f8f 100644
--- a/libgit2-glib/Makefile.am
+++ b/libgit2-glib/Makefile.am
@@ -43,7 +43,7 @@ INST_H_FILES =                                \
        ggit-index-entry-resolve-undo.h \
        ggit-main.h                     \
        ggit-message.h                  \
-       ggit-merge-tree-options.h       \
+       ggit-merge-options.h    \
        ggit-native.h                   \
        ggit-object.h                   \
        ggit-object-factory.h           \
@@ -102,7 +102,7 @@ C_FILES =                           \
        ggit-index-entry-resolve-undo.c \
        ggit-main.c                     \
        ggit-message.c                  \
-       ggit-merge-tree-options.c       \
+       ggit-merge-options.c    \
        ggit-native.c                   \
        ggit-object.c                   \
        ggit-object-factory.c           \
diff --git a/libgit2-glib/ggit-merge-tree-options.c b/libgit2-glib/ggit-merge-options.c
similarity index 54%
rename from libgit2-glib/ggit-merge-tree-options.c
rename to libgit2-glib/ggit-merge-options.c
index 7c7a686..0c10b68 100644
--- a/libgit2-glib/ggit-merge-tree-options.c
+++ b/libgit2-glib/ggit-merge-options.c
@@ -1,5 +1,5 @@
 /*
- * ggit-merge_tree-options.c
+ * ggit-merge-options.c
  * This file is part of libgit2-glib
  *
  * Copyright (C) 2013 - Ignacio Casal Quinteiro
@@ -18,22 +18,22 @@
  * along with libgit2-glib. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ggit-merge-tree-options.h"
+#include "ggit-merge-options.h"
 #include "ggit-diff-similarity-metric.h"
 
-struct _GgitMergeTreeOptions
+struct _GgitMergeOptions
 {
        git_merge_options merge_options;
 };
 
-G_DEFINE_BOXED_TYPE (GgitMergeTreeOptions, ggit_merge_tree_options,
-                     ggit_merge_tree_options_copy, ggit_merge_tree_options_free)
+G_DEFINE_BOXED_TYPE (GgitMergeOptions, ggit_merge_options,
+                     ggit_merge_options_copy, ggit_merge_options_free)
 
 const git_merge_options *
-_ggit_merge_tree_options_get_merge_tree_options (GgitMergeTreeOptions *merge_options)
+_ggit_merge_options_get_merge_options (GgitMergeOptions *merge_options)
 {
-       /* NULL is common for merge_tree_options as it specifies to use the default
-        * so handle a NULL merge_tree_options here instead of in every caller.
+       /* NULL is common for merge_options as it specifies to use the default
+        * so handle a NULL merge_options here instead of in every caller.
         */
        if (merge_options == NULL)
        {
@@ -44,21 +44,21 @@ _ggit_merge_tree_options_get_merge_tree_options (GgitMergeTreeOptions *merge_opt
 }
 
 /**
- * ggit_merge_tree_options_copy:
- * @merge_options: a #GgitMergeTreeOptions.
+ * ggit_merge_options_copy:
+ * @merge_options: a #GgitMergeOptions.
  *
- * Copies @merge_options into a newly allocated #GgitMergeTreeOptions.
+ * Copies @merge_options into a newly allocated #GgitMergeOptions.
  *
- * Returns: (transfer full): a newly allocated #GgitMergeTreeOptions.
+ * Returns: (transfer full): a newly allocated #GgitMergeOptions.
  */
-GgitMergeTreeOptions *
-ggit_merge_tree_options_copy (GgitMergeTreeOptions *merge_options)
+GgitMergeOptions *
+ggit_merge_options_copy (GgitMergeOptions *merge_options)
 {
-       GgitMergeTreeOptions *new_merge_options;
+       GgitMergeOptions *new_merge_options;
 
        g_return_val_if_fail (merge_options != NULL, NULL);
 
-       new_merge_options = g_slice_new (GgitMergeTreeOptions);
+       new_merge_options = g_slice_new (GgitMergeOptions);
 
        new_merge_options->merge_options = merge_options->merge_options;
 
@@ -66,43 +66,43 @@ ggit_merge_tree_options_copy (GgitMergeTreeOptions *merge_options)
 }
 
 /**
- * ggit_merge_tree_options_free:
- * @merge_options: a #GgitMergeTreeOptions.
+ * ggit_merge_options_free:
+ * @merge_options: a #GgitMergeOptions.
  *
  * Frees @merge_options.
  */
 void
-ggit_merge_tree_options_free (GgitMergeTreeOptions *merge_options)
+ggit_merge_options_free (GgitMergeOptions *merge_options)
 {
        g_return_if_fail (merge_options != NULL);
 
-       g_slice_free (GgitMergeTreeOptions, merge_options);
+       g_slice_free (GgitMergeOptions, merge_options);
 }
 
 /**
- * ggit_merge_tree_options_new:
+ * ggit_merge_options_new:
  * @flags: flags to consider when merging.
  * @rename_threshold: similarity to consider a file renamed (default 50).
  * @target_limit: maximum similarity sources to examine
- *                (overrides the `merge_tree.renameLimit` config) (default 200).
+ *                (overrides the `merge.renameLimit` config) (default 200).
  * @metric: (allow-none): a #GgitDiffSimilarityMetric or %NULL to use internal metric.
  * @file_favor: a #GgitMergeFileFavor.
  *
- * Creates a new #GgitMergeTreeOptions.
+ * Creates a new #GgitMergeOptions.
  *
- * Returns: a newly allocated #GgitMergeTreeOptions.
+ * Returns: a newly allocated #GgitMergeOptions.
  */
-GgitMergeTreeOptions *
-ggit_merge_tree_options_new (GgitMergeTreeFlags        flags,
-                             guint                     rename_threshold,
-                             guint                     target_limit,
-                             GgitDiffSimilarityMetric *metric,
-                             GgitMergeFileFavor        file_favor)
+GgitMergeOptions *
+ggit_merge_options_new (GgitMergeTreeFlags        flags,
+                        guint                     rename_threshold,
+                        guint                     target_limit,
+                        GgitDiffSimilarityMetric *metric,
+                        GgitMergeFileFavor        file_favor)
 {
-       GgitMergeTreeOptions *merge_options;
+       GgitMergeOptions *merge_options;
        git_merge_options gmerge_options = GIT_MERGE_OPTIONS_INIT;
 
-       merge_options = g_slice_new (GgitMergeTreeOptions);
+       merge_options = g_slice_new (GgitMergeOptions);
 
        gmerge_options.flags = (git_merge_tree_flag_t)flags;
        gmerge_options.rename_threshold = rename_threshold;
diff --git a/libgit2-glib/ggit-merge-tree-options.h b/libgit2-glib/ggit-merge-options.h
similarity index 53%
rename from libgit2-glib/ggit-merge-tree-options.h
rename to libgit2-glib/ggit-merge-options.h
index c93856c..d3dce2b 100644
--- a/libgit2-glib/ggit-merge-tree-options.h
+++ b/libgit2-glib/ggit-merge-options.h
@@ -1,5 +1,5 @@
 /*
- * ggit-merge_tree-options.h
+ * ggit-merge-options.h
  * This file is part of libgit2-glib
  *
  * Copyright (C) 2013 - Ignacio Casal Quinteiro
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef __GGIT_MERGE_TREE_OPTIONS_H__
-#define __GGIT_MERGE_TREE_OPTIONS_H__
+#ifndef __GGIT_MERGE_OPTIONS_H__
+#define __GGIT_MERGE_OPTIONS_H__
 
 #include <glib-object.h>
 #include <git2.h>
@@ -29,25 +29,25 @@
 
 G_BEGIN_DECLS
 
-#define GGIT_TYPE_MERGE_TREE_OPTIONS       (ggit_merge_tree_options_get_type ())
-#define GGIT_MERGE_TREE_OPTIONS(obj)       ((GgitMergeTreeOptions *)obj)
+#define GGIT_TYPE_MERGE_OPTIONS       (ggit_merge_options_get_type ())
+#define GGIT_MERGE_OPTIONS(obj)       ((GgitMergeOptions *)obj)
 
-GType                  ggit_merge_tree_options_get_type                (void) G_GNUC_CONST;
+GType                  ggit_merge_options_get_type                (void) G_GNUC_CONST;
 
 const git_merge_options *
-                      _ggit_merge_tree_options_get_merge_tree_options  (GgitMergeTreeOptions   
*merge_options);
+                      _ggit_merge_options_get_merge_options       (GgitMergeOptions   *merge_options);
 
-GgitMergeTreeOptions  *ggit_merge_tree_options_copy                    (GgitMergeTreeOptions   
*merge_options);
-void                   ggit_merge_tree_options_free                    (GgitMergeTreeOptions   
*merge_options);
+GgitMergeOptions      *ggit_merge_options_copy                    (GgitMergeOptions   *merge_options);
+void                   ggit_merge_options_free                    (GgitMergeOptions   *merge_options);
 
-GgitMergeTreeOptions  *ggit_merge_tree_options_new                     (GgitMergeTreeFlags        flags,
-                                                                        guint                     
rename_threshold,
-                                                                        guint                     
target_limit,
-                                                                        GgitDiffSimilarityMetric *metric,
-                                                                        GgitMergeFileFavor       file_favor);
+GgitMergeOptions      *ggit_merge_options_new                     (GgitMergeTreeFlags        flags,
+                                                                   guint                     
rename_threshold,
+                                                                   guint                     target_limit,
+                                                                   GgitDiffSimilarityMetric *metric,
+                                                                   GgitMergeFileFavor        file_favor);
 
 G_END_DECLS
 
-#endif /* __GGIT_MERGE_TREE_OPTIONS_H__ */
+#endif /* __GGIT_MERGE_OPTIONS_H__ */
 
 /* ex:set ts=8 noet: */
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index 04f6a48..572d676 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -201,11 +201,11 @@ typedef struct _GgitIndexEntriesResolveUndo GgitIndexEntriesResolveUndo;
 typedef struct _GgitIndexEntryResolveUndo GgitIndexEntryResolveUndo;
 
 /**
- * GgitMergeTreeOptions:
+ * GgitMergeOptions:
  *
  * Represents the options used when merging.
  */
-typedef struct _GgitMergeTreeOptions GgitMergeTreeOptions;
+typedef struct _GgitMergeOptions GgitMergeOptions;
 
 /**
  * GgitNative:
diff --git a/libgit2-glib/ggit.h b/libgit2-glib/ggit.h
index eeaef2b..a7236c3 100644
--- a/libgit2-glib/ggit.h
+++ b/libgit2-glib/ggit.h
@@ -44,7 +44,7 @@
 #include <libgit2-glib/ggit-index-entry-resolve-undo.h>
 #include <libgit2-glib/ggit-index.h>
 #include <libgit2-glib/ggit-main.h>
-#include <libgit2-glib/ggit-merge-tree-options.h>
+#include <libgit2-glib/ggit-merge-options.h>
 #include <libgit2-glib/ggit-message.h>
 #include <libgit2-glib/ggit-native.h>
 #include <libgit2-glib/ggit-object-factory-base.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]