From 3c299dfe48c0060272c2966fff599b3b417e2ee4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:33:07 -0600 Subject: Rename old tq methods that no longer need a unique name --- arts/gui/kde/klayoutbox_impl.cpp | 10 +++++----- arts/gui/kde/klayoutbox_impl.h | 4 ++-- arts/gui/kde/klevelmeter_linebars.cpp | 2 +- arts/gui/kde/kpopupbox_private.h | 22 +++++++++++----------- arts/gui/kde/kpoti.cpp | 26 +++++++++++++------------- arts/gui/kde/kpoti.h | 4 ++-- arts/gui/kde/ktickmarks_impl.cpp | 4 ++-- arts/gui/kde/kvolumefader_impl.cpp | 8 ++++---- arts/gui/kde/kwidget_impl.cpp | 12 ++++++------ 9 files changed, 46 insertions(+), 46 deletions(-) (limited to 'arts/gui/kde') diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 9aeee822..5ee56635 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -85,11 +85,11 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if ( width() < height() ) flags |= TQStyle::Style_Horizontal; - tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); } -TQSize KLayoutBox_Separator::tqminimumSizeHint() const { - int wh = tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this ); +TQSize KLayoutBox_Separator::minimumSizeHint() const { + int wh = tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this ); return TQSize( wh, wh ); } @@ -105,12 +105,12 @@ KLayoutBox_Line::KLayoutBox_Line( int width, int space, TQWidget* p, const char* void KLayoutBox_Line::paintEvent( TQPaintEvent* ) { //kdDebug() << k_funcinfo << size() << endl; TQPainter p( this ); - p.setPen( TQPen( tqcolorGroup().foreground(), _width ) ); + p.setPen( TQPen( colorGroup().foreground(), _width ) ); if ( width() > height() ) p.drawLine( 0, height()/2, width(), height()/2 ); else p.drawLine( width()/2, 0, width()/2, height() ); } -TQSize KLayoutBox_Line::tqminimumSizeHint() const { +TQSize KLayoutBox_Line::minimumSizeHint() const { //kdDebug() << k_funcinfo << size() << endl; int wh = _width + 2* _space; return TQSize( wh, wh ); diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index 38cca947..eee3b781 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -85,7 +85,7 @@ public: KLayoutBox_Separator( TQWidget*, const char* =0 ); void resizeEvent( TQResizeEvent* ); void paintEvent( TQPaintEvent* ); - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; }; class KLayoutBox_Line : public TQWidget { @@ -96,7 +96,7 @@ private: public: KLayoutBox_Line( int, int, TQWidget*, const char* =0 ); void paintEvent( TQPaintEvent* ); - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; }; #endif diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index 37dfe4d3..cdbb819d 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -31,7 +31,7 @@ KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidg //kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<setMinimumSize( 5, 5 ); this->substyle( substyle ); - _stdcolors = tqcolorGroup(); + _stdcolors = colorGroup(); setBackgroundMode( TQt::NoBackground ); } diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h index b9b38e7f..07fb221c 100644 --- a/arts/gui/kde/kpopupbox_private.h +++ b/arts/gui/kde/kpopupbox_private.h @@ -88,7 +88,7 @@ public: TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if( width() < height() ) flags |= TQStyle::Style_Horizontal; - tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), tqcolorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); } signals: void clicked(); @@ -151,17 +151,17 @@ public slots: } } public: - TQSize tqminimumSizeHint() const { - int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + TQSize minimumSizeHint() const { + int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; @@ -187,17 +187,17 @@ public slots: else setPixmap( _pmown ); } public: - TQSize tqminimumSizeHint() const { - int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + TQSize minimumSizeHint() const { + int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index dca86721..b38902d8 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -53,7 +53,7 @@ struct KPoti::KPotiPrivate bool bgDirty; KPixmap bgdb; - KPixmap bgPixmap( const TQColorGroup & tqcolorGroup ) + KPixmap bgPixmap( const TQColorGroup & colorGroup ) { if( bgDirty || bgdb.isNull() ) { @@ -73,8 +73,8 @@ struct KPoti::KPotiPrivate // inset shadow KPixmap gradient( bgdb.size() ); - KPixmapEffect::gradient( gradient, tqcolorGroup.light(), tqcolorGroup.dark(), KPixmapEffect::DiagonalGradient ); - dbp.setBrush( TQBrush( tqcolorGroup.button(), gradient ) ); + KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient ); + dbp.setBrush( TQBrush( colorGroup.button(), gradient ) ); dbp.drawEllipse( drawRect ); potiRect.setSize( drawRect.size() * 0.9 ); @@ -133,12 +133,12 @@ TQSizePolicy KPoti::sizePolicy() const return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); } -TQSize KPoti::tqsizeHint() const +TQSize KPoti::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KPoti::tqminimumSizeHint() const +TQSize KPoti::minimumSizeHint() const { int width = 40; int height = 40; @@ -162,7 +162,7 @@ TQString KPoti::text() const void KPoti::setText( const TQString & text ) { d->label = text; - setMinimumSize( tqminimumSizeHint() ); + setMinimumSize( minimumSizeHint() ); updateGeometry(); } @@ -408,8 +408,8 @@ void KPoti::paintPoti( TQPainter * p ) p2.translate( db.rect().center().x(), db.rect().center().y() ); p2.rotate( potiPos * 180.0 / PI ); TQRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 ); - TQBrush buttonbrush( tqcolorGroup().button() ); - qDrawShadePanel( &p2, pointer, tqcolorGroup(), true, 1, &buttonbrush ); + TQBrush buttonbrush( colorGroup().button() ); + qDrawShadePanel( &p2, pointer, colorGroup(), true, 1, &buttonbrush ); p2.end(); p->drawPixmap( d->potiRect, db ); @@ -440,7 +440,7 @@ void KPoti::reallyMovePoti( float newPos ) void KPoti::drawContents( TQPainter * p ) { TQPixmap doublebuffer( contentsRect().size() ); - doublebuffer.fill( tqcolorGroup().background() ); + doublebuffer.fill( colorGroup().background() ); TQPainter dbp( &doublebuffer ); if( m_bLabel ) { @@ -455,10 +455,10 @@ void KPoti::drawContents( TQPainter * p ) if( ticks ) drawTicks( &dbp, buttonRadius, tickLength, interval ); - dbp.drawPixmap( d->buttonRect, d->bgPixmap( tqcolorGroup() ) ); + dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); if( hasFocus() ) - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, tqcolorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); paintPoti( &dbp ); dbp.end(); @@ -711,7 +711,7 @@ void KPoti::repeatTimeout() void KPoti::drawTicks( TQPainter *p, double dist, double w, int i ) const { - p->setPen( tqcolorGroup().foreground() ); + p->setPen( colorGroup().foreground() ); double angle,s,c; double x, y; for (int v=0; v<=i; v++) diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index d9013c8a..52705f8f 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -53,8 +53,8 @@ public: int tickInterval() const { return tickInt; } virtual TQSizePolicy sizePolicy() const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; TQString text() const; public slots: diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp index 4988ad7b..5df8dd00 100644 --- a/arts/gui/kde/ktickmarks_impl.cpp +++ b/arts/gui/kde/ktickmarks_impl.cpp @@ -75,8 +75,8 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { int _minsize; // Shorcuts int w,h; - TQColor colornormal = tqcolorGroup().foreground(); - TQColor colordiff = tqcolorGroup().buttonText(); + TQColor colornormal = colorGroup().foreground(); + TQColor colordiff = colorGroup().buttonText(); if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) { p->translate( contentsRect().left(), contentsRect().bottom() ); diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index fca3466e..97ea35a6 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -159,10 +159,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::BottomToTop ) h = contentsRect().height() * ( 1 - _value ); else h = contentsRect().height() * _value; for ( int i=int( h ); isetPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( i )/contentsRect().height() ) ); + p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( i )/contentsRect().height() ) ); p->drawLine( contentsRect().left(), this->frameWidth() + i, contentsRect().right(), this->frameWidth() + i ); } - p->setPen( tqcolorGroup().dark() ); + p->setPen( colorGroup().dark() ); p->drawLine( contentsRect().left(), this->frameWidth() + int( h ), contentsRect().right(), this->frameWidth() + int( h ) ); } else { float w; @@ -170,10 +170,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::LeftToRight ) w = - contentsRect().width() * ( 1 - _value ); else w = - contentsRect().width() * _value; for ( int i=int( w ); i>=-contentsRect().width(); i-- ) { - p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( -i )/contentsRect().width() ) ); + p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( -i )/contentsRect().width() ) ); p->drawLine( this->frameWidth() + i, contentsRect().top(), this->frameWidth() + i, contentsRect().bottom() ); } - p->setPen( tqcolorGroup().dark() ); + p->setPen( colorGroup().dark() ); p->drawLine( this->frameWidth() + int( w ), contentsRect().top(), this->frameWidth() + int( w ), contentsRect().bottom() ); } } diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index b716f4c3..2a1399f1 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -143,26 +143,26 @@ void KWidget_impl::visible(bool newVisible) SizePolicy KWidget_impl::hSizePolicy() { - return ( SizePolicy )_qwidget->tqsizePolicy().horData(); + return ( SizePolicy )_qwidget->sizePolicy().horData(); } void KWidget_impl::hSizePolicy( SizePolicy p ) { - TQSizePolicy sp = _qwidget->tqsizePolicy(); + TQSizePolicy sp = _qwidget->sizePolicy(); sp.setHorData( ( TQSizePolicy::SizeType )p ); - _qwidget->tqsetSizePolicy( sp ); + _qwidget->setSizePolicy( sp ); } SizePolicy KWidget_impl::vSizePolicy() { - return ( SizePolicy )_qwidget->tqsizePolicy().verData(); + return ( SizePolicy )_qwidget->sizePolicy().verData(); } void KWidget_impl::vSizePolicy( SizePolicy p ) { - TQSizePolicy sp = _qwidget->tqsizePolicy(); + TQSizePolicy sp = _qwidget->sizePolicy(); sp.setVerData( ( TQSizePolicy::SizeType )p ); - _qwidget->tqsetSizePolicy( sp ); + _qwidget->setSizePolicy( sp ); } void KWidget_impl::show() -- cgit v1.2.1