From 5debd26d86e7e1bb9ad9dcfa9b98e672440c195b Mon Sep 17 00:00:00 2001 From: gregory guy Date: Mon, 17 Aug 2020 20:24:48 +0200 Subject: [PATCH] remove some deprecated qt2 stuff. TQList --> TQPtrList Signed-off-by: gregory guy --- kpacman/board.h | 2 +- kpacman/kpacman.cpp | 2 +- kpacman/kpacman.h | 4 ++-- kpacman/painter.cpp | 14 +++++++------- kpacman/painter.h | 32 ++++++++++++++++---------------- kpacman/referee.cpp | 10 +++++----- kpacman/referee.h | 10 +++++----- kpacman/status.cpp | 8 ++++---- kpacman/status.h | 10 +++++----- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/kpacman/board.h b/kpacman/board.h index 061cbd8..f2758d5 100644 --- a/kpacman/board.h +++ b/kpacman/board.h @@ -3,7 +3,7 @@ #include #include -#include + #include #define OUT -1 diff --git a/kpacman/kpacman.cpp b/kpacman/kpacman.cpp index 4b87122..8d91f17 100644 --- a/kpacman/kpacman.cpp +++ b/kpacman/kpacman.cpp @@ -196,7 +196,7 @@ void KpacmanApp::readSchemes() schemeID.resize(schemeCount); schemeMode.resize(schemeCount); - schemesPopup = new TQList; + schemesPopup = new TQPtrList; schemesPopup->setAutoDelete(true); modesPopup = selectGraphicScheme->popupMenu(); diff --git a/kpacman/kpacman.h b/kpacman/kpacman.h index c6ab495..c6f9133 100644 --- a/kpacman/kpacman.h +++ b/kpacman/kpacman.h @@ -24,7 +24,7 @@ #endif // include files for TQt -#include + #include #include @@ -170,7 +170,7 @@ class KpacmanApp : public TDEMainWindow int mode; TDEPopupMenu *modesPopup; // TDEAction main scheme selection menu - TQList *schemesPopup; // submenus for selecting scheme + TQPtrList *schemesPopup; // submenus for selecting scheme // ID's of the menuitem(s) for finding/selecting scheme by id TQArray modeID; diff --git a/kpacman/painter.cpp b/kpacman/painter.cpp index b585df3..7df62c2 100644 --- a/kpacman/painter.cpp +++ b/kpacman/painter.cpp @@ -53,11 +53,11 @@ Painter::Painter( Board *b, TQWidget *parent, int Scheme, int Mode, Bitfont *fon confScheme(); } -TQList *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, - TQList *pixmaps) +TQPtrList *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, + TQPtrList *pixmaps) { if (pixmaps == NULL) { - pixmaps = new TQList; + pixmaps = new TQPtrList; pixmaps->setAutoDelete(TRUE); } @@ -95,11 +95,11 @@ TQList *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, return pixmaps; } -TQList *Painter::textPixmap(TQStrList &str, TQList *pixmaps, +TQPtrList *Painter::textPixmap(TQStrList &str, TQPtrList *pixmaps, TQColor fg, TQColor bg) { if (pixmaps == NULL) { - pixmaps = new TQList; + pixmaps = new TQPtrList; pixmaps->setAutoDelete(TRUE); } @@ -114,11 +114,11 @@ TQList *Painter::textPixmap(TQStrList &str, TQList *pixmaps, return pixmaps; } -TQList *Painter::textPixmap(TQString str, TQList *pixmaps, +TQPtrList *Painter::textPixmap(TQString str, TQPtrList *pixmaps, TQColor fg, TQColor bg) { if (pixmaps == NULL) { - pixmaps = new TQList; + pixmaps = new TQPtrList; pixmaps->setAutoDelete(TRUE); } diff --git a/kpacman/painter.h b/kpacman/painter.h index d44705c..fa84ede 100644 --- a/kpacman/painter.h +++ b/kpacman/painter.h @@ -8,7 +8,7 @@ #include #include #include -#include + #include #include @@ -106,27 +106,27 @@ private: TQString lastFruitScorePixmapName; TQString lastMonsterScorePixmapName; - TQList *loadPixmap(TQWidget *parent, TQString pixmapName, - TQList *pixmaps=0); - TQList *textPixmap(TQStrList &, TQList *pixmaps=0, + TQPtrList *loadPixmap(TQWidget *parent, TQString pixmapName, + TQPtrList *pixmaps=0); + TQPtrList *textPixmap(TQStrList &, TQPtrList *pixmaps=0, TQColor fg = BLACK, TQColor bg = TQColor()); - TQList *textPixmap(TQString str, TQList *pixmaps=0, + TQPtrList *textPixmap(TQString str, TQPtrList *pixmaps=0, TQColor fg = BLACK, TQColor bg = TQColor()); TQPoint point(int pos); int checkRange(int value, int max, int min=0); - TQList *wallPix; - TQList *prisonPix; - TQList *pointPix; - TQList *energizerPix; - TQList *fruitPix; - TQList *pacmanPix; - TQList *dyingPix; - TQList *eyesPix; - TQList *monsterPix; - TQList *fruitScorePix; - TQList *monsterScorePix; + TQPtrList *wallPix; + TQPtrList *prisonPix; + TQPtrList *pointPix; + TQPtrList *energizerPix; + TQPtrList *fruitPix; + TQPtrList *pacmanPix; + TQPtrList *dyingPix; + TQPtrList *eyesPix; + TQPtrList *monsterPix; + TQPtrList *fruitScorePix; + TQPtrList *monsterScorePix; TQPixmap roomPix; TQPixmap backPix; diff --git a/kpacman/referee.cpp b/kpacman/referee.cpp index efe0d12..959745e 100644 --- a/kpacman/referee.cpp +++ b/kpacman/referee.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include "referee.h" #include #include @@ -44,16 +44,16 @@ Referee::Referee( TQWidget *parent, const char *name, int Scheme, int Mode, Bitf fruit = new Fruit(board); - monsters = new TQList; + monsters = new TQPtrList; monsters->setAutoDelete(TRUE); - monsterRect = new TQList; + monsterRect = new TQPtrList; monsterRect->setAutoDelete(TRUE); - energizers = new TQList; + energizers = new TQPtrList; energizers->setAutoDelete(TRUE); - energizerRect = new TQList; + energizerRect = new TQPtrList; energizerRect->setAutoDelete(TRUE); pacmanRect.setRect(0, 0, 0, 0); diff --git a/kpacman/referee.h b/kpacman/referee.h index 3cb2b59..cbc00a9 100644 --- a/kpacman/referee.h +++ b/kpacman/referee.h @@ -7,7 +7,7 @@ #include #include -#include + #include #include #include @@ -155,11 +155,11 @@ private: Pacman *pacman; Fruit *fruit; - TQList *monsters; - TQList *monsterRect; + TQPtrList *monsters; + TQPtrList *monsterRect; - TQList *energizers; - TQList *energizerRect; + TQPtrList *energizers; + TQPtrList *energizerRect; TQRect pacmanRect; TQRect fruitRect; diff --git a/kpacman/status.cpp b/kpacman/status.cpp index 6143b00..1a43f5c 100644 --- a/kpacman/status.cpp +++ b/kpacman/status.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include "status.h" #include #include @@ -26,11 +26,11 @@ Status::Status( TQWidget *parent, const char *name, int Scheme, int Mode ) : confScheme(); } -TQList *Status::loadPixmap(TQWidget *parent, TQString pixmapName, - TQList *pixmaps) +TQPtrList *Status::loadPixmap(TQWidget *parent, TQString pixmapName, + TQPtrList *pixmaps) { if (pixmaps == NULL) { - pixmaps = new TQList; + pixmaps = new TQPtrList; pixmaps->setAutoDelete(TRUE); } diff --git a/kpacman/status.h b/kpacman/status.h index 6428043..94fd09e 100644 --- a/kpacman/status.h +++ b/kpacman/status.h @@ -12,7 +12,7 @@ #include #include #include -#include + #include #include @@ -58,11 +58,11 @@ private: TQString lastLifesPixmapName; TQString lastLevelPixmapName; - TQList *loadPixmap(TQWidget *parent, TQString pixmapName, - TQList *pixmaps=0); + TQPtrList *loadPixmap(TQWidget *parent, TQString pixmapName, + TQPtrList *pixmaps=0); - TQList *lifesPix; - TQList *levelPix; + TQPtrList *lifesPix; + TQPtrList *levelPix; int maxLevel; int level;