From 4648ea0c6a25f5c64076e9939d976be3820423ec Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 23:25:50 +0900 Subject: Removed obsolete Qt2's TQList/TQListIterator classes and replaced with TQt3's TQPtrList/TQPtrListIterator ones. Signed-off-by: Michele Calgaro --- kgoldrunner/src/kgrcanvas.cpp | 6 +++--- kgoldrunner/src/kgrcanvas.h | 2 +- kgoldrunner/src/kgrfigure.cpp | 4 ++-- kgoldrunner/src/kgrfigure.h | 8 ++++---- kgoldrunner/src/kgrgame.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kgoldrunner/src/kgrcanvas.cpp b/kgoldrunner/src/kgrcanvas.cpp index cd364d15..bd642214 100644 --- a/kgoldrunner/src/kgrcanvas.cpp +++ b/kgoldrunner/src/kgrcanvas.cpp @@ -396,8 +396,8 @@ void KGrCanvas::initView() #else TQPixmap * pm; TQPoint * pt; - TQList pmList; - TQList ptList; + TQPtrList pmList; + TQPtrList ptList; pt = new TQPoint (0, 0); // "Hot spot" not used in KGoldrunner. @@ -469,7 +469,7 @@ void KGrCanvas::initView() #ifdef QT3 enemySprites = new TQPtrList (); #else - enemySprites = new TQList (); + enemySprites = new TQPtrList (); #endif enemySprites->setAutoDelete(TRUE); } diff --git a/kgoldrunner/src/kgrcanvas.h b/kgoldrunner/src/kgrcanvas.h index bf9cb1cf..884fc40e 100644 --- a/kgoldrunner/src/kgrcanvas.h +++ b/kgoldrunner/src/kgrcanvas.h @@ -96,7 +96,7 @@ private: #ifdef QT3 TQPtrList * enemySprites; #else - TQList * enemySprites; + TQPtrList * enemySprites; #endif void initView(); diff --git a/kgoldrunner/src/kgrfigure.cpp b/kgoldrunner/src/kgrfigure.cpp index 272c571e..850de749 100644 --- a/kgoldrunner/src/kgrfigure.cpp +++ b/kgoldrunner/src/kgrfigure.cpp @@ -713,7 +713,7 @@ void KGrHero::digRight(){ #ifdef QT3 void KGrHero::setEnemyList(TQPtrList *e) #else -void KGrHero::setEnemyList(TQList *e) +void KGrHero::setEnemyList(TQPtrList *e) #endif { enemies = e; @@ -1673,7 +1673,7 @@ bool KGrEnemy::willNotFall (int x, int y) #ifdef QT3 void KGrEnemy::setEnemyList(TQPtrList *e) #else -void KGrEnemy::setEnemyList(TQList *e) +void KGrEnemy::setEnemyList(TQPtrList *e) #endif { enemies = e; diff --git a/kgoldrunner/src/kgrfigure.h b/kgoldrunner/src/kgrfigure.h index 70c5fbed..f25950b2 100644 --- a/kgoldrunner/src/kgrfigure.h +++ b/kgoldrunner/src/kgrfigure.h @@ -116,7 +116,7 @@ public: #ifdef QT3 void setEnemyList(TQPtrList *); #else - void setEnemyList(TQList *); + void setEnemyList(TQPtrList *); #endif void init(int,int); void setKey(Direction); @@ -133,7 +133,7 @@ private: #ifdef QT3 TQPtrList *enemies; #else - TQList *enemies; + TQPtrList *enemies; #endif KGrCanvas * heroView; bool standOnEnemy(); @@ -172,7 +172,7 @@ public: #ifdef QT3 void setEnemyList(TQPtrList *); #else - void setEnemyList(TQList *); + void setEnemyList(TQPtrList *); #endif virtual void init(int,int); static int WALKDELAY; @@ -192,7 +192,7 @@ private: #ifdef QT3 TQPtrList *enemies; #else - TQList *enemies; + TQPtrList *enemies; #endif bool standOnEnemy(); bool bumpingFriend(); diff --git a/kgoldrunner/src/kgrgame.h b/kgoldrunner/src/kgrgame.h index 29cd135d..4e420199 100644 --- a/kgoldrunner/src/kgrgame.h +++ b/kgoldrunner/src/kgrgame.h @@ -158,7 +158,7 @@ private: #ifdef QT3 TQPtrList enemies; // The list of enemies. #else - TQList enemies; // The list of enemies. + TQPtrList enemies; // The list of enemies. #endif int enemyCount; // How many enemies. KGrEnemy * enemy; // One of the enemies. @@ -250,7 +250,7 @@ private: #ifdef QT3 TQPtrList collections; // List of ALL collections. #else - TQList collections; // List of ALL collections. + TQPtrList collections; // List of ALL collections. #endif KGrCollection * collection; // Collection currently in use. -- cgit v1.2.1