Use GtkFooPrivate instead GtkFooPriv

rightpeter · Aug 27, 2010 · 1e5d7c0 · 1e5d7c0
1 parent c6a44d8
commit 1e5d7c0
Show file tree

Hide file tree

Showing 98 changed files with 1,316 additions and 1,316 deletions.
diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
@@ -35,7 +35,7 @@
  * @widget: The GtkWidget whose properties and features are exported via this
  *   accessible instance
  */
-struct _GtkAccessiblePriv
+struct _GtkAccessiblePrivate
 {
   GtkWidget *widget;
 };
@@ -49,15 +49,15 @@ gtk_accessible_init (GtkAccessible *accesible)
 {
   accesible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accesible,
                                                  GTK_TYPE_ACCESSIBLE,
-                                                 GtkAccessiblePriv);
+                                                 GtkAccessiblePrivate);
 }
 
 static void
 gtk_accessible_class_init (GtkAccessibleClass *klass)
 {
   klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
 
-  g_type_class_add_private (klass, sizeof (GtkAccessiblePriv));
+  g_type_class_add_private (klass, sizeof (GtkAccessiblePrivate));
 }
 
 /**
@@ -121,7 +121,7 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
 static void
 gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
 {
-  GtkAccessiblePriv *priv = accessible->priv;
+  GtkAccessiblePrivate *priv = accessible->priv;
 
   if (priv->widget)
   {

diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
@@ -37,7 +37,7 @@ G_BEGIN_DECLS
 #define GTK_ACCESSIBLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
 
 typedef struct _GtkAccessible                GtkAccessible;
-typedef struct _GtkAccessiblePriv            GtkAccessiblePriv;
+typedef struct _GtkAccessiblePrivate         GtkAccessiblePrivate;
 typedef struct _GtkAccessibleClass           GtkAccessibleClass;
 
   /*
@@ -48,7 +48,7 @@ struct _GtkAccessible
   AtkObject parent;
 
   /*< private >*/
-  GtkAccessiblePriv *priv;
+  GtkAccessiblePrivate *priv;
 };
 
 struct _GtkAccessibleClass

diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
@@ -50,7 +50,7 @@
 #include "gtkintl.h"
 
 
-struct _GtkAlignmentPriv
+struct _GtkAlignmentPrivate
 {
   gfloat        xalign;
   gfloat        yalign;
@@ -221,17 +221,17 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0,
                                                       GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPriv));
+  g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPrivate));
 }
 
 static void
 gtk_alignment_init (GtkAlignment *alignment)
 {
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
 
   alignment->priv = G_TYPE_INSTANCE_GET_PRIVATE (alignment,
                                                  GTK_TYPE_ALIGNMENT,
-                                                 GtkAlignmentPriv);
+                                                 GtkAlignmentPrivate);
   priv = alignment->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (alignment), FALSE);
