diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-17 19:19:26 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-17 19:19:26 -0500 |
| commit | 33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd (patch) | |
| tree | 4939d6567b50d0dd669257422a6868aa1259e62b /tqtinterface/qt4/src/widgets/tqmainwindow.cpp | |
| parent | f01eee0362e54f47d0266295c5263790c04b6510 (diff) | |
| download | experimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.tar.gz experimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.zip | |
Revert "Rename tqsize* to size*"
This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
Diffstat (limited to 'tqtinterface/qt4/src/widgets/tqmainwindow.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/widgets/tqmainwindow.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqmainwindow.cpp b/tqtinterface/qt4/src/widgets/tqmainwindow.cpp index e05de63..1921297 100644 --- a/tqtinterface/qt4/src/widgets/tqmainwindow.cpp +++ b/tqtinterface/qt4/src/widgets/tqmainwindow.cpp @@ -140,7 +140,7 @@ public: void setRightDock( TQDockArea *r ); void setCentralWidget( TQWidget *w ); bool hasHeightForWidth() const { return FALSE; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQLayoutIterator iterator(); TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::BothDirections; } @@ -189,23 +189,23 @@ TQLayoutItem* TQMainWindowLayout::takeAt(int index) { return 0; } -TQSize TQMainWindowLayout::sizeHint() const +TQSize TQMainWindowLayout::tqsizeHint() const { int w = 0; int h = 0; if ( left ) { - w += left->sizeHint().width(); - h = TQMAX( h, left->sizeHint().height() ); + w += left->tqsizeHint().width(); + h = TQMAX( h, left->tqsizeHint().height() ); } if ( right ) { - w += right->sizeHint().width(); - h = TQMAX( h, right->sizeHint().height() ); + w += right->tqsizeHint().width(); + h = TQMAX( h, right->tqsizeHint().height() ); } if ( central ) { - w += central->sizeHint().width(); + w += central->tqsizeHint().width(); int diff = extraPixels(); - h = TQMAX( h, central->sizeHint().height() + diff ); + h = TQMAX( h, central->tqsizeHint().height() + diff ); } return TQSize( w, h ); @@ -1566,7 +1566,7 @@ void TQMainWindow::hide() /*! \reimp */ -TQSize TQMainWindow::sizeHint() const +TQSize TQMainWindow::tqsizeHint() const { TQMainWindow* that = (TQMainWindow*) this; // Workaround: because d->tll get's deleted in |