[glib/wip/gproperty-2] gproperty: Remove unused argument from G_DEFINE_PROPERTY

From: Emmanuele Bassi <ebassi src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib/wip/gproperty-2] gproperty: Remove unused argument from G_DEFINE_PROPERTY
Date: Tue, 18 Jun 2013 07:42:54 +0000 (UTC)
commit 3de39fbfda12ec23e3f005ee6d028dc52020d0f6
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Jun 18 08:41:28 2013 +0100

    gproperty: Remove unused argument from G_DEFINE_PROPERTY
    
    The lowercase type name is not used any more, so we can drop it; this
    should keep the character count down.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=648526

 gobject/gproperty.h      |   43 +++++++++++++++++++------------------------
 gobject/tests/property.c |   18 +++++++++---------
 2 files changed, 28 insertions(+), 33 deletions(-)
---
diff --git a/gobject/gproperty.h b/gobject/gproperty.h
index 0856036..7a32ec9 100644
--- a/gobject/gproperty.h
+++ b/gobject/gproperty.h
@@ -521,28 +521,27 @@ void            g_property_init_default        (GProperty *property,
                                        t_n##_properties); \
   }
 
-#define _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN(T_N, t_n, c_type, name, flags) \
+#define _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN(T_N, c_type, name, flags) \
 { \
   GProperty *g_property = (GProperty *) \
     g_##c_type##_property_new (#name, flags, \
                                G_STRUCT_OFFSET (T_N##Private, name), \
                                NULL, \
                                NULL);
-#define _G_DEFINE_PROPERTY_EXTENDED_BEGIN(T_N, t_n, c_type, name, offset, setterFunc, getterFunc, flags) \
+#define _G_DEFINE_PROPERTY_EXTENDED_BEGIN(T_N, c_type, name, offset, setterFunc, getterFunc, flags) \
 { \
   GProperty *g_property = (GProperty *) \
     g_##c_type##_property_new (#name, flags, \
                                offset, \
                                setterFunc, \
                                getterFunc);
-#define _G_DEFINE_PROPERTY_EXTENDED_END(T_N, t_n, name) \
+#define _G_DEFINE_PROPERTY_EXTENDED_END \
   g_ptr_array_add (g_define_properties, g_property); \
 }
 
 /**
  * G_DEFINE_PROPERTY_EXTENDED:
  * @T_N: the name of the type, in CamelCase
- * @t_n: the name of the type, in lower case, with spaces replaced by underscores
  * @c_type: the C type of the property, in lower case, minus the "g" if the type
  *   is defined by GLib; for instance "int" for "gint", "uint8" for "guint8",
  *   "boolean" for "gboolean"; strings stored in a gchar* are defined as "string"
@@ -557,7 +556,7 @@ void            g_property_init_default        (GProperty *property,
  * The most generic property definition macro.
  *
  * |[
- *   G_DEFINE_PROPERTY_EXTENDED (GtkGadget, gtk_gadget,
+ *   G_DEFINE_PROPERTY_EXTENDED (GtkGadget,
  *                               int,
  *                               width,
  *                               G_STRUCT_OFFSET (GtkGadgetPrivate, width),
@@ -582,15 +581,14 @@ void            g_property_init_default        (GProperty *property,
  *
  * Since: 2.38
  */
-#define G_DEFINE_PROPERTY_EXTENDED(T_N, t_n, c_type, name, offset, setterFunc, getterFunc, flags, _C_) \
-  _G_DEFINE_PROPERTY_EXTENDED_BEGIN (T_N, t_n, c_type, name, offset, setterFunc, getterFunc, flags) \
+#define G_DEFINE_PROPERTY_EXTENDED(T_N, c_type, name, offset, setterFunc, getterFunc, flags, _C_) \
+  _G_DEFINE_PROPERTY_EXTENDED_BEGIN (T_N, c_type, name, offset, setterFunc, getterFunc, flags) \
   { _C_; } \
