From 6baf4d9bcc8fac7d3ac4442ffa54138f9670b20f Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <poincare@ikezoe.net>
Date: Fri, 27 Jul 2007 21:14:15 +0000
Subject: Remove E_MAKE_TYPE macro.

2007-07-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>

	* e-util/e-util.h: Remove E_MAKE_TYPE macro.

	* e-util/e-bit-array.c:
	* e-util/e-sorter-array.c:
	* e-util/e-sorter.c:
	* e-util/e-text-event-processor-emacs-like.c:
	* e-util/e-text-event-processor.c:
	* widgets/menus/gal-define-views-dialog.c:
	* widgets/menus/gal-define-views-model.c:
	* widgets/menus/gal-view-collection.c:
	* widgets/menus/gal-view-etable.c:
	* widgets/menus/gal-view-factory-etable.c:
	* widgets/menus/gal-view-factory.c:
	* widgets/menus/gal-view-instance-save-as-dialog.c:
	* widgets/menus/gal-view-instance.c:
	* widgets/menus/gal-view-new-dialog.c:
	* widgets/menus/gal-view.c:
	* widgets/misc/e-canvas-background.c:
	* widgets/misc/e-canvas-vbox.c:
	* widgets/misc/e-canvas.c:
	* widgets/misc/e-printable.c:
	* widgets/misc/e-reflow-model.c:
	* widgets/misc/e-reflow.c:
	* widgets/misc/e-selection-model-array.c:
	* widgets/misc/e-selection-model-simple.c:
	* widgets/misc/e-selection-model.c:
	* widgets/table/e-cell-checkbox.c:
	* widgets/table/e-cell-combo.c:
	* widgets/table/e-cell-date.c:
	* widgets/table/e-cell-float.c:
	* widgets/table/e-cell-hbox.c:
	* widgets/table/e-cell-number.c:
	* widgets/table/e-cell-pixbuf.c:
	* widgets/table/e-cell-popup.c:
	* widgets/table/e-cell-progress.c:
	* widgets/table/e-cell-size.c:
	* widgets/table/e-cell-spin-button.c:
	* widgets/table/e-cell-text.c:
	* widgets/table/e-cell-toggle.c:
	* widgets/table/e-cell-tree.c:
	* widgets/table/e-cell-vbox.c:
	* widgets/table/e-cell.c:
	* widgets/table/e-table-click-to-add.c:
	* widgets/table/e-table-col.c:
	* widgets/table/e-table-column-specification.c:
	* widgets/table/e-table-column.c:
	* widgets/table/e-table-config-field.c:
	* widgets/table/e-table-config.c:
	* widgets/table/e-table-extras.c:
	* widgets/table/e-table-field-chooser-dialog.c:
	* widgets/table/e-table-field-chooser-item.c:
	* widgets/table/e-table-field-chooser.c:
	* widgets/table/e-table-group-container.c:
	* widgets/table/e-table-group-leaf.c:
	* widgets/table/e-table-group.c:
	* widgets/table/e-table-header-item.c:
	* widgets/table/e-table-header.c:
	* widgets/table/e-table-item.c:
	* widgets/table/e-table-memory-callbacks.c:
	* widgets/table/e-table-memory-store.c:
	* widgets/table/e-table-memory.c:
	* widgets/table/e-table-model.c:
	* widgets/table/e-table-one.c:
	* widgets/table/e-table-scrolled.c:
	* widgets/table/e-table-search.c:
	* widgets/table/e-table-selection-model.c:
	* widgets/table/e-table-simple.c:
	* widgets/table/e-table-sort-info.c:
	* widgets/table/e-table-sorted-variable.c:
	* widgets/table/e-table-sorted.c:
	* widgets/table/e-table-sorter.c:
	* widgets/table/e-table-specification.c:
	* widgets/table/e-table-state.c:
	* widgets/table/e-table-subset-variable.c:
	* widgets/table/e-table-subset.c:
	* widgets/table/e-table-without.c:
	* widgets/table/e-table.c:
	* widgets/table/e-tree-memory-callbacks.c:
	* widgets/table/e-tree-memory.c:
	* widgets/table/e-tree-model.c:
	* widgets/table/e-tree-scrolled.c:
	* widgets/table/e-tree-selection-model.c:
	* widgets/table/e-tree-simple.c:
	* widgets/table/e-tree-sorted-variable.c:
	* widgets/table/e-tree-sorted.c:
	* widgets/table/e-tree-table-adapter.c:
	* widgets/table/e-tree.c:
	* widgets/text/e-completion-callbacks.c:
	* widgets/text/e-completion-view.c:
	* widgets/text/e-completion.c:
	* widgets/text/e-entry.c:
	* widgets/text/e-table-text-model.c:
	* widgets/text/e-text-model-uri.c:
	* widgets/text/e-text-model.c:
	* widgets/text/e-text.c:
        Use G_DEFINE_TYPE instead of E_MAKE_TYPE.


svn path=/trunk/; revision=33864
---
 e-util/e-bit-array.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'e-util/e-bit-array.c')

diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index 8fa7af134e..07728b4134 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -28,8 +28,6 @@
 #include "e-bit-array.h"
 #include "e-util.h"
 
-#define PARENT_TYPE G_TYPE_OBJECT
-
 #define ONES ((guint32) 0xffffffff)
 
 #define BOX(n) ((n) / 32)
@@ -38,7 +36,7 @@
 #define BITMASK_LEFT(n) ((((n) % 32) == 0) ? 0 : (ONES << (32 - ((n) % 32))))
 #define BITMASK_RIGHT(n) ((guint32)(((guint32) ONES) >> ((n) % 32)))
 
-static GObjectClass *parent_class;
+G_DEFINE_TYPE (EBitArray, e_bit_array, G_TYPE_OBJECT)
 
 static void
 e_bit_array_insert_real(EBitArray *eba, int row)
@@ -151,8 +149,8 @@ eba_dispose (GObject *object)
 		g_free(eba->data);
 	eba->data = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	if (G_OBJECT_CLASS (e_bit_array_parent_class)->dispose)
+		(* G_OBJECT_CLASS (e_bit_array_parent_class)->dispose) (object);
 }
 
 /** 
@@ -411,16 +409,11 @@ e_bit_array_class_init (EBitArrayClass *klass)
 {
 	GObjectClass *object_class;
 
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
 	object_class = G_OBJECT_CLASS(klass);
 
 	object_class->dispose = eba_dispose;
 }
 
-E_MAKE_TYPE(e_bit_array, "EBitArray", EBitArray,
-	    e_bit_array_class_init, e_bit_array_init, PARENT_TYPE)
-
 EBitArray *
 e_bit_array_new (int count)
 {
-- 
cgit v1.2.3