[gnome-software: 11/13] lib: Use correct glib-mkenums trigraphs to hide LAST enum members




commit 512e606085c7e325ce6e4658346da2f3c5f2cdfc
Author: Philip Withnall <pwithnall endlessos org>
Date:   Tue Jan 26 20:51:19 2021 +0000

    lib: Use correct glib-mkenums trigraphs to hide LAST enum members
    
    They aren’t private, but they shouldn’t be included in the list of enum
    members registered with `g_enum_register_static()`.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 lib/gs-app-list-private.h    |  3 +--
 lib/gs-app-list.h            |  3 +--
 lib/gs-app.h                 | 15 +++++----------
 lib/gs-plugin-event.h        |  3 +--
 lib/gs-plugin-types.h        | 12 ++++--------
 lib/gs-utils.h               |  3 +--
 plugins/flatpak/gs-flatpak.h |  3 +--
 src/gs-content-rating.h      |  3 +--
 8 files changed, 15 insertions(+), 30 deletions(-)
---
diff --git a/lib/gs-app-list-private.h b/lib/gs-app-list-private.h
index 41e138fd..3bf908c1 100644
--- a/lib/gs-app-list-private.h
+++ b/lib/gs-app-list-private.h
@@ -30,8 +30,7 @@ typedef enum {
        GS_APP_LIST_FLAG_WATCH_APPS             = 1 << 2,
        GS_APP_LIST_FLAG_WATCH_APPS_RELATED     = 1 << 3,
        GS_APP_LIST_FLAG_WATCH_APPS_ADDONS      = 1 << 4,
-       /*< private >*/
-       GS_APP_LIST_FLAG_LAST
+       GS_APP_LIST_FLAG_LAST  /*< skip >*/
 } GsAppListFlags;
 
 GsAppList      *gs_app_list_copy               (GsAppList      *list);
diff --git a/lib/gs-app-list.h b/lib/gs-app-list.h
index e7902a6d..8b0e0c2b 100644
--- a/lib/gs-app-list.h
+++ b/lib/gs-app-list.h
@@ -35,8 +35,7 @@ typedef enum {
        GS_APP_LIST_FILTER_FLAG_KEY_VERSION     = 1 << 2,
        GS_APP_LIST_FILTER_FLAG_PREFER_INSTALLED= 1 << 3,
        GS_APP_LIST_FILTER_FLAG_KEY_ID_PROVIDES = 1 << 4,
-       /*< private >*/
-       GS_APP_LIST_FILTER_FLAG_LAST,
+       GS_APP_LIST_FILTER_FLAG_LAST,  /*< skip >*/
        GS_APP_LIST_FILTER_FLAG_MASK            = G_MAXUINT64
 } GsAppListFilterFlags;
 
diff --git a/lib/gs-app.h b/lib/gs-app.h
index 5aeaac31..6018dfd0 100644
--- a/lib/gs-app.h
+++ b/lib/gs-app.h
@@ -58,8 +58,7 @@ typedef enum {
        GS_APP_STATE_UPDATABLE_LIVE,                    /* Since: 0.5.4 */
        GS_APP_STATE_PURCHASABLE,                       /* Since: 0.5.17 */
        GS_APP_STATE_PURCHASING,                        /* Since: 0.5.17 */
-       /*< private >*/
-       GS_APP_STATE_LAST
+       GS_APP_STATE_LAST  /*< skip >*/
 } GsAppState;
 
 /**
@@ -96,8 +95,7 @@ typedef enum {
        GS_APP_KUDO_HI_DPI_ICON                 = 1 << 14,
        GS_APP_KUDO_SANDBOXED                   = 1 << 15,
        GS_APP_KUDO_SANDBOXED_SECURE            = 1 << 16,
-       /*< private >*/
-       GS_APP_KUDO_LAST
+       GS_APP_KUDO_LAST  /*< skip >*/
 } GsAppKudo;
 
 /**
@@ -144,8 +142,7 @@ typedef enum {
        GS_APP_QUIRK_HIDE_FROM_SEARCH   = 1 << 15,      /* Since: 3.32 */
        GS_APP_QUIRK_HIDE_EVERYWHERE    = 1 << 16,      /* Since: 3.36 */
        GS_APP_QUIRK_DO_NOT_AUTO_UPDATE = 1 << 17,      /* Since: 3.36 */
-       /*< private >*/
-       GS_APP_QUIRK_LAST
+       GS_APP_QUIRK_LAST  /*< skip >*/
 } GsAppQuirk;
 
 #define        GS_APP_INSTALL_DATE_UNSET               0
