From 43373dd610017d7e78672e473a36285a92254f2e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 16 Sep 2018 16:36:44 +0200 Subject: Rename private implementation types according to new Gtk conventions --- ganv/box.h | 8 ++++---- ganv/canvas.h | 6 +++--- ganv/circle.h | 10 +++++----- ganv/edge.h | 8 ++++---- ganv/group.h | 10 +++++----- ganv/item.h | 10 +++++----- ganv/module.h | 8 ++++---- ganv/node.h | 8 ++++---- ganv/port.h | 8 ++++---- ganv/text.h | 10 +++++----- ganv/widget.h | 10 +++++----- 11 files changed, 48 insertions(+), 48 deletions(-) (limited to 'ganv') diff --git a/ganv/box.h b/ganv/box.h index 203be69..ab166bf 100644 --- a/ganv/box.h +++ b/ganv/box.h @@ -27,12 +27,12 @@ G_BEGIN_DECLS #define GANV_IS_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GANV_TYPE_BOX)) #define GANV_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GANV_TYPE_BOX, GanvBoxClass)) -typedef struct _GanvBoxClass GanvBoxClass; -typedef struct _GanvBoxImpl GanvBoxImpl; +typedef struct _GanvBoxClass GanvBoxClass; +typedef struct _GanvBoxPrivate GanvBoxPrivate; struct _GanvBox { - GanvNode node; - GanvBoxImpl* impl; + GanvNode node; + GanvBoxPrivate* impl; }; /** diff --git a/ganv/canvas.h b/ganv/canvas.h index fc42c6f..3ffb55c 100644 --- a/ganv/canvas.h +++ b/ganv/canvas.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define GANV_IS_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GANV_TYPE_CANVAS)) #define GANV_CANVAS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GANV_TYPE_CANVAS, GanvCanvasClass)) -typedef struct GanvCanvasImpl GanvCanvasImpl; +typedef struct GanvCanvasImpl GanvCanvasPrivate; typedef struct _GanvCanvasClass GanvCanvasClass; /** @@ -52,8 +52,8 @@ typedef enum { } GanvDirection; struct _GanvCanvas { - GtkLayout layout; - GanvCanvasImpl* impl; + GtkLayout layout; + GanvCanvasPrivate* impl; }; struct _GanvCanvasClass { diff --git a/ganv/circle.h b/ganv/circle.h index cca9e5f..f181b54 100644 --- a/ganv/circle.h +++ b/ganv/circle.h @@ -27,9 +27,9 @@ G_BEGIN_DECLS #define GANV_IS_CIRCLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GANV_TYPE_CIRCLE)) #define GANV_CIRCLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GANV_TYPE_CIRCLE, GanvCircleClass)) -typedef struct _GanvCircle GanvCircle; -typedef struct _GanvCircleClass GanvCircleClass; -typedef struct _GanvCircleImpl GanvCircleImpl; +typedef struct _GanvCircle GanvCircle; +typedef struct _GanvCircleClass GanvCircleClass; +typedef struct _GanvCirclePrivate GanvCirclePrivate; /** * GanvCircle: @@ -38,8 +38,8 @@ typedef struct _GanvCircleImpl GanvCircleImpl; * any child nodes (though, like any #GanvNode, it may have a label). */ struct _GanvCircle { - GanvNode node; - GanvCircleImpl* impl; + GanvNode node; + GanvCirclePrivate* impl; }; struct _GanvCircleClass { diff --git a/ganv/edge.h b/ganv/edge.h index d135bad..bf0fb14 100644 --- a/ganv/edge.h +++ b/ganv/edge.h @@ -29,12 +29,12 @@ G_BEGIN_DECLS #define GANV_IS_EDGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GANV_TYPE_EDGE)) #define GANV_EDGE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GANV_TYPE_EDGE, GanvEdgeClass)) -typedef struct _GanvEdgeClass GanvEdgeClass; -typedef struct _GanvEdgeImpl GanvEdgeImpl; +typedef struct _GanvEdgeClass GanvEdgeClass; +typedef struct _GanvEdgePrivate GanvEdgePrivate; struct _GanvEdge { - GanvItem item; - GanvEdgeImpl* impl; + GanvItem item; + GanvEdgePrivate* impl; }; struct _GanvEdgeClass { diff --git a/ganv/group.h b/ganv/group.h index 42ad5df..0f835e4 100644 --- a/ganv/group.h +++ b/ganv/group.h @@ -32,13 +32,13 @@ G_BEGIN_DECLS #define GANV_IS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GANV_TYPE_GROUP)) #define GANV_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GANV_TYPE_GROUP, GanvGroupClass)) -typedef struct _GanvGroup GanvGroup; -typedef struct _GanvGroupImpl GanvGroupImpl; -typedef struct _GanvGroupClass GanvGroupClass; +typedef struct _GanvGroup GanvGroup; +typedef struct _GanvGroupPrivate GanvGroupPrivate; +typedef struct _GanvGroupClass GanvGroupClass; struct _GanvGroup { - GanvItem item; - GanvGroupImpl* impl; + GanvItem item; + GanvGroupPrivate* impl; }; struct _GanvGroupClass { diff --git a/ganv/item.h b/ganv/item.h index 2da061b..4605ffb 100644 --- a/ganv/item.h +++ b/ganv/item.h @@ -30,9 +30,9 @@ G_BEGIN_DECLS struct _GanvCanvas; -typedef struct _GanvItem GanvItem; -typedef struct _GanvItemImpl GanvItemImpl; -typedef struct _GanvItemClass GanvItemClass; +typedef struct _GanvItem GanvItem; +typedef struct _GanvItemPrivate GanvItemPrivate; +typedef struct _GanvItemClass GanvItemClass; /* Object flags for items */ enum { @@ -52,8 +52,8 @@ enum { #define GANV_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GANV_TYPE_ITEM, GanvItemClass)) struct _GanvItem { - GtkObject object; - GanvItemImpl* impl; + GtkObject object; + GanvItemPrivate* impl; }; struct _GanvItemClass { diff --git a/ganv/module.h b/ganv/module.h index 6314383..37fcf96 100644 --- a/ganv/module.h +++ b/ganv/module.h @@ -30,14 +30,14 @@ G_BEGIN_DECLS #define GANV_IS_MODULE_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GANV_TYPE_MODULE)) #define GANV_MODULE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GANV_TYPE_MODULE, GanvModuleClass)) -typedef struct _GanvModuleClass GanvModuleClass; -typedef struct _GanvModuleImpl GanvModuleImpl; +typedef struct _GanvModuleClass GanvModuleClass; +typedef struct _GanvModulePrivate GanvModulePrivate; typedef void (*GanvPortFunc)(GanvPort* port, void* data); struct _GanvModule { - GanvBox box; - GanvModuleImpl* impl; + GanvBox box; + GanvModulePrivate* impl; }; struct _GanvModuleClass { diff --git a/ganv/node.h b/ganv/node.h index c98e2b2..b0dd82f 100644 --- a/ganv/node.h +++ b/ganv/node.h @@ -29,12 +29,12 @@ G_BEGIN_DECLS #define GANV_IS_NODE_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GANV_TYPE_NODE)) #define GANV_NODE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GANV_TYPE_NODE, GanvNodeClass)) -typedef struct _GanvNodeClass GanvNodeClass; -typedef struct _GanvNodeImpl GanvNodeImpl; +typedef struct _GanvNodeClass GanvNodeClass; +typedef struct _GanvNodePrivate GanvNodePrivate; struct _GanvNode { - GanvItem item; - GanvNodeImpl* impl; + GanvItem item; + GanvNodePrivate* impl; }; struct _GanvNodeClass { diff --git a/ganv/port.h b/ganv/port.h index 70e801e..03f4bb3 100644 --- a/ganv/port.h +++ b/ganv/port.h @@ -29,12 +29,12 @@ G_BEGIN_DECLS #define GANV_IS_PORT_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GANV_TYPE_PORT)) #define GANV_PORT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GANV_TYPE_PORT, GanvPortClass)) -typedef struct _GanvPortClass GanvPortClass; -typedef struct _GanvPortImpl GanvPortImpl; +typedef struct _GanvPortClass GanvPortClass; +typedef struct _GanvPortPrivate GanvPortPrivate; struct _GanvPort { - GanvBox box; - GanvPortImpl* impl; + GanvBox box; + GanvPortPrivate* impl; }; struct _GanvPortClass { diff --git a/ganv/text.h b/ganv/text.h index 52d87d6..6f03a1b 100644 --- a/ganv/text.h +++ b/ganv/text.h @@ -27,13 +27,13 @@ G_BEGIN_DECLS #define GANV_IS_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GANV_TYPE_TEXT)) #define GANV_TEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GANV_TYPE_TEXT, GanvTextClass)) -typedef struct _GanvText GanvText; -typedef struct _GanvTextClass GanvTextClass; -typedef struct _GanvTextImpl GanvTextImpl; +typedef struct _GanvText GanvText; +typedef struct _GanvTextClass GanvTextClass; +typedef struct _GanvTextPrivate GanvTextPrivate; struct _GanvText { - GanvItem item; - GanvTextImpl* impl; + GanvItem item; + GanvTextPrivate* impl; }; struct _GanvTextClass { diff --git a/ganv/widget.h b/ganv/widget.h index 5aa81e9..5b54ba4 100644 --- a/ganv/widget.h +++ b/ganv/widget.h @@ -31,13 +31,13 @@ G_BEGIN_DECLS #define GANV_IS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GANV_TYPE_WIDGET)) #define GANV_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GANV_TYPE_WIDGET, GanvWidgetClass)) -typedef struct _GanvWidget GanvWidget; -typedef struct _GanvWidgetImpl GanvWidgetImpl; -typedef struct _GanvWidgetClass GanvWidgetClass; +typedef struct _GanvWidget GanvWidget; +typedef struct _GanvWidgetPrivate GanvWidgetPrivate; +typedef struct _GanvWidgetClass GanvWidgetClass; struct _GanvWidget { - GanvItem item; - GanvWidgetImpl* impl; + GanvItem item; + GanvWidgetPrivate* impl; }; struct _GanvWidgetClass { -- cgit v1.2.1