From a19492b5502371785de5749c2b12bbdbd012fc7a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:37:27 -0600 Subject: Remove additional unneeded tq method conversions --- knights/challenge_graph.cpp | 2 +- knights/challenge_graph_view.cpp | 4 ++-- knights/console.cpp | 4 ++-- knights/dlg_challenge.cpp | 8 ++++---- knights/io_internet.cpp | 16 ++++++++-------- knights/knights.cpp | 12 ++++++------ knights/knights.h | 2 +- knights/knightstextview.cpp | 2 +- knights/list_pgn.cpp | 4 ++-- knights/pgn.cpp | 22 +++++++++++----------- knights/proto_uci.cpp | 20 ++++++++++---------- knights/proto_xboard.cpp | 36 ++++++++++++++++++------------------ knights/setpageengines.cpp | 6 +++--- knights/splash.cpp | 2 +- knights/tab_seeklist.cpp | 2 +- knights/tabbox.cpp | 2 +- knights/tabmanager.cpp | 2 +- knights/wiz_setup.cpp | 2 +- 18 files changed, 74 insertions(+), 74 deletions(-) diff --git a/knights/challenge_graph.cpp b/knights/challenge_graph.cpp index 634f99d..b248c40 100644 --- a/knights/challenge_graph.cpp +++ b/knights/challenge_graph.cpp @@ -339,7 +339,7 @@ void Challenge_Graph::menuFunct( int funct ) emit sendCMD( Command( 0, CMD_Player_Finger, selectedPlayerName ) ); break; case MENU_TELL: - emit sendCMD( Command( 0, CMD_Set_Input, TQString( "tell %1 " ).tqarg( selectedPlayerName ) ) ); + emit sendCMD( Command( 0, CMD_Set_Input, TQString( "tell %1 " ).arg( selectedPlayerName ) ) ); break; case MENU_NOTIFY: emit sendCMD( Command( 0, CMD_Add_Friend, selectedPlayerName ) ); diff --git a/knights/challenge_graph_view.cpp b/knights/challenge_graph_view.cpp index d6fa862..6c59b08 100644 --- a/knights/challenge_graph_view.cpp +++ b/knights/challenge_graph_view.cpp @@ -103,8 +103,8 @@ void Challenge_Graph_View::contentsMouseMoveEvent(TQMouseEvent* e) Challenge_Game *g = cr->getGame(); match = i18n( " Name: %1 Rating: %2 Match Type: %3 %4 Base Time: %5 Increment: %6" ) - .tqarg( g->_player ).tqarg( g->rating() ).tqarg( g->_match_type ).tqarg( g->_is_rated ) - .tqarg( g->clock() ).tqarg( g->increment() ); + .arg( g->_player ).arg( g->rating() ).arg( g->_match_type ).arg( g->_is_rated ) + .arg( g->clock() ).arg( g->increment() ); break; } statusbar->setText( match ); diff --git a/knights/console.cpp b/knights/console.cpp index 6b36fa5..326acc6 100644 --- a/knights/console.cpp +++ b/knights/console.cpp @@ -171,7 +171,7 @@ void Console::historyForward( void ) /////////////////////////////////////// void Console::replyPrivate( void ) { - myLineEdit->setText( TQString( "tell %1 " ).tqarg( lastPrivateSource ) ); + myLineEdit->setText( TQString( "tell %1 " ).arg( lastPrivateSource ) ); if( !myLineEdit->hasFocus() ) getFocus(); } @@ -182,7 +182,7 @@ void Console::replyPrivate( void ) /////////////////////////////////////// void Console::replyChannel( void ) { - myLineEdit->setText( TQString( "tell %1 " ).tqarg( lastChannelSource ) ); + myLineEdit->setText( TQString( "tell %1 " ).arg( lastChannelSource ) ); if( !myLineEdit->hasFocus() ) getFocus(); } diff --git a/knights/dlg_challenge.cpp b/knights/dlg_challenge.cpp index 104f574..2df0b43 100644 --- a/knights/dlg_challenge.cpp +++ b/knights/dlg_challenge.cpp @@ -107,7 +107,7 @@ void dlg_challenge::setValues( const TQString &string, const TQString &local ) localRating = list[3]; } LABEL_Headline->setText( i18n("%1 %2 vs. %3 %4\nin a %5 match.") - .tqarg(local).tqarg(localRating).tqarg(otherPlayer).tqarg(otherRating).tqarg(list[5]) ); + .arg(local).arg(localRating).arg(otherPlayer).arg(otherRating).arg(list[5]) ); if( list[4].lower() == "rated" ) { COMBO_Rated->setCurrentItem(1); @@ -137,14 +137,14 @@ void dlg_challenge::setValues( const TQString &string, const TQString &local ) TQString dlg_challenge::values( void ) { TQString match; - match = TQString("match %1").tqarg(otherPlayer); + match = TQString("match %1").arg(otherPlayer); if( COMBO_Rated->currentItem() == 0 ) match += " unrated"; else match += " rated"; - match += TQString(" %1 %1").tqarg(BOX_WhiteBase->value()).tqarg(BOX_WhiteInc->value()); + match += TQString(" %1 %1").arg(BOX_WhiteBase->value()).arg(BOX_WhiteInc->value()); if( BUTTON_TimeOdds->isChecked() ) - match += TQString(" %1 %1").tqarg(BOX_BlackBase->value()).tqarg(BOX_BlackInc->value()); + match += TQString(" %1 %1").arg(BOX_BlackBase->value()).arg(BOX_BlackInc->value()); return match; } diff --git a/knights/io_internet.cpp b/knights/io_internet.cpp index d1191f2..984876d 100644 --- a/knights/io_internet.cpp +++ b/knights/io_internet.cpp @@ -223,7 +223,7 @@ void io_internet::connectToServer() */ consoleTab = new Console( 0, myServer->Name, myResource ); myTabList[consoleTab] = consoleTab; - myResource->tabManager->addTab( myTabList[consoleTab], i18n( "%1 Console" ).tqarg( myServer->Name ) ); + myResource->tabManager->addTab( myTabList[consoleTab], i18n( "%1 Console" ).arg( myServer->Name ) ); connect( myTabList[consoleTab], TQT_SIGNAL( sendCMD( const Command& ) ), this, TQT_SLOT( recvCMD( const Command& ) ) ); connect( this, TQT_SIGNAL( sendCMD( const Command& ) ), myTabList[consoleTab], TQT_SLOT( recvCMD( const Command& ) ) ); @@ -996,13 +996,13 @@ void io_internet::updateSoughtList(TQString soughtLine) void io_internet::sendUserSettings() { send("set style 12"); - send(TQString("set interface Knights %1").tqarg(_VERSION_)); - send(TQString("set private %1").tqarg(myResource->OPTION_Private)); - send(TQString("set kibitz %1").tqarg(myResource->OPTION_Kibitz)); - send(TQString("set tell %1").tqarg(myResource->OPTION_Tell)); - send(TQString("set shout %1").tqarg(myResource->OPTION_Shout)); - send(TQString("set seek %1").tqarg(myResource->OPTION_Seek)); - send(TQString("set tolerance %1").tqarg(myResource->OPTION_Profanity)); + send(TQString("set interface Knights %1").arg(_VERSION_)); + send(TQString("set private %1").arg(myResource->OPTION_Private)); + send(TQString("set kibitz %1").arg(myResource->OPTION_Kibitz)); + send(TQString("set tell %1").arg(myResource->OPTION_Tell)); + send(TQString("set shout %1").arg(myResource->OPTION_Shout)); + send(TQString("set seek %1").arg(myResource->OPTION_Seek)); + send(TQString("set tolerance %1").arg(myResource->OPTION_Profanity)); } /////////////////////////////////////// diff --git a/knights/knights.cpp b/knights/knights.cpp index 3271773..a82895a 100644 --- a/knights/knights.cpp +++ b/knights/knights.cpp @@ -561,29 +561,29 @@ void Knights::setStatusBar( const int &ID, const TQString &MSG ) case BOOK_ERROR_1: Message->setText( i18n( "Error with white engine" ) ); KMessageBox::sorry( this, - i18n("You selected %1 to play white,\nbut it can only be used as a book engine.\nPlease select another engine to play white.").tqarg( MSG ), + i18n("You selected %1 to play white,\nbut it can only be used as a book engine.\nPlease select another engine to play white.").arg( MSG ), i18n("White Engine Problem") ); break; case BOOK_ERROR_2: Message->setText( i18n( "Error with white book engine" ) ); KMessageBox::sorry( this, - i18n("You selected %1 to play white's book,\nbut it can only be used as a regular engine.\nPlease select another engine to play white's book.").tqarg( MSG ), + i18n("You selected %1 to play white's book,\nbut it can only be used as a regular engine.\nPlease select another engine to play white's book.").arg( MSG ), i18n("White Book Engine Problem") ); break; case BOOK_ERROR_3: Message->setText( i18n( "Error with black engine" ) ); KMessageBox::sorry( this, - i18n("You selected %1 to play black,\nbut it can only be used as a book engine.\nPlease select another engine to play black.").tqarg( MSG ), + i18n("You selected %1 to play black,\nbut it can only be used as a book engine.\nPlease select another engine to play black.").arg( MSG ), i18n("Black Engine Problem") ); break; case BOOK_ERROR_4: Message->setText( i18n( "Error with black book engine" ) ); KMessageBox::sorry( this, - i18n("You selected %1 to play black's book,\nbut it can only be used as a regular engine.\nPlease select another engine to play black's book.").tqarg( MSG ), + i18n("You selected %1 to play black's book,\nbut it can only be used as a regular engine.\nPlease select another engine to play black's book.").arg( MSG ), i18n("Black Book Engine Problem") ); break; case ENGINE_DIED_ERROR: - Message->setText( i18n( "The computer opponent assigned to play %1 has crashed" ).tqarg( MSG ) ); + Message->setText( i18n( "The computer opponent assigned to play %1 has crashed" ).arg( MSG ) ); break; case LOAD_ERROR: Message->setText( i18n( "There was an error while loading the file" ) ); @@ -1017,7 +1017,7 @@ void Knights::installThemes( void ) if( installError ) { KMessageBox::sorry( this, - i18n("The theme could not be installed:\n%1").tqarg( allerror ), + i18n("The theme could not be installed:\n%1").arg( allerror ), i18n("Can not install theme") ); } return; diff --git a/knights/knights.h b/knights/knights.h index a9f3341..12a3cb7 100644 --- a/knights/knights.h +++ b/knights/knights.h @@ -72,7 +72,7 @@ class Knights : public KMainWindow public slots: void KillAll( void ); void menuClose( void ); - /** Yeah, they're sloppy, but I need my own tqgeometry managment routines + /** Yeah, they're sloppy, but I need my own geometry managment routines because I don't like the "default" look my statusbar was getting ( double-height ). Plus, I want the console to appear only when needed. */ void resizeMainFrame( void ); diff --git a/knights/knightstextview.cpp b/knights/knightstextview.cpp index bbde9f5..c6b9669 100644 --- a/knights/knightstextview.cpp +++ b/knights/knightstextview.cpp @@ -215,7 +215,7 @@ void KnightsTextView::print( void ) /* Print the Page Number */ paint.setFont( myResource->FONT_Standard ); paint.setPen( myResource->COLOR_Black ); - TQString pageCount = i18n( "Page %1 of %2" ).tqarg( currentPage ).tqarg( totalPages ); + TQString pageCount = i18n( "Page %1 of %2" ).arg( currentPage ).arg( totalPages ); paint.drawText( view.width() - paint.fontMetrics().width( pageCount ), view.bottom() + paint.fontMetrics().ascent() + 5, pageCount ); if( view.top() >= simpText.height() ) diff --git a/knights/list_pgn.cpp b/knights/list_pgn.cpp index fd304ca..4534089 100644 --- a/knights/list_pgn.cpp +++ b/knights/list_pgn.cpp @@ -80,7 +80,7 @@ void list_pgn::setURL( TQString URL ) if( tmpPGN.open( URL ) == FALSE ) { - status->message( i18n( "Can not open %1" ).tqarg( URL ) ); + status->message( i18n( "Can not open %1" ).arg( URL ) ); return; } listView->hide(); @@ -140,6 +140,6 @@ void list_pgn::timerEvent( TQTimerEvent* ) tmpPGN.TAG_Site, tmpPGN.TAG_Date, TQString::number(tmpPGN.File_Position) ); - status->message( i18n( TQString( "%1 matches found." ).tqarg( listView->childCount() ) ) ); + status->message( i18n( TQString( "%1 matches found." ).arg( listView->childCount() ) ) ); } } diff --git a/knights/pgn.cpp b/knights/pgn.cpp index cd95e91..c2a827a 100644 --- a/knights/pgn.cpp +++ b/knights/pgn.cpp @@ -134,11 +134,11 @@ TQStringList* pgn::notation( const int format ) Line = ( tmp + 2 ) >> 1; if( ( tmp % 2 ) == 0 ) { - notation = TQString( "%1. %2" ).tqarg( Line ).tqarg( (*IT).SAN ); + notation = TQString( "%1. %2" ).arg( Line ).arg( (*IT).SAN ); } else { - notation = TQString( "%1... %2" ).tqarg( Line ).tqarg( (*IT).SAN ); + notation = TQString( "%1... %2" ).arg( Line ).arg( (*IT).SAN ); } list->append( notation ); tmp++; @@ -152,13 +152,13 @@ TQStringList* pgn::notation( const int format ) Line = ( tmp + 2 ) >> 1; if( ( tmp % 2 ) == 0 ) { - notation = TQString( "%1. %2" ).tqarg( Line ).tqarg( (*IT).SAN ); + notation = TQString( "%1. %2" ).arg( Line ).arg( (*IT).SAN ); } else { if( showLineNumber ) { - notation = TQString( "%1... %2" ).tqarg( Line ).tqarg( (*IT).SAN ); + notation = TQString( "%1... %2" ).arg( Line ).arg( (*IT).SAN ); } else { @@ -169,20 +169,20 @@ TQStringList* pgn::notation( const int format ) /* Insert NAGs */ if( (*IT).NAG != 0 ) { - notation += TQString( " $%1" ).tqarg( TQString::number( (*IT).NAG ) ); + notation += TQString( " $%1" ).arg( TQString::number( (*IT).NAG ) ); } /* Insert RAVs */ annon = RAV.find( tmp ); if( annon != NULL ) { - notation += TQString( " (%1)" ).tqarg( annon->text ); + notation += TQString( " (%1)" ).arg( annon->text ); showLineNumber = true; } /* Insert Annotations */ annon = annotations.find( tmp ); if( annon != NULL ) { - notation += TQString( " {%1}" ).tqarg( annon->text ); + notation += TQString( " {%1}" ).arg( annon->text ); showLineNumber = true; } list->append( notation ); @@ -204,7 +204,7 @@ TQString pgn::caption( void ) { TQString caption; - caption = i18n( "%1 vs. %2").tqarg( TAG_White ).tqarg( TAG_Black ); + caption = i18n( "%1 vs. %2").arg( TAG_White ).arg( TAG_Black ); return caption; } /////////////////////////////////////// @@ -289,7 +289,7 @@ void pgn::init( void ) /* Build Date */ qdt = TQDateTime::currentDateTime(); - TAG_Date = TQString("%1.%2.%3").tqarg(qdt.date().year(),4).tqarg(qdt.date().month(),2).tqarg(qdt.date().day(),2); + TAG_Date = TQString("%1.%2.%3").arg(qdt.date().year(),4).arg(qdt.date().month(),2).arg(qdt.date().day(),2); TAG_Date = TAG_Date.replace( TQRegExp("\\s"), TQString("0") ); TAG_Time = qdt.time().toString(); @@ -387,7 +387,7 @@ bool pgn::load( const int pos ) /* Allocate the Tab_PGNView */ pgnView = new tab_pgnView( this, Resource ); connect( pgnView, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( childViewDestroyed() ) ); - Resource->tabManager->addTab( pgnView, i18n( "%1 vs. %2" ).tqarg( TAG_White ).tqarg( TAG_Black ) ); + Resource->tabManager->addTab( pgnView, i18n( "%1 vs. %2" ).arg( TAG_White ).arg( TAG_Black ) ); pgnView->init(); File.at( File_Position ); currentLine = ""; @@ -950,7 +950,7 @@ void pgn::print( void ) { /* Allocate the Tab_PGNView */ pgnView = new tab_pgnView( this, Resource ); - Resource->tabManager->addTab( pgnView, i18n( "%1 vs. %2" ).tqarg( TAG_White ).tqarg( TAG_Black ) ); + Resource->tabManager->addTab( pgnView, i18n( "%1 vs. %2" ).arg( TAG_White ).arg( TAG_Black ) ); connect( pgnView, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( childViewDestroyed() ) ); pgnView->init(); } diff --git a/knights/proto_uci.cpp b/knights/proto_uci.cpp index 45b5eca..8aa39a1 100644 --- a/knights/proto_uci.cpp +++ b/knights/proto_uci.cpp @@ -76,13 +76,13 @@ void proto_uci::parse( const Command &command ) } if( FEN.isEmpty() ) { - emit output( TQString("position startpos moves %1").tqarg( cmd.getData() ) ); + emit output( TQString("position startpos moves %1").arg( cmd.getData() ) ); } else { - emit output( TQString("position fen %1 moves %2").tqarg( FEN ).tqarg( cmd.getData() ) ); + emit output( TQString("position fen %1 moves %2").arg( FEN ).arg( cmd.getData() ) ); } - emit output( TQString("go wtime %1 btime %2 depth %3").tqarg( cmd.getWhiteTime() ).tqarg( cmd.getBlackTime() ).tqarg( difficulty ) ); + emit output( TQString("go wtime %1 btime %2 depth %3").arg( cmd.getWhiteTime() ).arg( cmd.getBlackTime() ).arg( difficulty ) ); break; /* Command: Set Difficulty */ @@ -105,13 +105,13 @@ void proto_uci::parse( const Command &command ) hintMode = TRUE; if( FEN.isEmpty() ) { - emit output( TQString("position startpos moves %1").tqarg( cmd.getData() ) ); + emit output( TQString("position startpos moves %1").arg( cmd.getData() ) ); } else { - emit output( TQString("position fen %1 moves %2").tqarg( FEN ).tqarg( cmd.getData() ) ); + emit output( TQString("position fen %1 moves %2").arg( FEN ).arg( cmd.getData() ) ); } - emit output( TQString("go wtime %1 btime %2 depth %3").tqarg( cmd.getWhiteTime() ).tqarg( cmd.getBlackTime() ).tqarg( difficulty ) ); + emit output( TQString("go wtime %1 btime %2 depth %3").arg( cmd.getWhiteTime() ).arg( cmd.getBlackTime() ).arg( difficulty ) ); break; /* Command: Play White */ @@ -154,8 +154,8 @@ void proto_uci::parse( const TQString &string ) { /* The Engine Gives a Hint */ hintMode = FALSE; -// emit output( Command( myID, CMD_Hint, i18n( "%1 suggests this move:\n%2" ).tqarg( engineName ).tqarg( strList[1] ) ) ); - emit output( Command( myID, CMD_Hint, TQString( "%1 suggests this move:\n%2" ).tqarg( engineName ).tqarg( strList[1] ) ) ); +// emit output( Command( myID, CMD_Hint, i18n( "%1 suggests this move:\n%2" ).arg( engineName ).arg( strList[1] ) ) ); + emit output( Command( myID, CMD_Hint, TQString( "%1 suggests this move:\n%2" ).arg( engineName ).arg( strList[1] ) ) ); } else { @@ -197,8 +197,8 @@ void proto_uci::parse( const TQString &string ) { if( strList[1] == "error" ) { -// emit output( Command( myID, CMD_Tell_User_Error, i18n( "%1 did not pass it's copy protection check." ).tqarg( engineName ) ) ); - emit output( Command( myID, CMD_Tell_User_Error, TQString( "%1 did not pass it's copy protection check." ).tqarg( engineName ) ) ); +// emit output( Command( myID, CMD_Tell_User_Error, i18n( "%1 did not pass it's copy protection check." ).arg( engineName ) ) ); + emit output( Command( myID, CMD_Tell_User_Error, TQString( "%1 did not pass it's copy protection check." ).arg( engineName ) ) ); } } } diff --git a/knights/proto_xboard.cpp b/knights/proto_xboard.cpp index 9bdff6b..9be0fed 100644 --- a/knights/proto_xboard.cpp +++ b/knights/proto_xboard.cpp @@ -120,13 +120,13 @@ void proto_xboard::parse( const Command &command ) { if( Army == WHITE ) { - emit output( TQString( "time %1" ).tqarg( cmd.getWhiteTime() ) ); - emit output( TQString( "otim %1" ).tqarg( cmd.getBlackTime() ) ); + emit output( TQString( "time %1" ).arg( cmd.getWhiteTime() ) ); + emit output( TQString( "otim %1" ).arg( cmd.getBlackTime() ) ); } else { - emit output( TQString( "time %1" ).tqarg( cmd.getBlackTime() ) ); - emit output( TQString( "otim %1" ).tqarg( cmd.getWhiteTime() ) ); + emit output( TQString( "time %1" ).arg( cmd.getBlackTime() ) ); + emit output( TQString( "otim %1" ).arg( cmd.getWhiteTime() ) ); } } if( FEATURE_UserMove ) @@ -267,9 +267,9 @@ void proto_xboard::parse( const Command &command ) if( FEATURE_Time ) { if( Army == WHITE ) - emit output( TQString( "time %1" ).tqarg( cmd.getWhiteTime() ) ); + emit output( TQString( "time %1" ).arg( cmd.getWhiteTime() ) ); else - emit output( TQString( "time %1" ).tqarg( cmd.getBlackTime() ) ); + emit output( TQString( "time %1" ).arg( cmd.getBlackTime() ) ); } break; @@ -278,9 +278,9 @@ void proto_xboard::parse( const Command &command ) if( FEATURE_Time ) { if( Army == WHITE ) - emit output( TQString( "otim %1" ).tqarg( cmd.getBlackTime() ) ); + emit output( TQString( "otim %1" ).arg( cmd.getBlackTime() ) ); else - emit output( TQString( "otim %1" ).tqarg( cmd.getWhiteTime() ) ); + emit output( TQString( "otim %1" ).arg( cmd.getWhiteTime() ) ); } break; @@ -354,7 +354,7 @@ void proto_xboard::parse( const Command &command ) case CMD_Set_Board: if( FEATURE_SetBoard == TRUE ) { - emit output( TQString( "setboard %1" ).tqarg( cmd.getData() ) ); + emit output( TQString( "setboard %1" ).arg( cmd.getData() ) ); } else { @@ -446,7 +446,7 @@ void proto_xboard::parse( const TQString &string ) /* Hint */ if( strList[0] == "Hint:" ) { - emit output( Command( myID, CMD_Hint, i18n( "%1 suggests this move:\n%2" ).tqarg( FEATURE_MyName ).tqarg( strList[1] ) ) ); + emit output( Command( myID, CMD_Hint, i18n( "%1 suggests this move:\n%2" ).arg( FEATURE_MyName ).arg( strList[1] ) ) ); return; } @@ -468,56 +468,56 @@ void proto_xboard::parse( const TQString &string ) /* Tell User */ if( strList[0] == "telluser" ) { - emit output( Command( myID, CMD_Tell_User, i18n( "%1 tells you:\n%2" ).tqarg( FEATURE_MyName ).tqarg( strIn.right( strIn.length() - 9 ) ) ) ); + emit output( Command( myID, CMD_Tell_User, i18n( "%1 tells you:\n%2" ).arg( FEATURE_MyName ).arg( strIn.right( strIn.length() - 9 ) ) ) ); return; } /* Tell User Error */ if( strList[0] == "tellusererror" ) { - emit output( Command( myID, CMD_Tell_User_Error, i18n( "%1 tells you:\n%2" ).tqarg( FEATURE_MyName ).tqarg( strIn.right( strIn.length() - 14 ) ) ) ); + emit output( Command( myID, CMD_Tell_User_Error, i18n( "%1 tells you:\n%2" ).arg( FEATURE_MyName ).arg( strIn.right( strIn.length() - 14 ) ) ) ); return; } /* Error */ if( strList[0] == "Error" ) { - emit output( Command( myID, CMD_Tell_User_Error, i18n( "%1 tells you:\n%2" ).tqarg( FEATURE_MyName ).tqarg( strIn.right( strIn.length() ) ) ) ); + emit output( Command( myID, CMD_Tell_User_Error, i18n( "%1 tells you:\n%2" ).arg( FEATURE_MyName ).arg( strIn.right( strIn.length() ) ) ) ); return; } /* Tell Opponent */ if( strList[0] == "tellopponent" ) { - emit output( Command( myID, CMD_Tell_Opponent, TQString( "%1" ).tqarg( strIn.right( strIn.length() - 13 ) ) ) ); + emit output( Command( myID, CMD_Tell_Opponent, TQString( "%1" ).arg( strIn.right( strIn.length() - 13 ) ) ) ); return; } /* Tell Others */ if( strList[0] == "tellothers" ) { - emit output( Command( myID, CMD_Tell_Others, TQString( "%1" ).tqarg( strIn.right( strIn.length() - 11 ) ) ) ); + emit output( Command( myID, CMD_Tell_Others, TQString( "%1" ).arg( strIn.right( strIn.length() - 11 ) ) ) ); return; } /* Tell All */ if( strList[0] == "tellall" ) { - emit output( Command( myID, CMD_Tell_All, TQString( "%1" ).tqarg( strIn.right( strIn.length() - 8 ) ) ) ); + emit output( Command( myID, CMD_Tell_All, TQString( "%1" ).arg( strIn.right( strIn.length() - 8 ) ) ) ); return; } /* Tell ICS */ if( strList[0] == "tellics" ) { - emit output( Command( myID, CMD_Tell_ICS, TQString( "%1" ).tqarg( strIn.right( strIn.length() - 8 ) ) ) ); + emit output( Command( myID, CMD_Tell_ICS, TQString( "%1" ).arg( strIn.right( strIn.length() - 8 ) ) ) ); return; } /* Tell ICS No Alias */ if( strList[0] == "tellicsnoalias" ) { - emit output( Command( myID, CMD_Tell_ICS, TQString( "%1" ).tqarg( strIn.right( strIn.length() - 15 ) ) ) ); + emit output( Command( myID, CMD_Tell_ICS, TQString( "%1" ).arg( strIn.right( strIn.length() - 15 ) ) ) ); return; } diff --git a/knights/setpageengines.cpp b/knights/setpageengines.cpp index d64651c..baac2bb 100644 --- a/knights/setpageengines.cpp +++ b/knights/setpageengines.cpp @@ -143,9 +143,9 @@ void setPageEngines::BuildEngineData( void ) (void) new TQListViewItem( Engines_ListView, (*enginesIT).Name, proto, - TQString( "%1" ).tqarg( (*enginesIT).Wins ), - TQString( "%1" ).tqarg( (*enginesIT).Losses ), - TQString( "%1" ).tqarg( (*enginesIT).Draws ) ); + TQString( "%1" ).arg( (*enginesIT).Wins ), + TQString( "%1" ).arg( (*enginesIT).Losses ), + TQString( "%1" ).arg( (*enginesIT).Draws ) ); EngineList.append( (*enginesIT).Name ); } diff --git a/knights/splash.cpp b/knights/splash.cpp index 9622b7c..1156c4c 100644 --- a/knights/splash.cpp +++ b/knights/splash.cpp @@ -33,7 +33,7 @@ splash::splash() : move( ( TQApplication::desktop()->width() - Hint.width() ) / 2, ( TQApplication::desktop()->height() - Hint.height() ) / 2 ); show(); - tqrepaint( FALSE ); + repaint( FALSE ); } splash::~splash() { diff --git a/knights/tab_seeklist.cpp b/knights/tab_seeklist.cpp index a3a7330..539a124 100644 --- a/knights/tab_seeklist.cpp +++ b/knights/tab_seeklist.cpp @@ -186,7 +186,7 @@ void tab_SeekList::menuFunct( int funct ) emit sendCMD( Command( 0, CMD_Player_Finger, selectedPlayerName ) ); break; case MENU_TELL: - emit sendCMD( Command( 0, CMD_Set_Input, TQString( "tell %1 " ).tqarg( selectedPlayerName ) ) ); + emit sendCMD( Command( 0, CMD_Set_Input, TQString( "tell %1 " ).arg( selectedPlayerName ) ) ); break; case MENU_NOTIFY: emit sendCMD( Command( 0, CMD_Add_Friend, selectedPlayerName ) ); diff --git a/knights/tabbox.cpp b/knights/tabbox.cpp index 4e8d9ce..00286c3 100644 --- a/knights/tabbox.cpp +++ b/knights/tabbox.cpp @@ -160,7 +160,7 @@ void TabBox::destroyChild( void ) /////////////////////////////////////// void TabBox::changeMyCaption( TQWidget *child ) { - setCaption( i18n("%1 - Knights").tqarg( myTabs->tabLabel( child ) ) ); + setCaption( i18n("%1 - Knights").arg( myTabs->tabLabel( child ) ) ); } /////////////////////////////////////// // diff --git a/knights/tabmanager.cpp b/knights/tabmanager.cpp index 2057cb1..e3cb076 100644 --- a/knights/tabmanager.cpp +++ b/knights/tabmanager.cpp @@ -150,7 +150,7 @@ void TabManager::saveTabGeometry( const TQString &childName, const TQSize &child appConfig->writeEntry( childName, childSize ); appConfig->sync(); - kdDebug() << "Saved tqgeometry for Widget: " << childName << endl; + kdDebug() << "Saved geometry for Widget: " << childName << endl; } /////////////////////////////////////// // diff --git a/knights/wiz_setup.cpp b/knights/wiz_setup.cpp index f7b1d8f..885daa9 100644 --- a/knights/wiz_setup.cpp +++ b/knights/wiz_setup.cpp @@ -74,7 +74,7 @@ void wiz_setup::initPage1( void ) WelcomeMessage->setText( i18n( "Thank you for installing Knights, the graphical chess interface for KDE. To help you get started quickly, there are a few things Knights will need to setup. You should click 'Next' to see what they are." ) ); P1B1->addWidget( WelcomeMessage, 1, 3 ); - addPage( Page1, i18n("Welcome to Knights v%1!").tqarg(_VERSION_) ); + addPage( Page1, i18n("Welcome to Knights v%1!").arg(_VERSION_) ); setNextEnabled( Page1, TRUE ); setHelpEnabled( Page1, FALSE ); } -- cgit v1.2.3