Rename a number of old tq methods that are no longer tq specific

35 files changed, 141 insertions, 141 deletions

diff --git a/knights/challenge_graph.cpp b/knights/challenge_graph.cpp
index a027f56..dee2662 100644
--- a/knights/challenge_graph.cpp
+++ b/knights/challenge_graph.cpp
@@ -30,7 +30,7 @@
 #include <tqscrollview.h>
 #include <tqwidget.h>
 #include <tqrect.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpainter.h>
 #include <tqregexp.h>
 
@@ -66,7 +66,7 @@ Challenge_Graph::Challenge_Graph( TQWidget* parent, const char* name, resource *
 
 
 	/* Setup Style for myStatusBar */
-	myStatusBar->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
+	myStatusBar->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
 	myStatusBar->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	clear();
 
@@ -311,7 +311,7 @@ void Challenge_Graph::createBackground( void )
 	painter.drawText( 64, y_size - 8, i18n( "Time" ) );
 	painter.end();
 
-	graph->tqsetBackgroundPixmap( background );
+	graph->setBackgroundPixmap( background );
 }
 ///////////////////////////////////////
 //
@@ -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/console.h b/knights/console.h
index 262dfb2..a9b9fe3 100644
--- a/knights/console.h
+++ b/knights/console.h
@@ -21,7 +21,7 @@
 /* TQt */
 #include <tqstringlist.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 /* Local */
 #include "definitions.h"
 #include "resource.h"
diff --git a/knights/core.cpp b/knights/core.cpp
index 72a91c5..112f8d6 100644
--- a/knights/core.cpp
+++ b/knights/core.cpp
@@ -227,7 +227,7 @@ void core::setMatch( int ID )
 
 	/* Give Ourselves Focus */
 	setActiveWindow();
-	tqtopLevelWidget()->raise();
+	topLevelWidget()->raise();
 }
 
 ///////////////////////////////////////
diff --git a/knights/dlg_challenge.cpp b/knights/dlg_challenge.cpp
index f4e04e1..2df0b43 100644
--- a/knights/dlg_challenge.cpp
+++ b/knights/dlg_challenge.cpp
@@ -48,7 +48,7 @@ dlg_challenge::dlg_challenge(TQWidget *parent, const char *name, resource *Rsrc
 			LABEL_BlackInc = new TQLabel( BOX_Black );
 	BUTTON_TimeOdds = new TQCheckBox( i18n("Time Odds Match"),BOX_Parent );
 
-	LABEL_Headline->tqsetAlignment( TQt::AlignCenter );
+	LABEL_Headline->setAlignment( TQt::AlignCenter );
 	COMBO_Rated->setEditable( FALSE );
 	COMBO_Rated->insertItem( i18n("Unrated"), 0 );
 	COMBO_Rated->insertItem( i18n("Rated"), 1 );
@@ -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/dlg_settings.h b/knights/dlg_settings.h
index 646970b..91df2fc 100644
--- a/knights/dlg_settings.h
+++ b/knights/dlg_settings.h
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kdialogbase.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqvbox.h>
 #include "definitions.h"
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 5cfae56..55f93f1 100644
--- a/knights/knights.cpp
+++ b/knights/knights.cpp
@@ -34,7 +34,7 @@
 /* KFile */
 #include <kfiledialog.h>
 /* TQt */
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqiconset.h>
 #include <tqlabel.h>
 #include <tqframe.h>
@@ -163,21 +163,21 @@ bool Knights::init( void )
 	initMenus();
 
 	/* Init Message */
-	Message->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
+	Message->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
 
 	/* Init White Time Label */
 	GroupWhite.setColor( TQColorGroup::Background, Resource->COLOR_White );
 	GroupWhite.setColor( TQColorGroup::Foreground, Resource->COLOR_Black );
 	whiteTimeLabel->setPalette( TQPalette( GroupWhite, GroupWhite, GroupWhite ) );
 	whiteTimeLabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-	whiteTimeLabel->tqsetAlignment( TQt::AlignCenter | TQt::SingleLine );
+	whiteTimeLabel->setAlignment( TQt::AlignCenter | TQt::SingleLine );
 
 	/* Init Black Time Label */
 	GroupBlack.setColor( TQColorGroup::Background, Resource->COLOR_Black );
 	GroupBlack.setColor( TQColorGroup::Foreground, Resource->COLOR_White );
 	blackTimeLabel->setPalette( TQPalette( GroupBlack, GroupBlack, GroupBlack ) );
 	blackTimeLabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-	blackTimeLabel->tqsetAlignment( TQt::AlignCenter | TQt::SingleLine );
+	blackTimeLabel->setAlignment( TQt::AlignCenter | TQt::SingleLine );
 
 	/* Configure self */
 	setCentralWidget( MainFrame );
@@ -250,122 +250,122 @@ void Knights::initMenus( void )
 	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("undo"), KIcon::Small ) ),
 												i18n( "&Retract Move" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_RETRACT );
 	matchMenu->setItemEnabled( MENU_RETRACT, FALSE );
