qtbindings 4.8.6.2 → 4.8.6.3

data/ext/ruby/qtruby/src/qtruby.cpp

@@ -909,6 +909,52 @@ qitemselection_count(VALUE self)
 	return INT2NUM(item->count());
 }
 
+static VALUE
+qpolygon_at(VALUE self, VALUE i)
+{
+	smokeruby_object *o = value_obj_info(self);
+	QPolygon * item = (QPolygon *) o->ptr;
+	QPoint point = item->at(NUM2INT(i));
+
+	smokeruby_object  * result = alloc_smokeruby_object(	true,
+															qtcore_Smoke,
+															qtcore_Smoke->idClass("QPoint").index,
+															new QPoint(point) );
+
+	return set_obj_info("Qt::Point", result);
+}
+
+static VALUE
+qpolygon_count(VALUE self)
+{
+	smokeruby_object *o = value_obj_info(self);
+	QPolygon * item = (QPolygon *) o->ptr;
+	return INT2NUM(item->count());
+}
+
+static VALUE
+qpolygonf_at(VALUE self, VALUE i)
+{
+	smokeruby_object *o = value_obj_info(self);
+	QPolygonF * item = (QPolygonF *) o->ptr;
+	QPointF point = item->at(NUM2INT(i));
+
+	smokeruby_object  * result = alloc_smokeruby_object(	true,
+															qtcore_Smoke,
+															qtcore_Smoke->idClass("QPointF").index,
+															new QPointF(point) );
+
+	return set_obj_info("Qt::PointF", result);
+}
+
+static VALUE
+qpolygonf_count(VALUE self)
+{
+	smokeruby_object *o = value_obj_info(self);
+	QPolygonF * item = (QPolygonF *) o->ptr;
+	return INT2NUM(item->count());
+}
+
 static VALUE
 metaObject(VALUE self)
 {
@@ -2121,27 +2167,27 @@ dumpCandidates(VALUE /*self*/, VALUE rmeths)
 	if(rmeths != Qnil) {
 	int count = RARRAY_LEN(rmeths);
 		for(int i = 0; i < count; i++) {
-		rb_str_catf(errmsg, "\t");
+		qt_rb_str_catf(errmsg, "\t");
 		int id = NUM2INT(rb_funcall(rb_ary_entry(rmeths, i), rb_intern("index"), 0));
 		Smoke* smoke = smokeList[NUM2INT(rb_funcall(rb_ary_entry(rmeths, i), rb_intern("smoke"), 0))];
 		const Smoke::Method &meth = smoke->methods[id];
 		const char *tname = smoke->types[meth.ret].name;
 		if(meth.flags & Smoke::mf_enum) {
-			rb_str_catf(errmsg, "enum ");
-			rb_str_catf(errmsg, "%s::%s", smoke->classes[meth.classId].className, smoke->methodNames[meth.name]);
-			rb_str_catf(errmsg, "\n");
+			qt_rb_str_catf(errmsg, "enum ");
+			qt_rb_str_catf(errmsg, "%s::%s", smoke->classes[meth.classId].className, smoke->methodNames[meth.name]);
+			qt_rb_str_catf(errmsg, "\n");
 		} else {
-			if(meth.flags & Smoke::mf_static) rb_str_catf(errmsg, "static ");
-			rb_str_catf(errmsg, "%s ", (tname ? tname:"void"));
-			rb_str_catf(errmsg, "%s::%s(", smoke->classes[meth.classId].className, smoke->methodNames[meth.name]);
+			if(meth.flags & Smoke::mf_static) qt_rb_str_catf(errmsg, "static ");
+			qt_rb_str_catf(errmsg, "%s ", (tname ? tname:"void"));
+			qt_rb_str_catf(errmsg, "%s::%s(", smoke->classes[meth.classId].className, smoke->methodNames[meth.name]);
 			for(int i = 0; i < meth.numArgs; i++) {
-			if(i) rb_str_catf(errmsg, ", ");
+			if(i) qt_rb_str_catf(errmsg, ", ");
 			tname = smoke->types[smoke->argumentList[meth.args+i]].name;
-			rb_str_catf(errmsg, "%s", (tname ? tname:"void"));
+			qt_rb_str_catf(errmsg, "%s", (tname ? tname:"void"));
 			}
-			rb_str_catf(errmsg, ")");
-			if(meth.flags & Smoke::mf_const) rb_str_catf(errmsg, " const");
-			rb_str_catf(errmsg, "\n");
+			qt_rb_str_catf(errmsg, ")");
+			if(meth.flags & Smoke::mf_const) qt_rb_str_catf(errmsg, " const");
+			qt_rb_str_catf(errmsg, "\n");
 			}
 		}
 	}
@@ -2364,6 +2410,17 @@ create_qt_class(VALUE /*self*/, VALUE package_value, VALUE module_value)
 		rb_define_method(klass, "at", (VALUE (*) (...)) qitemselection_at, 1);
 		rb_define_method(klass, "count", (VALUE (*) (...)) qitemselection_count, 0);
 		rb_define_method(klass, "length", (VALUE (*) (...)) qitemselection_count, 0);
+	} else if (packageName == "Qt::Polygon") {
+		rb_define_method(klass, "[]", (VALUE (*) (...)) qpolygon_at, 1);
+		rb_define_method(klass, "at", (VALUE (*) (...)) qpolygon_at, 1);
+		rb_define_method(klass, "count", (VALUE (*) (...)) qpolygon_count, 0);
+		rb_define_method(klass, "length", (VALUE (*) (...)) qpolygon_count, 0);
+	} else if (packageName == "Qt::PolygonF") {
+		rb_define_method(klass, "[]", (VALUE (*) (...)) qpolygonf_at, 1);
+		rb_define_method(klass, "at", (VALUE (*) (...)) qpolygonf_at, 1);
+		rb_define_method(klass, "count", (VALUE (*) (...)) qpolygonf_count, 0);
+		rb_define_method(klass, "length", (VALUE (*) (...)) qpolygonf_count, 0);
+		rb_define_method(klass, "point", (VALUE (*) (...)) qpolygonf_at, 1);
 	} else if (packageName == "Qt::Painter") {
 		rb_define_method(klass, "drawLines", (VALUE (*) (...)) qpainter_drawlines, -1);
 		rb_define_method(klass, "draw_lines", (VALUE (*) (...)) qpainter_drawlines, -1);

data/ext/ruby/qtruby/src/qtruby.h

@@ -159,7 +159,7 @@ extern Q_DECL_EXPORT void mapPointer(VALUE obj, smokeruby_object *o, Smoke::Inde
 extern Q_DECL_EXPORT void unmapPointer(smokeruby_object *, Smoke::Index, void*);
 
 extern Q_DECL_EXPORT const char * resolve_classname(smokeruby_object * o);
-extern Q_DECL_EXPORT VALUE rb_str_catf(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
+extern Q_DECL_EXPORT VALUE qt_rb_str_catf(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
 
 extern Q_DECL_EXPORT VALUE findMethod(VALUE self, VALUE c_value, VALUE name_value);
 extern Q_DECL_EXPORT VALUE findAllMethods(int argc, VALUE * argv, VALUE self);

data/ext/ruby/qtruby/test/opoverloading.rb

@@ -1,46 +1,46 @@
-require 'Qt'
-
-class Qt::Point
-   def to_s
-      "(#{x}, #{y})"
-   end
-end
-
-$t = binding
-def test(str)
-   puts "#{str.ljust 25} => #{eval(str, $t)}"
-end
-
-test("p1 = Qt::Point.new(5,5)")
-test("p2 = Qt::Point.new(20,20)")
-test("p1 + p2")
-test("p1 - p2")
-test("-p1 + p2")
-test("p2 += p1")
-test("p2 -= p1")
-test("p2 * 3")
-
-class Qt::Region
-   def to_s
-      "(#{empty?})"
-   end
-end
-
-test("r1 = Qt::Region.new()")
-test("r2 = Qt::Region.new( 100,100,200,80, Qt::Region::Ellipse )")
-test("r1 + r2")
-
-class Qt::WMatrix
-   def to_s
-      "(#{m11}, #{m12}, #{m21}, #{m22}, #{dx}, #{dy})"
-   end
-end
-
-test("a    = Math::PI/180 * 25")         # convert 25 to radians
-test("sina = Math.sin(a)")
-test("cosa = Math.cos(a)")
-test("m1 = Qt::Matrix.new(1, 0, 0, 1, 10, -20)")  # translation matrix
-test("m2 = Qt::Matrix.new( cosa, sina, -sina, cosa, 0, 0 )")
-test("m3 = Qt::Matrix.new(1.2, 0, 0, 0.7, 0, 0)") # scaling matrix
-test("m = Qt::Matrix.new")
-test("m = m3 * m2 * m1")                  # combine all transformations
+require 'Qt'
+
+class Qt::Point
+   def to_s
+      "(#{x}, #{y})"
+   end
+end
+
+$t = binding
+def test(str)
+   puts "#{str.ljust 25} => #{eval(str, $t)}"
+end
+
+test("p1 = Qt::Point.new(5,5)")
+test("p2 = Qt::Point.new(20,20)")
+test("p1 + p2")
+test("p1 - p2")
+test("-p1 + p2")
+test("p2 += p1")
+test("p2 -= p1")
+test("p2 * 3")
+
+class Qt::Region
+   def to_s
+      "(#{empty?})"
+   end
+end
+
+test("r1 = Qt::Region.new()")
+test("r2 = Qt::Region.new( 100,100,200,80, Qt::Region::Ellipse )")
+test("r1 + r2")
+
+class Qt::WMatrix
+   def to_s
+      "(#{m11}, #{m12}, #{m21}, #{m22}, #{dx}, #{dy})"
+   end
+end
+
+test("a    = Math::PI/180 * 25")         # convert 25 to radians
+test("sina = Math.sin(a)")
+test("cosa = Math.cos(a)")
+test("m1 = Qt::Matrix.new(1, 0, 0, 1, 10, -20)")  # translation matrix
+test("m2 = Qt::Matrix.new( cosa, sina, -sina, cosa, 0, 0 )")
+test("m3 = Qt::Matrix.new(1.2, 0, 0, 0.7, 0, 0)") # scaling matrix
+test("m = Qt::Matrix.new")
+test("m = m3 * m2 * m1")                  # combine all transformations

data/ext/ruby/qtruby/test/unittests.rb

@@ -1,151 +1,151 @@
-require 'Qt'
-require 'test/unit'
-
-class TestQtRuby < Test::Unit::TestCase
-
-  def setup
-    @app = Qt::Application.instance || Qt::Application.new(ARGV)
-    assert @app
-  end
-
-  def test_link_against_qt4
-    assert_raise(NoMethodError) { @app.setMainWidget(nil) }
-  end
-
-  def test_qapplication_methods
-   assert @app == Qt::Application::instance
-   assert @app == Qt::CoreApplication::instance
-   assert @app == Qt::Application.instance
-   assert @app == Qt::CoreApplication.instance
-   assert @app == $qApp
-  end
-
-  def test_qapplication_inheritance
-   assert @app.inherits("Qt::Application")
-   assert @app.inherits("Qt::CoreApplication")
-   assert @app.inherits("Qt::Object")
-  end
-
-  def test_widget_inheritance
-    widget = Qt::Widget.new(nil)
-    assert widget.inherits("Qt::Widget")
-    assert widget.inherits("Qt::Object")
-    assert widget.inherits("QObject")
-  end
-
-  def test_qstring_marshall
-    widget = Qt::Widget.new(nil)
-    assert widget.objectName.nil?
-    widget.objectName = "Barney"
-    assert widget.objectName == "Barney"
-  end
-
-  def test_widgetlist
-    w1 = Qt::Widget.new(nil)
-    w2 = Qt::Widget.new(w1)
-    w3 = Qt::Widget.new(w1)
-    w4 = Qt::Widget.new(w2)
-
-    assert w1.children == [ w2, w3 ]
-  end
-
-  def test_find_children
-    w = Qt::Widget.new(nil)
-    assert_raise(TypeError) { w.findChildren(nil) }
-
-    assert w.findChildren(Qt::Widget) == [ ]
-    w2 = Qt::Widget.new(w)
-
-    assert w.findChildren(Qt::Widget) == [ w2 ]
-    assert w.findChildren(Qt::Object) == [ w2 ]
-    assert w.findChildren(Qt::LineEdit) == [ ]
-    assert w.findChildren(Qt::Widget,"Bob") == [ ]
-    assert w.findChildren(Qt::Object,"Bob") == [ ]
-
-    w2.objectName = "Bob"
-
-    assert w.findChildren(Qt::Widget) == [ w2 ]
-    assert w.findChildren(Qt::Object) == [ w2 ]
-    assert w.findChildren(Qt::Widget,"Bob") == [ w2 ]
-    assert w.findChildren(Qt::Object,"Bob") == [ w2 ]
-    assert w.findChildren(Qt::LineEdit, "Bob") == [ ]
-
-    w3 = Qt::Widget.new(w)
-    w4 = Qt::LineEdit.new(w2)
-    w4.setObjectName("Bob")
-
-    assert w.findChildren(Qt::Widget) == [ w4, w2, w3 ]
-    assert w.findChildren(Qt::LineEdit) == [ w4 ]
-    assert w.findChildren(Qt::Widget,"Bob") == [ w4, w2 ]    
-    assert w.findChildren(Qt::LineEdit,"Bob") == [ w4 ]    
-  end
-
-  def test_find_child
-    w = Qt::Widget.new(nil)
-    assert_raise(TypeError) { w.findChild(nil) }
-
-    assert_nil w.findChild(Qt::Widget)
-    w2 = Qt::Widget.new(w)
-
-    w3 = Qt::Widget.new(w)
-    w3.objectName = "Bob"
-    w4 = Qt::LineEdit.new(w2)
-    w4.objectName = "Bob"
-
-    assert w.findChild(Qt::Widget,"Bob") == w3
-    assert w.findChild(Qt::LineEdit,"Bob") == w4
-  end
-
-  def test_boolean_marshalling
-    assert Qt::Variant.new(true).toBool
-    assert !Qt::Variant.new(false).toBool
-
-    assert !Qt::Boolean.new(true).nil?
-    assert Qt::Boolean.new(false).nil?
-
-    # Invalid variant conversion should change b to false
-    b = Qt::Boolean.new(true)
-    v = Qt::Variant.new("Blah")
-    v.toInt(b);
-
-    assert b.nil?
-  end
-
-  def test_intp_marshalling
-    assert Qt::Integer.new(100).value == 100
-  end
-
-  def test_variant_conversions
-    v = Qt::Variant.new(Qt::Variant::Invalid)
-
-    assert !v.isValid
-    assert v.isNull
-
-    v = Qt::Variant.new(55)
-    assert v.toInt == 55
-    assert v.toUInt == 55
-    assert v.toLongLong == 55
-    assert v.toULongLong == 55
-    assert Qt::Variant.new(-55).toLongLong == -55
-    assert Qt::Variant.new(-55).toULongLong == 18446744073709551561
-    assert v.toDouble == 55.0
-    assert v.toChar == Qt::Char.new(55)
-    assert v.toString == "55"
-    assert v.toStringList == [ ]
-
-
-    assert Qt::Variant.new("Blah").toStringList == [ "Blah" ]
-
-    assert Qt::Variant.new(Qt::Size.new(30,40)).toSize == Qt::Size.new(30,40)
-    assert Qt::Variant.new(Qt::SizeF.new(20,30)).toSizeF == Qt::SizeF.new(20,30)
-
-    assert Qt::Variant.new(Qt::Rect.new(30,40,10,10)).toRect == Qt::Rect.new(30,40,10,10)
-    assert Qt::Variant.new(Qt::RectF.new(20,30,10,10)).toRectF == Qt::RectF.new(20,30,10,10)
-
-    assert Qt::Variant.new(Qt::Point.new(30,40)).toPoint == Qt::Point.new(30,40)
-    assert Qt::Variant.new(Qt::PointF.new(20,30)).toPointF == Qt::PointF.new(20,30)
-
-
-  end
-
-end
+require 'Qt'
+require 'test/unit'
+
+class TestQtRuby < Test::Unit::TestCase
+
+  def setup
+    @app = Qt::Application.instance || Qt::Application.new(ARGV)
+    assert @app
+  end
+
+  def test_link_against_qt4
+    assert_raise(NoMethodError) { @app.setMainWidget(nil) }
+  end
+
+  def test_qapplication_methods
+   assert @app == Qt::Application::instance
+   assert @app == Qt::CoreApplication::instance
+   assert @app == Qt::Application.instance
+   assert @app == Qt::CoreApplication.instance
+   assert @app == $qApp
+  end
+
+  def test_qapplication_inheritance
+   assert @app.inherits("Qt::Application")
+   assert @app.inherits("Qt::CoreApplication")
+   assert @app.inherits("Qt::Object")
+  end
+
+  def test_widget_inheritance
+    widget = Qt::Widget.new(nil)
+    assert widget.inherits("Qt::Widget")
+    assert widget.inherits("Qt::Object")
+    assert widget.inherits("QObject")
+  end
+
+  def test_qstring_marshall
+    widget = Qt::Widget.new(nil)
+    assert widget.objectName.nil?
+    widget.objectName = "Barney"
+    assert widget.objectName == "Barney"
+  end
+
+  def test_widgetlist
+    w1 = Qt::Widget.new(nil)
+    w2 = Qt::Widget.new(w1)
+    w3 = Qt::Widget.new(w1)
+    w4 = Qt::Widget.new(w2)
+
+    assert w1.children == [ w2, w3 ]
+  end
+
+  def test_find_children
+    w = Qt::Widget.new(nil)
+    assert_raise(TypeError) { w.findChildren(nil) }
+
+    assert w.findChildren(Qt::Widget) == [ ]
+    w2 = Qt::Widget.new(w)
+
+    assert w.findChildren(Qt::Widget) == [ w2 ]
+    assert w.findChildren(Qt::Object) == [ w2 ]
+    assert w.findChildren(Qt::LineEdit) == [ ]
+    assert w.findChildren(Qt::Widget,"Bob") == [ ]
+    assert w.findChildren(Qt::Object,"Bob") == [ ]
+
+    w2.objectName = "Bob"
+
+    assert w.findChildren(Qt::Widget) == [ w2 ]
+    assert w.findChildren(Qt::Object) == [ w2 ]
+    assert w.findChildren(Qt::Widget,"Bob") == [ w2 ]
+    assert w.findChildren(Qt::Object,"Bob") == [ w2 ]
+    assert w.findChildren(Qt::LineEdit, "Bob") == [ ]
+
+    w3 = Qt::Widget.new(w)
+    w4 = Qt::LineEdit.new(w2)
+    w4.setObjectName("Bob")
+
+    assert w.findChildren(Qt::Widget) == [ w4, w2, w3 ]
+    assert w.findChildren(Qt::LineEdit) == [ w4 ]
+    assert w.findChildren(Qt::Widget,"Bob") == [ w4, w2 ]    
+    assert w.findChildren(Qt::LineEdit,"Bob") == [ w4 ]    
+  end
+
+  def test_find_child
+    w = Qt::Widget.new(nil)
+    assert_raise(TypeError) { w.findChild(nil) }
+
+    assert_nil w.findChild(Qt::Widget)
+    w2 = Qt::Widget.new(w)
+
+    w3 = Qt::Widget.new(w)
+    w3.objectName = "Bob"
+    w4 = Qt::LineEdit.new(w2)
+    w4.objectName = "Bob"
+
+    assert w.findChild(Qt::Widget,"Bob") == w3
+    assert w.findChild(Qt::LineEdit,"Bob") == w4
+  end
+
+  def test_boolean_marshalling
+    assert Qt::Variant.new(true).toBool
+    assert !Qt::Variant.new(false).toBool
+
+    assert !Qt::Boolean.new(true).nil?
+    assert Qt::Boolean.new(false).nil?
+
+    # Invalid variant conversion should change b to false
+    b = Qt::Boolean.new(true)
+    v = Qt::Variant.new("Blah")
+    v.toInt(b);
+
+    assert b.nil?
+  end
+
+  def test_intp_marshalling
+    assert Qt::Integer.new(100).value == 100
+  end
+
+  def test_variant_conversions
+    v = Qt::Variant.new(Qt::Variant::Invalid)
+
+    assert !v.isValid
+    assert v.isNull
+
+    v = Qt::Variant.new(55)
+    assert v.toInt == 55
+    assert v.toUInt == 55
+    assert v.toLongLong == 55
+    assert v.toULongLong == 55
+    assert Qt::Variant.new(-55).toLongLong == -55
+    assert Qt::Variant.new(-55).toULongLong == 18446744073709551561
+    assert v.toDouble == 55.0
+    assert v.toChar == Qt::Char.new(55)
+    assert v.toString == "55"
+    assert v.toStringList == [ ]
+
+
+    assert Qt::Variant.new("Blah").toStringList == [ "Blah" ]
+
+    assert Qt::Variant.new(Qt::Size.new(30,40)).toSize == Qt::Size.new(30,40)
+    assert Qt::Variant.new(Qt::SizeF.new(20,30)).toSizeF == Qt::SizeF.new(20,30)
+
+    assert Qt::Variant.new(Qt::Rect.new(30,40,10,10)).toRect == Qt::Rect.new(30,40,10,10)
+    assert Qt::Variant.new(Qt::RectF.new(20,30,10,10)).toRectF == Qt::RectF.new(20,30,10,10)
+
+    assert Qt::Variant.new(Qt::Point.new(30,40)).toPoint == Qt::Point.new(30,40)
+    assert Qt::Variant.new(Qt::PointF.new(20,30)).toPointF == Qt::PointF.new(20,30)
+
+
+  end
+
+end