Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7)

10 files changed, 48 insertions, 48 deletions

diff --git a/arts/kde/kartsfloatwatch.h b/arts/kde/kartsfloatwatch.h
index d8c177ee6..b8cb229f0 100644
--- a/arts/kde/kartsfloatwatch.h
+++ b/arts/kde/kartsfloatwatch.h
@@ -44,7 +44,7 @@ namespace Arts { class KFloatWatchProxy_impl; }
  * \code
  *   StereoVolumeControl stereoVolumeControl = ...;
  *   KArtsFloatWatch *w = new KArtsFloatWatch(stereoVolumeControl, "scaleFactor_changed", this);
- *   connect(w, TQT_SIGNAL(valueChanged(float)), this, TQT_SLOT(setValue(float)));
+ *   connect(w, TQ_SIGNAL(valueChanged(float)), this, TQ_SLOT(setValue(float)));
  * \endcode
  */
 class KArtsFloatWatch : public TQObject {
diff --git a/arts/kde/kaudioconverter.cpp b/arts/kde/kaudioconverter.cpp
index 1eb8c20e5..d387535d2 100644
--- a/arts/kde/kaudioconverter.cpp
+++ b/arts/kde/kaudioconverter.cpp
@@ -88,7 +88,7 @@ void KAudioConverter::requestPlayObject(const KURL &url)
 		Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl();
 		inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl);
 
-		TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &)));
+		TQObject::connect(inputStreamImpl, TQ_SIGNAL(mimeTypeFound(const TQString &)), TQ_SLOT(slotMimeType(const TQString &)));
 
 		inputStream.openURL(url.url().latin1());
 		inputStream.streamStart();
@@ -161,9 +161,9 @@ void KAudioConverter::start()
 	Arts::connect(m_incoming->object(), "left", m_request, "left");
 	Arts::connect(m_incoming->object(), "right", m_request, "right");
 
-	TQObject::connect(requestImpl, TQT_SIGNAL(newBlockSize(long)), TQT_SIGNAL(newBlockSize(long)));
-	TQObject::connect(requestImpl, TQT_SIGNAL(newBlockPointer(long)), TQT_SIGNAL(newBlockPointer(long)));
-	TQObject::connect(requestImpl, TQT_SIGNAL(newData()), TQT_SIGNAL(newData()));
+	TQObject::connect(requestImpl, TQ_SIGNAL(newBlockSize(long)), TQ_SIGNAL(newBlockSize(long)));
+	TQObject::connect(requestImpl, TQ_SIGNAL(newBlockPointer(long)), TQ_SIGNAL(newBlockPointer(long)));
+	TQObject::connect(requestImpl, TQ_SIGNAL(newData()), TQ_SIGNAL(newData()));
 
 	// Special mpeglib case
 	// TODO: needed at all??
diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp
index eb08abdb7..02c88411a 100644
--- a/arts/kde/kaudiorecordstream.cpp
+++ b/arts/kde/kaudiorecordstream.cpp
@@ -66,7 +66,7 @@ KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const TQString &
 	d->inqueue.setAutoDelete( true );
 	d->title = title;
 
-	connect( d->kserver, TQT_SIGNAL( restartedServer() ), TQT_SLOT( slotRestartedServer() ) );
+	connect( d->kserver, TQ_SIGNAL( restartedServer() ), TQ_SLOT( slotRestartedServer() ) );
 
 	d->in = Arts::DynamicCast( d->kserver->server().createObject( "Arts::Synth_AMAN_RECORD" ) );
 	d->effectStack = Arts::DynamicCast( d->kserver->server().createObject( "Arts::StereoEffectStack" ) );
@@ -196,8 +196,8 @@ void KAudioRecordStream::start( int samplingRate, int bits, int channels )
 
 			d->receiver_base = new KByteSoundReceiver( samplingRate, bits, channels, d->title.local8Bit() );
 			d->receiver = Arts::ByteSoundReceiver::_from_base( d->receiver_base );
-			connect( d->receiver_base, TQT_SIGNAL( data( const char *, unsigned int ) ),
-					TQT_SLOT( slotData( const char *, unsigned int ) ) );
+			connect( d->receiver_base, TQ_SIGNAL( data( const char *, unsigned int ) ),
+					TQ_SLOT( slotData( const char *, unsigned int ) ) );
 			Arts::connect( d->convert, "outdata", d->receiver, "indata" );
 
 			d->convert.start();
diff --git a/arts/kde/kconverttest.cpp b/arts/kde/kconverttest.cpp
index 647c2f320..6c5706122 100644
--- a/arts/kde/kconverttest.cpp
+++ b/arts/kde/kconverttest.cpp
@@ -81,13 +81,13 @@ int main(int argc, char **argv)
 	// converter.setup(44100);
 	converter.requestPlayObject(url);
 
