diff options
Diffstat (limited to 'konquest')
-rw-r--r-- | konquest/fleetdlg.cc | 4 | ||||
-rw-r--r-- | konquest/gameboard.cc | 6 | ||||
-rw-r--r-- | konquest/gameboard.h | 2 | ||||
-rw-r--r-- | konquest/gameenddlg.cc | 2 | ||||
-rw-r--r-- | konquest/newGameDlg_ui.ui | 16 | ||||
-rw-r--r-- | konquest/planet_info.cc | 16 | ||||
-rw-r--r-- | konquest/planet_info.h | 2 | ||||
-rw-r--r-- | konquest/scoredlg.cc | 4 |
8 files changed, 26 insertions, 26 deletions
diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc index b78053e4..20cb2e0c 100644 --- a/konquest/fleetdlg.cc +++ b/konquest/fleetdlg.cc @@ -46,10 +46,10 @@ FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets ) fleetTable->addColumn(i18n("Ships")); fleetTable->addColumn(i18n("Kill Percentage")); fleetTable->addColumn(i18n("Arrival Turn")); - fleetTable->setMinimumSize( fleetTable->tqsizeHint() ); + fleetTable->setMinimumSize( fleetTable->sizeHint() ); KPushButton *okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->setMinimumSize( okButton->tqsizeHint() ); + okButton->setMinimumSize( okButton->sizeHint() ); okButton->setDefault(true); TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this ); diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc index 9f1d1a7f..eb44deb2 100644 --- a/konquest/gameboard.cc +++ b/konquest/gameboard.cc @@ -60,10 +60,10 @@ GameBoard::GameBoard( TQWidget *parent ) turnCounter = new TQLabel( this ); turnCounter->setPalette( palette ); turnCounter->setText( "Turn" ); - turnCounter->setMaximumHeight( turnCounter->tqsizeHint().height() ); + turnCounter->setMaximumHeight( turnCounter->sizeHint().height() ); endTurn = new TQPushButton( i18n("End Turn"), this ); - endTurn->setFixedSize( endTurn->tqsizeHint() ); + endTurn->setFixedSize( endTurn->sizeHint() ); endTurn->setPalette( palette ); shipCountEdit = new TQLineEdit( this ); @@ -137,7 +137,7 @@ GameBoard::~GameBoard() } #if 0 -TQSize GameBoard::tqsizeHint() const +TQSize GameBoard::sizeHint() const { return TQSize( 600, 550 ); } diff --git a/konquest/gameboard.h b/konquest/gameboard.h index e429a4a4..29c803dd 100644 --- a/konquest/gameboard.h +++ b/konquest/gameboard.h @@ -32,7 +32,7 @@ public: bool isGameInProgress(void) const { return gameInProgress; } -// virtual TQSize tqsizeHint() const; +// virtual TQSize sizeHint() const; protected slots: void startNewGame(); diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc index 726f0561..c9aa374a 100644 --- a/konquest/gameenddlg.cc +++ b/konquest/gameenddlg.cc @@ -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->tqsetAlignment( AlignCenter ); + label1->setAlignment( AlignCenter ); turnCountLbl = new TQLabel( page ); turnCount = new TQSlider( 1, 40, 1, 5, Qt::Horizontal, page ); diff --git a/konquest/newGameDlg_ui.ui b/konquest/newGameDlg_ui.ui index fd7f782d..6c50c8d0 100644 --- a/konquest/newGameDlg_ui.ui +++ b/konquest/newGameDlg_ui.ui @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -303,7 +303,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -328,7 +328,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -353,7 +353,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc index 9343fb81..a45b0b0f 100644 --- a/konquest/planet_info.cc +++ b/konquest/planet_info.cc @@ -38,8 +38,8 @@ PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette ) 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 ); } diff --git a/konquest/planet_info.h b/konquest/planet_info.h index ade4b9b7..a8b14a2c 100644 --- a/konquest/planet_info.h +++ b/konquest/planet_info.h @@ -31,7 +31,7 @@ public: void setPlanetList( PlanetList &newPlanets ); void rescanPlanets(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: void showPlanet( Planet * ); diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc index 843867bb..1b4f06d0 100644 --- a/konquest/scoredlg.cc +++ b/konquest/scoredlg.cc @@ -39,10 +39,10 @@ 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->tqsizeHint() ); + scoreTable->setMinimumSize( scoreTable->sizeHint() ); KPushButton *okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->setMinimumSize( okButton->tqsizeHint() ); + okButton->setMinimumSize( okButton->sizeHint() ); okButton->setDefault(true); TQVBoxLayout *tqlayout1 = new TQVBoxLayout( this ); |