GNOME.org
 

[libgit2-glib] Rename GgitStatusFlag to GgitStatusOption

commit 9830594b4ab64a4565e5e839cfd4ecfc5e7c4e2d
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sun Jun 23 16:18:41 2013 +0200

    Rename GgitStatusFlag to GgitStatusOption
    
    This disambiguates more clearly from GgitStatusFlags

 libgit2-glib/ggit-status-options.c |   10 +++---
 libgit2-glib/ggit-status-options.h |    2 +-
 libgit2-glib/ggit-types.c          |   16 ++++++------
 libgit2-glib/ggit-types.h          |   50 ++++++++++++++++++------------------
 4 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/libgit2-glib/ggit-status-options.c b/libgit2-glib/ggit-status-options.c
index 735ed7b..942b6d8 100644
--- a/libgit2-glib/ggit-status-options.c
+++ b/libgit2-glib/ggit-status-options.c
@@ -90,7 +90,7 @@ ggit_status_options_free (GgitStatusOptions *status_options)
 
 /**
  * ggit_status_options_new:
- * @flags: status flags.
+ * @options: status options.
  * @show: status show options.
  * @pathspec: (allow-none): which paths to show, defaults to showing all paths.
  *
@@ -99,16 +99,16 @@ ggit_status_options_free (GgitStatusOptions *status_options)
  * Returns: a newly allocated #GgitStatusOptions.
  */
 GgitStatusOptions *
