diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:05:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:05:41 -0600 |
| commit | 2d6954f69caf63ed5057bd8e1405a65d7d970292 (patch) | |
| tree | 88e6436b2e81d4e68313f02a9021054252e14cc4 /kexi/plugins/forms/widgets/kexidbcombobox.cpp | |
| parent | f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (diff) | |
| download | koffice-2d6954f69caf63ed5057bd8e1405a65d7d970292.tar.gz koffice-2d6954f69caf63ed5057bd8e1405a65d7d970292.zip | |
Rename obsolete tq methods to standard names
Diffstat (limited to 'kexi/plugins/forms/widgets/kexidbcombobox.cpp')
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbcombobox.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index db56b550..5d2a24fd 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -124,7 +124,7 @@ bool KexiDBComboBox::isEditable() const void KexiDBComboBox::paintEvent( TQPaintEvent * ) { TQPainter p( this ); - TQColorGroup cg( tqpalette().active() ); + TQColorGroup cg( palette().active() ); // if ( hasFocus() ) // cg.setColor(TQColorGroup::Base, cg.highlight()); // else @@ -144,9 +144,9 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) return; } -//! @todo support reverse tqlayout +//! @todo support reverse layout //bool reverse = TQApplication::reverseLayout(); - tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg, + style().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg, flags, (uint)TQStyle::SC_All, (d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None ) ); @@ -157,11 +157,11 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) else { //not editable: we need to paint the current item TQRect editorGeometry( this->editorGeometry() ); if ( hasFocus() ) { - if (0==qstrcmp(tqstyle().name(), "windows")) //a hack + if (0==qstrcmp(style().name(), "windows")) //a hack p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) ); - TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); + TQRect r( TQStyle::visualRect( style().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, + style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight())); } //todo @@ -171,7 +171,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) TQRect KexiDBComboBox::editorGeometry() const { TQRect r( TQStyle::visualRect( - tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo, + style().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxEditField), d->paintedCombo ) ); //if ((height()-r.bottom())<6) @@ -232,7 +232,7 @@ void KexiDBComboBox::setLabelPosition(LabelPosition position) TQRect KexiDBComboBox::buttonGeometry() const { TQRect arrowRect( - tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) ); + style().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) ); arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo); arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style return arrowRect; @@ -509,7 +509,7 @@ TQSize KexiDBComboBox::sizeHint() const const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18; const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2; - d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, + d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut())); return d->sizeHint; |