-	matchMenu->tqsetWhatsThis( MENU_RETRACT, i18n( "Select this to retract your last move." ) );
+	matchMenu->setWhatsThis( MENU_RETRACT, i18n( "Select this to retract your last move." ) );
 	// MENU_RESIGN
 	matchMenu->insertItem( i18n( "Resign" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_RESIGN );
 	matchMenu->setItemEnabled( MENU_RESIGN, FALSE );
-	matchMenu->tqsetWhatsThis( MENU_RESIGN, i18n( "Use this to concede the match to your opponent." ) );
+	matchMenu->setWhatsThis( MENU_RESIGN, i18n( "Use this to concede the match to your opponent." ) );
 	// MENU_CALL_FLAG
 	matchMenu->insertItem( i18n( "&Call Flag" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_CALL_FLAG );
 	matchMenu->setItemEnabled( MENU_CALL_FLAG, FALSE );
-	matchMenu->tqsetWhatsThis( MENU_CALL_FLAG, i18n( "Use this to declare the match over, due to your opponent being out of time." ) );
+	matchMenu->setWhatsThis( MENU_CALL_FLAG, i18n( "Use this to declare the match over, due to your opponent being out of time." ) );
 	// MENU_HINT
 	matchMenu->insertItem( i18n( "&Hint" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_HINT );
 	matchMenu->setItemEnabled( MENU_HINT, FALSE );
-	matchMenu->tqsetWhatsThis( MENU_HINT, i18n( "This will ask your opponent for a hint." ) );
+	matchMenu->setWhatsThis( MENU_HINT, i18n( "This will ask your opponent for a hint." ) );
 	// MENU_MOVE_NOW
 	matchMenu->insertItem( i18n( "Move &Now" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_MOVE_NOW );
 	matchMenu->setItemEnabled( MENU_MOVE_NOW, FALSE );
-	matchMenu->tqsetWhatsThis( MENU_MOVE_NOW, i18n( "Clicking this option will force your opponent to move immediately." ) );
+	matchMenu->setWhatsThis( MENU_MOVE_NOW, i18n( "Clicking this option will force your opponent to move immediately." ) );
 	// MENU_ORIENTATION
 	matchMenu->insertItem( i18n( "&Flip View" ), Core, TQT_SLOT(matchMenu(int)), Key_F2, MENU_ORIENTATION );
 	matchMenu->setItemEnabled( MENU_ORIENTATION, FALSE );
-	matchMenu->tqsetWhatsThis( MENU_ORIENTATION, i18n( "This will reverse the chessboard's orientation by 180 degrees." ) );
+	matchMenu->setWhatsThis( MENU_ORIENTATION, i18n( "This will reverse the chessboard's orientation by 180 degrees." ) );
 	// MENU_PONDER
 	matchMenu->insertItem( i18n( "&Ponder" ), this, TQT_SLOT(Settings(int)), 0, MENU_PONDER );
 	matchMenu->setItemChecked( MENU_PONDER, Resource->OPTION_Ponder );
 	matchMenu->setItemEnabled( MENU_PONDER, FALSE );
-	matchMenu->tqsetWhatsThis( MENU_PONDER, i18n( "This toggles your opponent's ability to think while it's your turn." ) );
+	matchMenu->setWhatsThis( MENU_PONDER, i18n( "This toggles your opponent's ability to think while it's your turn." ) );
 	matchMenu->insertSeparator();
 	// MENU_PAUSE
 	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("player_pause"), KIcon::Small ) ),
 												i18n( "Pause" ), this, TQT_SLOT( Settings(int) ), Key_F12, MENU_PAUSE );
 	matchMenu->setItemEnabled( MENU_PAUSE, FALSE );
-	matchMenu->tqsetWhatsThis( MENU_PAUSE, i18n( "Select this to pause the clock for this match." ) );
+	matchMenu->setWhatsThis( MENU_PAUSE, i18n( "Select this to pause the clock for this match." ) );
 	/*
 			drawMenu menu
 	*/
 	// MENU_OFFER_DRAW
 	drawMenu->insertItem( i18n( "&Offer Draw" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_OFFER_DRAW );
-	drawMenu->tqsetWhatsThis( MENU_OFFER_DRAW, i18n( "Clicking this will inform your opponent that you are willing draw the match." ) );
+	drawMenu->setWhatsThis( MENU_OFFER_DRAW, i18n( "Clicking this will inform your opponent that you are willing draw the match." ) );
 	// MENU_ACCEPT_DRAW
 	drawMenu->insertItem( i18n( "&Accept Draw" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_ACCEPT_DRAW );
-	drawMenu->tqsetWhatsThis( MENU_ACCEPT_DRAW, i18n( "Clicking this will accept a draw offered by your opponent." ) );
+	drawMenu->setWhatsThis( MENU_ACCEPT_DRAW, i18n( "Clicking this will accept a draw offered by your opponent." ) );
 	// MENU_REJECT_DRAW
 	drawMenu->insertItem( i18n( "&Reject Draw" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_REJECT_DRAW );
-	drawMenu->tqsetWhatsThis( MENU_REJECT_DRAW, i18n( "Clicking this will reject a draw offered by your opponent." ) );
+	drawMenu->setWhatsThis( MENU_REJECT_DRAW, i18n( "Clicking this will reject a draw offered by your opponent." ) );
 	// MENU_IGNORE_DRAW
 	drawMenu->insertItem( i18n( "&Ignore Draw" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_IGNORE_DRAW );
-	drawMenu->tqsetWhatsThis( MENU_IGNORE_DRAW, i18n( "Clicking this will ignore future draw offers from your opponent." ) );
+	drawMenu->setWhatsThis( MENU_IGNORE_DRAW, i18n( "Clicking this will ignore future draw offers from your opponent." ) );
 	/*
 			fileMenu menu
 	*/
 	// MENU_NEWGAME
 	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filenew"), KIcon::Small ) ),
 												i18n( "&New Match..." ), this, TQT_SLOT( openNewMatchDialog() ), CTRL+Key_N, MENU_NEWGAME );
-	fileMenu->tqsetWhatsThis( MENU_NEWGAME, i18n( "This allows you to begin a new match." ) );
+	fileMenu->setWhatsThis( MENU_NEWGAME, i18n( "This allows you to begin a new match." ) );
 	// MENU_LOAD
 	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileopen"), KIcon::Small ) ),
 												i18n( "&Load Match..." ), Core, TQT_SLOT( load() ), CTRL+Key_L, MENU_LOAD );
-	fileMenu->tqsetWhatsThis( MENU_LOAD, i18n( "The Load command will allow you to select a previously saved match and play it again." ) );
+	fileMenu->setWhatsThis( MENU_LOAD, i18n( "The Load command will allow you to select a previously saved match and play it again." ) );
 	fileMenu->insertSeparator();
 	// MENU_SAVE
 	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), KIcon::Small ) ),
 												i18n( "&Save Match" ), this, TQT_SLOT( SaveGame() ), CTRL+Key_S, MENU_SAVE );
 	fileMenu->setItemEnabled( MENU_SAVE, FALSE );
