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

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

11 files changed, 125 insertions, 125 deletions

diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc
index 1af7a9b6..b78053e4 100644
--- a/konquest/fleetdlg.cc
+++ b/konquest/fleetdlg.cc
@@ -1,4 +1,4 @@
-#include <layout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <math.h>
@@ -46,21 +46,21 @@ FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets )
     fleetTable->addColumn(i18n("Ships"));
     fleetTable->addColumn(i18n("Kill Percentage"));
     fleetTable->addColumn(i18n("Arrival Turn"));
-    fleetTable->setMinimumSize( fleetTable->sizeHint() );
+    fleetTable->setMinimumSize( fleetTable->tqsizeHint() );
 
     KPushButton *okButton = new KPushButton( KStdGuiItem::ok(), this );
-    okButton->setMinimumSize( okButton->sizeHint() );
+    okButton->setMinimumSize( okButton->tqsizeHint() );
     okButton->setDefault(true);
 
-    TQVBoxLayout *layout1 = new TQVBoxLayout( this );
-    TQHBoxLayout *layout2 = new TQHBoxLayout;
+    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this );
+    TQHBoxLayout *tqlayout2 = new TQHBoxLayout;
 
-    layout1->addWidget( fleetTable, 1 );
-    layout1->addLayout( layout2 );
+    tqlayout1->addWidget( fleetTable, 1 );
+    tqlayout1->addLayout( tqlayout2 );
 
-    layout2->addStretch( 2 );
-    layout2->addWidget( okButton );
-    layout2->addStretch( 2 );
+    tqlayout2->addStretch( 2 );
+    tqlayout2->addWidget( okButton );
+    tqlayout2->addStretch( 2 );
 
     connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
 
@@ -79,10 +79,10 @@ FleetDlg::init()
     while( (curFleet = nextFleet())) {
         fleetNumber++;
         new FleetDlgListViewItem(fleetTable,
-                                 TQString("%1").arg(fleetNumber),
+                                 TQString("%1").tqarg(fleetNumber),
                                  curFleet->destination->getName(),
-                                 TQString("%1").arg(curFleet->getShipCount()),
-                                 TQString("%1").arg(KGlobal::locale()->formatNumber(curFleet->killPercentage, 3)),
-                                 TQString("%1").arg((int)ceil(curFleet->arrivalTurn)));
+                                 TQString("%1").tqarg(curFleet->getShipCount()),
+                                 TQString("%1").tqarg(KGlobal::locale()->formatNumber(curFleet->killPercentage, 3)),
+                                 TQString("%1").tqarg((int)ceil(curFleet->arrivalTurn)));
     }
 }
diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc
index f4b0e25a..9f1d1a7f 100644
--- a/konquest/gameboard.cc
+++ b/konquest/gameboard.cc
@@ -1,4 +1,4 @@
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
 #include <tqslider.h>
@@ -8,7 +8,7 @@
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 #include <tqvalidator.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -60,10 +60,10 @@ GameBoard::GameBoard( TQWidget *parent )
     turnCounter = new TQLabel( this );
     turnCounter->setPalette( palette );
     turnCounter->setText( "Turn" );
-    turnCounter->setMaximumHeight( turnCounter->sizeHint().height() );
+    turnCounter->setMaximumHeight( turnCounter->tqsizeHint().height() );
 
     endTurn = new TQPushButton( i18n("End Turn"), this );
-    endTurn->setFixedSize( endTurn->sizeHint() );
+    endTurn->setFixedSize( endTurn->tqsizeHint() );
     endTurn->setPalette( palette );
 
     shipCountEdit = new TQLineEdit( this );
@@ -88,33 +88,33 @@ GameBoard::GameBoard( TQWidget *parent )
     //********************************************************************
     // Layout the main window
     //********************************************************************