-ggit_status_options_new (GgitStatusFlag   flags,
-                         GgitStatusShow   show,
-                         const gchar    **pathspec)
+ggit_status_options_new (GgitStatusOption   options,
+                         GgitStatusShow     show,
+                         const gchar      **pathspec)
 {
        GgitStatusOptions *status_options;
        git_status_options gstatus_options = GIT_STATUS_OPTIONS_INIT;
 
        status_options = g_slice_new (GgitStatusOptions);
 
-       gstatus_options.flags = flags;
+       gstatus_options.flags = options;
        gstatus_options.show = show;
 
        ggit_utils_get_git_strarray_from_str_array (pathspec,
diff --git a/libgit2-glib/ggit-status-options.h b/libgit2-glib/ggit-status-options.h
index 2e1ce64..a21faeb 100644
--- a/libgit2-glib/ggit-status-options.h
+++ b/libgit2-glib/ggit-status-options.h
@@ -42,7 +42,7 @@ const git_status_options *
 GgitStatusOptions *ggit_status_options_copy               (GgitStatusOptions        *status_options);
 void               ggit_status_options_free               (GgitStatusOptions        *status_options);
 
-GgitStatusOptions *ggit_status_options_new                (GgitStatusFlag            flags,
+GgitStatusOptions *ggit_status_options_new                (GgitStatusOption          options,
                                                            GgitStatusShow            show,
                                                            const gchar             **pathspec);
 
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index d837e72..4c7b8b0 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -168,14 +168,14 @@ ASSERT_ENUM (GGIT_SUBMODULE_UPDATE_CHECKOUT, GIT_SUBMODULE_UPDATE_CHECKOUT);
 ASSERT_ENUM (GGIT_SUBMODULE_UPDATE_REBASE,   GIT_SUBMODULE_UPDATE_REBASE);
 ASSERT_ENUM (GGIT_SUBMODULE_UPDATE_MERGE,    GIT_SUBMODULE_UPDATE_MERGE);
 
-ASSERT_ENUM (GGIT_STATUS_FLAG_INCLUDE_UNTRACKED, GIT_STATUS_OPT_INCLUDE_UNTRACKED);
-ASSERT_ENUM (GGIT_STATUS_FLAG_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_IGNORED);
-ASSERT_ENUM (GGIT_STATUS_FLAG_INCLUDE_UNMODIFIED, GIT_STATUS_OPT_INCLUDE_UNMODIFIED);
-ASSERT_ENUM (GGIT_STATUS_FLAG_EXCLUDE_SUBMODULES, GIT_STATUS_OPT_EXCLUDE_SUBMODULES);
-ASSERT_ENUM (GGIT_STATUS_FLAG_RECURSE_UNTRACKED_DIRS, GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS);
-ASSERT_ENUM (GGIT_STATUS_FLAG_DISABLE_PATHSPEC_MATCH, GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH);
-ASSERT_ENUM (GGIT_STATUS_FLAG_RECURSE_IGNORED_DIRS, GIT_STATUS_OPT_RECURSE_IGNORED_DIRS);
-ASSERT_ENUM (GGIT_STATUS_FLAG_DEFAULT, GIT_STATUS_OPT_DEFAULTS);
+ASSERT_ENUM (GGIT_STATUS_OPTION_INCLUDE_UNTRACKED, GIT_STATUS_OPT_INCLUDE_UNTRACKED);
+ASSERT_ENUM (GGIT_STATUS_OPTION_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_IGNORED);
+ASSERT_ENUM (GGIT_STATUS_OPTION_INCLUDE_UNMODIFIED, GIT_STATUS_OPT_INCLUDE_UNMODIFIED);
+ASSERT_ENUM (GGIT_STATUS_OPTION_EXCLUDE_SUBMODULES, GIT_STATUS_OPT_EXCLUDE_SUBMODULES);
+ASSERT_ENUM (GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS, GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS);
+ASSERT_ENUM (GGIT_STATUS_OPTION_DISABLE_PATHSPEC_MATCH, GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH);
+ASSERT_ENUM (GGIT_STATUS_OPTION_RECURSE_IGNORED_DIRS, GIT_STATUS_OPT_RECURSE_IGNORED_DIRS);
+ASSERT_ENUM (GGIT_STATUS_OPTION_DEFAULT, GIT_STATUS_OPT_DEFAULTS);
 
 ASSERT_ENUM (GGIT_STATUS_SHOW_INDEX_AND_WORKDIR, GIT_STATUS_SHOW_INDEX_AND_WORKDIR);
 ASSERT_ENUM (GGIT_STATUS_SHOW_INDEX_ONLY, GIT_STATUS_SHOW_INDEX_ONLY);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index 0dac501..0771d63 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -676,35 +676,35 @@ typedef enum {
 } GgitTreeWalkMode;
 
 /**
- * GgitStatusFlag:
- * GGIT_STATUS_FLAG_INCLUDE_UNTRACKED: include untracked files (default).
- * GGIT_STATUS_FLAG_INCLUDE_IGNORED: include ignored files (default).
- * GGIT_STATUS_FLAG_INCLUDE_UNMODIFIED: include unmodified files.
- * GGIT_STATUS_FLAG_EXCLUDE_SUBMODULES: exclude submodules.
- * GGIT_STATUS_FLAG_RECURSE_UNTRACKED_DIRS: search untracked directories recursively (default).
- * GGIT_STATUS_FLAG_DISABLE_PATHSPEC_MATCH: do not match path specifications.
- * GGIT_STATUS_FLAG_RECURSE_IGNORED_DIRS: search ignored directories recursively.
- * GGIT_STATUS_FLAG_SORT_CASE_SENSITIVELY: sort case sensitive.
- * GGIT_STATUS_FLAG_SORT_CASE_INSENSITIVELY: sort case insensitive.
- * GGIT_STATUS_FLAG_DEFAULT: default flags.
+ * GgitStatusOption:
+ * GGIT_STATUS_OPTION_INCLUDE_UNTRACKED: include untracked files (default).
+ * GGIT_STATUS_OPTION_INCLUDE_IGNORED: include ignored files (default).
+ * GGIT_STATUS_OPTION_INCLUDE_UNMODIFIED: include unmodified files.
+ * GGIT_STATUS_OPTION_EXCLUDE_SUBMODULES: exclude submodules.
+ * GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS: search untracked directories recursively (default).
+ * GGIT_STATUS_OPTION_DISABLE_PATHSPEC_MATCH: do not match path specifications.
+ * GGIT_STATUS_OPTION_RECURSE_IGNORED_DIRS: search ignored directories recursively.
+ * GGIT_STATUS_OPTION_SORT_CASE_SENSITIVELY: sort case sensitive.
+ * GGIT_STATUS_OPTION_SORT_CASE_INSENSITIVELY: sort case insensitive.
+ * GGIT_STATUS_OPTION_DEFAULT: default flags.
  *
- * Status flags specified when using #ggit_repository_file_status_foreach.
+ * Status options specified when using #ggit_repository_file_status_foreach.
  *
  */
 typedef enum {
-       GGIT_STATUS_FLAG_INCLUDE_UNTRACKED        = (1 << 0),
-       GGIT_STATUS_FLAG_INCLUDE_IGNORED          = (1 << 1),
-       GGIT_STATUS_FLAG_INCLUDE_UNMODIFIED       = (1 << 2),
-       GGIT_STATUS_FLAG_EXCLUDE_SUBMODULES       = (1 << 3),
-       GGIT_STATUS_FLAG_RECURSE_UNTRACKED_DIRS   = (1 << 4),
-       GGIT_STATUS_FLAG_DISABLE_PATHSPEC_MATCH   = (1 << 5),
-       GGIT_STATUS_FLAG_RECURSE_IGNORED_DIRS     = (1 << 6),
-       GGIT_STATUS_FLAG_SORT_CASE_SENSITIVELY    = (1 << 9),
-       GGIT_STATUS_FLAG_SORT_CASE_INSENSITIVELY  = (1 << 10),
-       GGIT_STATUS_FLAG_DEFAULT                  = GGIT_STATUS_FLAG_INCLUDE_IGNORED |
-                                                   GGIT_STATUS_FLAG_INCLUDE_UNTRACKED |
-                                                   GGIT_STATUS_FLAG_RECURSE_UNTRACKED_DIRS
-} GgitStatusFlag;
+       GGIT_STATUS_OPTION_INCLUDE_UNTRACKED        = (1 << 0),
+       GGIT_STATUS_OPTION_INCLUDE_IGNORED          = (1 << 1),
+       GGIT_STATUS_OPTION_INCLUDE_UNMODIFIED       = (1 << 2),
+       GGIT_STATUS_OPTION_EXCLUDE_SUBMODULES       = (1 << 3),
+       GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS   = (1 << 4),
+       GGIT_STATUS_OPTION_DISABLE_PATHSPEC_MATCH   = (1 << 5),
+       GGIT_STATUS_OPTION_RECURSE_IGNORED_DIRS     = (1 << 6),
+       GGIT_STATUS_OPTION_SORT_CASE_SENSITIVELY    = (1 << 9),
+       GGIT_STATUS_OPTION_SORT_CASE_INSENSITIVELY  = (1 << 10),
+       GGIT_STATUS_OPTION_DEFAULT                  = GGIT_STATUS_OPTION_INCLUDE_IGNORED |
+                                                     GGIT_STATUS_OPTION_INCLUDE_UNTRACKED |
+                                                     GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS
+} GgitStatusOption;
 
 /**
  * GgitStatusShow:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]