From 22da7013fff03b0a938a6048633369d1b2041a52 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:56:22 +0900 Subject: Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro (cherry picked from commit 3b66617d9d5f343c30a87381720db2fc835ce52b) --- kaddressbook/jumpbuttonbar.cpp | 2 +- kaddressbook/views/cardview.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kaddressbook') diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index def1896fe..1a1d249c1 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons() TQFontMetrics fm = fontMetrics(); TQPushButton *btn = new TQPushButton( "", this ); btn->hide(); - TQSize buttonSize = style().tqsizeFromContents( TQStyle::CT_PushButton, btn, + TQSize buttonSize = style().sizeFromContents( TQStyle::CT_PushButton, btn, fm.size( ShowPrefix, "X - X") ). expandedTo( TQApplication::globalStrut() ); delete btn; diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 47181557f..e77d66e04 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg ) // if we are the current item and the view has focus, draw focus rect if ( mView->currentItem() == this && mView->hasFocus() ) { - mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, + mView->style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg, TQStyle::Style_FocusAtBorder, TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) ); -- cgit v1.2.1