[virt-tools-list] [libosinfo 2/2] Use G_PARAM_STATIC_STRINGS everywhere

Christophe Fergeau cfergeau at redhat.com
Thu Dec 13 11:41:08 UTC 2012


Remove the last uses of G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB
---
 osinfo/osinfo_deployment.c           |  8 ++------
 osinfo/osinfo_devicelink.c           |  4 +---
 osinfo/osinfo_devicelinkfilter.c     |  4 +---
 osinfo/osinfo_entity.c               |  4 +---
 osinfo/osinfo_install_config_param.c |  8 ++------
 osinfo/osinfo_list.c                 |  4 +---
 osinfo/osinfo_os.c                   |  8 ++------
 osinfo/osinfo_product.c              | 24 ++++++------------------
 osinfo/osinfo_resources.c            | 20 +++++---------------
 osinfo/osinfo_tree.c                 | 36 +++++++++---------------------------
 10 files changed, 30 insertions(+), 90 deletions(-)

diff --git a/osinfo/osinfo_deployment.c b/osinfo/osinfo_deployment.c
index d69fd81..3678fa2 100644
--- a/osinfo/osinfo_deployment.c
+++ b/osinfo/osinfo_deployment.c
@@ -155,9 +155,7 @@ osinfo_deployment_class_init (OsinfoDeploymentClass *klass)
                                 OSINFO_TYPE_OS,
                                 G_PARAM_CONSTRUCT_ONLY |
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass,
                                     PROP_OS,
                                     pspec);
@@ -172,9 +170,7 @@ osinfo_deployment_class_init (OsinfoDeploymentClass *klass)
                                 OSINFO_TYPE_PLATFORM,
                                 G_PARAM_CONSTRUCT_ONLY |
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass,
                                     PROP_PLATFORM,
                                     pspec);
diff --git a/osinfo/osinfo_devicelink.c b/osinfo/osinfo_devicelink.c
index 1ae75e2..383c7f2 100644
--- a/osinfo/osinfo_devicelink.c
+++ b/osinfo/osinfo_devicelink.c
@@ -130,9 +130,7 @@ osinfo_devicelink_class_init (OsinfoDeviceLinkClass *klass)
                                 OSINFO_TYPE_DEVICE,
                                 G_PARAM_CONSTRUCT_ONLY |
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass,
                                     PROP_TARGET,
                                     pspec);
diff --git a/osinfo/osinfo_devicelinkfilter.c b/osinfo/osinfo_devicelinkfilter.c
index 371bb63..004d38a 100644
--- a/osinfo/osinfo_devicelinkfilter.c
+++ b/osinfo/osinfo_devicelinkfilter.c
@@ -135,9 +135,7 @@ osinfo_devicelinkfilter_class_init (OsinfoDeviceLinkFilterClass *klass)
                                 OSINFO_TYPE_FILTER,
                                 G_PARAM_CONSTRUCT_ONLY |
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass,
                                     PROP_TARGET_FILTER,
                                     pspec);
diff --git a/osinfo/osinfo_entity.c b/osinfo/osinfo_entity.c
index e9dabfe..f108447 100644
--- a/osinfo/osinfo_entity.c
+++ b/osinfo/osinfo_entity.c
@@ -137,9 +137,7 @@ osinfo_entity_class_init (OsinfoEntityClass *klass)
                                  NULL /* default value */,
                                  G_PARAM_CONSTRUCT_ONLY |
                                  G_PARAM_READWRITE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass,
                                      PROP_ID,
                                      pspec);
diff --git a/osinfo/osinfo_install_config_param.c b/osinfo/osinfo_install_config_param.c
index 6e34769..7876d20 100644
--- a/osinfo/osinfo_install_config_param.c
+++ b/osinfo/osinfo_install_config_param.c
@@ -125,9 +125,7 @@ osinfo_install_config_param_class_init (OsinfoInstallConfigParamClass *klass)
                                 G_PARAM_WRITABLE |
                                 G_PARAM_READABLE |
                                 G_PARAM_CONSTRUCT_ONLY |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass,
                                     PROP_NAME,
                                     pspec);
@@ -142,9 +140,7 @@ osinfo_install_config_param_class_init (OsinfoInstallConfigParamClass *klass)
                               OSINFO_TYPE_INSTALL_CONFIG_PARAM_POLICY,
                               OSINFO_INSTALL_CONFIG_PARAM_POLICY_OPTIONAL,
                               G_PARAM_READABLE |
-                              G_PARAM_STATIC_NAME |
-                              G_PARAM_STATIC_NICK |
-                              G_PARAM_STATIC_BLURB);
+                              G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass,
                                     PROP_POLICY,
                                     pspec);
diff --git a/osinfo/osinfo_list.c b/osinfo/osinfo_list.c
index afc04d3..657dace 100644
--- a/osinfo/osinfo_list.c
+++ b/osinfo/osinfo_list.c
@@ -133,9 +133,7 @@ osinfo_list_class_init (OsinfoListClass *klass)
                                OSINFO_TYPE_ENTITY,
                                G_PARAM_CONSTRUCT_ONLY |
                                G_PARAM_READWRITE |
-                               G_PARAM_STATIC_NAME |
-                               G_PARAM_STATIC_BLURB |
-                               G_PARAM_STATIC_NICK);
+                               G_PARAM_STATIC_STRINGS);
 
     g_object_class_install_property(g_klass,
                                     PROP_ELEMENT_TYPE,
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index 8d4ef6f..6de2515 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -145,9 +145,7 @@ osinfo_os_class_init (OsinfoOsClass *klass)
                                  _("Generic Family"),
                                  NULL /* default value */,
                                  G_PARAM_READABLE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass,
                                      PROP_FAMILY,
                                      pspec);
