Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 18f2e55a9d248d16a07ee2ab882fae9c8b461be3.

1 files changed, 11 insertions, 11 deletions

diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp
index be8ae7d..b3ca31d 100644
--- a/kaffeine/src/input/dvb/dvbstream.cpp
+++ b/kaffeine/src/input/dvb/dvbstream.cpp
@@ -65,9 +65,9 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
 	fdFrontend = fdDvr = 0;
 	ndmx = 0;
 	currentTransponder = Transponder();
-	frontendName = TQString("/dev/dvb/adapter%1/frontend%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
-	dvrName = TQString("/dev/dvb/adapter%1/dvr%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
-	demuxName = TQString("/dev/dvb/adapter%1/demux%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
+	frontendName = TQString("/dev/dvb/adapter%1/frontend%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
+	dvrName = TQString("/dev/dvb/adapter%1/dvr%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
+	demuxName = TQString("/dev/dvb/adapter%1/demux%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
 
 	out.setAutoDelete( true );
 
@@ -84,7 +84,7 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
 	cam = NULL;
 	plug = NULL;
 
-	connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkStatus()) );
+	connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checktqStatus()) );
 }
 
 
@@ -221,7 +221,7 @@ bool DvbStream::closeFe()
 
 
 
-void DvbStream::connectStatus( bool con )
+void DvbStream::connecttqStatus( bool con )
 {
 	if ( con )
 		statusTimer.start( 1000 );
@@ -879,7 +879,7 @@ void DvbStream::removeOut( DVBout *o )
 
 
 
-bool DvbStream::checkStatus()
+bool DvbStream::checktqStatus()
 {
 	int32_t strength;
 	fe_status_t festatus;
@@ -887,19 +887,19 @@ bool DvbStream::checkStatus()
 
        strength=0;
 	ioctl(fdFrontend,FE_READ_SIGNAL_STRENGTH,&strength);
-	emit signalStatus(strength*100/65535);
+	emit signaltqStatus(strength*100/65535);
 
 	strength=0;
 	ioctl(fdFrontend,FE_READ_SNR,&strength);
-	emit snrStatus(strength*100/65535);
+	emit snrtqStatus(strength*100/65535);
 
 	memset( &festatus, 0, sizeof(festatus) );
 	ioctl(fdFrontend,FE_READ_STATUS,&festatus);
 
 	if (festatus & FE_HAS_LOCK)
-		emit lockStatus( true );
+		emit locktqStatus( true );
 	else {
-		emit lockStatus( false );
+		emit locktqStatus( false );
 		ret = false;
 	}
 
@@ -1481,7 +1481,7 @@ void DvbStream::stopFrontend()
 
 void DvbStream::setScanning( bool b )
 {
-	connectStatus( b );
+	connecttqStatus( b );
 }