Remove some deprecated Qt2 stuff.

TQArray vs TQMemArray.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/1/head
gregory guy 4 years ago
parent a451e44f4a
commit a212e6154c
No known key found for this signature in database
GPG Key ID: 3BCCA0F7AB4536F4

@ -57,9 +57,9 @@ option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
include( ConfigureChecks.cmake ) include( ConfigureChecks.cmake )
###### global compiler settings (Qt2 stuff: TQArray vs TQMemArray -- qmemarray.h) ###### global compiler settings
add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST -UTQT_NO_COMPAT ) add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )

@ -26,7 +26,7 @@ TQPixmap Bitfont::text(TQString str, TQColor fg, TQColor bg)
TQPixmap FG(str.length()*fontWidth, fontHeight); TQPixmap FG(str.length()*fontWidth, fontHeight);
TQBitmap MASK(str.length()*fontWidth, fontHeight, TRUE); TQBitmap MASK(str.length()*fontWidth, fontHeight, TRUE);
const uchar *s = (const uchar *) str.data(); const uchar *s = (const uchar *) str.local8Bit().data();
for (uint i = 0; i < str.length(); i++) { for (uint i = 0; i < str.length(); i++) {
if (font.width() == font.height()) if (font.width() == font.height())
bitBlt(&MASK, i*fontWidth, 0, &font, bitBlt(&MASK, i*fontWidth, 0, &font,

@ -11,7 +11,7 @@
#include "board.h" #include "board.h"
#include "bitmaps.h" #include "bitmaps.h"
Board::Board(int size) : TQArray<int> (size) Board::Board(int size) : TQMemArray<int> (size)
{ {
sz = size; // set size of board sz = size; // set size of board
@ -58,7 +58,7 @@ void Board::init(Image image, TQString levelName)
"or could not be opened for reading."); "or could not be opened for reading.");
msg.replace(TQRegExp("@LEVELNAME@"), levelName); msg.replace(TQRegExp("@LEVELNAME@"), levelName);
// TQMessageBox::information(0, i18n("Initialization Error"), msg); // TQMessageBox::information(0, i18n("Initialization Error"), msg);
printf("%s\n", msg.data()); printf("%s\n", msg.local8Bit());
} else { } else {
map.fill(' ', BoardHeight*BoardWidth); map.fill(' ', BoardHeight*BoardWidth);
int height = 0; int height = 0;
@ -75,7 +75,7 @@ void Board::init(Image image, TQString levelName)
map.replace(height*BoardWidth, map.replace(height*BoardWidth,
(line.length() > BoardWidth) ? BoardWidth : line.length(), (line.length() > BoardWidth) ? BoardWidth : line.length(),
line.data()); line.local8Bit());
height++; height++;
} }
@ -93,7 +93,7 @@ void Board::init(Image image, TQString levelName)
break; break;
case Level : setup(demo_bits); case Level : setup(demo_bits);
break; break;
case File : setup((uchar *) map.data()); case File : setup((uchar *) map.local8Bit().data());
break; break;
default : break; default : break;
} }

@ -1,7 +1,7 @@
#ifndef BOARD_H #ifndef BOARD_H
#define BOARD_H #define BOARD_H
#include <tqarray.h> #include <tqmemarray.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqrect.h> #include <tqrect.h>
@ -37,7 +37,7 @@ enum Image { None, Intro, Demo, Level, File };
#define pacmanBit 0x0040 #define pacmanBit 0x0040
#define monsterBit 0x0100 #define monsterBit 0x0100
class Board : public TQArray<int> class Board : public TQMemArray<int>
{ {
public: public:
Board (int size); Board (int size);

@ -173,10 +173,10 @@ class KpacmanApp : public TDEMainWindow
TQPtrList<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 // ID's of the menuitem(s) for finding/selecting scheme by id
TQArray<int> modeID; TQMemArray<int> modeID;
TQArray<int> schemeID; TQMemArray<int> schemeID;
TQArray<int> schemeMode; // mode(group) of the schemes, -1 if no group TQMemArray<int> schemeMode; // mode(group) of the schemes, -1 if no group
bool highscoresChecked; // highscores display active bool highscoresChecked; // highscores display active
bool focusedPause; // Pause caused by focusEvents bool focusedPause; // Pause caused by focusEvents

@ -120,7 +120,7 @@ void KpacmanView::confScheme()
"or is of an unknown format."); "or is of an unknown format.");
msg.replace(TQRegExp("@FONTNAME@"), fontName); msg.replace(TQRegExp("@FONTNAME@"), fontName);
// TQMessageBox::critical(this, i18n("Initialization Error"), msg); // TQMessageBox::critical(this, i18n("Initialization Error"), msg);
printf("%s\n", msg.data()); printf("%s\n", msg.local8Bit());
} }
} }