-    TQHBoxLayout *layout1 = new TQHBoxLayout( this );
-    TQVBoxLayout *layout2 = new TQVBoxLayout;
-    TQHBoxLayout *layout3 = new TQHBoxLayout;
-    TQVBoxLayout *layout4 = new TQVBoxLayout;
+    TQHBoxLayout *tqlayout1 = new TQHBoxLayout( this );
+    TQVBoxLayout *tqlayout2 = new TQVBoxLayout;
+    TQHBoxLayout *tqlayout3 = new TQHBoxLayout;
+    TQVBoxLayout *tqlayout4 = new TQVBoxLayout;
 
-    layout1->addLayout( layout2 );
-    layout2->addLayout( layout3 );
+    tqlayout1->addLayout( tqlayout2 );
+    tqlayout2->addLayout( tqlayout3 );
 
-    layout3->addSpacing( 5 );
-    layout3->addWidget( gameMessage, 10 );
-    layout3->addWidget( shipCountEdit, 1 );
-    layout3->addWidget( endTurn, 1 );
+    tqlayout3->addSpacing( 5 );
+    tqlayout3->addWidget( gameMessage, 10 );
+    tqlayout3->addWidget( shipCountEdit, 1 );
+    tqlayout3->addWidget( endTurn, 1 );
 
-    layout2->addSpacing( 5 );
-    layout2->addWidget( mapWidget, 0, AlignTop );
-    layout2->addWidget( msgWidget );
-    layout2->addStretch( 1 );
+    tqlayout2->addSpacing( 5 );
+    tqlayout2->addWidget( mapWidget, 0, AlignTop );
+    tqlayout2->addWidget( msgWidget );
+    tqlayout2->addStretch( 1 );
 
-    layout1->addSpacing( 5 );
-    layout1->addLayout( layout4, 10 );
+    tqlayout1->addSpacing( 5 );
+    tqlayout1->addLayout( tqlayout4, 10 );
 
-    layout4->addWidget( planetInfo, 1 );
-    layout4->addSpacing( 10 );
-    layout4->addWidget( turnCounter,  1 );
-    layout4->addStretch( 1 );
+    tqlayout4->addWidget( planetInfo, 1 );
+    tqlayout4->addSpacing( 10 );
+    tqlayout4->addWidget( turnCounter,  1 );
+    tqlayout4->addStretch( 1 );
 
-    layout1->addStretch( 1 );
+    tqlayout1->addStretch( 1 );
 
     //**********************************************************************
     // Set up signal/slot connections
@@ -137,7 +137,7 @@ GameBoard::~GameBoard()
 }
 
 #if 0
-TQSize GameBoard::sizeHint() const
+TQSize GameBoard::tqsizeHint() const
 {
     return TQSize( 600, 550 );
 }
@@ -315,10 +315,10 @@ GameBoard::turn()
             TQString msg;
             msg = i18n("The distance from Planet %1 to Planet %2 is %3 light years.\n"
                        "A ship leaving this turn will arrive on turn %4")
-                  .arg(sourcePlanet->getName())
-		  .arg(destPlanet->getName())
-                  .arg(KGlobal::locale()->formatNumber( dist, 2 ))
-		  .arg(KGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 ));
+                  .tqarg(sourcePlanet->getName())
+		  .tqarg(destPlanet->getName())
+                  .tqarg(KGlobal::locale()->formatNumber( dist, 2 ))
+		  .tqarg(KGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 ));
 	    KMessageBox::information( this, msg, i18n("Distance"));
 
             gameState = NONE;
@@ -431,7 +431,7 @@ GameBoard::turn()
     }
 
     TQString turnStr;
-    turnStr = i18n("Turn #: %1 of %2").arg(turnNumber).arg(lastTurn);
+    turnStr = i18n("Turn #: %1 of %2").tqarg(turnNumber).tqarg(lastTurn);
 
     turnCounter->setText( turnStr );
 
@@ -470,15 +470,15 @@ GameBoard::nextTurn()
     Player *winner = findWinner();
     if (winner)
     {
-        mapWidget->repaint(true);
+        mapWidget->tqrepaint(true);
         KMessageBox::information(this, 
-              i18n("The mighty %1 has conquered the galaxy!").arg(winner->getName()),
+              i18n("The mighty %1 has conquered the galaxy!").tqarg(winner->getName()),
               i18n("Game Over"));
     }
 
     if( (turnNumber == lastTurn) && !winner )
     {
-        mapWidget->repaint(true);
+        mapWidget->tqrepaint(true);
         GameEndDlg *dlg = new GameEndDlg( this );
 
         if( dlg->exec() == KDialogBase::Yes ) {
@@ -492,7 +492,7 @@ GameBoard::nextTurn()
     {
         // Game over, man! Game over.
 
-        mapWidget->repaint(true);
+        mapWidget->tqrepaint(true);
 
         gameOver();
     };
@@ -565,8 +565,8 @@ GameBoard::gameMsg(const TQString &msg, Player *player, Planet *planet, Player *
     {
        if (!player->isAiPlayer())
           isHumanInvolved = true;
-       colorMsg = colorMsg.arg(playerString(player));
-       plainMsg = plainMsg.arg(player->getName());
+       colorMsg = colorMsg.tqarg(playerString(player));
+       plainMsg = plainMsg.tqarg(player->getName());
     }
 
     if (planet)
@@ -577,15 +577,15 @@ GameBoard::gameMsg(const TQString &msg, Player *player, Planet *planet, Player *
           isHumanInvolved = true;
 
        TQString color = planetPlayer->getColor().name();
-       colorMsg = colorMsg.arg(TQString("<font color=\"%1\">%2</font>").arg(color, planet->getName()));
-       plainMsg = plainMsg.arg(planet->getName());
+       colorMsg = colorMsg.tqarg(TQString("<font color=\"%1\">%2</font>").tqarg(color, planet->getName()));
+       plainMsg = plainMsg.tqarg(planet->getName());
     }
-    msgWidget->append(("<qt><font color=\"white\">Turn %1:</font> <font color=\""+color+"\">").arg(turnNumber)+colorMsg+"</font></qt>");
+    msgWidget->append(("<qt><font color=\"white\">Turn %1:</font> <font color=\""+color+"\">").tqarg(turnNumber)+colorMsg+"</font></qt>");
     msgWidget->scrollToBottom();
     
     if (isHumanInvolved)
     {
-       mapWidget->repaint(true);
+       mapWidget->tqrepaint(true);
        KMessageBox::information(this, plainMsg);
     }
 }
@@ -660,7 +660,7 @@ GameBoard::doFleetArrival( AttackFleet *arrivingFleet )
 
         	TQString msg;
         	msg = i18n("Reinforcements (%1 ships) have arrived for planet %2.")
-        	      .arg(arrivingFleet->getShipCount());
+        	      .tqarg(arrivingFleet->getShipCount());
                 gameMsg(msg, 0, arrivingFleet->destination);
         }
     } else {
@@ -717,7 +717,7 @@ GameBoard::doFleetArrival( AttackFleet *arrivingFleet )
         }
     }
 
-    mapWidget->repaint(true);
+    mapWidget->tqrepaint(true);
 }
 
 //************************************************************************
diff --git a/konquest/gameboard.h b/konquest/gameboard.h
index 29c803dd..e429a4a4 100644
--- a/konquest/gameboard.h
+++ b/konquest/gameboard.h
@@ -32,7 +32,7 @@ public:
 
     bool isGameInProgress(void) const { return gameInProgress; }
 
-//    virtual TQSize sizeHint() const;
+//    virtual TQSize tqsizeHint() const;
 
 protected slots:
     void startNewGame();
diff --git a/konquest/gamecore.cc b/konquest/gamecore.cc
index 6696cbea..e02c115f 100644
--- a/konquest/gamecore.cc
+++ b/konquest/gamecore.cc
@@ -482,7 +482,7 @@ Player::getName()
 TQString
 Player::getColoredName()
 {
-    return TQString("<font color=\"%1\">%2</font>").arg(color.name(), name);
+    return TQString("<font color=\"%1\">%2</font>").tqarg(color.name(), name);
 }
 
 Player *Player::createPlayer( TQString newName, TQColor color, int playerNum, bool isAi )
diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc
index 637e9dc3..726f0561 100644
--- a/konquest/gameenddlg.cc
+++ b/konquest/gameenddlg.cc
@@ -1,5 +1,5 @@
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqvbox.h>
 
@@ -20,7 +20,7 @@ GameEndDlg::GameEndDlg( TQWidget *parent )
 
     // Create controls
     TQLabel *label1 = new TQLabel( i18n("This is the last turn.\nDo you wish to add extra turns?")+"\n\n", page );
-    label1->setAlignment( AlignCenter );
+    label1->tqsetAlignment( AlignCenter );
     
     turnCountLbl = new TQLabel( page );
     turnCount = new TQSlider( 1, 40, 1, 5, Qt::Horizontal, page );
@@ -71,6 +71,6 @@ GameEndDlg::extraTurns()
 void
 GameEndDlg::turnCountChange( int newTurnCount )
 {
-    TQString newLbl = i18n("Extra turns: %1").arg( newTurnCount );
+    TQString newLbl = i18n("Extra turns: %1").tqarg( newTurnCount );
     turnCountLbl->setText( newLbl);
 }
diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc
index a8aa33de..3d0cd67e 100644
--- a/konquest/map_widget.cc
+++ b/konquest/map_widget.cc
@@ -149,7 +149,7 @@ ConquestMap::squareBlink()
 void
 ConquestMap::mapUpdate()
 {
-    viewport()->repaint(false);
+    viewport()->tqrepaint(false);
 }
 
 
diff --git a/konquest/newGameDlg_ui.ui b/konquest/newGameDlg_ui.ui
index 55a8a2b9..fd7f782d 100644
--- a/konquest/newGameDlg_ui.ui
+++ b/konquest/newGameDlg_ui.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -26,7 +26,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -97,7 +97,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -131,7 +131,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -147,7 +147,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>0</width>
                                             <height>20</height>
@@ -172,7 +172,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>0</width>
                                             <height>20</height>
@@ -193,7 +193,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -202,7 +202,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -246,7 +246,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -262,7 +262,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>0</width>
                                             <height>20</height>
@@ -284,7 +284,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>0</width>
                                             <height>20</height>
@@ -303,7 +303,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -312,7 +312,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -328,7 +328,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>31</width>
                                             <height>20</height>
@@ -353,7 +353,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>51</width>
                                             <height>20</height>
diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cc
index 4cc9323f..a3d2718b 100644
--- a/konquest/newgamedlg.cc
+++ b/konquest/newgamedlg.cc
@@ -1,5 +1,5 @@
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
 #include <tqslider.h>