@@ -166,8 +163,7 @@ typedef enum {
        GS_APP_QUALITY_LOWEST,
        GS_APP_QUALITY_NORMAL,
        GS_APP_QUALITY_HIGHEST,
-       /*< private >*/
-       GS_APP_QUALITY_LAST
+       GS_APP_QUALITY_LAST  /*< skip >*/
 } GsAppQuality;
 
 typedef enum {
@@ -186,8 +182,7 @@ typedef enum {
        GS_APP_PERMISSIONS_SETTINGS             = 1 << 11,
        GS_APP_PERMISSIONS_X11                  = 1 << 12,
        GS_APP_PERMISSIONS_ESCAPE_SANDBOX       = 1 << 13,
-       /*< private >*/
-       GS_APP_PERMISSIONS_LAST
+       GS_APP_PERMISSIONS_LAST  /*< skip >*/
 } GsAppPermissions;
 
 #define LIMITED_PERMISSIONS (GS_APP_PERMISSIONS_SETTINGS | \
diff --git a/lib/gs-plugin-event.h b/lib/gs-plugin-event.h
index dc744867..090c5b12 100644
--- a/lib/gs-plugin-event.h
+++ b/lib/gs-plugin-event.h
@@ -35,8 +35,7 @@ typedef enum {
        GS_PLUGIN_EVENT_FLAG_VISIBLE            = 1 << 1,       /* Since: 3.22 */
        GS_PLUGIN_EVENT_FLAG_WARNING            = 1 << 2,       /* Since: 3.22 */
        GS_PLUGIN_EVENT_FLAG_INTERACTIVE        = 1 << 3,       /* Since: 3.30 */
-       /*< private >*/
-       GS_PLUGIN_EVENT_FLAG_LAST
+       GS_PLUGIN_EVENT_FLAG_LAST  /*< skip >*/
 } GsPluginEventFlag;
 
 GsPluginEvent          *gs_plugin_event_new            (void);
diff --git a/lib/gs-plugin-types.h b/lib/gs-plugin-types.h
index 2020504e..993b67a3 100644
--- a/lib/gs-plugin-types.h
+++ b/lib/gs-plugin-types.h
@@ -34,8 +34,7 @@ typedef enum {
        GS_PLUGIN_STATUS_QUERYING,
        GS_PLUGIN_STATUS_INSTALLING,
        GS_PLUGIN_STATUS_REMOVING,
-       /*< private >*/
-       GS_PLUGIN_STATUS_LAST
+       GS_PLUGIN_STATUS_LAST  /*< skip >*/
 } GsPluginStatus;
 
 /**
@@ -90,8 +89,7 @@ typedef enum {
        GS_PLUGIN_ERROR_AC_POWER_REQUIRED,
        GS_PLUGIN_ERROR_TIMED_OUT,
        GS_PLUGIN_ERROR_BATTERY_LEVEL_TOO_LOW,
-       /*< private >*/
-       GS_PLUGIN_ERROR_LAST
+       GS_PLUGIN_ERROR_LAST  /*< skip >*/
 } GsPluginError;
 
 /**
@@ -185,8 +183,7 @@ typedef enum {
        GS_PLUGIN_RULE_RUN_AFTER,
        GS_PLUGIN_RULE_RUN_BEFORE,
        GS_PLUGIN_RULE_BETTER_THAN,
-       /*< private >*/
-       GS_PLUGIN_RULE_LAST
+       GS_PLUGIN_RULE_LAST  /*< skip >*/
 } GsPluginRule;
 
 /**
@@ -277,8 +274,7 @@ typedef enum {
        GS_PLUGIN_ACTION_DOWNLOAD,
        GS_PLUGIN_ACTION_GET_ALTERNATES,
        GS_PLUGIN_ACTION_GET_LANGPACKS,
-       /*< private >*/
-       GS_PLUGIN_ACTION_LAST
+       GS_PLUGIN_ACTION_LAST  /*< skip >*/
 } GsPluginAction;
 
 G_END_DECLS
diff --git a/lib/gs-utils.h b/lib/gs-utils.h
index dc4576ac..54f86d80 100644
--- a/lib/gs-utils.h
+++ b/lib/gs-utils.h
@@ -30,8 +30,7 @@ typedef enum {
        GS_UTILS_CACHE_FLAG_WRITEABLE           = 1 << 0,
        GS_UTILS_CACHE_FLAG_USE_HASH            = 1 << 1,
        GS_UTILS_CACHE_FLAG_ENSURE_EMPTY        = 1 << 2,
-       /*< private >*/
-       GS_UTILS_CACHE_FLAG_LAST
+       GS_UTILS_CACHE_FLAG_LAST  /*< skip >*/
 } GsUtilsCacheFlags;
 
 guint           gs_utils_get_file_age          (GFile          *file);
diff --git a/plugins/flatpak/gs-flatpak.h b/plugins/flatpak/gs-flatpak.h
index 15bdd0a0..06de3e9d 100644
--- a/plugins/flatpak/gs-flatpak.h
+++ b/plugins/flatpak/gs-flatpak.h
@@ -21,8 +21,7 @@ G_DECLARE_FINAL_TYPE (GsFlatpak, gs_flatpak, GS, FLATPAK, GObject)
 typedef enum {
        GS_FLATPAK_FLAG_NONE                    = 0,
        GS_FLATPAK_FLAG_IS_TEMPORARY            = 1 << 0,
-       /*< private >*/
-       GS_FLATPAK_FLAG_LAST
+       GS_FLATPAK_FLAG_LAST  /*< skip >*/
 } GsFlatpakFlags;
 
 GsFlatpak      *gs_flatpak_new                 (GsPlugin               *plugin,
diff --git a/src/gs-content-rating.h b/src/gs-content-rating.h
index 0e31784d..a3590152 100644
--- a/src/gs-content-rating.h
+++ b/src/gs-content-rating.h
@@ -55,8 +55,7 @@ typedef enum {
        GS_CONTENT_RATING_SYSTEM_GRAC,
        GS_CONTENT_RATING_SYSTEM_ESRB,
        GS_CONTENT_RATING_SYSTEM_IARC,
-       /*< private >*/
-       GS_CONTENT_RATING_SYSTEM_LAST
+       GS_CONTENT_RATING_SYSTEM_LAST  /*< skip >*/
 } GsContentRatingSystem;
 
 gchar *gs_utils_content_rating_age_to_str (GsContentRatingSystem system,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]