summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2011-04-30 11:00:01 +0100
committerJavier Jardón <jjardon@gnome.org>2011-04-30 12:59:13 +0100
commitea702f4c4feac29e6366a04c02953c425bb5f288 (patch)
tree8f0632696de6941156990c157d44d47af29c9317
parenta8fe5748d8a921a18c203e0c3e5cb7d15ef01dd8 (diff)
downloadpango-ea702f4c4feac29e6366a04c02953c425bb5f288.tar.gz
pango/pango-engine.c: Use G_DEFINE_TYPE instead custom macro
-rw-r--r--pango/pango-engine.c49
1 files changed, 36 insertions, 13 deletions
diff --git a/pango/pango-engine.c b/pango/pango-engine.c
index 50ba7f40..bb109e5e 100644
--- a/pango/pango-engine.c
+++ b/pango/pango-engine.c
@@ -25,13 +25,30 @@
#include "pango-engine-private.h"
#include "pango-impl-utils.h"
-PANGO_DEFINE_TYPE_ABSTRACT (PangoEngine, pango_engine,
- NULL, NULL,
- G_TYPE_OBJECT)
+static void
+pango_engine_init (PangoEngine *self)
+{
+}
+
+static void
+pango_engine_class_init (PangoEngineClass *klass)
+{
+}
-PANGO_DEFINE_TYPE_ABSTRACT (PangoEngineLang, pango_engine_lang,
- NULL, NULL,
- PANGO_TYPE_ENGINE)
+G_DEFINE_ABSTRACT_TYPE (PangoEngine, pango_engine, G_TYPE_OBJECT);
+
+
+static void
+pango_engine_lang_init (PangoEngineLang *self)
+{
+}
+
+static void
+pango_engine_lang_class_init (PangoEngineLangClass *klass)
+{
+}
+
+G_DEFINE_ABSTRACT_TYPE (PangoEngineLang, pango_engine_lang, PANGO_TYPE_ENGINE);
static PangoCoverageLevel
pango_engine_shape_real_covers (PangoEngineShape *engine G_GNUC_UNUSED,
@@ -49,14 +66,17 @@ pango_engine_shape_real_covers (PangoEngineShape *engine G_GNUC_UNUSED,
}
static void
+pango_engine_shape_init (PangoEngineShape *klass)
+{
+}
+
+static void
pango_engine_shape_class_init (PangoEngineShapeClass *class)
{
class->covers = pango_engine_shape_real_covers;
}
-PANGO_DEFINE_TYPE_ABSTRACT (PangoEngineShape, pango_engine_shape,
- pango_engine_shape_class_init, NULL,
- PANGO_TYPE_ENGINE)
+G_DEFINE_ABSTRACT_TYPE (PangoEngineShape, pango_engine_shape, PANGO_TYPE_ENGINE);
void
_pango_engine_shape_shape (PangoEngineShape *engine,
@@ -155,15 +175,18 @@ fallback_engine_covers (PangoEngineShape *engine G_GNUC_UNUSED,
}
static void
-fallback_engine_class_init (PangoEngineShapeClass *class)
+pango_fallback_engine_init (PangoFallbackEngine *self)
+{
+}
+
+static void
+pango_fallback_engine_class_init (PangoFallbackEngineClass *class)
{
class->covers = fallback_engine_covers;
class->script_shape = fallback_engine_shape;
}
-static PANGO_DEFINE_TYPE (PangoFallbackEngine, pango_fallback_engine,
- fallback_engine_class_init, NULL,
- PANGO_TYPE_ENGINE_SHAPE)
+G_DEFINE_ABSTRACT_TYPE (PangoFallbackEngine, pango_fallback_engine, PANGO_TYPE_ENGINE_SHAPE);
PangoEngineShape *
_pango_get_fallback_shaper (void)