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/tqtoolbar.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/tqtoolbar.cpp')
-rw-r--r-- | tqtinterface/qt4/src/widgets/tqtoolbar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqtoolbar.cpp b/tqtinterface/qt4/src/widgets/tqtoolbar.cpp index 3def167..0701c6a 100644 --- a/tqtinterface/qt4/src/widgets/tqtoolbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqtoolbar.cpp @@ -106,7 +106,7 @@ class TQToolBarSeparator : public TQWidget public: TQToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } public Q_SLOTS: void setOrientation( Qt::Orientation ); @@ -188,7 +188,7 @@ void TQToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize TQToolBarSeparator::sizeHint() const +TQSize TQToolBarSeparator::tqsizeHint() const { int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); @@ -698,7 +698,7 @@ void TQToolBar::createPopup() cp->setItemChecked( i, TRUE ); if ( !maxItems ) { if ( cp->count() == 10 ) { - int h = cp->sizeHint().height(); + int h = cp->tqsizeHint().height(); maxItems = TQApplication::desktop()->height() * 10 / h; } } else if ( cp->count() >= maxItems - 1 ) { @@ -734,9 +734,9 @@ void TQToolBar::checkForExtension( const TQSize &sz ) bool tooSmall; if ( orientation() == Qt::Horizontal ) - tooSmall = sz.width() < sizeHint().width(); + tooSmall = sz.width() < tqsizeHint().width(); else - tooSmall = sz.height() < sizeHint().height(); + tooSmall = sz.height() < tqsizeHint().height(); if ( tooSmall ) { createPopup(); |