From 28723595822268551d3e050c3a83bf6ca5e17dd5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:10:39 -0600 Subject: Rename old tq methods that no longer need a unique name --- kmymoney2/widgets/kmymoneycombo.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kmymoney2/widgets/kmymoneycombo.cpp') diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp index 0d8ce4d..7146f68 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -131,12 +131,12 @@ void KMyMoneyCombo::paintEvent(TQPaintEvent* ev) // is that length 1 is the blank case so no need to do painting if(str.length() > 1) { TQPainter p( this ); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); p.setPen(g.text()); TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::tqvisualRect(re, this); + re = TQStyle::visualRect(re, this); p.setClipRect( re ); p.save(); p.setFont(font()); @@ -182,7 +182,7 @@ bool KMyMoneyCombo::isInArrowArea(const TQPoint& pos) const { TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::tqvisualRect(arrowRect, this); + arrowRect = TQStyle::visualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. @@ -305,9 +305,9 @@ void KMyMoneyCombo::setSelectedItem(const TQString& id) update(); } -TQSize KMyMoneyCombo::tqsizeHint() const +TQSize KMyMoneyCombo::sizeHint() const { - return KComboBox::tqsizeHint(); + return KComboBox::sizeHint(); // I wanted to use the code below to adjust the size of the combo box // according to the largest item in the selector list. Apparently that @@ -325,11 +325,11 @@ TQSize KMyMoneyCombo::tqsizeHint() const if ( w > maxW ) maxW = w; - TQSize tqsizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, + TQSize sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)). expandedTo(TQApplication::globalStrut())); - return tqsizeHint; + return sizeHint; #endif } -- cgit v1.2.1