From ba335c4be73ee8e3ae5c6084e889c003825cda44 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:04:05 -0600 Subject: Rename obsolete tq methods to standard names --- libk3b/tools/k3bcutcombobox.cpp | 2 +- libk3b/tools/k3blistview.cpp | 8 ++++---- libk3b/tools/k3bmsfedit.cpp | 4 ++-- libk3b/tools/k3brichtextlabel.h | 2 +- libk3b/tools/k3btoolbox.cpp | 4 ++-- libk3b/tools/k3btoolbutton.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'libk3b/tools') diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp index 089e27e..a92ae6a 100644 --- a/libk3b/tools/k3bcutcombobox.cpp +++ b/libk3b/tools/k3bcutcombobox.cpp @@ -205,7 +205,7 @@ void K3bCutComboBox::resizeEvent( TQResizeEvent* e ) void K3bCutComboBox::cutText() { - d->width = TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this, + d->width = TQStyle::visualRect( style().querySubControlMetrics(TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField), this ).width(); for( int i = 0; i < (int)d->originalItems.count(); ++i ) { diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index b998cf5..048f2ee 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -448,8 +448,8 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i // some styles use the widget's geometry s_dummyProgressBar->setGeometry( r ); - listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); - listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags ); + listView()->style().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); + listView()->style().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags ); // now we really paint the progress in the listview p->drawPixmap( 0, 0, *doubleBuffer ); @@ -508,7 +508,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i if( col == 0 ) { if( m_checked ) { - TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() ); + TQRect r( 0, marginVertical(), width, /*listView()->style().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() ); TQStyle::SFlags flags = TQStyle::Style_Default; if( listView()->isEnabled() ) @@ -520,7 +520,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i else flags |= TQStyle::Style_Off; - listView()->tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags ); + listView()->style().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags ); } } } diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index e3d3a70..07ed77d 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -59,8 +59,8 @@ TQSize K3bMsfEdit::sizeHint() const TQFontMetrics fm( font() ); int w = fm.width( "00:00:00" ); int wx = fm.width( ' ' )*2; - int frame = tqstyle().pixelMetric( TQStyle::PM_SpinBoxFrameWidth ); - return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this, + int frame = style().pixelMetric( TQStyle::PM_SpinBoxFrameWidth ); + return style().tqsizeFromContents(TQStyle::CT_SpinBox, this, TQSize( w + wx + downRect().width() + frame*2, h + frame*2). expandedTo( TQApplication::globalStrut() )); diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index a23c9df..d2c7250 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -21,7 +21,7 @@ #include /** - * @short A replacement for TQLabel that supports richtext and proper tqlayout management + * @short A replacement for TQLabel that supports richtext and proper layout management * * @author Waldo Bastian */ diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index e812f0a..f260b7d 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -60,7 +60,7 @@ K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent ) TQSize K3bToolBoxSeparator::sizeHint() const { - int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, + int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); return TQSize( extent, 0 ); } @@ -71,7 +71,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal; - tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), + style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), colorGroup(), flags ); } diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index 5b80907..04d767c 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -68,7 +68,7 @@ void K3bToolButton::drawButton( TQPainter* p ) if( isEnabled() ) arrowFlags |= TQStyle::Style_Enabled; - tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, + style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, TQRect(width()-7, height()-7, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } -- cgit v1.2.3