Rename obsolete tq methods to standard names

5 files changed, 50 insertions, 50 deletions

diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc
index 2e18d0bc..e933e895 100644
--- a/konquest/fleetdlg.cc
+++ b/konquest/fleetdlg.cc
@@ -52,15 +52,15 @@ FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets )
     okButton->setMinimumSize( okButton->sizeHint() );
     okButton->setDefault(true);
 
-    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this );
-    TQHBoxLayout *tqlayout2 = new TQHBoxLayout;
+    TQVBoxLayout *layout1 = new TQVBoxLayout( this );
+    TQHBoxLayout *layout2 = new TQHBoxLayout;
 
-    tqlayout1->addWidget( fleetTable, 1 );
-    tqlayout1->addLayout( tqlayout2 );
+    layout1->addWidget( fleetTable, 1 );
+    layout1->addLayout( layout2 );
 
-    tqlayout2->addStretch( 2 );
-    tqlayout2->addWidget( okButton );
-    tqlayout2->addStretch( 2 );
+    layout2->addStretch( 2 );
+    layout2->addWidget( okButton );
+    layout2->addStretch( 2 );
 
     connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
 
diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc
index 9f44f872..455ea03c 100644
--- a/konquest/gameboard.cc
+++ b/konquest/gameboard.cc
@@ -88,33 +88,33 @@ GameBoard::GameBoard( TQWidget *parent )
     //********************************************************************
     // Layout the main window
     //********************************************************************
-    TQHBoxLayout *tqlayout1 = new TQHBoxLayout( this );
-    TQVBoxLayout *tqlayout2 = new TQVBoxLayout;
-    TQHBoxLayout *tqlayout3 = new TQHBoxLayout;
-    TQVBoxLayout *tqlayout4 = new TQVBoxLayout;
+    TQHBoxLayout *layout1 = new TQHBoxLayout( this );
+    TQVBoxLayout *layout2 = new TQVBoxLayout;
+    TQHBoxLayout *layout3 = new TQHBoxLayout;
+    TQVBoxLayout *layout4 = new TQVBoxLayout;
 
-    tqlayout1->addLayout( tqlayout2 );
-    tqlayout2->addLayout( tqlayout3 );
+    layout1->addLayout( layout2 );
+    layout2->addLayout( layout3 );
 
-    tqlayout3->addSpacing( 5 );
-    tqlayout3->addWidget( gameMessage, 10 );
-    tqlayout3->addWidget( shipCountEdit, 1 );
-    tqlayout3->addWidget( endTurn, 1 );
+    layout3->addSpacing( 5 );
+    layout3->addWidget( gameMessage, 10 );
+    layout3->addWidget( shipCountEdit, 1 );
+    layout3->addWidget( endTurn, 1 );
 
-    tqlayout2->addSpacing( 5 );
-    tqlayout2->addWidget( mapWidget, 0, AlignTop );
-    tqlayout2->addWidget( msgWidget );
-    tqlayout2->addStretch( 1 );
+    layout2->addSpacing( 5 );
+    layout2->addWidget( mapWidget, 0, AlignTop );
+    layout2->addWidget( msgWidget );
+    layout2->addStretch( 1 );
 
-    tqlayout1->addSpacing( 5 );
-    tqlayout1->addLayout( tqlayout4, 10 );
+    layout1->addSpacing( 5 );
+    layout1->addLayout( layout4, 10 );
 
-    tqlayout4->addWidget( planetInfo, 1 );
-    tqlayout4->addSpacing( 10 );
-    tqlayout4->addWidget( turnCounter,  1 );
-    tqlayout4->addStretch( 1 );
+    layout4->addWidget( planetInfo, 1 );
+    layout4->addSpacing( 10 );
+    layout4->addWidget( turnCounter,  1 );
+    layout4->addStretch( 1 );
 
-    tqlayout1->addStretch( 1 );
+    layout1->addStretch( 1 );
 
     //**********************************************************************
     // Set up signal/slot connections
diff --git a/konquest/newGameDlg_ui.ui b/konquest/newGameDlg_ui.ui
index 6c50c8d0..55a8a2b9 100644
--- a/konquest/newGameDlg_ui.ui
+++ b/konquest/newGameDlg_ui.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -26,7 +26,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -97,7 +97,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -131,7 +131,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -202,7 +202,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -246,7 +246,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout7</cstring>
+                                <cstring>layout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -312,7 +312,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc
index 0d4df824..1d178493 100644
--- a/konquest/planet_info.cc
+++ b/konquest/planet_info.cc
@@ -27,14 +27,14 @@ PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette )
 
     clearDisplay();
 
-    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this );
-
-    tqlayout1->addWidget( name );
-    tqlayout1->addWidget( owner );
-    tqlayout1->addWidget( ships );
-    tqlayout1->addWidget( production );
-    tqlayout1->addWidget( kill_percent );
-    tqlayout1->addStretch(1);
+    TQVBoxLayout *layout1 = new TQVBoxLayout( this );
+
+    layout1->addWidget( name );
+    layout1->addWidget( owner );
+    layout1->addWidget( ships );
+    layout1->addWidget( production );
+    layout1->addWidget( kill_percent );
+    layout1->addStretch(1);
 
     setMouseTracking( true );
 
diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc
index 116f88c6..fee4a404 100644
--- a/konquest/scoredlg.cc
+++ b/konquest/scoredlg.cc
@@ -45,15 +45,15 @@ ScoreDlg::ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players
     okButton->setMinimumSize( okButton->sizeHint() );
     okButton->setDefault(true);
 
-    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this );
-    TQHBoxLayout *tqlayout2 = new TQHBoxLayout;
+    TQVBoxLayout *layout1 = new TQVBoxLayout( this );
+    TQHBoxLayout *layout2 = new TQHBoxLayout;
 
-    tqlayout1->addWidget( scoreTable, 1 );
-    tqlayout1->addLayout( tqlayout2 );
+    layout1->addWidget( scoreTable, 1 );
+    layout1->addLayout( layout2 );
 
-    tqlayout2->addStretch( 2 );
-    tqlayout2->addWidget( okButton );
-    tqlayout2->addStretch( 2 );
+    layout2->addStretch( 2 );
+    layout2->addWidget( okButton );
+    layout2->addStretch( 2 );
 
     connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );