diff options
Diffstat (limited to 'chalk/ui')
| -rw-r--r-- | chalk/ui/kis_color_cup.cpp | 4 | ||||
| -rw-r--r-- | chalk/ui/squeezedcombobox.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chalk/ui/kis_color_cup.cpp b/chalk/ui/kis_color_cup.cpp index 198cb01fc..751cfdda6 100644 --- a/chalk/ui/kis_color_cup.cpp +++ b/chalk/ui/kis_color_cup.cpp @@ -83,7 +83,7 @@ void KisColorCup::slotClicked() TQSize KisColorCup::sizeHint() const { - return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). + return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). expandedTo(TQApplication::globalStrut()); } @@ -110,7 +110,7 @@ void KisColorCup::drawButtonLabel( TQPainter *painter ) if ( hasFocus() ) { TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); } } diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index d0cd8825b..6656e35da 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -98,7 +98,7 @@ TQSize SqueezedComboBox::sizeHint() const int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18; int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; - return style().tqsizeFromContents(TQStyle::CT_ComboBox, this, + return style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)). expandedTo(TQApplication::globalStrut()); } |