-	fileMenu->tqsetWhatsThis( MENU_SAVE, i18n( "The Save command will allow you to store a copy of your current match for later use." ) );
+	fileMenu->setWhatsThis( MENU_SAVE, i18n( "The Save command will allow you to store a copy of your current match for later use." ) );
 	// MENU_SAVEAS
 	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), KIcon::Small ) ),
 												i18n( "Save Match &As..." ), this, TQT_SLOT( SaveGameAs() ), CTRL+Key_A, MENU_SAVEAS );
 	fileMenu->setItemEnabled( MENU_SAVEAS, FALSE );
-	fileMenu->tqsetWhatsThis( MENU_SAVEAS, i18n( "The Save command will allow you to store a copy of your current match for later use." ) );
+	fileMenu->setWhatsThis( MENU_SAVEAS, i18n( "The Save command will allow you to store a copy of your current match for later use." ) );
 	fileMenu->insertSeparator();
 	// MENU_CONNECT
 	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("connect_creating"), KIcon::Small ) ),
 												i18n( "Connect to Server" ), this, TQT_SLOT( netConnect() ), CTRL+Key_C, MENU_CONNECT );
-	fileMenu->tqsetWhatsThis( MENU_CONNECT, i18n( "Clicking this will connect Knights with an internet chess server." ) );
+	fileMenu->setWhatsThis( MENU_CONNECT, i18n( "Clicking this will connect Knights with an internet chess server." ) );
 	fileMenu->insertSeparator();
 	// MENU_PRINT
 	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileprint"), KIcon::Small ) ),
 												i18n( "&Print Notation..." ), Core, TQT_SLOT( print() ), CTRL+Key_P, MENU_PRINT );
 	fileMenu->setItemEnabled( MENU_PRINT, FALSE );
