1 files changed, 23 insertions, 23 deletions

diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc
index 9343fb81..c41c4096 100644
--- a/konquest/planet_info.cc
+++ b/konquest/planet_info.cc
@@ -1,6 +1,6 @@
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpalette.h>
+#include <layout.h>
+#include <palette.h>
 #include <tqcolor.h>
 #include <kapplication.h>
 #include <klocale.h>
@@ -27,19 +27,19 @@ PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette )
 
     clearDisplay();
 
-    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this );
+    TQVBoxLayout *layout1 = new TQVBoxLayout( this );
 
-    tqlayout1->addWidget( name );
-    tqlayout1->addWidget( owner );
-    tqlayout1->addWidget( ships );
-    tqlayout1->addWidget( production );
-    tqlayout1->addWidget( kill_percent );
-    tqlayout1->addStretch(1);
+    layout1->addWidget( name );
+    layout1->addWidget( owner );
+    layout1->addWidget( ships );
+    layout1->addWidget( production );
+    layout1->addWidget( kill_percent );
+    layout1->addStretch(1);
 
     setMouseTracking( true );
 
-    setMinimumSize( tqsizeHint() );
-    setMaximumHeight( tqsizeHint().height() );
+    setMinimumSize( sizeHint() );
+    setMaximumHeight( sizeHint().height() );
 }
 
 PlanetInfo::~PlanetInfo()
@@ -47,15 +47,15 @@ PlanetInfo::~PlanetInfo()
     emptyPlanetInfoList();
 }
 
-TQSize PlanetInfo::tqsizeHint() const
+TQSize PlanetInfo::sizeHint() const
 {
     int height;
 
-    height = name->tqsizeHint().height() +
-    		owner->tqsizeHint().height() +
-		ships->tqsizeHint().height() +
-		production->tqsizeHint().height()+
-		kill_percent->tqsizeHint().height();
+    height = name->sizeHint().height() +
+    		owner->sizeHint().height() +
+		ships->sizeHint().height() +
+		production->sizeHint().height()+
+		kill_percent->sizeHint().height();
 
     return TQSize( 100, height );
 }
@@ -126,7 +126,7 @@ void PlanetInfo::showPlanet( Planet *planet )
 
         TQString temp;
 
-        temp = "<qt>" + i18n("Planet name: %1").tqarg(planet->getName());
+        temp = "<qt>" + i18n("Planet name: %1").arg(planet->getName());
         name->setText( temp );
         return;
     }
@@ -141,19 +141,19 @@ void PlanetInfo::showPlanet( Planet *planet )
 
             TQString temp;
 
-            temp = "<qt>" + i18n("Planet name: %1").tqarg(p->planet->getName());
+            temp = "<qt>" + i18n("Planet name: %1").arg(p->planet->getName());
             name->setText( temp );
 
-            temp = "<qt>" + i18n("Owner: %1").tqarg(p->planet->getPlayer()->getColoredName());
+            temp = "<qt>" + i18n("Owner: %1").arg(p->planet->getPlayer()->getColoredName());
             owner->setText( temp );
 
-            temp = "<qt>" + i18n("Ships: %1").tqarg( KGlobal::locale()->formatNumber(p->ships, 0) );
+            temp = "<qt>" + i18n("Ships: %1").arg( KGlobal::locale()->formatNumber(p->ships, 0) );
             ships->setText( temp );
 
-            temp = "<qt>" + i18n("Production: %1").tqarg( KGlobal::locale()->formatNumber(p->production, 0) );
+            temp = "<qt>" + i18n("Production: %1").arg( KGlobal::locale()->formatNumber(p->production, 0) );
             production->setText( temp );
 
-            temp = "<qt>" + i18n("Kill percent: %1").tqarg( KGlobal::locale()->formatNumber(p->killRate, 3) );
+            temp = "<qt>" + i18n("Kill percent: %1").arg( KGlobal::locale()->formatNumber(p->killRate, 3) );
             kill_percent->setText( temp );
         }
     }