From ba6b21419810544e0c8666969d21d72161d9084c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:20:25 -0600 Subject: Rename obsolete tq methods to standard names --- libtdeedu/extdate/extdatepicker.cpp | 2 +- libtdeedu/extdate/extdatetimeedit.cpp | 6 +++--- libtdeedu/extdate/extdatewidget.cpp | 8 ++++---- libtdeedu/tdeeduui/tdeeduglossary.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libtdeedu') diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp index 5557b8fd..7d167a98 100644 --- a/libtdeedu/extdate/extdatepicker.cpp +++ b/libtdeedu/extdate/extdatepicker.cpp @@ -490,7 +490,7 @@ ExtDatePicker::setFontSize(int s) maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); } - TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, + TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); selectMonth->setMinimumSize(metricBound); diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp index b2468107..bc64c6ed 100644 --- a/libtdeedu/extdate/extdatetimeedit.cpp +++ b/libtdeedu/extdate/extdatetimeedit.cpp @@ -436,7 +436,7 @@ void ExtDateTimeEditor::paintEvent( TQPaintEvent * ) colorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background ); buffer.painter()->fillRect( 0, 0, width(), height(), bg ); d->paint( txt, hasFocus(), *buffer.painter(), colorGroup(), rect(), - tqstyle() ); + style() ); buffer.end(); } @@ -974,7 +974,7 @@ TQSize ExtDateEdit::sizeHint() const { constPolish(); TQFontMetrics fm( font() ); - int fw = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); + int fw = style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); int h = TQMAX( fm.lineSpacing(), 14 ) + 2; int w = 2 + fm.width( '9' ) * 8 + fm.width( d->ed->separator() ) * 2 + d->controls->upRect().width() + fw * 4; @@ -2434,7 +2434,7 @@ public: // { // constPolish(); // TQFontMetrics fm( font() ); -// int fw = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); +// int fw = style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); // int h = fm.lineSpacing() + 2; // int w = 2 + fm.width( '9' ) * 6 + fm.width( d->ed->separator() ) * 2 + // d->controls->upRect().width() + fw * 4; diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp index 041b0d76..bd0163d3 100644 --- a/libtdeedu/extdate/extdatewidget.cpp +++ b/libtdeedu/extdate/extdatewidget.cpp @@ -74,8 +74,8 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, // { // d = new ExtDateWidgetPrivate; // KLocale *locale = KGlobal::locale(); -// TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); -// tqlayout->setAutoAdd(true); +// TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); +// layout->setAutoAdd(true); // d->m_day = new ExtDateWidgetSpinBox(1, 1, this); // d->m_month = new TQComboBox(false, this); // for (int i = 1; ; ++i) @@ -98,8 +98,8 @@ void ExtDateWidget::init(const ExtDate& date) { d = new ExtDateWidgetPrivate; //KLocale *locale = KGlobal::locale(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + layout->setAutoAdd(true); d->m_day = new ExtDateWidgetSpinBox(1, 1, this); d->m_month = new TQComboBox(false, this); for (int i = 1; ; ++i) diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h index e5d29ba0..629466d4 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.h +++ b/libtdeedu/tdeeduui/tdeeduglossary.h @@ -148,7 +148,7 @@ class Glossary TQString m_picturepath; /** - * Load the tqlayout from an XML file. + * Load the layout from an XML file. * * @param doc The TQDomDocument which will contain the read XML * contents. -- cgit v1.2.3