-	fileMenu->tqsetWhatsThis( MENU_PRINT, i18n( "The Print command will allow you to print this game's notation on your printer." ) );
+	fileMenu->setWhatsThis( MENU_PRINT, i18n( "The Print command will allow you to print this game's notation on your printer." ) );
 	fileMenu->insertSeparator();
 	// MENU_CLOSE
 	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileclose"), KIcon::Small ) ),
 												i18n( "&Close Match" ), Core, TQT_SLOT( clearMatch() ), CTRL+Key_W, MENU_CLOSE );
 	fileMenu->setItemEnabled( MENU_CLOSE, FALSE );
-	fileMenu->tqsetWhatsThis( MENU_CLOSE, i18n( "This command removes the current match." ) );
+	fileMenu->setWhatsThis( MENU_CLOSE, i18n( "This command removes the current match." ) );
 	// MENU_CLOSEALL
 	fileMenu->insertItem( i18n( "Close All" ), Core, TQT_SLOT( clearAll() ), 0, MENU_CLOSEALL );
 	fileMenu->setItemEnabled( MENU_CLOSEALL, FALSE );
-	fileMenu->tqsetWhatsThis( MENU_CLOSEALL, i18n( "This command will remove all matches that are currently loaded." ) );
+	fileMenu->setWhatsThis( MENU_CLOSEALL, i18n( "This command will remove all matches that are currently loaded." ) );
 	fileMenu->insertSeparator();
 	// MENU_TQUIT
 	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("exit"), KIcon::Small ) ),
 												i18n( "&Quit" ), this, TQT_SLOT(menuClose()), CTRL+Key_Q, MENU_TQUIT );
-	fileMenu->tqsetWhatsThis( MENU_TQUIT, i18n( "The Quit command will stop all matches and exit Knights." ) );
+	fileMenu->setWhatsThis( MENU_TQUIT, i18n( "The Quit command will stop all matches and exit Knights." ) );
 	/*
 			settingsMenu menu
 	*/
 	// MENU_INSTALL_THEMES
 	settingsMenu->insertItem( i18n( "&Install Themes" ), this, TQT_SLOT(installThemes()), 0, MENU_INSTALL_THEMES );
-	settingsMenu->tqsetWhatsThis( MENU_INSTALL_THEMES, i18n( "This lets you install downloaded themes into Knights." ) );
+	settingsMenu->setWhatsThis( MENU_INSTALL_THEMES, i18n( "This lets you install downloaded themes into Knights." ) );
 	// MENU_BINDINGS_DIALOG
 	settingsMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("key_bindings"), KIcon::Small ) ),
 														i18n( "Configure &Key Bindings..." ), this, TQT_SLOT(openKeyBindingDialog()), 0, MENU_BINDINGS_DIALOG );
-	settingsMenu->tqsetWhatsThis( MENU_BINDINGS_DIALOG, i18n( "Click this if you want to change the keyboard shortcuts that Knights uses." ) );
+	settingsMenu->setWhatsThis( MENU_BINDINGS_DIALOG, i18n( "Click this if you want to change the keyboard shortcuts that Knights uses." ) );
 	// MENU_SETTINGS_DIALOG
 	settingsMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("configure"), KIcon::Small ) ),
 														i18n( "&Configure Knights..." ), this, TQT_SLOT(openSettingsDialog()), 0, MENU_SETTINGS_DIALOG );