-  _G_DEFINE_PROPERTY_EXTENDED_END (T_N, t_n, name)
+  _G_DEFINE_PROPERTY_EXTENDED_END
 
 /**
  * G_DEFINE_PROPERTY_WITH_CODE:
  * @T_N: the name of the type, in CamelCase
- * @t_n: the name of the type, in lower case, with spaces replaced by underscores
  * @c_type: the C type of the property, in lower case, minus the "g" if the type
  *   is defined by GLib; for instance "int" for "gint", "uint8" for "guint8",
  *   "boolean" for "gboolean"; strings stored in a gchar* are defined as "string"
@@ -607,15 +605,14 @@ void            g_property_init_default        (GProperty *property,
  *
  * Since: 2.38
  */
-#define G_DEFINE_PROPERTY_WITH_CODE(T_N, t_n, c_type, name, flags, _C_) \
-  _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN (T_N, t_n, c_type, name, flags) \
+#define G_DEFINE_PROPERTY_WITH_CODE(T_N, c_type, name, flags, _C_) \
+  _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN (T_N, c_type, name, flags) \
   { _C_; } \
-  _G_DEFINE_PROPERTY_EXTENDED_END (T_N, t_n, name)
+  _G_DEFINE_PROPERTY_EXTENDED_END
 
 /**
  * G_DEFINE_PROPERTY_WITH_DEFAULT:
  * @T_N: the name of the type, in CamelCase
- * @t_n: the name of the type, in lower case, with spaces replaced by underscores
  * @c_type: the C type of the property, in lower case, minus the "g" if the type
  *   is defined by GLib; for instance "int" for "gint", "uint8" for "guint8",
  *   "boolean" for "gboolean"; strings stored in a gchar* are defined as "string"
@@ -632,15 +629,14 @@ void            g_property_init_default        (GProperty *property,
  *
  * Since: 2.38
  */
-#define G_DEFINE_PROPERTY_WITH_DEFAULT(T_N, t_n, c_type, name, flags, defVal) \
-  _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN (T_N, t_n, c_type, name, flags) \
+#define G_DEFINE_PROPERTY_WITH_DEFAULT(T_N, c_type, name, flags, defVal) \
+  _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN (T_N, c_type, name, flags) \
   G_PROPERTY_DEFAULT (defVal) \
-  _G_DEFINE_PROPERTY_EXTENDED_END (T_N, t_n, name)
+  _G_DEFINE_PROPERTY_EXTENDED_END
 
 /**
  * G_DEFINE_PROPERTY_WITH_RANGE:
  * @T_N: the name of the type, in CamelCase
- * @t_n: the name of the type, in lower case, with spaces replaced by underscores
  * @c_type: the C type of the property, in lower case, minus the "g" if the type
  *   is defined by GLib; for instance "int" for "gint", "uint8" for "guint8",
  *   "boolean" for "gboolean"; strings stored in a gchar* are defined as "string"
@@ -658,15 +654,14 @@ void            g_property_init_default        (GProperty *property,
  *
  * Since: 2.38
  */
-#define G_DEFINE_PROPERTY_WITH_RANGE(T_N, t_n, c_type, name, flags, minVal, maxVal) \
-  _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN (T_N, t_n, c_type, name, flags) \
+#define G_DEFINE_PROPERTY_WITH_RANGE(T_N, c_type, name, flags, minVal, maxVal) \
+  _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN (T_N, c_type, name, flags) \
   G_PROPERTY_RANGE (minVal, maxVal) \
-  _G_DEFINE_PROPERTY_EXTENDED_END (T_N, t_n, name)
+  _G_DEFINE_PROPERTY_EXTENDED_END
 
 /**
  * G_DEFINE_PROPERTY:
  * @T_N: the name of the type, in CamelCase
- * @t_n: the name of the type, in lower case, with spaces replaced by underscores
  * @c_type: the C type of the property, in lower case, minus the "g" if the type
  *   is defined by GLib; for instance "int" for "gint", "uint8" for "guint8",
  *   "boolean" for "gboolean"; strings stored in a gchar* are defined as "string"
@@ -682,9 +677,9 @@ void            g_property_init_default        (GProperty *property,
  *
  * Since: 2.38
  */