@ -70,7 +70,7 @@ TQPtrList<TQPixmap> *Painter::loadPixmap(TQWidget *parent, TQString pixmapName,
"or is of an unknown format."); "or is of an unknown format.");
msg.replace(TQRegExp("@PIXMAPNAME@"), pixmapName); msg.replace(TQRegExp("@PIXMAPNAME@"), pixmapName);
// TQMessageBox::critical(parent, i18n("Initialization Error"), msg); // TQMessageBox::critical(parent, i18n("Initialization Error"), msg);
printf("%s\n", msg.data()); printf("%s\n", msg.local8Bit());
return 0; return 0;
} }
@ -668,7 +668,7 @@ TQString Painter::decodeHexOctString(TQString s)
return s; return s;
} }
void Painter::fillScoreString(TQStrList &list, TQArray<int> &values) void Painter::fillScoreString(TQStrList &list, TQMemArray<int> &values)
{ {
if( !list.isEmpty()) if( !list.isEmpty())
list.clear(); list.clear();
@ -692,11 +692,11 @@ void Painter::fillScoreString(TQStrList &list, TQArray<int> &values)
s.insert(0, char (values[i] / 1000 + 0x10)); s.insert(0, char (values[i] / 1000 + 0x10));
} }
list.append(s.data()); list.append(s.local8Bit());
} }
} }
void Painter::fillArray(TQArray<int> &array, TQString values, int max) void Painter::fillArray(TQMemArray<int> &array, TQString values, int max)
{ {
array.resize(max); array.resize(max);
int last = 0; int last = 0;

@ -53,8 +53,8 @@ public:
protected: protected:
TQString decodeHexOctString(TQString str); TQString decodeHexOctString(TQString str);
void fillScoreString(TQStrList &, TQArray<int> &); void fillScoreString(TQStrList &, TQMemArray<int> &);
void fillArray(TQArray<int> &, TQString, int); void fillArray(TQMemArray<int> &, TQString, int);
void fillStrList(TQStrList &, TQString, int); void fillStrList(TQStrList &, TQString, int);
void fillPixmapName(TQStrList &); void fillPixmapName(TQStrList &);
@ -75,9 +75,9 @@ private:
int BlockWidth; int BlockWidth;
int BlockHeight; int BlockHeight;
TQArray<int> fruitScore; TQMemArray<int> fruitScore;
TQStrList fruitScoreString; TQStrList fruitScoreString;
TQArray<int> monsterScore; TQMemArray<int> monsterScore;
TQStrList monsterScoreString; TQStrList monsterScoreString;
TQString pixmapDirectory; TQString pixmapDirectory;

@ -424,7 +424,7 @@ void Referee::initKeys()
RightKey = TDEAccel::stringToKey(right); RightKey = TDEAccel::stringToKey(right);
} }
void Referee::fillArray(TQArray<int> &array, TQString values, int max) void Referee::fillArray(TQMemArray<int> &array, TQString values, int max)
{ {
if (max < 0) if (max < 0)
max = values.contains(',')+1; max = values.contains(',')+1;
@ -901,10 +901,10 @@ void Referee::introPaint(int t)
case 12 : repaint(pix->draw(38, 28, RoomPix, i18n("\"CLYDE\""), ORANGE, TQColor(), AlignLeft), FALSE); case 12 : repaint(pix->draw(38, 28, RoomPix, i18n("\"CLYDE\""), ORANGE, TQColor(), AlignLeft), FALSE);
break; break;
case 13 : pts.sprintf("%d", pointScore); case 13 : pts.sprintf("%d", pointScore);
repaint(pix->draw(28, 44, RoomPix, pts.data(), WHITE, TQColor(), AlignRight), FALSE); repaint(pix->draw(28, 44, RoomPix, pts.local8Bit(), WHITE, TQColor(), AlignRight), FALSE);
repaint(pix->draw(31, 44, RoomPix, "\x1C\x1D\x1E", WHITE, TQColor(), AlignLeft), FALSE); repaint(pix->draw(31, 44, RoomPix, "\x1C\x1D\x1E", WHITE, TQColor(), AlignLeft), FALSE);
pts.sprintf("%d", energizerScore); pts.sprintf("%d", energizerScore);
repaint(pix->draw(28, 48, RoomPix, pts.data(), WHITE, TQColor(), AlignRight), FALSE); repaint(pix->draw(28, 48, RoomPix, pts.local8Bit(), WHITE, TQColor(), AlignRight), FALSE);
repaint(pix->draw(31, 48, RoomPix, "\x1C\x1D\x1E", WHITE, TQColor(), AlignLeft), FALSE); repaint(pix->draw(31, 48, RoomPix, "\x1C\x1D\x1E", WHITE, TQColor(), AlignLeft), FALSE);
break; break;
case 14 : // "@ 1980 MIDWAY MFG.CO." case 14 : // "@ 1980 MIDWAY MFG.CO."

@ -80,7 +80,7 @@ protected:
void focusOutEvent(TQFocusEvent *); void focusOutEvent(TQFocusEvent *);
void focusInEvent(TQFocusEvent *); void focusInEvent(TQFocusEvent *);
void fillArray(TQArray<int> &, TQString, int); void fillArray(TQMemArray<int> &, TQString, int);
void fillStrList(TQStrList &, TQString, int); void fillStrList(TQStrList &, TQString, int);
void fillMapName(); void fillMapName();
@ -102,22 +102,22 @@ private:
TQString mapDirectory; TQString mapDirectory;
TQStrList mapName; TQStrList mapName;
TQArray<int> speed; TQMemArray<int> speed;
TQArray<int> monsterIQ; TQMemArray<int> monsterIQ;
TQArray<int> fruitIQ; TQMemArray<int> fruitIQ;
TQArray<int> fruitIndex; TQMemArray<int> fruitIndex;
TQArray<int> pacmanTicks; TQMemArray<int> pacmanTicks;
TQArray<int> remTicks; TQMemArray<int> remTicks;
TQArray<int> dangerousTicks; TQMemArray<int> dangerousTicks;
TQArray<int> harmlessTicks; TQMemArray<int> harmlessTicks;
TQArray<int> harmlessDurTicks; TQMemArray<int> harmlessDurTicks;
TQArray<int> harmlessWarnTicks; TQMemArray<int> harmlessWarnTicks;
TQArray<int> arrestTicks; TQMemArray<int> arrestTicks;
TQArray<int> arrestDurTicks; TQMemArray<int> arrestDurTicks;
TQArray<int> fruitTicks; TQMemArray<int> fruitTicks;
TQArray<int> fruitAppearsTicks; TQMemArray<int> fruitAppearsTicks;
TQArray<int> fruitDurTicks; TQMemArray<int> fruitDurTicks;
TQArray<int> fruitScoreDurTicks; TQMemArray<int> fruitScoreDurTicks;
int monsterScoreDurMS; int monsterScoreDurMS;
int playerDurMS; int playerDurMS;
@ -135,9 +135,9 @@ private:
int pointScore; int pointScore;
int energizerScore; int energizerScore;
TQArray<int> fruitScore; TQMemArray<int> fruitScore;
TQArray<int> monsterScore; TQMemArray<int> monsterScore;
TQArray<int> extraLifeScore; TQMemArray<int> extraLifeScore;
int extraLifeScoreIndex; int extraLifeScoreIndex;
int nextExtraLifeScore; int nextExtraLifeScore;

@ -128,7 +128,7 @@ void Score::paintEvent( TQPaintEvent *e)
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
s.sprintf("%2d%9d %-3.3s %-8.8s", s.sprintf("%2d%9d %-3.3s %-8.8s",
i+1, hallOfFame[i].points, hallOfFame[i].name.utf8().data(), i+1, hallOfFame[i].points, hallOfFame[i].name.utf8().data(),
formatDate(hallOfFame[i].moment.date()).data()); formatDate(hallOfFame[i].moment.date()).utf8());
if (rect(1, (11+i)*1.25, s).intersects(e->rect())) { if (rect(1, (11+i)*1.25, s).intersects(e->rect())) {
TQPixmap pix = bitfont->text(s, (i == lastScore) ? YELLOW : WHITE, BLACK); TQPixmap pix = bitfont->text(s, (i == lastScore) ? YELLOW : WHITE, BLACK);
bitBlt(this, x(1), y((11+i)*1.25), &pix); bitBlt(this, x(1), y((11+i)*1.25), &pix);

@ -136,7 +136,7 @@ TQString Status::decodeHexOctString(TQString s)
return s; return s;
} }
void Status::fillArray(TQArray<int> &array, TQString values, int max) void Status::fillArray(TQMemArray<int> &array, TQString values, int max)
{ {
array.resize(max); array.resize(max);
int last = 0; int last = 0;

@ -11,7 +11,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqarray.h> #include <tqmemarray.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqstrlist.h> #include <tqstrlist.h>
#include <tqregexp.h> #include <tqregexp.h>
@ -35,7 +35,7 @@ protected:
TQString decodeHexOctString(TQString str); TQString decodeHexOctString(TQString str);
void fillArray(TQArray<int> &, TQString, int); void fillArray(TQMemArray<int> &, TQString, int);
void fillStrList(TQStrList &, TQString, int); void fillStrList(TQStrList &, TQString, int);
void fillPixmapName(TQStrList &); void fillPixmapName(TQStrList &);
@ -46,7 +46,7 @@ protected:
void initPixmaps(); void initPixmaps();
private: private:
TQArray<int> levelPos; TQMemArray<int> levelPos;
int actualLifes; int actualLifes;
int actualLevel; int actualLevel;

Loading…
Cancel
Save