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

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

1 files changed, 14 insertions, 14 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)));
     }
 }