-#define G_DEFINE_PROPERTY(T_N, t_n, c_type, name, flags) \
-  _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN (T_N, t_n, c_type, name, flags) \
-  _G_DEFINE_PROPERTY_EXTENDED_END (T_N, t_n, name)
+#define G_DEFINE_PROPERTY(T_N, c_type, name, flags) \
+  _G_DEFINE_DIRECT_PROPERTY_EXTENDED_BEGIN (T_N, c_type, name, flags) \
+  _G_DEFINE_PROPERTY_EXTENDED_END
 
 /* accessors generation */
 #define _G_DECLARE_PROPERTY_GETTER(T_n, t_n, f_t, f_n)  f_t t_n##_get_##f_n (T_n *self)
diff --git a/gobject/tests/property.c b/gobject/tests/property.c
index b63e77b..550ad1e 100644
--- a/gobject/tests/property.c
+++ b/gobject/tests/property.c
@@ -104,31 +104,31 @@ test_object_class_init (TestObjectClass *klass)
   gobject_class->finalize = test_object_finalize;
 
   G_DEFINE_PROPERTIES (TestObject, test_object, klass,
-                       G_DEFINE_PROPERTY (TestObject, test_object,
+                       G_DEFINE_PROPERTY (TestObject,
                                           int,
                                           integer_val,
                                           G_PROPERTY_READWRITE)
-                       G_DEFINE_PROPERTY (TestObject, test_object,
+                       G_DEFINE_PROPERTY (TestObject,
                                           double,
                                           double_val,
                                           G_PROPERTY_READWRITE)
-                       G_DEFINE_PROPERTY (TestObject, test_object,
+                       G_DEFINE_PROPERTY (TestObject,
                                           string,
                                           string_val,
                                           G_PROPERTY_READWRITE | G_PROPERTY_COPY_SET)
-                       G_DEFINE_PROPERTY (TestObject, test_object,
+                       G_DEFINE_PROPERTY (TestObject,
                                           boolean,
                                           bool_val,
                                           G_PROPERTY_READWRITE)
-                       G_DEFINE_PROPERTY (TestObject, test_object,
+                       G_DEFINE_PROPERTY (TestObject,
                                           float,
                                           width,
                                           G_PROPERTY_READWRITE)
-                       G_DEFINE_PROPERTY (TestObject, test_object,
+                       G_DEFINE_PROPERTY (TestObject,
                                           float,
                                           height,
                                           G_PROPERTY_READWRITE)
-                       G_DEFINE_PROPERTY_EXTENDED (TestObject, test_object,
+                       G_DEFINE_PROPERTY_EXTENDED (TestObject,
                                                    enum,
                                                    enum_val,
                                                    G_STRUCT_OFFSET (TestObjectPrivate, enum_val),
@@ -137,11 +137,11 @@ test_object_class_init (TestObjectClass *klass)
                                                    G_PROPERTY_READWRITE,
                                                    G_PROPERTY_DEFAULT (TEST_ENUM_UNSET)
                                                    g_property_set_prerequisite (g_property, 
test_enum_get_type ());)
-                       G_DEFINE_PROPERTY (TestObject, test_object,
+                       G_DEFINE_PROPERTY (TestObject,
                                           boolean,
                                           enum_val_set,
                                           G_PROPERTY_READABLE);
-                       G_DEFINE_PROPERTY_WITH_CODE (TestObject, test_object,
+                       G_DEFINE_PROPERTY_WITH_CODE (TestObject,
                                                     uint8,
                                                     with_default,
                                                     G_PROPERTY_READWRITE,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]