From 36770452958a79a095f9d9e605e79f66cfa79a2b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:20:47 -0600 Subject: Rename obsolete tq methods to standard names --- konquest/fleetdlg.cc | 14 +++++++------- konquest/gameboard.cc | 42 +++++++++++++++++++++--------------------- konquest/newGameDlg_ui.ui | 14 +++++++------- konquest/planet_info.cc | 16 ++++++++-------- konquest/scoredlg.cc | 14 +++++++------- 5 files changed, 50 insertions(+), 50 deletions(-) (limited to 'konquest') 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 @@ - tqlayout9 + layout9 @@ -26,7 +26,7 @@ - tqlayout4 + layout4 @@ -97,7 +97,7 @@ - tqlayout3 + layout3 @@ -131,7 +131,7 @@ - tqlayout2 + layout2 @@ -202,7 +202,7 @@ - tqlayout8 + layout8 @@ -246,7 +246,7 @@ - tqlayout7 + layout7 @@ -312,7 +312,7 @@ - tqlayout5 + layout5 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()) ); -- cgit v1.2.3