diff options
-rw-r--r-- | kpacman/board.h | 2 | ||||
-rw-r--r-- | kpacman/kpacman.cpp | 2 | ||||
-rw-r--r-- | kpacman/kpacman.h | 4 | ||||
-rw-r--r-- | kpacman/painter.cpp | 14 | ||||
-rw-r--r-- | kpacman/painter.h | 32 | ||||
-rw-r--r-- | kpacman/referee.cpp | 10 | ||||
-rw-r--r-- | kpacman/referee.h | 10 | ||||
-rw-r--r-- | kpacman/status.cpp | 8 | ||||
-rw-r--r-- | 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 <ntqarray.h> #include <ntqstring.h> -#include <ntqlist.h> + #include <ntqrect.h> #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<TDEPopupMenu>; + schemesPopup = new TQPtrList<TDEPopupMenu>; 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 <ntqlist.h> + #include <ntqfileinf.h> #include <ntqregexp.h> @@ -170,7 +170,7 @@ class KpacmanApp : public TDEMainWindow int mode; TDEPopupMenu *modesPopup; // TDEAction main scheme selection menu - TQList<TDEPopupMenu> *schemesPopup; // submenus for selecting scheme + TQPtrList<TDEPopupMenu> *schemesPopup; // submenus for selecting scheme // ID's of the menuitem(s) for finding/selecting scheme by id TQArray<int> 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<TQPixmap> *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, - TQList<TQPixmap> *pixmaps) +TQPtrList<TQPixmap> *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, + TQPtrList<TQPixmap> *pixmaps) { if (pixmaps == NULL) { - pixmaps = new TQList<TQPixmap>; + pixmaps = new TQPtrList<TQPixmap>; pixmaps->setAutoDelete(TRUE); } @@ -95,11 +95,11 @@ TQList<TQPixmap> *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, return pixmaps; } -TQList<TQPixmap> *Painter::textPixmap(TQStrList &str, TQList<TQPixmap> *pixmaps, +TQPtrList<TQPixmap> *Painter::textPixmap(TQStrList &str, TQPtrList<TQPixmap> *pixmaps, TQColor fg, TQColor bg) { if (pixmaps == NULL) { - pixmaps = new TQList<TQPixmap>; + pixmaps = new TQPtrList<TQPixmap>; pixmaps->setAutoDelete(TRUE); } @@ -114,11 +114,11 @@ TQList<TQPixmap> *Painter::textPixmap(TQStrList &str, TQList<TQPixmap> *pixmaps, return pixmaps; } -TQList<TQPixmap> *Painter::textPixmap(TQString str, TQList<TQPixmap> *pixmaps, +TQPtrList<TQPixmap> *Painter::textPixmap(TQString str, TQPtrList<TQPixmap> *pixmaps, TQColor fg, TQColor bg) { if (pixmaps == NULL) { - pixmaps = new TQList<TQPixmap>; + pixmaps = new TQPtrList<TQPixmap>; 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 <ntqbitmap.h> #include <ntqlabel.h> #include <ntqcolor.h> -#include <ntqlist.h> + #include <ntqstrlist.h> #include <ntqregexp.h> @@ -106,27 +106,27 @@ private: TQString lastFruitScorePixmapName; TQString lastMonsterScorePixmapName; - TQList<TQPixmap> *loadPixmap(TQWidget *parent, TQString pixmapName, - TQList<TQPixmap> *pixmaps=0); - TQList<TQPixmap> *textPixmap(TQStrList &, TQList<TQPixmap> *pixmaps=0, + TQPtrList<TQPixmap> *loadPixmap(TQWidget *parent, TQString pixmapName, + TQPtrList<TQPixmap> *pixmaps=0); + TQPtrList<TQPixmap> *textPixmap(TQStrList &, TQPtrList<TQPixmap> *pixmaps=0, TQColor fg = BLACK, TQColor bg = TQColor()); - TQList<TQPixmap> *textPixmap(TQString str, TQList<TQPixmap> *pixmaps=0, + TQPtrList<TQPixmap> *textPixmap(TQString str, TQPtrList<TQPixmap> *pixmaps=0, TQColor fg = BLACK, TQColor bg = TQColor()); TQPoint point(int pos); int checkRange(int value, int max, int min=0); - TQList<TQPixmap> *wallPix; - TQList<TQPixmap> *prisonPix; - TQList<TQPixmap> *pointPix; - TQList<TQPixmap> *energizerPix; - TQList<TQPixmap> *fruitPix; - TQList<TQPixmap> *pacmanPix; - TQList<TQPixmap> *dyingPix; - TQList<TQPixmap> *eyesPix; - TQList<TQPixmap> *monsterPix; - TQList<TQPixmap> *fruitScorePix; - TQList<TQPixmap> *monsterScorePix; + TQPtrList<TQPixmap> *wallPix; + TQPtrList<TQPixmap> *prisonPix; + TQPtrList<TQPixmap> *pointPix; + TQPtrList<TQPixmap> *energizerPix; + TQPtrList<TQPixmap> *fruitPix; + TQPtrList<TQPixmap> *pacmanPix; + TQPtrList<TQPixmap> *dyingPix; + TQPtrList<TQPixmap> *eyesPix; + TQPtrList<TQPixmap> *monsterPix; + TQPtrList<TQPixmap> *fruitScorePix; + TQPtrList<TQPixmap> *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 <tdeconfig.h> #include <kstddirs.h> -#include <referee.h> +#include "referee.h" #include <ntqdatetm.h> #include <stdlib.h> @@ -44,16 +44,16 @@ Referee::Referee( TQWidget *parent, const char *name, int Scheme, int Mode, Bitf fruit = new Fruit(board); - monsters = new TQList<Monster>; + monsters = new TQPtrList<Monster>; monsters->setAutoDelete(TRUE); - monsterRect = new TQList<TQRect>; + monsterRect = new TQPtrList<TQRect>; monsterRect->setAutoDelete(TRUE); - energizers = new TQList<Energizer>; + energizers = new TQPtrList<Energizer>; energizers->setAutoDelete(TRUE); - energizerRect = new TQList<TQRect>; + energizerRect = new TQPtrList<TQRect>; 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 <kapp.h> #include <ntqwidget.h> -#include <ntqlist.h> + #include <ntqstrlist.h> #include <ntqarray.h> #include <ntqbitarry.h> @@ -155,11 +155,11 @@ private: Pacman *pacman; Fruit *fruit; - TQList<Monster> *monsters; - TQList<TQRect> *monsterRect; + TQPtrList<Monster> *monsters; + TQPtrList<TQRect> *monsterRect; - TQList<Energizer> *energizers; - TQList<TQRect> *energizerRect; + TQPtrList<Energizer> *energizers; + TQPtrList<TQRect> *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 <tdelocale.h> #include <kstddirs.h> -#include <status.h> +#include "status.h" #include <ntqpixmap.h> #include <ntqbitmap.h> @@ -26,11 +26,11 @@ Status::Status( TQWidget *parent, const char *name, int Scheme, int Mode ) : confScheme(); } -TQList<TQPixmap> *Status::loadPixmap(TQWidget *parent, TQString pixmapName, - TQList<TQPixmap> *pixmaps) +TQPtrList<TQPixmap> *Status::loadPixmap(TQWidget *parent, TQString pixmapName, + TQPtrList<TQPixmap> *pixmaps) { if (pixmaps == NULL) { - pixmaps = new TQList<TQPixmap>; + pixmaps = new TQPtrList<TQPixmap>; 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 <ntqpixmap.h> #include <ntqstring.h> #include <ntqarray.h> -#include <ntqlist.h> + #include <ntqstrlist.h> #include <ntqregexp.h> @@ -58,11 +58,11 @@ private: TQString lastLifesPixmapName; TQString lastLevelPixmapName; - TQList<TQPixmap> *loadPixmap(TQWidget *parent, TQString pixmapName, - TQList<TQPixmap> *pixmaps=0); + TQPtrList<TQPixmap> *loadPixmap(TQWidget *parent, TQString pixmapName, + TQPtrList<TQPixmap> *pixmaps=0); - TQList<TQPixmap> *lifesPix; - TQList<TQPixmap> *levelPix; + TQPtrList<TQPixmap> *lifesPix; + TQPtrList<TQPixmap> *levelPix; int maxLevel; int level; |