rpms/kdebindings/devel kdebindings-4.3.95-fix-build.patch,1.1,1.2

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9067/devel

Modified Files:
	kdebindings-4.3.95-fix-build.patch 
Log Message:
Fix more instances of isDerivedFromByName usage.

kdebindings-4.3.95-fix-build.patch:
 handlers.cpp    |   23 +++++++++++------------
 methodcall.cpp  |    2 +-
 qyotoshared.cpp |    2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

Index: kdebindings-4.3.95-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.95-fix-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebindings-4.3.95-fix-build.patch	24 Jan 2010 07:27:45 -0000	1.1
+++ kdebindings-4.3.95-fix-build.patch	24 Jan 2010 08:24:53 -0000	1.2
@@ -1,3 +1,94 @@
+diff -ur kdebindings-4.3.95/csharp/qyoto/src/handlers.cpp kdebindings-4.3.95-fix-build/csharp/qyoto/src/handlers.cpp
+--- kdebindings-4.3.95/csharp/qyoto/src/handlers.cpp	2009-12-31 14:34:07.000000000 +0100
++++ kdebindings-4.3.95-fix-build/csharp/qyoto/src/handlers.cpp	2010-01-24 09:20:51.000000000 +0100
+@@ -372,7 +372,6 @@
+ 
+ }
+ 
+-// extern bool isDerivedFromByName(Smoke *smoke, const char *className, const char *baseClassName);
+ extern void mapPointer(void * obj, smokeqyoto_object *o, Smoke::Index classId, void *lastptr);
+ 
+ Q_DECL_EXPORT bool
+@@ -386,7 +385,7 @@
+ 			|| qstrcmp(className, "QModelIndex") == 0 )
+ 	{
+ 		return true;
+-	} else if (o->smoke->isDerivedFromByName(className, "QLayoutItem")) {
++	} else if (Smoke::isDerivedFrom(className, "QLayoutItem")) {
+ 		QLayoutItem * item = (QLayoutItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QLayoutItem").index);
+ 		if (item->layout() != 0 || item->widget() != 0 || item->spacerItem() != 0) {
+ 			return true;
+@@ -396,36 +395,36 @@
+ 		if (item->listWidget() != 0) {
+ 			return true;
+ 		}
+-	} else if (o->smoke->isDerivedFromByName(className, "QTableWidgetItem")) {
++	} else if (Smoke::isDerivedFrom(className, "QTableWidgetItem")) {
+ 		QTableWidgetItem * item = (QTableWidgetItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QTableWidgetItem").index);
+ 		if (item->tableWidget() != 0) {
+ 			return true;
+ 		}
+-	} else if (o->smoke->isDerivedFromByName(className, "QTreeWidgetItem")) {
++	} else if (Smoke::isDerivedFrom(className, "QTreeWidgetItem")) {
+ 		QTreeWidgetItem * item = (QTreeWidgetItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QTreeWidgetItem").index);
+ 		if (item->treeWidget() != 0) {
+ 			return true;
+ 		}
+-	} else if (o->smoke->isDerivedFromByName(className, "QGraphicsScene")) {
++	} else if (Smoke::isDerivedFrom(className, "QGraphicsScene")) {
+ 		QGraphicsScene * scene = (QGraphicsScene *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsScene").index);
+ 		if (scene->views().count() > 0 || scene->parent() != 0) {
+ 			return true;
+ 		}
+-	} else if (o->smoke->isDerivedFromByName(className, "QWidget")) {
++	} else if (Smoke::isDerivedFrom(className, "QWidget")) {
+ 		// Only garbage collect the widget if it's hidden, doesn't have any parents and if there are no more 
+ 		// references to it in the code. This should produce a more 'natural' behaviour for top-level widgets.
+ 		QWidget * qwidget = (QWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QWidget").index);
+ 		if (qwidget->isVisible() || qwidget->parent() != 0) {
+ 			return true;
+ 		}
+-	} else if (o->smoke->isDerivedFromByName(className, "QObject")) {
++	} else if (Smoke::isDerivedFrom(className, "QObject")) {
+ 		QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
+ 		if (qobject->parent() != 0) {
+ 			return true;
+ 		}
+-	} else if (o->smoke->isDerivedFromByName(className, "QTextBlockUserData")) {
++	} else if (Smoke::isDerivedFrom(className, "QTextBlockUserData")) {
+ 		return true;
+-	} else if (o->smoke->isDerivedFromByName(className, "QGraphicsItem")) {
++	} else if (Smoke::isDerivedFrom(className, "QGraphicsItem")) {
+ 		QGraphicsItem * item = (QGraphicsItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsItem").index);
+ 		if (item->scene() != 0 || item->parentItem() != 0) {
+ 			return true;
+@@ -442,7 +441,7 @@
+ Q_DECL_EXPORT const char *
+ qyoto_resolve_classname_qt(smokeqyoto_object * o)
+ {
+-	if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QEvent")) {
++	if (Smoke::isDerivedFrom(o->smoke->classes[o->classId].className, "QEvent")) {
+ 		QEvent * qevent = (QEvent *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QEvent").index);
+ 		switch (qevent->type()) {
+ 		case QEvent::Timer:
+@@ -662,7 +661,7 @@
+ 		default:
+ 			break;
+ 		}
+-	} else if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QGraphicsItem")) {
++	} else if (Smoke::isDerivedFrom(o->smoke->classes[o->classId].className, "QGraphicsItem")) {
+ 		QGraphicsItem * item = (QGraphicsItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QGraphicsItem").index);
+ 		switch (item->type()) {
+ 		case 1:
+@@ -695,7 +694,7 @@
+ 			o->classId = o->smoke->idClass("QGraphicsItemGroup").index;
+ 			break;
+ 		}
+-	} else if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QLayoutItem")) {
++	} else if (Smoke::isDerivedFrom(o->smoke->classes[o->classId].className, "QLayoutItem")) {
+ 		QLayoutItem * item = (QLayoutItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QLayoutItem").index);
+ 		if (item->widget() != 0) {
+ 			o->classId = o->smoke->idClass("QWidgetItem").index;
 diff -ur kdebindings-4.3.95/csharp/qyoto/src/methodcall.cpp kdebindings-4.3.95-fix-build/csharp/qyoto/src/methodcall.cpp
 --- kdebindings-4.3.95/csharp/qyoto/src/methodcall.cpp	2009-12-31 14:34:07.000000000 +0100
 +++ kdebindings-4.3.95-fix-build/csharp/qyoto/src/methodcall.cpp	2010-01-24 08:24:11.000000000 +0100
@@ -10,3 +101,15 @@ diff -ur kdebindings-4.3.95/csharp/qyoto
  			{
  				_called = true;
  			}
+diff -ur kdebindings-4.3.95/csharp/qyoto/src/qyotoshared.cpp kdebindings-4.3.95-fix-build/csharp/qyoto/src/qyotoshared.cpp
+--- kdebindings-4.3.95/csharp/qyoto/src/qyotoshared.cpp	2009-12-31 14:34:07.000000000 +0100
++++ kdebindings-4.3.95-fix-build/csharp/qyoto/src/qyotoshared.cpp	2010-01-24 09:21:43.000000000 +0100
+@@ -304,7 +304,7 @@
+ const char *
+ qyoto_resolve_classname(smokeqyoto_object * o)
+ {
+-	if (o->smoke->isDerivedFromByName(o->smoke->classes[o->classId].className, "QObject")) {
++	if (Smoke::isDerivedFrom(o->smoke->classes[o->classId].className, "QObject")) {
+ 		QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject").index);
+ 		const QMetaObject * meta = qobject->metaObject();
+