-	settingsMenu->tqsetWhatsThis( MENU_SETTINGS_DIALOG, i18n( "This opens a new window which allows you to customize Knights to your particular tastes." ) );
+	settingsMenu->setWhatsThis( MENU_SETTINGS_DIALOG, i18n( "This opens a new window which allows you to customize Knights to your particular tastes." ) );
 	/*
 			tutorialMenu menu
 	*/
 	tutorialMenu->setCheckable(TRUE);
 	// MENU_OPEN_TUTORIAL
 	tutorialMenu->insertItem( i18n( "Begin a Tutorial" ), this, TQT_SLOT(Settings(int)), 0, MENU_OPEN_TUTORIAL );
-//	tutorialMenu->tqsetWhatsThis( MENU_OPEN_TUTORIAL, i18n( "" ) );
+//	tutorialMenu->setWhatsThis( MENU_OPEN_TUTORIAL, i18n( "" ) );
 	/*
 			topMenu menu
 	*/
@@ -397,8 +397,8 @@ void Knights::resizeMainFrame(void)
 	Core->move( 0, 0 );
 	Core->resize();
 	/* Get our size hints */
-	S_Message = Message->tqsizeHint();
-	S_Menu = topMenu->tqsizeHint();
+	S_Message = Message->sizeHint();
+	S_Menu = topMenu->sizeHint();
 	statusHeight = S_Message.height() + ( margin << 1 );
 	statusY += Core->height() + margin + statusHeight + margin;
 	statusX = Core->width();
@@ -447,7 +447,7 @@ void Knights::resizeEvent( TQResizeEvent * )
 	if( ResizeFlag ) return;
 	/* Get the height & Y of the status bar */
 	gridX = Core->width() >> 3;
-	S_Message = Message->tqsizeHint() + TQSize( 2, 2 );
+	S_Message = Message->sizeHint() + TQSize( 2, 2 );
 	statusHeight = S_Message.height() + ( margin << 1 );
 	Resource->Widget_Height = statusHeight;
 	statusY += Core->height() + margin;
@@ -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..930a652 100644
--- a/knights/knights.h
+++ b/knights/knights.h
@@ -30,7 +30,7 @@
 #include <kstatusbar.h>
 #include <kcmdlineargs.h>
 /* QT */
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqpixmap.h>
 #include <tqstring.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 dba45c7..c6b9669 100644