@@ -96,7 +96,7 @@ NewGameDlg::init()
     for( TQListViewItem *item = w->listPlayers->firstChild(); 
          item; item = item->nextSibling(), plrNum++ )
     {
-       TQString key = TQString("Player_%1").arg(plrNum);
+       TQString key = TQString("Player_%1").tqarg(plrNum);
        
        TQString playerName = config->readEntry(key);
        if (playerName.isEmpty())
@@ -184,7 +184,7 @@ NewGameDlg::setPlayerCount(int playerCount)
     
     while(w->listPlayers->childCount() < playerCount)
     {
-       TQString playerName = i18n("Generated AI player name", "Comp%1").arg(i+1);
+       TQString playerName = i18n("Generated AI player name", "Comp%1").tqarg(i+1);
        TQPixmap pm(16,16);
        TQColor color(PlayerColors[i]);
        pm.fill(color);
@@ -229,9 +229,9 @@ NewGameDlg::turns()
 void
 NewGameDlg::updateLabels()
 {
-    w->labelPlayers->setText(i18n("Number of &players: %1").arg(w->sliderPlayers->value()));
-    w->labelPlanets->setText(i18n("Number of neutral p&lanets: %1").arg(w->sliderPlanets->value()));
-    w->labelTurns->setText(i18n("Number of &turns: %1").arg(w->sliderTurns->value()));
+    w->labelPlayers->setText(i18n("Number of &players: %1").tqarg(w->sliderPlayers->value()));
+    w->labelPlanets->setText(i18n("Number of neutral p&lanets: %1").tqarg(w->sliderPlanets->value()));
+    w->labelTurns->setText(i18n("Number of &turns: %1").tqarg(w->sliderTurns->value()));
 }
 
 void
@@ -269,7 +269,7 @@ NewGameDlg::save()
     for( TQListViewItem *item = w->listPlayers->firstChild(); 
          item; item = item->nextSibling() )
     {
-        TQString key = TQString("Player_%1").arg(plrNum);
+        TQString key = TQString("Player_%1").tqarg(plrNum);
         TQString playerName = item->text(0);
         bool ai = (item->text(2) == "A");
         if (ai)
diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc
index c41c4096..9343fb81 100644
--- a/konquest/planet_info.cc
+++ b/konquest/planet_info.cc
@@ -1,6 +1,6 @@
 #include <tqlabel.h>
-#include <layout.h>
-#include <palette.h>
+#include <tqlayout.h>
+#include <tqpalette.h>
 #include <tqcolor.h>
 #include <kapplication.h>
 #include <klocale.h>
@@ -27,19 +27,19 @@ PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette )
 
     clearDisplay();
 
-    TQVBoxLayout *layout1 = new TQVBoxLayout( this );
+    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this );
 
-    layout1->addWidget( name );
-    layout1->addWidget( owner );
-    layout1->addWidget( ships );
-    layout1->addWidget( production );
-    layout1->addWidget( kill_percent );
-    layout1->addStretch(1);
+    tqlayout1->addWidget( name );
+    tqlayout1->addWidget( owner );
+    tqlayout1->addWidget( ships );
+    tqlayout1->addWidget( production );
+    tqlayout1->addWidget( kill_percent );
+    tqlayout1->addStretch(1);
 
     setMouseTracking( true );
 
-    setMinimumSize( sizeHint() );
-    setMaximumHeight( sizeHint().height() );
+    setMinimumSize( tqsizeHint() );
+    setMaximumHeight( tqsizeHint().height() );
 }
 
 PlanetInfo::~PlanetInfo()
@@ -47,15 +47,15 @@ PlanetInfo::~PlanetInfo()
     emptyPlanetInfoList();
 }
 
-TQSize PlanetInfo::sizeHint() const
+TQSize PlanetInfo::tqsizeHint() const
 {
     int height;
 
-    height = name->sizeHint().height() +
-    		owner->sizeHint().height() +
-		ships->sizeHint().height() +
-		production->sizeHint().height()+
-		kill_percent->sizeHint().height();
+    height = name->tqsizeHint().height() +
+    		owner->tqsizeHint().height() +
+		ships->tqsizeHint().height() +
+		production->tqsizeHint().height()+
+		kill_percent->tqsizeHint().height();
 
     return TQSize( 100, height );
 }
@@ -126,7 +126,7 @@ void PlanetInfo::showPlanet( Planet *planet )
 
         TQString temp;
 
-        temp = "<qt>" + i18n("Planet name: %1").arg(planet->getName());
+        temp = "<qt>" + i18n("Planet name: %1").tqarg(planet->getName());
         name->setText( temp );
         return;
     }
@@ -141,19 +141,19 @@ void PlanetInfo::showPlanet( Planet *planet )
 
             TQString temp;
 
-            temp = "<qt>" + i18n("Planet name: %1").arg(p->planet->getName());
+            temp = "<qt>" + i18n("Planet name: %1").tqarg(p->planet->getName());
             name->setText( temp );
 
-            temp = "<qt>" + i18n("Owner: %1").arg(p->planet->getPlayer()->getColoredName());
+            temp = "<qt>" + i18n("Owner: %1").tqarg(p->planet->getPlayer()->getColoredName());
             owner->setText( temp );
 
-            temp = "<qt>" + i18n("Ships: %1").arg( KGlobal::locale()->formatNumber(p->ships, 0) );
+            temp = "<qt>" + i18n("Ships: %1").tqarg( KGlobal::locale()->formatNumber(p->ships, 0) );
             ships->setText( temp );
 
