TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 17 insertions, 17 deletions

diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp
index 16f2db93..075a2151 100644
--- a/krec/krecfilewidgets.cpp
+++ b/krec/krecfilewidgets.cpp
@@ -64,8 +64,8 @@ kdDebug( 60005 ) << k_funcinfo << file << endl;
 			for ( TQValueList<KRecBuffer*>::iterator it = _file->_buffers.begin(); it != _file->_buffers.end(); ++it ) {
 				newBuffer( ( *it ) );
 			}
-			connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), this, TQT_SLOT( newBuffer( KRecBuffer* ) ) );
-			connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
+			connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( newBuffer( KRecBuffer* ) ) );
+			connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
 			//kdDebug( 60005 ) << _file->_currentBuffer << endl;
 		}
 	}
@@ -98,7 +98,7 @@ void KRecFileWidget::mouseReleaseEvent( TQMouseEvent* qme ) {
 void KRecFileWidget::newBuffer( KRecBuffer* buffer ) {
 	//kdDebug( 60005 ) << k_funcinfo << buffer << endl;
 	KRecBufferWidget *tmp = new KRecBufferWidget( buffer, this );
-	connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), this, TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
+	connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), TQT_TQOBJECT(this), TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
 	bufferwidgets.append( tmp );
 	tmp->show();
 	resizeEvent();
@@ -119,12 +119,12 @@ void KRecFileWidget::deleteBuffer( KRecBuffer* buffer ) {
 
 void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) {
 	KPopupMenu tmp( this );
-	KToggleAction* _activeaction = new KToggleAction( i18n( "Toggle Active/Disabled State" ), KShortcut(), this );
+	KToggleAction* _activeaction = new KToggleAction( i18n( "Toggle Active/Disabled State" ), KShortcut(), TQT_TQOBJECT(this) );
 	_activeaction->setChecked( bw->buffer()->active() );
 	connect( _activeaction, TQT_SIGNAL( toggled( bool ) ), bw->buffer(), TQT_SLOT( setActive( bool ) ) );
-	KAction* _removeaction = new KAction( i18n( "Remove This Part" ), "fileremove", KShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), this );
-	KAction* _changetitle = new KAction( i18n( "Change Title of This Part" ), KShortcut(), bw, TQT_SLOT( changeTitle() ), this );
-	KAction* _changecomment = new KAction( i18n( "Change Comment of This Part" ), KShortcut(), bw, TQT_SLOT( changeComment() ), this );
+	KAction* _removeaction = new KAction( i18n( "Remove This Part" ), "fileremove", KShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) );
+	KAction* _changetitle = new KAction( i18n( "Change Title of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) );
+	KAction* _changecomment = new KAction( i18n( "Change Comment of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) );
 	_activeaction->plug( &tmp );
 	_changetitle->plug( &tmp );
 	_changecomment->plug( &tmp );
@@ -147,7 +147,7 @@ KRecBufferWidget::KRecBufferWidget( KRecBuffer* buffer, TQWidget* p, const char*
   , _main_region( 0 ), _title_region( 0 ), _fileend_region( 0 )
   , alreadyreadsize( 0 )
 {
-	connect( _buffer, TQT_SIGNAL( somethingChanged() ), this, TQT_SLOT( update() ) );
+	connect( _buffer, TQT_SIGNAL( somethingChanged() ), TQT_TQOBJECT(this), TQT_SLOT( update() ) );
 	kdDebug( 60005 ) << k_funcinfo << endl;
 }
 KRecBufferWidget::~KRecBufferWidget() {
@@ -189,19 +189,19 @@ void KRecBufferWidget::initLayout() {
 void KRecBufferWidget::drawFrame( TQPainter* p ) {
 	//kdDebug( 60005 ) << k_funcinfo << endl;
 	if ( _buffer->active() )
-		p->setBrush( colorGroup().highlight() );
+		p->setBrush( tqcolorGroup().highlight() );
 	else
-		p->setBrush( colorGroup().highlight().dark() );
-	p->setPen( TQPen( colorGroup().dark(), 1 ) );
+		p->setBrush( tqcolorGroup().highlight().dark() );
+	p->setPen( TQPen( tqcolorGroup().dark(), 1 ) );
 	p->drawRect( _title_region->boundingRect() );
 	p->drawRect( _fileend_region->boundingRect() );
 
 	p->setBrush( TQBrush() );
-	p->setPen( TQPen( colorGroup().dark(), 1 ) );
+	p->setPen( TQPen( tqcolorGroup().dark(), 1 ) );
 	p->drawRect( _main_region->boundingRect() );
 
-	p->setPen( TQPen( colorGroup().highlightedText() ) );
-	p->drawText( _title_region->boundingRect(), Qt::AlignCenter, _buffer->title() );
+	p->setPen( TQPen( tqcolorGroup().highlightedText() ) );
+	p->drawText( _title_region->boundingRect(), TQt::AlignCenter, _buffer->title() );
 
 }
 void KRecBufferWidget::drawContents( TQPainter* p ) {
@@ -220,7 +220,7 @@ void KRecBufferWidget::drawContents( TQPainter* p ) {
 	p->setPen( TQPen( TQColor( 0,0,0 ) ) );
 	TQString comment = _buffer->comment();
 	if ( comment.isNull() ) comment = i18n( "Lots of Data" );
-	p->drawText( _main_region->boundingRect(), Qt::AlignCenter, comment );
+	p->drawText( _main_region->boundingRect(), TQt::AlignCenter, comment );
 }
 void KRecBufferWidget::paintEvent( TQPaintEvent* ) {
 	initLayout();
@@ -232,12 +232,12 @@ void KRecBufferWidget::paintEvent( TQPaintEvent* ) {
 
 void KRecBufferWidget::mousePressEvent( TQMouseEvent* qme ) {
 	kdDebug( 60005 ) << k_funcinfo << endl;
-	if ( _main_region->contains( qme->pos() ) || _title_region->contains( qme->pos() ) )
+	if ( _main_region->tqcontains( qme->pos() ) || _title_region->tqcontains( qme->pos() ) )
 		if ( qme->button() == Qt::RightButton )
 			emit popupMenu( this, qme->globalPos() );
 }
 void KRecBufferWidget::mouseDoubleClickEvent( TQMouseEvent* qme ) {
-	if ( _title_region->contains( qme->pos() ) )
+	if ( _title_region->tqcontains( qme->pos() ) )
 		_buffer->setActive( !_buffer->active() );
 }