Removed RCS-style IDs.

[ruby-evas.git] / src / rb_line.c

diff --git a/src/rb_line.c b/src/rb_line.c
index 0710836710221548ae00cbd61c2674866fe778f9..82f280c45586709f42869e50ff2cda0f3d55c7bc 100644 (file)
--- a/src/rb_line.c
+++ b/src/rb_line.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_line.c 32 2004-07-10 14:07:49Z tilman $
- *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * This library is free software; you can redistribute it and/or
@@ -26,20 +24,15 @@
 #include "rb_evas.h"
 #include "rb_evas_object.h"
 
-static VALUE c_new (VALUE klass, VALUE evas)
+static VALUE c_init (VALUE self, VALUE evas)
 {
-       VALUE self, argv[1];
-       Evas_Object **rect;
-
        CHECK_CLASS (evas, cEvas);
-       GET_OBJ (evas, Evas, e);
+       GET_OBJ (evas, RbEvas, e);
+       GET_OBJ (self, RbEvasObject, line);
 
-       self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
-                                c_evas_object_free, rect);
-       *rect = evas_object_line_add (*e);
+       line->real = evas_object_line_add (e->real);
 
-       argv[0] = evas;
-       rb_obj_call_init (self, 1, argv);
+       rb_call_super (1, &evas);
 
        return self;
 }
@@ -48,9 +41,9 @@ static VALUE c_get_xy (VALUE self)
 {
        int coord[4] = {0, 0, 0, 0};
 
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, RbEvasObject, e);
 
-       evas_object_line_xy_get (*e, &coord[0], &coord[1],
+       evas_object_line_xy_get (e->real, &coord[0], &coord[1],
                                 &coord[2], &coord[3]);
 
        return rb_ary_new3 (4, INT2FIX (coord[0]), INT2FIX (coord[1]),
@@ -60,14 +53,14 @@ static VALUE c_get_xy (VALUE self)
 static VALUE c_set_xy (VALUE self, VALUE x1, VALUE y1,
                        VALUE x2, VALUE y2)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, RbEvasObject, e);
 
        Check_Type (x1, T_FIXNUM);
        Check_Type (y1, T_FIXNUM);
        Check_Type (x2, T_FIXNUM);
        Check_Type (y2, T_FIXNUM);
 
-       evas_object_line_xy_set (*e, FIX2INT (x1), FIX2INT (y1),
+       evas_object_line_xy_set (e->real, FIX2INT (x1), FIX2INT (y1),
                                 FIX2INT (x2), FIX2INT (y2));
 
        return Qnil;
@@ -75,9 +68,9 @@ static VALUE c_set_xy (VALUE self, VALUE x1, VALUE y1,
 
 void Init_Line (void)
 {
-       VALUE cLine = rb_define_class_under (mEvas, "Line", cEvasObject);
+       VALUE c = rb_define_class_under (mEvas, "Line", cEvasObject);
 
-       rb_define_singleton_method (cLine, "new", c_new, 1);
-       rb_define_method (cLine, "get_xy", c_get_xy, 0);
-       rb_define_method (cLine, "set_xy", c_set_xy, 4);
+       rb_define_method (c, "initialize", c_init, 1);
+       rb_define_method (c, "get_xy", c_get_xy, 0);
+       rb_define_method (c, "set_xy", c_set_xy, 4);
 }