-	TQObject::connect(&converter, TQT_SIGNAL(rawStreamStart()), get, TQT_SLOT(slotRawStreamStart()));
+	TQObject::connect(&converter, TQ_SIGNAL(rawStreamStart()), get, TQ_SLOT(slotRawStreamStart()));
 
-	TQObject::connect(&converter, TQT_SIGNAL(newBlockSize(long)), get, TQT_SLOT(slotNewBlockSize(long)));
-	TQObject::connect(&converter, TQT_SIGNAL(newBlockPointer(long)), get, TQT_SLOT(slotNewBlockPointer(long)));
-	TQObject::connect(&converter, TQT_SIGNAL(newData()), get, TQT_SLOT(slotNewData()));
+	TQObject::connect(&converter, TQ_SIGNAL(newBlockSize(long)), get, TQ_SLOT(slotNewBlockSize(long)));
+	TQObject::connect(&converter, TQ_SIGNAL(newBlockPointer(long)), get, TQ_SLOT(slotNewBlockPointer(long)));
+	TQObject::connect(&converter, TQ_SIGNAL(newData()), get, TQ_SLOT(slotNewData()));
 	
-	TQObject::connect(&converter, TQT_SIGNAL(rawStreamFinished()), get, TQT_SLOT(slotRawStreamFinished()));
+	TQObject::connect(&converter, TQ_SIGNAL(rawStreamFinished()), get, TQ_SLOT(slotRawStreamFinished()));
 
 	converter.start();
 
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index d893675cd..38acef54d 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -80,14 +80,14 @@ void TDEIOInputStream_impl::streamStart()
 	m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
 	m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
 
-	TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-			 this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));		     
-	TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
-			 this, TQT_SLOT(slotResult(TDEIO::Job *)));		     
-	TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-			 this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
-	TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
-			 this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
+	TQObject::connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+			 this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));		     
+	TQObject::connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)),
+			 this, TQ_SLOT(slotResult(TDEIO::Job *)));		     
+	TQObject::connect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+			 this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
+	TQObject::connect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
+			 this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
 
 	m_streamStarted = true;
 }
@@ -98,14 +98,14 @@ void TDEIOInputStream_impl::streamEnd()
 
 	if(m_job != 0)
 	{
-		TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-	    				this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-		TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
-						this, TQT_SLOT(slotResult(TDEIO::Job *)));		     
-		TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-				 this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
-		TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
-				 this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
+		TQObject::disconnect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	    				this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+		TQObject::disconnect(m_job, TQ_SIGNAL(result(TDEIO::Job *)),
+						this, TQ_SLOT(slotResult(TDEIO::Job *)));		     
+		TQObject::disconnect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+				 this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
+		TQObject::disconnect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
+				 this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
 
 		if ( m_streamPulled )
 			outdata.endPull();
diff --git a/arts/kde/kplayobject.cpp b/arts/kde/kplayobject.cpp
index f11c0eb8f..a9b3a8a36 100644
--- a/arts/kde/kplayobject.cpp
+++ b/arts/kde/kplayobject.cpp
@@ -179,7 +179,7 @@ void KDE::PlayObject::play()
 			if ( d->creator )
 				delete d->creator;
 			d->creator = new KDE::PlayObjectCreator( d->server );
-			d->creator->create( d->url, d->createBUS, this, TQT_SLOT( attachPlayObject( Arts::PlayObject ) ) );
+			d->creator->create( d->url, d->createBUS, this, TQ_SLOT( attachPlayObject( Arts::PlayObject ) ) );
 			kdDebug( 400 ) << "KDE::PlayObject::play(): creator called" << endl;
 			d->internalState = Arts::posPlaying;
 		}
diff --git a/arts/kde/kplayobjectcreator.cpp b/arts/kde/kplayobjectcreator.cpp
index 039c8a3bc..4b8f0ba01 100644
--- a/arts/kde/kplayobjectcreator.cpp
+++ b/arts/kde/kplayobjectcreator.cpp
@@ -44,7 +44,7 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj
 	if (m_server.isNull() || url.isEmpty() )
 		return false;
 
-	connect( this, TQT_SIGNAL( playObjectCreated( Arts::PlayObject ) ),
+	connect( this, TQ_SIGNAL( playObjectCreated( Arts::PlayObject ) ),
 			receiver, slot );
 
 	// check if the URL is a local file
@@ -57,8 +57,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj
 		m_instream = Arts::TDEIOInputStream::_from_base(instream_impl);
 
 		// signal will be called once the ioslave knows the mime-type of the stream
-		connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)),
-				 this, TQT_SLOT(slotMimeType(const TQString &)));
+		connect(instream_impl, TQ_SIGNAL(mimeTypeFound(const TQString &)),
+				 this, TQ_SLOT(slotMimeType(const TQString &)));
 
 		// GO!
 		m_instream.openURL(url.url().latin1());
