From 51cbc8705e27096dd92d545f6315091876d722c4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:31:47 -0600 Subject: [PATCH] Rename additional global TQt functions --- kbounce/game.cpp | 2 +- kmines/solver/testRate.cpp | 2 +- kmines/solver/testSolve.cpp | 2 +- kreversi/highscores.cpp | 2 +- ksirtet/ksirtet/check_score.cpp | 2 +- ksmiletris/gamewidget.cpp | 6 +++--- ksnake/board.cpp | 6 +++--- libksirtet/lib/internal.cpp | 6 +++--- lskat/lskat/KRSocket.cpp | 4 ++-- lskat/lskat/main.cpp | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kbounce/game.cpp b/kbounce/game.cpp index a223fea8..7b655905 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -424,7 +424,7 @@ JezzGame::~JezzGame() void JezzGame::display( const TQString &text, int size ) { - qDebug("This function \"display\" shouldn't be called!!!"); + tqDebug("This function \"display\" shouldn't be called!!!"); if ( !text.isEmpty() ) { //kdDebug(12008) << "text = " << text << endl; diff --git a/kmines/solver/testRate.cpp b/kmines/solver/testRate.cpp index 7fa9e90f..e7a4c8c1 100644 --- a/kmines/solver/testRate.cpp +++ b/kmines/solver/testRate.cpp @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { if ( argc!=4 ) - qFatal("Arguments: width height nbMines"); + tqFatal("Arguments: width height nbMines"); long seed = time(0); cout << "seed = " << seed << endl; diff --git a/kmines/solver/testSolve.cpp b/kmines/solver/testSolve.cpp index 61b7e570..27bb59c1 100644 --- a/kmines/solver/testSolve.cpp +++ b/kmines/solver/testSolve.cpp @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { if ( argc!=4 ) - qFatal("Arguments: width height nbMines"); + tqFatal("Arguments: width height nbMines"); long seed = time(0); cout << "seed = " << seed << endl; diff --git a/kreversi/highscores.cpp b/kreversi/highscores.cpp index 2c089975..fae86a40 100644 --- a/kreversi/highscores.cpp +++ b/kreversi/highscores.cpp @@ -70,7 +70,7 @@ void ExtManager::convertLegacy(uint gameType) // Since there is no information about the skill level // in the legacy highscore list, consider they are // for beginner skill ... - qDebug("convert legacy %i", gameType); + tqDebug("convert legacy %i", gameType); if ( gameType!=0 ) return; diff --git a/ksirtet/ksirtet/check_score.cpp b/ksirtet/ksirtet/check_score.cpp index e748c286..e81008b9 100644 --- a/ksirtet/ksirtet/check_score.cpp +++ b/ksirtet/ksirtet/check_score.cpp @@ -15,7 +15,7 @@ int main(int argc, char **argv) TQString s = args->arg(0); bool ok; uint nb = s.toUInt(&ok); - if ( !ok ) qFatal("The argument is not an unsigned integer."); + if ( !ok ) tqFatal("The argument is not an unsigned integer."); cout << "--------------" << endl; diff --git a/ksmiletris/gamewidget.cpp b/ksmiletris/gamewidget.cpp index b0cc3316..13583f15 100644 --- a/ksmiletris/gamewidget.cpp +++ b/ksmiletris/gamewidget.cpp @@ -159,16 +159,16 @@ void GameWidget::loadSprites() void GameWidget::loadSprite(Sprite spr, const TQString & path) { if (!sprites[spr].load(locate("appdata", TQString("data/") + path))) - qFatal("Cannot open data files.\nHave you correctly installed KSmiletris?"); + tqFatal("Cannot open data files.\nHave you correctly installed KSmiletris?"); } void GameWidget::loadMaskedSprite(Sprite spr, const TQString & path1, const TQString & path2) { TQBitmap bmp; if (!sprites[spr].load(locate("appdata", TQString("data/") + path1))) - qFatal("Cannot open data files.\nHave you correctly installed KSmiletris?"); + tqFatal("Cannot open data files.\nHave you correctly installed KSmiletris?"); if (!bmp.load(locate("appdata", TQString("data/") + path2))) - qFatal("Cannot open data files.\nHave you correctly installed KSmiletris?"); + tqFatal("Cannot open data files.\nHave you correctly installed KSmiletris?"); sprites[spr].setMask(bmp); } diff --git a/ksnake/board.cpp b/ksnake/board.cpp index 0959dee1..a55834ad 100644 --- a/ksnake/board.cpp +++ b/ksnake/board.cpp @@ -63,7 +63,7 @@ void Pos::addBTree(Pos *np) { else if(np->index() > index()) p = &right; else { - qFatal("Repeated nodes on btree should never happens"); + tqFatal("Repeated nodes on btree should never happens"); } if(! *p) { @@ -113,7 +113,7 @@ void Pos::addList(Pos *np) { return; } } - qFatal("Shouldn't reach this point"); + tqFatal("Shouldn't reach this point"); } Board::Board(int s) @@ -250,7 +250,7 @@ int Board::getNextCloseTo(int s, int d, bool diag, int lastIndex) return(nextSq); } } - qFatal("Never here"); + tqFatal("Never here"); } // Make possible moves. diff --git a/libksirtet/lib/internal.cpp b/libksirtet/lib/internal.cpp index 1622a2fa..25a19bd9 100644 --- a/libksirtet/lib/internal.cpp +++ b/libksirtet/lib/internal.cpp @@ -15,7 +15,7 @@ //----------------------------------------------------------------------------- void Local::dataError(uint i) { - qWarning("MP : Invalid data from board #%i", i); + tqWarning("MP : Invalid data from board #%i", i); } void Local::readData(bool inverse) @@ -56,7 +56,7 @@ Server::Server(uint _interval) void Server::congestion() { - qWarning("MP : congestion occurred !!"); + tqWarning("MP : congestion occurred !!"); } void Server::serverTimeout() @@ -274,5 +274,5 @@ void Client::notifier(int) break; default: DATA_ERROR(0); } - if ( !s.atEnd() ) qWarning("CLIENT : remaining data"); + if ( !s.atEnd() ) tqWarning("CLIENT : remaining data"); } diff --git a/lskat/lskat/KRSocket.cpp b/lskat/lskat/KRSocket.cpp index 91c5e42e..0950385a 100644 --- a/lskat/lskat/KRSocket.cpp +++ b/lskat/lskat/KRSocket.cpp @@ -109,7 +109,7 @@ KRServerSocket::KRServerSocket( const char *_path, int optname, int value, int l if ( !init ( _path,optname,value,level ) ) { - qFatal("Error constructing PF_UNIX domain server socket\n"); + tqFatal("Error constructing PF_UNIX domain server socket\n"); return; } @@ -124,7 +124,7 @@ KRServerSocket::KRServerSocket( const char *_path ) : if ( !init ( _path ) ) { - qFatal("Error constructing PF_UNIX domain server socket\n"); + tqFatal("Error constructing PF_UNIX domain server socket\n"); return; } diff --git a/lskat/lskat/main.cpp b/lskat/lskat/main.cpp index fa3a777f..f753fffd 100644 --- a/lskat/lskat/main.cpp +++ b/lskat/lskat/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { TQString s = args->getOption("debug"); global_debug = s.toInt(); - qDebug("Debug level set to %d\n", global_debug); + tqDebug("Debug level set to %d\n", global_debug); } args->clear();