@@ -163,9 +161,7 @@ osinfo_os_class_init (OsinfoOsClass *klass)
                                  _("Generic Distro"),
                                  NULL /* default value */,
                                  G_PARAM_READABLE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass,
                                      PROP_DISTRO,
                                      pspec);
diff --git a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c
index 2e0ff5d..35a0f09 100644
--- a/osinfo/osinfo_product.c
+++ b/osinfo/osinfo_product.c
@@ -165,9 +165,7 @@ osinfo_product_class_init (OsinfoProductClass *klass)
                                  _("Name"),
                                  NULL /* default value */,
                                  G_PARAM_READABLE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass, PROP_NAME, pspec);
 
     /**
@@ -180,9 +178,7 @@ osinfo_product_class_init (OsinfoProductClass *klass)
                                  _("Short ID"),
                                  NULL /* default value */,
                                  G_PARAM_READABLE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass, PROP_SHORT_ID, pspec);
 
     /**
@@ -195,9 +191,7 @@ osinfo_product_class_init (OsinfoProductClass *klass)
                                  _("Vendor"),
                                  NULL /* default value */,
                                  G_PARAM_READABLE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass, PROP_VENDOR, pspec);
 
     /**
@@ -210,9 +204,7 @@ osinfo_product_class_init (OsinfoProductClass *klass)
                                  _("Version"),
                                  NULL /* default value */,
                                  G_PARAM_READABLE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass, PROP_VERSION, pspec);
 
     /**
@@ -225,9 +217,7 @@ osinfo_product_class_init (OsinfoProductClass *klass)
                                  _("Codename"),
                                  NULL /* default value */,
                                  G_PARAM_READABLE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass, PROP_NAME, pspec);
 
     /**
@@ -240,9 +230,7 @@ osinfo_product_class_init (OsinfoProductClass *klass)
                                  _("URI of the logo"),
                                  NULL /* default value */,
                                  G_PARAM_READABLE |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass, PROP_LOGO, pspec);
 }
 
diff --git a/osinfo/osinfo_resources.c b/osinfo/osinfo_resources.c
index 64b27a1..1cdc888 100644
--- a/osinfo/osinfo_resources.c
+++ b/osinfo/osinfo_resources.c
@@ -171,9 +171,7 @@ osinfo_resources_class_init (OsinfoResourcesClass *klass)
                                  NULL /* default value */,
                                  G_PARAM_READWRITE |
                                  G_PARAM_CONSTRUCT_ONLY |
-                                 G_PARAM_STATIC_NAME |
-                                 G_PARAM_STATIC_NICK |
-                                 G_PARAM_STATIC_BLURB);
+                                 G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass,
                                      PROP_ARCHITECTURE,
                                      pspec);
@@ -190,9 +188,7 @@ osinfo_resources_class_init (OsinfoResourcesClass *klass)
                                 G_MAXINT,
                                 -1,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass,
                                      PROP_CPU,
                                      pspec);
@@ -209,9 +205,7 @@ osinfo_resources_class_init (OsinfoResourcesClass *klass)
                               G_MAXINT,
                               -1,
                               G_PARAM_READWRITE |
-                              G_PARAM_STATIC_NAME |
-                              G_PARAM_STATIC_NICK |
-                              G_PARAM_STATIC_BLURB);
+                              G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass,
                                      PROP_N_CPUS,
                                      pspec);
@@ -228,9 +222,7 @@ osinfo_resources_class_init (OsinfoResourcesClass *klass)
                                 G_MAXINT64,
                                 -1,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass,
                                      PROP_RAM,
                                      pspec);
@@ -247,9 +239,7 @@ osinfo_resources_class_init (OsinfoResourcesClass *klass)
                                 G_MAXINT64,
                                 -1,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property (g_klass,
                                      PROP_STORAGE,
                                      pspec);
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 9575a8d..3b964a1 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -277,9 +277,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("CPU Architecture"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_ARCHITECTURE, pspec);
 
     /**
@@ -292,9 +290,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("The URL to this tree"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_URL, pspec);
 
     /**
@@ -307,9 +303,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("The expected ISO9660 volume ID"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_TREEINFO_FAMILY, pspec);
 
     /**
@@ -322,9 +316,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("The expected ISO9660 publisher ID"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_TREEINFO_VARIANT, pspec);
 
     /**
@@ -337,9 +329,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("The expected ISO9660 application ID"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_TREEINFO_VERSION, pspec);
 
     /**
@@ -352,9 +342,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("The expected ISO9660 system ID"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_TREEINFO_ARCH, pspec);
 
     /**
@@ -367,9 +355,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("The path to the kernel image"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_KERNEL_PATH, pspec);
 
     /**
@@ -382,9 +368,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("The path to the inirtd image"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_INITRD_PATH, pspec);
 
     /**
@@ -397,9 +381,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
                                 _("The path to the bootable ISO image"),
                                 NULL /* default value */,
                                 G_PARAM_READWRITE |
-                                G_PARAM_STATIC_NAME |
-                                G_PARAM_STATIC_NICK |
-                                G_PARAM_STATIC_BLURB);
+                                G_PARAM_STATIC_STRINGS);
     g_object_class_install_property(g_klass, PROP_BOOT_ISO_PATH, pspec);
 
 }
-- 
1.8.0.1




More information about the virt-tools-list mailing list