summaryrefslogtreecommitdiffstats
path: root/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp')
-rw-r--r--experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp
index 3def1675a..0701c6a3c 100644
--- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp
+++ b/experimental/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();