@@ -274,7 +274,7 @@ gtk_alignment_new (gfloat xalign,
 		   gfloat yscale)
 {
   GtkAlignment *alignment;
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
 
   alignment = g_object_new (GTK_TYPE_ALIGNMENT, NULL);
 
@@ -295,7 +295,7 @@ gtk_alignment_set_property (GObject         *object,
 			    GParamSpec      *pspec)
 {
   GtkAlignment *alignment = GTK_ALIGNMENT (object);
-  GtkAlignmentPriv *priv = alignment->priv;
+  GtkAlignmentPrivate *priv = alignment->priv;
 
   switch (prop_id)
     {
@@ -371,7 +371,7 @@ gtk_alignment_get_property (GObject         *object,
 			    GParamSpec      *pspec)
 {
   GtkAlignment *alignment = GTK_ALIGNMENT (object);
-  GtkAlignmentPriv *priv = alignment->priv;
+  GtkAlignmentPrivate *priv = alignment->priv;
 
   switch (prop_id)
     {
@@ -432,7 +432,7 @@ gtk_alignment_set (GtkAlignment *alignment,
 		   gfloat        xscale,
 		   gfloat        yscale)
 {
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
   GtkWidget *child;
 
   g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
@@ -485,7 +485,7 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
 			     GtkAllocation *allocation)
 {
   GtkAlignment *alignment = GTK_ALIGNMENT (widget);
-  GtkAlignmentPriv *priv = alignment->priv;
+  GtkAlignmentPrivate *priv = alignment->priv;
   GtkBin *bin;
   GtkAllocation child_allocation;
   GtkWidget *bin_child;
@@ -576,7 +576,7 @@ gtk_alignment_get_size (GtkSizeRequest *widget,
 			gint           *natural_size)
 {
   GtkAlignment *alignment = GTK_ALIGNMENT (widget);
-  GtkAlignmentPriv *priv = alignment->priv;
+  GtkAlignmentPrivate *priv = alignment->priv;
   GtkWidget *child;
   guint minimum, natural;
 
@@ -651,7 +651,7 @@ gtk_alignment_set_padding (GtkAlignment    *alignment,
 			   guint            padding_left,
 			   guint            padding_right)
 {
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
   GtkWidget *child;
 
   g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
@@ -711,7 +711,7 @@ gtk_alignment_get_padding (GtkAlignment    *alignment,
 			   guint           *padding_left,
 			   guint           *padding_right)
 {
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
 
   g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
 

diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_ALIGNMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
 
 
-typedef struct _GtkAlignment       GtkAlignment;
-typedef struct _GtkAlignmentPriv   GtkAlignmentPriv;
-typedef struct _GtkAlignmentClass  GtkAlignmentClass;
+typedef struct _GtkAlignment              GtkAlignment;
+typedef struct _GtkAlignmentPrivate       GtkAlignmentPrivate;
+typedef struct _GtkAlignmentClass         GtkAlignmentClass;
 
 struct _GtkAlignment
 {
   GtkBin bin;
 
   /* <private> */
-  GtkAlignmentPriv *priv;
+  GtkAlignmentPrivate *priv;
 };
 
 struct _GtkAlignmentClass

diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
@@ -52,7 +52,7 @@
 
 #define MIN_ARROW_SIZE  15
 
-struct _GtkArrowPriv
+struct _GtkArrowPrivate
 {
   gint16 arrow_type;
   gint16 shadow_type;
@@ -119,7 +119,7 @@ gtk_arrow_class_init (GtkArrowClass *class)
                                                                0.0, 1.0, 0.7,
                                                                GTK_PARAM_READABLE));
 
-  g_type_class_add_private (class, sizeof (GtkArrowPriv));
+  g_type_class_add_private (class, sizeof (GtkArrowPrivate));
 }
 
 static void
@@ -129,7 +129,7 @@ gtk_arrow_set_property (GObject         *object,
 			GParamSpec      *pspec)
 {
   GtkArrow *arrow = GTK_ARROW (object);
-  GtkArrowPriv *priv = arrow->priv;
+  GtkArrowPrivate *priv = arrow->priv;
 
   switch (prop_id)
     {
@@ -156,7 +156,7 @@ gtk_arrow_get_property (GObject         *object,
 			GParamSpec      *pspec)
 {
   GtkArrow *arrow = GTK_ARROW (object);
-  GtkArrowPriv *priv = arrow->priv;
+  GtkArrowPrivate *priv = arrow->priv;
 
   switch (prop_id)
     {
@@ -175,12 +175,12 @@ gtk_arrow_get_property (GObject         *object,
 static void
 gtk_arrow_init (GtkArrow *arrow)
 {
-  GtkArrowPriv *priv;
+  GtkArrowPrivate *priv;
   gint xpad, ypad;
 
   arrow->priv = G_TYPE_INSTANCE_GET_PRIVATE (arrow,
                                              GTK_TYPE_ARROW,
-                                             GtkArrowPriv);
+                                             GtkArrowPrivate);
   priv = arrow->priv;
 
   gtk_widget_set_has_window (GTK_WIDGET (arrow), FALSE);
@@ -206,7 +206,7 @@ GtkWidget*
 gtk_arrow_new (GtkArrowType  arrow_type,
 	       GtkShadowType shadow_type)
 {
-  GtkArrowPriv *priv;
+  GtkArrowPrivate *priv;
   GtkArrow *arrow;
 
   arrow = g_object_new (GTK_TYPE_ARROW, NULL);
@@ -232,7 +232,7 @@ gtk_arrow_set (GtkArrow      *arrow,
 	       GtkArrowType   arrow_type,
 	       GtkShadowType  shadow_type)
 {
-  GtkArrowPriv *priv;
+  GtkArrowPrivate *priv;
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_ARROW (arrow));
@@ -272,7 +272,7 @@ gtk_arrow_expose (GtkWidget      *widget,
   if (gtk_widget_is_drawable (widget))
     {
       GtkArrow *arrow = GTK_ARROW (widget);
-      GtkArrowPriv *priv = arrow->priv;
+      GtkArrowPrivate *priv = arrow->priv;
       GtkMisc *misc = GTK_MISC (widget);
       GtkShadowType shadow_type;
       gint width, height;

diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
@@ -45,16 +45,16 @@ G_BEGIN_DECLS
 #define GTK_IS_ARROW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
 #define GTK_ARROW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
 
-typedef struct _GtkArrow        GtkArrow;
-typedef struct _GtkArrowPriv    GtkArrowPriv;
-typedef struct _GtkArrowClass   GtkArrowClass;
+typedef struct _GtkArrow              GtkArrow;
+typedef struct _GtkArrowPrivate       GtkArrowPrivate;
+typedef struct _GtkArrowClass         GtkArrowClass;
 
 struct _GtkArrow
 {
   GtkMisc misc;
 
   /*< private >*/
-  GtkArrowPriv *priv;
+  GtkArrowPrivate *priv;
 };
 
 struct _GtkArrowClass

diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
@@ -50,7 +50,7 @@
 
 
 
-struct _GtkAspectFramePriv
+struct _GtkAspectFramePrivate
 {
   GtkAllocation center_allocation;
 
@@ -128,17 +128,17 @@ gtk_aspect_frame_class_init (GtkAspectFrameClass *class)
                                                          TRUE,
                                                          GTK_PARAM_READWRITE));
 
-  g_type_class_add_private (class, sizeof (GtkAspectFramePriv));
+  g_type_class_add_private (class, sizeof (GtkAspectFramePrivate));
 }
 
 static void
 gtk_aspect_frame_init (GtkAspectFrame *aspect_frame)
 {
-  GtkAspectFramePriv *priv;
+  GtkAspectFramePrivate *priv;
 
   aspect_frame->priv = G_TYPE_INSTANCE_GET_PRIVATE (aspect_frame,
                                                     GTK_TYPE_ASPECT_FRAME,
-                                                    GtkAspectFramePriv);
+                                                    GtkAspectFramePrivate);
   priv = aspect_frame->priv;
 
   priv->xalign = 0.5;
@@ -154,7 +154,7 @@ gtk_aspect_frame_set_property (GObject         *object,
 			       GParamSpec      *pspec)
 {
   GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (object);
-  GtkAspectFramePriv *priv = aspect_frame->priv;
+  GtkAspectFramePrivate *priv = aspect_frame->priv;
 
   switch (prop_id)
     {
@@ -200,7 +200,7 @@ gtk_aspect_frame_get_property (GObject         *object,
 			       GParamSpec      *pspec)
 {
   GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (object);
-  GtkAspectFramePriv *priv = aspect_frame->priv;
+  GtkAspectFramePrivate *priv = aspect_frame->priv;
 
   switch (prop_id)
     {
@@ -247,7 +247,7 @@ gtk_aspect_frame_new (const gchar *label,
 		      gboolean     obey_child)
 {
   GtkAspectFrame *aspect_frame;
-  GtkAspectFramePriv *priv;
+  GtkAspectFramePrivate *priv;
 
   aspect_frame = g_object_new (GTK_TYPE_ASPECT_FRAME, NULL);
 
@@ -285,7 +285,7 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame,
 		      gfloat          ratio,
 		      gboolean        obey_child)
 {
-  GtkAspectFramePriv *priv;
+  GtkAspectFramePrivate *priv;
 
   g_return_if_fail (GTK_IS_ASPECT_FRAME (aspect_frame));
 
@@ -334,7 +334,7 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame      *frame,
 					   GtkAllocation *child_allocation)
 {
   GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (frame);
-  GtkAspectFramePriv *priv = aspect_frame->priv;
+  GtkAspectFramePrivate *priv = aspect_frame->priv;
   GtkBin *bin = GTK_BIN (frame);
   GtkWidget *child;
   gdouble ratio;

diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
@@ -44,16 +44,16 @@ G_BEGIN_DECLS
 #define GTK_IS_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
 #define GTK_ASPECT_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
 
-typedef struct _GtkAspectFrame       GtkAspectFrame;
-typedef struct _GtkAspectFramePriv   GtkAspectFramePriv;
-typedef struct _GtkAspectFrameClass  GtkAspectFrameClass;
+typedef struct _GtkAspectFrame              GtkAspectFrame;
+typedef struct _GtkAspectFramePrivate       GtkAspectFramePrivate;
+typedef struct _GtkAspectFrameClass         GtkAspectFrameClass;
 
 struct _GtkAspectFrame
 {
   GtkFrame frame;
 
   /*< private >*/
-  GtkAspectFramePriv *priv;
+  GtkAspectFramePrivate *priv;
 };
 
 struct _GtkAspectFrameClass