diff --git a/arts/kde/kplayobjectfactory.cpp b/arts/kde/kplayobjectfactory.cpp
index 708fe516e..ef10a925b 100644
--- a/arts/kde/kplayobjectfactory.cpp
+++ b/arts/kde/kplayobjectfactory.cpp
@@ -179,7 +179,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
 		d->helper->po = d->playObj;
 		d->helper->ap = d->amanPlay;
 		if( d->playObj->object().isNull() && d->amanPlay )
-			TQObject::connect( d->playObj, TQT_SIGNAL( playObjectCreated() ), d->helper, TQT_SLOT( connectAmanPlay() ) );
+			TQObject::connect( d->playObj, TQ_SIGNAL( playObjectCreated() ), d->helper, TQ_SLOT( connectAmanPlay() ) );
 		else
 			d->helper->connectAmanPlay();
 	}
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index 2e0f77aea..aaf6c63e1 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -102,16 +102,16 @@ void KVideoWidget::init(void)
 
     // Setup actions
     new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen",
-		       CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()),
+		       CTRL+SHIFT+Key_F, this, TQ_SLOT(fullscreenActivated()),
 		       actionCollection(), "fullscreen_mode" );
     new TDERadioAction( i18n("&Half Size"), ALT+Key_0,
-		      this, TQT_SLOT(halfSizeActivated()),
+		      this, TQ_SLOT(halfSizeActivated()),
 		      actionCollection(), "half_size" );
     new TDERadioAction( i18n("&Normal Size"), ALT+Key_1,
-		      this, TQT_SLOT(normalSizeActivated()),
+		      this, TQ_SLOT(normalSizeActivated()),
 		      actionCollection(), "normal_size" );
     new TDERadioAction( i18n("&Double Size"), ALT+Key_2,
-		      this, TQT_SLOT(doubleSizeActivated()),
+		      this, TQ_SLOT(doubleSizeActivated()),
 		      actionCollection(), "double_size" );
 
     ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
@@ -379,20 +379,20 @@ void KVideoWidget::fullscreenActivated()
 	fullscreenWidget = new KFullscreenVideoWidget( this );
 
 	// Interconnect mouse button signals
-	connect( fullscreenWidget, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )),
-		 this, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) );
+	connect( fullscreenWidget, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )),
+		 this, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) );
 
-	connect( fullscreenWidget, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )),
-		 this, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) );
+	connect( fullscreenWidget, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )),
+		 this, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) );
 
 	// ### Remove in KDE4
-	 connect( fullscreenWidget, TQT_SIGNAL(rightButtonPressed(const TQPoint &)),
-		this, TQT_SIGNAL(rightButtonPressed(const TQPoint &)) );
+	 connect( fullscreenWidget, TQ_SIGNAL(rightButtonPressed(const TQPoint &)),
+		this, TQ_SIGNAL(rightButtonPressed(const TQPoint &)) );
 		 
 	// Leave fullscreen mode with <Escape> key
 	TQAccel *a = new TQAccel( fullscreenWidget );
 	a->connectItem( a->insertItem( Key_Escape ),
-			this, TQT_SLOT(setWindowed()) );
+			this, TQ_SLOT(setWindowed()) );
 
 	fullscreenWidget->setFocus();
 	fullscreenWidget->showFullScreen();
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 101c7967b..176559bea 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -247,7 +247,7 @@ KNotify::KNotify( bool useArts )
 	d->playObjects.setAutoDelete(true);
 	d->audioManager = 0;
 	if( useArts ) {
-		connect( soundServer, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( restartedArtsd() ) );
+		connect( soundServer, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( restartedArtsd() ) );
 		restartedArtsd(); //started allready need to initialize d->audioManager
 	}
 #endif
@@ -530,7 +530,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
 	
 		if ( !d->playTimer ) {
 			d->playTimer = new TQTimer( this );
-			connect( d->playTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( playTimeout() ) );
+			connect( d->playTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( playTimeout() ) );
 		}
 		if ( !d->playTimer->isActive() ) {
 			d->playTimer->start( 1000 );
@@ -543,7 +543,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
 		TDEProcess *proc = d->externalPlayerProc;
 		if (!proc) {
 			proc = d->externalPlayerProc = new TDEProcess;
-			connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), TQT_SLOT( slotPlayerProcessExited( TDEProcess * )));
+			connect( proc, TQ_SIGNAL( processExited( TDEProcess * )), TQ_SLOT( slotPlayerProcessExited( TDEProcess * )));
 		}
 		if (proc->isRunning()) {
 			soundFinished( eventId, PlayerBusy );