[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames/kolf/tagaro
From:       Stefan Majewsky <majewsky () gmx ! net>
Date:       2010-10-31 22:15:07
Message-ID: 20101031221507.0368CAC8AE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1191672 by majewsky:

Import a crash fix from Tagaro, which will be necessary in the following.

 M  +1 -1      README  
 M  +3 -3      board.cpp  


--- trunk/KDE/kdegames/kolf/tagaro/README #1191671:1191672
@@ -5,7 +5,7 @@
 The given code has been copied from the libtagaro repository, which was, at the
 time of this writing, available from git://git.kde.org/libtagaro.git. The code
 was taken from the directories tagaro/interface/ and tagaro/graphics/ at commit
-5219d1bdcf96270ce9aa01b776eb96518462820e.
+a137e9b266dba51b3cb9fcbf32dd8a2a3a5976d5.
 
 Code that integrates with Tagaro::MessageOverlay has been removed, and
 Tagaro::Renderer and Tagaro::RendererClient have been replaced by KGameRenderer.
--- trunk/KDE/kdegames/kolf/tagaro/board.cpp #1191671:1191672
@@ -209,7 +209,7 @@
 	{
 		QGraphicsItem* item = value.value<QGraphicsItem*>();
 		d->m_pendingItems.removeAll(item);
-		QGraphicsObject* object = qgraphicsitem_cast<QGraphicsObject*>(item);
+		QGraphicsObject* object = item->toGraphicsObject();
 		Tagaro::SpriteObjectItem* objectItem = qobject_cast<Tagaro::SpriteObjectItem*>(object);
 		disconnect(objectItem, 0, this, 0);
 		d->m_items.removeAll(objectItem);
@@ -218,7 +218,7 @@
 	{
 		//check if this is a Tagaro::SpriteObjectItem
 		QGraphicsItem* item = value.value<QGraphicsItem*>();
-		QGraphicsObject* object = qgraphicsitem_cast<QGraphicsObject*>(item);
+		QGraphicsObject* object = item->toGraphicsObject();
 		Tagaro::SpriteObjectItem* objectItem = qobject_cast<Tagaro::SpriteObjectItem*>(object);
 		if (objectItem)
 		{
@@ -267,7 +267,7 @@
 		for (; it1 != it2; ++it1)
 		{
 			QGraphicsItem* item = *it1;
-			QGraphicsObject* object = qgraphicsitem_cast<QGraphicsObject*>(item);
+			QGraphicsObject* object = item->toGraphicsObject();
 			Tagaro::SpriteObjectItem* objectItem = qobject_cast<Tagaro::SpriteObjectItem*>(object);
 			if (objectItem)
 			{
[prev in list] [next in list] [prev in thread] [next in thread]