From 5ee84cb4d4327c37d6d330d57140d02b6a415ec5 Mon Sep 17 00:00:00 2001
From: Ming <ming@cocos2d-x.org>
Date: Fri, 3 Sep 2010 03:10:32 +0000
Subject: [PATCH] issue #119

---
 test_uphone/tests/ActionManagerTest/ActionManagerTest.cpp | 2 +-
 test_uphone/tests/ActionManagerTest/ActionManagerTest.h   | 2 +-
 test_uphone/tests/ActionsTest/ActionsTest.cpp             | 4 ++--
 test_uphone/tests/ActionsTest/ActionsTest.h               | 4 ++--
 test_uphone/tests/TileMapTest/TileMapTest.cpp             | 2 +-
 test_uphone/tests/TileMapTest/TileMapTest.h               | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test_uphone/tests/ActionManagerTest/ActionManagerTest.cpp b/test_uphone/tests/ActionManagerTest/ActionManagerTest.cpp
index c25db2b575..3704fd0a37 100644
--- a/test_uphone/tests/ActionManagerTest/ActionManagerTest.cpp
+++ b/test_uphone/tests/ActionManagerTest/ActionManagerTest.cpp
@@ -314,7 +314,7 @@ void ResumeTest::onEnter()
     this->schedule(schedule_selector(ResumeTest::resumeGrossini), 3.0f);
 }
 
-void ResumeTest::resumeGrossini()
+void ResumeTest::resumeGrossini(ccTime time)
 {
     this->unschedule(schedule_selector(ResumeTest::resumeGrossini));
 
diff --git a/test_uphone/tests/ActionManagerTest/ActionManagerTest.h b/test_uphone/tests/ActionManagerTest/ActionManagerTest.h
index 9dee24ce01..860a741e96 100644
--- a/test_uphone/tests/ActionManagerTest/ActionManagerTest.h
+++ b/test_uphone/tests/ActionManagerTest/ActionManagerTest.h
@@ -59,7 +59,7 @@ class ResumeTest : public ActionManagerTest
 public:
     virtual std::string title();
     virtual void onEnter();
-    void resumeGrossini();
+    void resumeGrossini(ccTime time);
 };
 
 class ActionManagerTestScene : public TestScene
diff --git a/test_uphone/tests/ActionsTest/ActionsTest.cpp b/test_uphone/tests/ActionsTest/ActionsTest.cpp
index 57283f270d..1464bcf931 100644
--- a/test_uphone/tests/ActionsTest/ActionsTest.cpp
+++ b/test_uphone/tests/ActionsTest/ActionsTest.cpp
@@ -599,7 +599,7 @@ void ActionSequence2::callback1()
     addChild(label);
 }
 
-void ActionSequence2::callback2(NSObject* sender)
+void ActionSequence2::callback2(CCNode* sender)
 {
     CGSize s = CCDirector::getSharedDirector()->getWinSize();
     CCLabel *label = CCLabel::labelWithString("callback 2 called", "Marker Felt", 16);
@@ -608,7 +608,7 @@ void ActionSequence2::callback2(NSObject* sender)
     addChild(label);
 }
 
-void ActionSequence2::callback3(NSObject* sender, void* data)
+void ActionSequence2::callback3(CCNode* sender, void* data)
 {
     CGSize s = CCDirector::getSharedDirector()->getWinSize();
     CCLabel *label = CCLabel::labelWithString("callback 3 called", "Marker Felt", 16);
diff --git a/test_uphone/tests/ActionsTest/ActionsTest.h b/test_uphone/tests/ActionsTest/ActionsTest.h
index 0bbf6e2865..2a674ce2b8 100644
--- a/test_uphone/tests/ActionsTest/ActionsTest.h
+++ b/test_uphone/tests/ActionsTest/ActionsTest.h
@@ -147,8 +147,8 @@ public:
     virtual std::string subtitle();
 
     void callback1();
-    void callback2(NSObject* sender);
-    void callback3(NSObject* sender, void* data);
+    void callback2(CCNode* sender);
+    void callback3(CCNode* sender, void* data);
 };
 
 class ActionSpawn : public ActionsDemo
diff --git a/test_uphone/tests/TileMapTest/TileMapTest.cpp b/test_uphone/tests/TileMapTest/TileMapTest.cpp
index 9a26eab5ff..965123f68f 100644
--- a/test_uphone/tests/TileMapTest/TileMapTest.cpp
+++ b/test_uphone/tests/TileMapTest/TileMapTest.cpp
@@ -352,7 +352,7 @@ TMXReadWriteTest::TMXReadWriteTest()
 	m_gid2 = 0;
 }
 
-void TMXReadWriteTest::removeSprite(NSObject* sender)
+void TMXReadWriteTest::removeSprite(CCNode* sender)
 {
 	////----UXLOG("removing tile: %x", sender);
 	CCNode* p = ((CCNode*)sender)->getParent();
diff --git a/test_uphone/tests/TileMapTest/TileMapTest.h b/test_uphone/tests/TileMapTest/TileMapTest.h
index fec7098208..3aeabc5e11 100644
--- a/test_uphone/tests/TileMapTest/TileMapTest.h
+++ b/test_uphone/tests/TileMapTest/TileMapTest.h
@@ -84,7 +84,7 @@ public:
 	TMXReadWriteTest(void);
 	virtual std::string title();
 
-	void removeSprite(NSObject* sender);
+	void removeSprite(CCNode* sender);
 	void updateCol(ccTime dt);
 	void repaintWithGID(ccTime dt);
 	void removeTiles(ccTime dt);