-            temp = "<qt>" + i18n("Production: %1").arg( KGlobal::locale()->formatNumber(p->production, 0) );
+            temp = "<qt>" + i18n("Production: %1").tqarg( KGlobal::locale()->formatNumber(p->production, 0) );
             production->setText( temp );
 
-            temp = "<qt>" + i18n("Kill percent: %1").arg( KGlobal::locale()->formatNumber(p->killRate, 3) );
+            temp = "<qt>" + i18n("Kill percent: %1").tqarg( KGlobal::locale()->formatNumber(p->killRate, 3) );
             kill_percent->setText( temp );
         }
     }
diff --git a/konquest/planet_info.h b/konquest/planet_info.h
index c962ba3f..ade4b9b7 100644
--- a/konquest/planet_info.h
+++ b/konquest/planet_info.h
@@ -4,7 +4,7 @@
 #include <tqframe.h>
 #include <tqstring.h>
 #include <tqptrlist.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include "gamecore.h"
 
@@ -31,7 +31,7 @@ public:
 
     void setPlanetList( PlanetList &newPlanets );
     void rescanPlanets();
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     
 public slots:
     void showPlanet( Planet * );
diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc
index 794ec97a..843867bb 100644
--- a/konquest/scoredlg.cc
+++ b/konquest/scoredlg.cc
@@ -1,4 +1,4 @@
-#include <layout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
@@ -39,21 +39,21 @@ ScoreDlg::ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players
     scoreTable->addColumn(i18n("Fleets Launched"));
     scoreTable->addColumn(i18n("Fleets Destroyed"));
     scoreTable->addColumn(i18n("Ships Destroyed"));
-    scoreTable->setMinimumSize( scoreTable->sizeHint() );
+    scoreTable->setMinimumSize( scoreTable->tqsizeHint() );
 
     KPushButton *okButton = new KPushButton( KStdGuiItem::ok(), this );
-    okButton->setMinimumSize( okButton->sizeHint() );
+    okButton->setMinimumSize( okButton->tqsizeHint() );
     okButton->setDefault(true);
 
-    TQVBoxLayout *layout1 = new TQVBoxLayout( this );
-    TQHBoxLayout *layout2 = new TQHBoxLayout;
+    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this );
+    TQHBoxLayout *tqlayout2 = new TQHBoxLayout;
 
-    layout1->addWidget( scoreTable, 1 );
-    layout1->addLayout( layout2 );
+    tqlayout1->addWidget( scoreTable, 1 );
+    tqlayout1->addLayout( tqlayout2 );
 
-    layout2->addStretch( 2 );
-    layout2->addWidget( okButton );
-    layout2->addStretch( 2 );
+    tqlayout2->addStretch( 2 );
+    tqlayout2->addWidget( okButton );
+    tqlayout2->addStretch( 2 );
 
     connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
 
@@ -71,10 +71,10 @@ ScoreDlg::init()
     for( ;(curPlayer = itr()); )
         new ScoreDlgListViewItem(scoreTable,
                                  curPlayer->getName(),
-                                 TQString("%1").arg(curPlayer->getShipsBuilt()),
-                                 TQString("%1").arg(curPlayer->getPlanetsConquered()),
-                                 TQString("%1").arg(curPlayer->getFleetsLaunched()),
-                                 TQString("%1").arg(curPlayer->getEnemyFleetsDestroyed()),
-                                 TQString("%1").arg(curPlayer->getEnemyShipsDestroyed()));
+                                 TQString("%1").tqarg(curPlayer->getShipsBuilt()),
+                                 TQString("%1").tqarg(curPlayer->getPlanetsConquered()),
+                                 TQString("%1").tqarg(curPlayer->getFleetsLaunched()),
+                                 TQString("%1").tqarg(curPlayer->getEnemyFleetsDestroyed()),
+                                 TQString("%1").tqarg(curPlayer->getEnemyShipsDestroyed()));
 }