From 914b4db5c94848135cd675ffdb5fa4049cbe33e4 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- arts/gui/common/artsgui.idl | 6 +++--- arts/gui/kde/klayoutbox_impl.cpp | 8 ++++---- arts/gui/kde/klayoutbox_impl.h | 4 ++-- arts/gui/kde/kpoti.cpp | 20 ++++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'arts/gui') diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl index 2cf5b614..de6da9e7 100644 --- a/arts/gui/common/artsgui.idl +++ b/arts/gui/common/artsgui.idl @@ -94,7 +94,7 @@ module Arts { }; /** - Some tqalignmentflags used by various widgets. + Some alignmentflags used by various widgets. Taken from Qt. (akrille) */ enum Align { @@ -117,7 +117,7 @@ module Arts { /** The LayoutBox. - Arrange your widgets vertical or horizontal. Usage is quite simple: Add the widgets you have in the right order - to the tqlayoutbox by calling addWidget(). + to the layoutbox by calling addWidget(). Thats it, no ._addChild or .tqparent with this widget. For more information see QBoxLayout. @@ -156,7 +156,7 @@ module Arts { /// The spacing between all widgets. attribute long spacing; /// The margin at the outsideborder. - attribute long tqlayoutmargin; + attribute long layoutmargin; }; /** IMHO (akrille) this should be removed and everywhere replaced with the LayoutBox... */ diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index e94ed1ec..6cbe9873 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -41,14 +41,14 @@ KLayoutBox_impl::~KLayoutBox_impl() { void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) { widget.tqparent( self() ); - this->_addChild( widget, "tqlayoutbox_item" ); + this->_addChild( widget, "layoutbox_item" ); TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); _layout->addWidget( tmp, stretch, align ); } void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) { widget.tqparent( self() ); - this->_addChild( widget, "tqlayoutbox_item" ); + this->_addChild( widget, "layoutbox_item" ); TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); _layout->insertWidget( index, tmp, stretch, align ); } @@ -66,8 +66,8 @@ void KLayoutBox_impl::addLine( long width, long space, long stretch, long align long KLayoutBox_impl::spacing() { return _layout->spacing(); } void KLayoutBox_impl::spacing( long n ) { _layout->setSpacing( n ); } -long KLayoutBox_impl::tqlayoutmargin() { return _layout->margin(); } -void KLayoutBox_impl::tqlayoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); } +long KLayoutBox_impl::layoutmargin() { return _layout->margin(); } +void KLayoutBox_impl::layoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); } Direction KLayoutBox_impl::direction() { return Arts::Direction( _layout->direction() ); } void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( TQBoxLayout::Direction( d ) ); } diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index a8272fe3..d4a2ec59 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -72,8 +72,8 @@ public: long spacing(); void spacing( long ); - long tqlayoutmargin(); - void tqlayoutmargin( long ); + long layoutmargin(); + void layoutmargin( long ); }; // class } // namespace diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index 6beed787..d7cf50df 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -64,11 +64,11 @@ struct KPoti::KPotiPrivate // create tqmask TQBitmap tqmask( bgdb.size(), true ); - TQPainter tqmaskpainter( &tqmask ); - tqmaskpainter.setPen( TQt::NoPen ); - tqmaskpainter.setBrush( TQt::color1 ); - tqmaskpainter.drawEllipse( drawRect ); - tqmaskpainter.end(); + TQPainter maskpainter( &tqmask ); + maskpainter.setPen( TQt::NoPen ); + maskpainter.setBrush( TQt::color1 ); + maskpainter.drawEllipse( drawRect ); + maskpainter.end(); bgdb.setMask( tqmask ); // inset shadow @@ -104,11 +104,11 @@ struct KPoti::KPotiPrivate // create tqmask TQBitmap tqmask( potidb.size(), true ); - TQPainter tqmaskpainter( &tqmask ); - tqmaskpainter.setPen( TQt::NoPen ); - tqmaskpainter.setBrush( TQt::color1 ); - tqmaskpainter.drawEllipse( drawRect ); - tqmaskpainter.end(); + TQPainter maskpainter( &tqmask ); + maskpainter.setPen( TQt::NoPen ); + maskpainter.setBrush( TQt::color1 ); + maskpainter.drawEllipse( drawRect ); + maskpainter.end(); potidb.setMask( tqmask ); KPixmap gradient( potidb.size() ); -- cgit v1.2.3