--- a/knights/knightstextview.cpp
+++ b/knights/knightstextview.cpp
@@ -207,7 +207,7 @@ void KnightsTextView::print( void )
 		{
 			/* Print the Contents */
 			paint.setClipRect( body );
-			simpText.draw( &paint, body.left(), body.top(), view, tqcolorGroup() );
+			simpText.draw( &paint, body.left(), body.top(), view, colorGroup() );
 			paint.setClipping( false );
 			view.moveBy( 0, body.height() );
 			paint.translate( 0, -body.height() );
@@ -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/knightstextview.h b/knights/knightstextview.h
index e7e83b5..2f55261 100644
--- a/knights/knightstextview.h
+++ b/knights/knightstextview.h
@@ -19,7 +19,7 @@
 #define KNIGHTSTEXTVIEW_H
 
 #include <tqwidget.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 
 /**
   *@author Troy Corbin Jr./Alexander Wels
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/match.cpp b/knights/match.cpp
index 68d2bc5..cd35460 100644
--- a/knights/match.cpp
+++ b/knights/match.cpp
@@ -891,7 +891,7 @@ bool match::move( void )
 			Clock->Pause();
 
 		Logic->OnMove = !Logic->OnMove;
-		/* Set tqStatus Bar */
+		/* Set Status Bar */
 		if( Logic->OnMove == WHITE )
 		{
 			emit setStatusBar( WHITE_TURN );
diff --git a/knights/pgn.cpp b/knights/pgn.cpp
index a0b4674..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;
 }
 ///////////////////////////////////////
@@ -288,8 +288,8 @@ void pgn::init( void )
 	uname( &unamePtr );
 
 	/* Build Date */
-	qdt = TQDateTime::tqcurrentDateTime();
-	TAG_Date = TQString("%1.%2.%3").tqarg(qdt.date().year(),4).tqarg(qdt.date().month(),2).tqarg(qdt.date().day(),2);
+	qdt = TQDateTime::currentDateTime();
+	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/pgn.h b/knights/pgn.h
index a2dc58d..72fe0b5 100644
--- a/knights/pgn.h
+++ b/knights/pgn.h
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqpainter.h>
 #include "definitions.h"
 #include "resource.h"
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/resource.h b/knights/resource.h
index 3704ca6..fd65dc6 100644
--- a/knights/resource.h
+++ b/knights/resource.h
@@ -30,7 +30,7 @@
 #include <klistview.h>
 #include <kcmdlineargs.h>
 /* TQt */
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/knights/setpageaudio.h b/knights/setpageaudio.h
index 2df144a..49a2a9f 100644
--- a/knights/setpageaudio.h
+++ b/knights/setpageaudio.h
@@ -24,7 +24,7 @@
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
diff --git a/knights/setpagedisplay.h b/knights/setpagedisplay.h
index e651cd5..94e020a 100644
--- a/knights/setpagedisplay.h
+++ b/knights/setpagedisplay.h
@@ -20,7 +20,7 @@
 
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <tqtextview.h>
+#include <textview.h>
 #include <tqtabwidget.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>
@@ -30,7 +30,7 @@
 #include <tqvbox.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include "resource.h"
 
 /**
diff --git a/knights/setpageengines.cpp b/knights/setpageengines.cpp
index d64651c..b3fe11b 100644
--- a/knights/setpageengines.cpp
+++ b/knights/setpageengines.cpp
@@ -73,7 +73,7 @@ setPageEngines::setPageEngines(TQWidget *parent, resource *Rsrc  ) : TQVBoxLayou
 		Engines_Button_Add = Engines_ButtonBox->addButton( i18n( "&Add..." ) );
 		Engines_Button_Change = Engines_ButtonBox->addButton( i18n( "&Modify..." ) );
 		Engines_Button_Delete = Engines_ButtonBox->addButton( i18n( "&Delete..." ) );
-		Engines_ButtonBox->tqlayout();
+		Engines_ButtonBox->layout();
 
 	BuildEngineData();
 
@@ -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/setpageengines.h b/knights/setpageengines.h
index 434ce8b..935e960 100644
--- a/knights/setpageengines.h
+++ b/knights/setpageengines.h
@@ -27,7 +27,7 @@
 #include <tqgroupbox.h>
 #include <tqptrlist.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include "resource.h"
 #include "dlg_engine.h"
 
diff --git a/knights/setpagegeneral.h b/knights/setpagegeneral.h
index 5f82f65..a87f18c 100644
--- a/knights/setpagegeneral.h
+++ b/knights/setpagegeneral.h
@@ -22,7 +22,7 @@
 #include <tqwidget.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>
diff --git a/knights/setpageservers.cpp b/knights/setpageservers.cpp
index 068e052..16aef9e 100644
--- a/knights/setpageservers.cpp
+++ b/knights/setpageservers.cpp
@@ -77,7 +77,7 @@ void setPageServers::initTab1( void )
 		Servers_Button_Add = Servers_ButtonBox->addButton( i18n( "&Add..." ) );
 		Servers_Button_Change = Servers_ButtonBox->addButton( i18n( "&Modify..." ) );
 		Servers_Button_Delete = Servers_ButtonBox->addButton( i18n( "&Delete..." ) );
-		Servers_ButtonBox->tqlayout();
+		Servers_ButtonBox->layout();
 
 	BuildServerData();
 
diff --git a/knights/setpageservers.h b/knights/setpageservers.h
index e248075..3636afa 100644
--- a/knights/setpageservers.h
+++ b/knights/setpageservers.h
@@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <tqptrlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include "resource.h"
 #include "dlg_server.h"
 
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_pgnview.cpp b/knights/tab_pgnview.cpp
index 3290e1f..b25565d 100644
--- a/knights/tab_pgnview.cpp
+++ b/knights/tab_pgnview.cpp
@@ -21,7 +21,7 @@
 #include "pgn.h"
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kstddirs.h>
 #include <ktempfile.h>
 
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/tabgrip.cpp b/knights/tabgrip.cpp
index 121ea21..1fc0813 100644
--- a/knights/tabgrip.cpp
+++ b/knights/tabgrip.cpp
@@ -42,7 +42,7 @@ TabGrip::~TabGrip()
 void TabGrip::paintEvent( TQPaintEvent* )
 {
 	TQPainter paint( this );
-	TQColorGroup group( tqcolorGroup() );
+	TQColorGroup group( colorGroup() );
 	paint.setPen( group.light() );
 	paint.drawLine( 2, 2, width() - 3, 2 );
 	paint.drawLine( 2, 5, width() - 3, 5 );
@@ -64,8 +64,8 @@ void TabGrip::mousePressEvent( TQMouseEvent *event )
 	{
 		couldDrag = TRUE;
 		offset = mapToGlobal( event->pos() );
-		offset.setX( tqtopLevelWidget()->x() - offset.x() );
-		offset.setY( tqtopLevelWidget()->y() - offset.y() );
+		offset.setX( topLevelWidget()->x() - offset.x() );
+		offset.setY( topLevelWidget()->y() - offset.y() );
 	}
 }
 ///////////////////////////////////////
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/tabpage.cpp b/knights/tabpage.cpp
index d98eeb7..1dc806d 100644
--- a/knights/tabpage.cpp
+++ b/knights/tabpage.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 
 ///////////////////////////////////////
@@ -53,7 +53,7 @@ TabPage::TabPage( TQWidget *parent, TQWidget *child, resource *rsrc ) : TQVBox(p
 	closeButton->setIconSet( TQIconSet( map ) );
 	closeButton->setAutoRaise( TRUE );
 	closeButton->setTextLabel( i18n( "Close This Tab" ), TRUE );
-	closeButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+	closeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	connect( closeButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( requestDestruction() ) );
 
 	myChild->reparent( this, TQPoint( 0, 0 ), TRUE );
diff --git a/knights/wiz_setup.cpp b/knights/wiz_setup.cpp
index f3c3d74..6ea9958 100644
--- a/knights/wiz_setup.cpp
+++ b/knights/wiz_setup.cpp
@@ -20,7 +20,7 @@
 #include <kstddirs.h>
 #include <tqstringlist.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include "wiz_setup.moc"
 
@@ -70,11 +70,11 @@ void wiz_setup::initPage1( void )
 	P1B1->addWidget( SideImage1, 1, 1 );
 
 	WelcomeMessage = new TQLabel( Page1 );
-	WelcomeMessage->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
+	WelcomeMessage->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
 	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 );
 }
@@ -93,7 +93,7 @@ void wiz_setup::initPage2( void )
 	P2B1->addMultiCellWidget( SideImage2, 1, 2, 1, 1 );
 
 	pgnExplain = new TQLabel( Page2 );
-	pgnExplain->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
+	pgnExplain->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
 	pgnExplain->setText( i18n( "When Knights saves a match to disk, it uses Portable Game Notation (PGN) to store the match. Several other computer chess games use PGN too. If you like, Knights can be the default PGN viewer on this system." ) );
 	P2B1->addWidget( pgnExplain, 1, 3 );
 
@@ -121,7 +121,7 @@ void wiz_setup::initPage3( void )
 	P3B1->addMultiCellWidget( SideImage3, 1, 2, 1, 1 );
 
 	engineExplain = new TQLabel( Page3 );
-	engineExplain->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
+	engineExplain->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
 	engineExplain->setText( i18n( "Knights can not play a chess match against you without help. Known as Chess Engines, these helpers can be found on the Internet and are often included with your distribution. Knights can look for Chess Engines that you may already have. If found, Knights will configure itself to use them." ) );
 	P3B1->addWidget( engineExplain, 1, 3 );
 
@@ -149,7 +149,7 @@ void wiz_setup::initPage4( void )
 	P4B1->addMultiCellWidget( SideImage4, 1, 2, 1, 1 );
 
 	serverExplain = new TQLabel( Page4 );
-	serverExplain->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
+	serverExplain->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
 	serverExplain->setText( i18n( "In order for you to play chess online, Knights will have to connect to a chess server. Knights has a list of several of these servers. If you like, this list can be used to automatically configure Knights." ) );
 	P4B1->addWidget( serverExplain, 1, 3 );
 
@@ -177,7 +177,7 @@ void wiz_setup::initPage5( void )
 	P5B1->addMultiCellWidget( SideImage5, 1, 2, 1, 1 );
 
 	FinishExplain = new TQLabel( Page5 );
-	FinishExplain->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
+	FinishExplain->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
 	FinishExplain->setText( i18n( "Knights has now configured itself according to your choices. We strongly recommend that you read the documentation to make full use of all that Knights has to offer. You can access it by pressing F1." ) );
 	P5B1->addWidget( FinishExplain, 1, 3 );
 
diff --git a/knights/wiz_setup.h b/knights/wiz_setup.h
index bfc5b44..2da9038 100644
--- a/knights/wiz_setup.h
+++ b/knights/wiz_setup.h
@@ -21,7 +21,7 @@
 #include <kwizard.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>