remove some deprecated qt2 stuff.

TQList --> TQPtrList

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/1/head
gregory guy 2 years ago
parent 2e2a3c5923
commit 5debd26d86
No known key found for this signature in database
GPG Key ID: 3BCCA0F7AB4536F4
  1. 2
      kpacman/board.h
  2. 2
      kpacman/kpacman.cpp
  3. 4
      kpacman/kpacman.h
  4. 14
      kpacman/painter.cpp
  5. 32
      kpacman/painter.h
  6. 10
      kpacman/referee.cpp
  7. 10
      kpacman/referee.h
  8. 8
      kpacman/status.cpp
  9. 10
      kpacman/status.h

@ -3,7 +3,7 @@
#include <ntqarray.h>
#include <ntqstring.h>
#include <ntqlist.h>
#include <ntqrect.h>
#define OUT -1

@ -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();

@ -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;

@ -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);
}

@ -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;

@ -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);

@ -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;

@ -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);
}

@ -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;

Loading…
Cancel
Save