diff options
Diffstat (limited to 'lib/widgets/qcomboview.cpp')
| -rw-r--r-- | lib/widgets/qcomboview.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 4db96f46..b9df3805 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -81,7 +81,7 @@ void QComboViewData::updateLinedGeometry() { if ( !ed || !combo ) return; - TQRect r = TQStyle::visualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo, + TQRect r = TQStyle::visualRect( combo->style().querySubControlMetrics(TQStyle::CC_ComboBox, combo, TQStyle::SC_ComboBoxEditField), combo ); // qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1); @@ -290,7 +290,7 @@ TQSize QComboView::sizeHint() const maxW = w; } */ - d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, + d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut())); return d->sizeHint; @@ -428,13 +428,13 @@ void QComboView::paintEvent( TQPaintEvent * ) } // bool reverse = TQApplication::reverseLayout(); - tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, + style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, flags, TQStyle::SC_All, (d->arrowDown ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None )); - TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); re = TQStyle::visualRect(re, this); p.setClipRect( re ); @@ -472,7 +472,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) d->discardNextMousePress = FALSE; return; } - TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); arrowRect = TQStyle::visualRect(arrowRect, this); @@ -749,7 +749,7 @@ void QComboView::popup() if (y + h > sy+sh && y - h - height() >= 0 ) y = y - h - height(); TQRect rect = - tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxListBoxPopup, TQStyleOption( x, y, w, h ) ); if ( rect.isNull() ) @@ -790,7 +790,7 @@ void QComboView::updateMask() { TQPainter p( &bm, this ); - tqstyle().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); + style().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); } setMask( bm ); @@ -902,7 +902,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) TQPoint comboPos; comboPos = mapFromGlobal( d->listView()->mapToGlobal(pos) ); TQRect arrowRect = - tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); arrowRect = TQStyle::visualRect(arrowRect, this); if ( arrowRect.contains( comboPos ) ) { @@ -918,7 +918,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) } } } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 && - tqstyle().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { + style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // qWarning("event filter:: emu"); TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); // if ( mouseW == d->listView()->viewport() ) { //### |