From 2845eab18323e57fdfa921c7c3ec6400f280a268 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 22:52:58 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- tdepacman/keys.cpp | 12 ++++++------ tdepacman/keys.h | 2 +- tdepacman/main.cpp | 6 +++--- tdepacman/painter.cpp | 2 +- tdepacman/painter.h | 10 +++++----- tdepacman/referee.cpp | 24 ++++++++++++------------ tdepacman/referee.h | 4 ++-- tdepacman/score.cpp | 4 ++-- tdepacman/score.h | 4 ++-- tdepacman/status.cpp | 2 +- tdepacman/status.h | 4 ++-- tdepacman/tdepacman.cpp | 2 +- tdepacman/tdepacman.h | 2 +- tdepacman/tdepacmanview.cpp | 2 +- tdepacman/tdepacmanview.h | 2 +- 15 files changed, 41 insertions(+), 41 deletions(-) diff --git a/tdepacman/keys.cpp b/tdepacman/keys.cpp index 4ce727a..04e3e23 100644 --- a/tdepacman/keys.cpp +++ b/tdepacman/keys.cpp @@ -84,7 +84,7 @@ PKeys::PKeys( TQWidget *parent, const char *name) setCaption(i18n("Change Direction Keys")); setFixedSize(380, 260); - lab = 0; + lab = nullptr; init(); } @@ -93,13 +93,13 @@ void PKeys::keyPressEvent( TQKeyEvent *e ) uint kCode = e->key() & ~(SHIFT | CTRL | ALT); TQString string = TDEAccel::keyToString(kCode); - if (lab != 0) { + if (lab != nullptr) { if ( string.isNull() ) lab->setText(i18n("Undefined key")); else lab->setText(string); } - else if ( lab == 0 && e->key() == Key_Escape) + else if ( lab == nullptr && e->key() == Key_Escape) reject(); } @@ -125,7 +125,7 @@ void PKeys::butRight() void PKeys::getKey(int i) { - if ( lab != 0) + if ( lab != nullptr) focusOut(lab); focusIn(labels[i]); @@ -148,10 +148,10 @@ void PKeys::focusIn(TQLabel *l) void PKeys::defaults() { - if ( lab != 0) + if ( lab != nullptr) focusOut(lab); - lab = 0; + lab = nullptr; labels[0]->setText("Up"); labels[1]->setText("Down"); diff --git a/tdepacman/keys.h b/tdepacman/keys.h index 33b6f2d..37fbe2c 100644 --- a/tdepacman/keys.h +++ b/tdepacman/keys.h @@ -16,7 +16,7 @@ class PKeys : public TQDialog { TQ_OBJECT public: - PKeys( TQWidget *parent=0, const char *name=0 ); + PKeys( TQWidget *parent=nullptr, const char *name=nullptr ); private slots: void butRight(); diff --git a/tdepacman/main.cpp b/tdepacman/main.cpp index fdd7555..94374f7 100644 --- a/tdepacman/main.cpp +++ b/tdepacman/main.cpp @@ -33,7 +33,7 @@ static const char *description = static TDECmdLineOptions options[] = { - { 0, 0, 0 } + { nullptr, nullptr, nullptr } // INSERT YOUR COMMANDLINE OPTIONS HERE }; @@ -42,8 +42,8 @@ int main(int argc, char *argv[]) TDEAboutData aboutData( "tdepacman", I18N_NOOP("TDEpacman"), VERSION, description, TDEAboutData::License_GPL, - "(c) 1998-2003, Jörg Thönnissen", 0, 0, "joe@dsite.de"); - aboutData.addAuthor("Jörg Thönnissen",0, "joe@dsite.de"); + "(c) 1998-2003, Jörg Thönnissen", nullptr, nullptr, "joe@dsite.de"); + aboutData.addAuthor("Jörg Thönnissen",nullptr, "joe@dsite.de"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. diff --git a/tdepacman/painter.cpp b/tdepacman/painter.cpp index 09e6e6e..71ae11c 100644 --- a/tdepacman/painter.cpp +++ b/tdepacman/painter.cpp @@ -71,7 +71,7 @@ TQPtrList *Painter::loadPixmap(TQWidget *parent, TQString pixmapName, msg.replace(TQRegExp("@PIXMAPNAME@"), pixmapName); // TQMessageBox::critical(parent, i18n("Initialization Error"), msg); printf("%s\n", msg.local8Bit().data()); - return 0; + return nullptr; } int height = PIXMAP.height(); diff --git a/tdepacman/painter.h b/tdepacman/painter.h index 775a788..771e45c 100644 --- a/tdepacman/painter.h +++ b/tdepacman/painter.h @@ -24,10 +24,10 @@ enum DrawWidget { Widget, RoomPix, BackPix }; class Painter { public: - Painter (Board *, TQWidget *parent=0, int scheme=-1, int mode=-1,Bitfont *font=0); + Painter (Board *, TQWidget *parent=nullptr, int scheme=-1, int mode=-1,Bitfont *font=nullptr); TQPixmap levelPix() { return roomPix; } - void setScheme(int scheme=-1, int mode=-1, Bitfont *font=0); + void setScheme(int scheme=-1, int mode=-1, Bitfont *font=nullptr); void setLevel(int level=0); TQRect rect(int pos, PixMap pix, uint i = 0); @@ -107,10 +107,10 @@ private: TQString lastMonsterScorePixmapName; TQPtrList *loadPixmap(TQWidget *parent, TQString pixmapName, - TQPtrList *pixmaps=0); - TQPtrList *textPixmap(TQStrList &, TQPtrList *pixmaps=0, + TQPtrList *pixmaps=nullptr); + TQPtrList *textPixmap(TQStrList &, TQPtrList *pixmaps=nullptr, TQColor fg = BLACK, TQColor bg = TQColor()); - TQPtrList *textPixmap(TQString str, TQPtrList *pixmaps=0, + TQPtrList *textPixmap(TQString str, TQPtrList *pixmaps=nullptr, TQColor fg = BLACK, TQColor bg = TQColor()); TQPoint point(int pos); diff --git a/tdepacman/referee.cpp b/tdepacman/referee.cpp index 94d6865..0e04e97 100644 --- a/tdepacman/referee.cpp +++ b/tdepacman/referee.cpp @@ -88,7 +88,7 @@ void Referee::paintEvent( TQPaintEvent *e) rect.intersects(pix->rect(board->position(fruithome), i18n("GAME OVER")))) pix->draw(board->position(fruithome), Widget, i18n("GAME OVER"), RED); - for (Energizer *e = energizers->first(); e != 0; e = energizers->next()) { + for (Energizer *e = energizers->first(); e != nullptr; e = energizers->next()) { if (e && e->state() == on && rect.intersects(pix->rect(e->position(), EnergizerPix)) && !(e->position() == pacman->position() && gameState.testBit(Scoring))) { @@ -108,7 +108,7 @@ void Referee::paintEvent( TQPaintEvent *e) pix->draw(fruit->position(), Widget, FruitPix, fruit->pix()); } - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m && m->state() == harmless && rect.intersects(pix->rect(m->position(), MonsterPix)) && !(m->position() == pacman->position() && gameState.testBit(Scoring))) { @@ -122,7 +122,7 @@ void Referee::paintEvent( TQPaintEvent *e) rect.intersects(pix->rect(pacman->position(), PacmanPix)) && pacman->pix() != -1) pix->draw(pacman->position(), Widget, PacmanPix, pacman->pix()); - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m && m->state() != harmless && rect.intersects(pix->rect(m->position(), MonsterPix)) && !(m->position() == pacman->position() && gameState.testBit(Scoring))) { @@ -209,7 +209,7 @@ void Referee::timerEvent( TQTimerEvent *e ) int pos = pacman->position(); if (moved && board->isMonster(pos) && !gameState.testBit(Dying)) { - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m && m->position() == pos) { if (m->state() == harmless && !gameState.testBit(Dying)) { m->setREM(remTicks[level]); @@ -241,7 +241,7 @@ void Referee::timerEvent( TQTimerEvent *e ) board->reset(pos, energizer); score(energizerScore); monstersEaten = 0; - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m && m->state() != rem) { m->setHarmless(harmlessTicks[level], harmlessDurTicks[level], harmlessWarnTicks[level]); @@ -285,7 +285,7 @@ void Referee::timerEvent( TQTimerEvent *e ) int lastBodyPix; int lastEyesPix; - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m) { lastRect = pix->rect(m->position(), MonsterPix); lastBodyPix = m->body(); @@ -685,11 +685,11 @@ void Referee::setScheme(int Scheme, int Mode, Bitfont *font) pacman->setMaxPixmaps(pix->maxPixmaps(PacmanPix)); fruit->setMaxPixmaps(pix->maxPixmaps(FruitPix)); - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m) m->setMaxPixmaps(pix->maxPixmaps(MonsterPix), pix->maxPixmaps(EyesPix)); - for (Energizer *e = energizers->first(); e != 0; e = energizers->next()) + for (Energizer *e = energizers->first(); e != nullptr; e = energizers->next()) if (e) e->setMaxPixmaps(pix->maxPixmaps(EnergizerPix)); @@ -772,7 +772,7 @@ void Referee::eaten() if (--timerCount > 0) TQTimer::singleShot( monsterScoreDurMS, this, TQ_SLOT(eaten())); else { - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m && m->direction() == X && !gameState.testBit(Introducing)) m->setDirection(N); if (monstersEaten != 4 || !gameState.testBit(Introducing)) @@ -933,7 +933,7 @@ void Referee::introPlay() id = 0; else if (board->isMonster(37*BoardWidth-6)) - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m && m->position() == 37*BoardWidth-6) { id = m->id(); id++; @@ -941,7 +941,7 @@ void Referee::introPlay() } if (id >= 0 && id <= 4) - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m && m->id() == id && m->position() == OUT) { m->setPosition(37*BoardWidth-1); m->setDirection(W); @@ -1209,7 +1209,7 @@ void Referee::killed() gameState.setBit(Dying); pacman->setDirection(X, true); - for (Monster *m = monsters->first(); m != 0; m = monsters->next()) + for (Monster *m = monsters->first(); m != nullptr; m = monsters->next()) if (m) m->setDirection(X); TQTimer::singleShot(dyingPreAnimationMS, this, TQ_SLOT(killed())); diff --git a/tdepacman/referee.h b/tdepacman/referee.h index fbb6287..aea9633 100644 --- a/tdepacman/referee.h +++ b/tdepacman/referee.h @@ -29,13 +29,13 @@ class Referee : public TQWidget { TQ_OBJECT public: - Referee (TQWidget *parent=0, const char *name=0, int scheme=-1, int mode=-1, Bitfont *font=0); + Referee (TQWidget *parent=nullptr, const char *name=nullptr, int scheme=-1, int mode=-1, Bitfont *font=nullptr); void setSkill(int); void setRoom(int); public slots: - void setScheme(int scheme, int mode, Bitfont *font=0); + void setScheme(int scheme, int mode, Bitfont *font=nullptr); void levelUp(); void levelUpPlay(); diff --git a/tdepacman/score.cpp b/tdepacman/score.cpp index e6a8895..8eb0ca3 100644 --- a/tdepacman/score.cpp +++ b/tdepacman/score.cpp @@ -464,7 +464,7 @@ void Score::read() void Score::write() { if (!highscoreFile.exists() && highscoreFile.name() == systemHighscoreFileInfo.filePath()) - KMessageBox::information(0, + KMessageBox::information(nullptr, i18n("You're going to create the highscore-file\n" "'%1'\n" "for your maschine, that should be used systemwide.\n" @@ -477,7 +477,7 @@ void Score::write() ).arg(systemHighscoreFileInfo.filePath())); if (highscoreFile.name() == privateHighscoreFileInfo.filePath()) - KMessageBox::information(0, + KMessageBox::information(nullptr, i18n("You're using a private highscore-file, that's mostly because of\n" "missing write-access to the systemwide file\n" "'%1' .\n" diff --git a/tdepacman/score.h b/tdepacman/score.h index 8fc5ed5..3fe3fcd 100644 --- a/tdepacman/score.h +++ b/tdepacman/score.h @@ -26,11 +26,11 @@ class Score : public TQWidget { TQ_OBJECT public: - Score (TQWidget *parent=0, const char *name=0, int scheme=-1, int mode=-1, Bitfont *font=0); + Score (TQWidget *parent=nullptr, const char *name=nullptr, int scheme=-1, int mode=-1, Bitfont *font=nullptr); ~Score(); public slots: - void setScheme(int scheme, int mode, Bitfont *font=0); + void setScheme(int scheme, int mode, Bitfont *font=nullptr); void set(int score); void set(int score, int player); diff --git a/tdepacman/status.cpp b/tdepacman/status.cpp index 19e8cd3..b72652a 100644 --- a/tdepacman/status.cpp +++ b/tdepacman/status.cpp @@ -43,7 +43,7 @@ TQPtrList *Status::loadPixmap(TQWidget *parent, TQString pixmapName, "or is of an unknown format."); msg.replace(TQRegExp("@PIXMAPNAME@"), pixmapName); TQMessageBox::information(parent, i18n("Initialization Error"), msg); - return 0; + return nullptr; } int height = PIXMAP.height(); diff --git a/tdepacman/status.h b/tdepacman/status.h index 09a7cc1..2203245 100644 --- a/tdepacman/status.h +++ b/tdepacman/status.h @@ -20,7 +20,7 @@ class Status : public TQWidget { TQ_OBJECT public: - Status(TQWidget *parent=0, const char *name=0, int scheme=-1, int mode=-1); + Status(TQWidget *parent=nullptr, const char *name=nullptr, int scheme=-1, int mode=-1); ~Status() {}; public slots: @@ -59,7 +59,7 @@ private: TQString lastLevelPixmapName; TQPtrList *loadPixmap(TQWidget *parent, TQString pixmapName, - TQPtrList *pixmaps=0); + TQPtrList *pixmaps=nullptr); TQPtrList *lifesPix; TQPtrList *levelPix; diff --git a/tdepacman/tdepacman.cpp b/tdepacman/tdepacman.cpp index 1af12ac..88bd20a 100644 --- a/tdepacman/tdepacman.cpp +++ b/tdepacman/tdepacman.cpp @@ -32,7 +32,7 @@ #define ID_STATUS_MSG 1 -TDEpacmanApp::TDEpacmanApp(TQWidget *, const char *name) : TDEMainWindow(0, name) +TDEpacmanApp::TDEpacmanApp(TQWidget *, const char *name) : TDEMainWindow(nullptr, name) { config=tdeApp->config(); diff --git a/tdepacman/tdepacman.h b/tdepacman/tdepacman.h index 8438277..6b025e4 100644 --- a/tdepacman/tdepacman.h +++ b/tdepacman/tdepacman.h @@ -58,7 +58,7 @@ class TDEpacmanApp : public TDEMainWindow public: /** constructor of TDEpacmanApp, calls all init functions to create the application. */ - TDEpacmanApp(TQWidget *parent = 0, const char *name = 0); + TDEpacmanApp(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~TDEpacmanApp(); protected: diff --git a/tdepacman/tdepacmanview.cpp b/tdepacman/tdepacmanview.cpp index 0f09f93..f6ffa20 100644 --- a/tdepacman/tdepacmanview.cpp +++ b/tdepacman/tdepacmanview.cpp @@ -110,7 +110,7 @@ void TDEpacmanView::confScheme() if (lastFontName != fontName) { - if (bitfont != 0) + if (bitfont != nullptr) delete bitfont; bitfont = new Bitfont(fontName, bitfontFirstChar, bitfontLastChar); diff --git a/tdepacman/tdepacmanview.h b/tdepacman/tdepacmanview.h index 3b3930b..215cc06 100644 --- a/tdepacman/tdepacmanview.h +++ b/tdepacman/tdepacmanview.h @@ -40,7 +40,7 @@ class TDEpacmanView : public TQWidget TQ_OBJECT public: /** Constructor for the main view */ - TDEpacmanView ( TQWidget *parent = 0, const char *name = 0); + TDEpacmanView ( TQWidget *parent = nullptr, const char *name = nullptr); /** Destructor for the main view */ virtual ~TDEpacmanView(); -- cgit v1.2.3