TQt4 port Kaffeine

This enables compilation under both Qt3 and Qt4


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

10 files changed, 117 insertions, 113 deletions

diff --git a/kaffeine/src/input/dvbclient/cdchannel.cpp b/kaffeine/src/input/dvbclient/cdchannel.cpp
index 6b0fad1..41a235e 100644
--- a/kaffeine/src/input/dvbclient/cdchannel.cpp
+++ b/kaffeine/src/input/dvbclient/cdchannel.cpp
@@ -34,7 +34,7 @@ CdChannel::CdChannel()
 
 
 
-CdChannel::CdChannel( const QString &n, int vp, int ap, int ac, int spid, int pg, int an, int tp, const QString &lg )
+CdChannel::CdChannel( const TQString &n, int vp, int ap, int ac, int spid, int pg, int an, int tp, const TQString &lg )
 {
 	name = n;
 	vpid = vp;
diff --git a/kaffeine/src/input/dvbclient/cdchannel.h b/kaffeine/src/input/dvbclient/cdchannel.h
index 880d95e..1b56d80 100644
--- a/kaffeine/src/input/dvbclient/cdchannel.h
+++ b/kaffeine/src/input/dvbclient/cdchannel.h
@@ -21,7 +21,7 @@
 #ifndef CDCHANNEL_H
 #define CDCHANNEL_H
 
-#include <qstring.h>
+#include <tqstring.h>
 
 
 
@@ -31,15 +31,15 @@ class CdChannel
 public:
 
 	CdChannel();
-	CdChannel( const QString &n, int vp, int ap, int ac, int spid, int pg, int an, int tp, const QString &lg );
+	CdChannel( const TQString &n, int vp, int ap, int ac, int spid, int pg, int an, int tp, const TQString &lg );
 	~CdChannel();
 
-	QString name;
+	TQString name;
 	unsigned short vpid, apid;
 	char ac3;
 	unsigned short subpid, page, id;
 	unsigned char type;
-	QString lang;
+	TQString lang;
 };
 
 #endif /* CDCHANNEL_H */
diff --git a/kaffeine/src/input/dvbclient/cdcleaner.cpp b/kaffeine/src/input/dvbclient/cdcleaner.cpp
index 58445a5..0a93c71 100644
--- a/kaffeine/src/input/dvbclient/cdcleaner.cpp
+++ b/kaffeine/src/input/dvbclient/cdcleaner.cpp
@@ -18,18 +18,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <qdir.h>
-#include <qstringlist.h>
+#include <tqdir.h>
+#include <tqstringlist.h>
 
 #include "cdcleaner.h"
 
 
 
-CdCleaner::CdCleaner( const QString &path )
+CdCleaner::CdCleaner( const TQString &path )
 {
 	livePath = path;
 
-	connect( &timer, SIGNAL(timeout()), this, SLOT(doClean()) );
+	connect( &timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doClean()) );
 	timer.start( 60*1000 );
 }
 
@@ -44,12 +44,12 @@ CdCleaner::~CdCleaner()
 
 void CdCleaner::doClean()
 {
-	start( QThread::LowestPriority );
+	start( TQThread::LowestPriority );
 }
 
 
 
-void CdCleaner::setPath( const QString &path )
+void CdCleaner::setPath( const TQString &path )
 {
 	livePath = path;
 }
@@ -58,11 +58,11 @@ void CdCleaner::setPath( const QString &path )
 
 void CdCleaner::run()
 {
-	QStringList list;
-	QDir d;
+	TQStringList list;
+	TQDir d;
 
 	d.setPath( livePath );
-	list = d.entryList( "DVBClient-*.ts", QDir::Files, QDir::Name );
+	list = d.entryList( "DVBClient-*.ts", TQDir::Files, TQDir::Name );
 	if ( list.count()>1 ) d.remove( list[0] );
 }
 
diff --git a/kaffeine/src/input/dvbclient/cdcleaner.h b/kaffeine/src/input/dvbclient/cdcleaner.h
index e4423d6..0f20bd5 100644
--- a/kaffeine/src/input/dvbclient/cdcleaner.h
+++ b/kaffeine/src/input/dvbclient/cdcleaner.h
@@ -21,23 +21,24 @@
 #ifndef CDCLEANER_H
 #define CDCLEANER_H
 
-#include <qobject.h>
-#include <qthread.h>
-#include <qstring.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqthread.h>
+#include <tqstring.h>
+#include <tqtimer.h>
 
 
 
-class CdCleaner : public QObject, public QThread
+class CdCleaner : public TQObject, public TQThread
 {
 
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-	CdCleaner( const QString &path );
+	CdCleaner( const TQString &path );
 	~CdCleaner();
-	void setPath( const QString &path );
+	void setPath( const TQString &path );
 
 protected:
 
@@ -49,8 +50,8 @@ private slots:
 
 private:
 
-	QTimer timer;
-	QString livePath;
+	TQTimer timer;
+	TQString livePath;
 };
 
 #endif /* CDCLEANER_H */
diff --git a/kaffeine/src/input/dvbclient/cddump.cpp b/kaffeine/src/input/dvbclient/cddump.cpp
index 075025a..9775cc2 100644
--- a/kaffeine/src/input/dvbclient/cddump.cpp
+++ b/kaffeine/src/input/dvbclient/cddump.cpp
@@ -29,7 +29,7 @@
 
 
 
-CdDump::CdDump( const QString &pipe )
+CdDump::CdDump( const TQString &pipe )
 {
 	unsigned int i, j, k;
 
@@ -43,7 +43,7 @@ CdDump::CdDump( const QString &pipe )
 
 	isRunning = false;
 	fifoName = pipe;
-	connect( &timerPatPmt, SIGNAL(timeout()), this, SLOT(setPatPmt()) );
+	connect( &timerPatPmt, TQT_SIGNAL(timeout()), this, TQT_SLOT(setPatPmt()) );
 	timerPatPmt.start( 500 );
 }
 
@@ -185,7 +185,7 @@ void CdDump::setPatPmt()
 
 
 
-bool CdDump::go( const QString &ad, int port, CdChannel c )
+bool CdDump::go( const TQString &ad, int port, CdChannel c )
 {
 	int sockopt=1;
 
@@ -262,7 +262,7 @@ CdDump::~CdDump()
 
 
 
-bool CdDump::doPause( const QString &name )
+bool CdDump::doPause( const TQString &name )
 {
 	if ( !timeShifting ) {
 		timeShiftFileName = name;
diff --git a/kaffeine/src/input/dvbclient/cddump.h b/kaffeine/src/input/dvbclient/cddump.h
index 695eb4b..27be1b8 100644
--- a/kaffeine/src/input/dvbclient/cddump.h
+++ b/kaffeine/src/input/dvbclient/cddump.h
@@ -27,11 +27,11 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#include <qthread.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qfile.h>
-#include <qtimer.h>
+#include <tqthread.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqfile.h>
+#include <tqtimer.h>
 
 #include "cdchannel.h"
 
@@ -55,18 +55,19 @@ struct srtpheader {	/* in network byte order */
 
 
 
-class CdDump : public QObject, public QThread
+class CdDump : public TQObject, public TQThread
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public :
 
-	CdDump( const QString &pipe );
+	CdDump( const TQString &pipe );
 	~CdDump();
 	virtual void run();
-	bool go( const QString &ad, int port, CdChannel c );
+	bool go( const TQString &ad, int port, CdChannel c );
 	void stop();
-	bool doPause( const QString &name );
+	bool doPause( const TQString &name );
 	bool running() const;
 
 private slots:
@@ -79,12 +80,12 @@ private :
 	void writePat();
 	void calculateCRC( unsigned char *p_begin, unsigned char *p_end );
 
-	QFile liveFile;
+	TQFile liveFile;
 	bool timeShifting;
-	QString timeShiftFileName;
+	TQString timeShiftFileName;
 	int waitPause;
 	int fdPipe;
-	QString fifoName;
+	TQString fifoName;
 	bool isRunning;
 	int sock;
 	struct sockaddr_in addr;
@@ -93,7 +94,7 @@ private :
 	unsigned char tspmt[188];
 	unsigned int CRC32[256];
 	int pmtpid;
-	QTimer timerPatPmt;
+	TQTimer timerPatPmt;
 	bool patpmt;
 
 signals:
diff --git a/kaffeine/src/input/dvbclient/cdlisten.cpp b/kaffeine/src/input/dvbclient/cdlisten.cpp
index 89ea3c7..2493d11 100644
--- a/kaffeine/src/input/dvbclient/cdlisten.cpp
+++ b/kaffeine/src/input/dvbclient/cdlisten.cpp
@@ -29,7 +29,7 @@
 
 CdListen::CdListen()
 {
-	connect( &timer, SIGNAL(timeout()), this, SLOT(updateList()) );
+	connect( &timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList()) );
 }
 
 
@@ -65,7 +65,7 @@ void CdListen::stop()
 
 
 
-bool CdListen::go( const QString &ad, int port )
+bool CdListen::go( const TQString &ad, int port )
 {
 	if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
 		KMessageBox::information( 0, i18n("Can't open info socket."), i18n("DVB Client") );
diff --git a/kaffeine/src/input/dvbclient/cdlisten.h b/kaffeine/src/input/dvbclient/cdlisten.h
index 2e1bc7e..3ae95e0 100644
--- a/kaffeine/src/input/dvbclient/cdlisten.h
+++ b/kaffeine/src/input/dvbclient/cdlisten.h
@@ -25,21 +25,22 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <qobject.h>
-#include <qthread.h>
-#include <qtimer.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqthread.h>
+#include <tqtimer.h>
+#include <tqstring.h>
 
-class CdListen : public QObject, public QThread
+class CdListen : public TQObject, public TQThread
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 
 	CdListen();
 	~CdListen();
 	virtual void run();
-	bool go( const QString &ad, int port );
+	bool go( const TQString &ad, int port );
 	void stop();
 
 private slots:
@@ -51,12 +52,12 @@ private:
 	int sock;
 	struct sockaddr_in addr;
 	bool isRunning;
-	QTimer timer;
-	QString currentList, newList;
+	TQTimer timer;
+	TQString currentList, newList;
 
 signals:
 
-	void listChanged( const QString& );
+	void listChanged( const TQString& );
 };
 
 #endif /* CDLISTEN_H */
diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp
index f28d128..f71579d 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.cpp
+++ b/kaffeine/src/input/dvbclient/cdwidget.cpp
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <qapplication.h>
-#include <qlayout.h>
-#include <qdir.h>
+#include <tqapplication.h>
+#include <tqlayout.h>
+#include <tqdir.h>
 
 #include <kiconloader.h>
 #include <klocale.h>
@@ -29,19 +29,19 @@
 
 
 
-CdWidget::CdWidget( const QString &ad, int port, int info, const QString &tspath, QWidget *parent, QObject *objParent, const char *name )
+CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspath, TQWidget *tqparent, TQObject *objParent, const char *name )
 	: KaffeineInput( objParent, name )
 {
-	mainWidget = new QVBox( parent );
-	mainWidget->setSizePolicy( QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred) );
-	split = new QSplitter( mainWidget );
+	mainWidget = new TQVBox( tqparent );
+	mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+	split = new TQSplitter( mainWidget );
 	split->setOpaqueResize( true );
-	playerBox = new QVBox( split );
+	playerBox = new TQVBox( split );
 	playerBox->setMinimumWidth( 200 );
-	channelsLb = new QListBox( split );
+	channelsLb = new TQListBox( split );
 	split->moveToFirst( channelsLb );
-	channelsLb->setSizePolicy( QSizePolicy (QSizePolicy::Preferred, QSizePolicy::MinimumExpanding) );
-	split->setResizeMode( channelsLb, QSplitter::KeepSize );
+	channelsLb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
+	split->setResizeMode( channelsLb, TQSplitter::KeepSize );
 
 	cdAddress = ad;
 	cdPort = port;
@@ -62,8 +62,8 @@ CdWidget::CdWidget( const QString &ad, int port, int info, const QString &tspath
 	listen = new CdListen();
 	listen->go( cdAddress, cdInfo );
 
-	fifoName = QDir::homeDirPath()+"/.kaxclient.ts";
-	QFile f( fifoName );
+	fifoName = TQDir::homeDirPath()+"/.kaxclient.ts";
+	TQFile f( fifoName );
 	if ( f.exists() ) f.remove();
 	if ( (mkfifo( fifoName.ascii(), 0644 ))<0 ) {
 		perror( fifoName.latin1() );
@@ -72,8 +72,8 @@ CdWidget::CdWidget( const QString &ad, int port, int info, const QString &tspath
 	}
 	else {
 		dump = new CdDump( fifoName );
-		connect( channelsLb, SIGNAL(selected(const QString &)), this, SLOT(channelSelected(const QString &)) );
-		connect( listen, SIGNAL(listChanged(const QString&)), this, SLOT(updateList(const QString&)) );
+		connect( channelsLb, TQT_SIGNAL(selected(const TQString &)), this, TQT_SLOT(channelSelected(const TQString &)) );
+		connect( listen, TQT_SIGNAL(listChanged(const TQString&)), this, TQT_SLOT(updateList(const TQString&)) );
 	}
 
 	lastChannel = 0;
@@ -93,7 +93,7 @@ void CdWidget::togglePanel()
 
 
 
-void CdWidget::getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames )
+void CdWidget::getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames )
 {
 	uiNames.append( i18n("DVB Client") );
 	iconNames.append( "network" );
@@ -102,11 +102,11 @@ void CdWidget::getTargets( QStringList &uiNames, QStringList &iconNames, QString
 
 
 
-bool CdWidget::execTarget( const QString &target )
+bool CdWidget::execTarget( const TQString &target )
 {
 	if ( target=="DVBCLIENT" ) {
 		emit showMe( this );
-		QTimer::singleShot( 100, this, SLOT(playLastChannel()) );
+		TQTimer::singleShot( 100, this, TQT_SLOT(playLastChannel()) );
 		return true;
 	}
 	return false;
@@ -114,14 +114,14 @@ bool CdWidget::execTarget( const QString &target )
 
 
 
-QWidget* CdWidget::wantPlayerWindow()
+TQWidget* CdWidget::wantPlayerWindow()
 {
 	return playerBox;
 }
 
 
 
-QWidget* CdWidget::inputMainWidget()
+TQWidget* CdWidget::inputMainWidget()
 {
 	return mainWidget;
 }
@@ -142,7 +142,7 @@ CdWidget::~CdWidget()
 
 void CdWidget::loadConfig( KConfig* config )
 {
-	QValueList<int> sl;
+	TQValueList<int> sl;
 
 	config->setGroup("DVBClient");
 	sl = config->readIntListEntry("SplitSizes");
@@ -164,12 +164,12 @@ void CdWidget::saveConfig()
 
 
 
-void CdWidget::updateList( const QString &list )
+void CdWidget::updateList( const TQString &list )
 {
-	QString c;
-	QString s = list;
+	TQString c;
+	TQString s = list;
 	int pos;
-	QString name, lang;
+	TQString name, lang;
 	int apid, vpid, ac3, subpid, page, id, type;
 
 	if ( dump->running() )
@@ -180,32 +180,32 @@ void CdWidget::updateList( const QString &list )
 	chan.clear();
 	if ( list=="quit" ) return;
 
-	while ( (pos = s.find("|"))!=-1 ) {
+	while ( (pos = s.tqfind("|"))!=-1 ) {
 		name = s.left( pos );
 		s = s.right( s.length()-pos-1 );
-		pos  = s.find("|");
+		pos  = s.tqfind("|");
 		vpid = s.left( pos ).toInt();
 		s = s.right( s.length()-pos-1 );
-		pos  = s.find("|");
+		pos  = s.tqfind("|");
 		apid = s.left( pos ).toInt();
 		s = s.right( s.length()-pos-1 );
-		pos  = s.find("|");
+		pos  = s.tqfind("|");
 		if ( s.left( pos )=="n" ) ac3 = 0;
 		else ac3 = 1;
 		s = s.right( s.length()-pos-1 );
-		pos  = s.find("|");
+		pos  = s.tqfind("|");
 		subpid = s.left( pos ).toInt();
 		s = s.right( s.length()-pos-1 );
-		pos  = s.find("|");
+		pos  = s.tqfind("|");
 		page = s.left( pos ).toInt();
 		s = s.right( s.length()-pos-1 );
-		pos  = s.find("|");
+		pos  = s.tqfind("|");
 		id = s.left( pos ).toInt();
 		s = s.right( s.length()-pos-1 );
-		pos  = s.find("|");
+		pos  = s.tqfind("|");
 		type = s.left( pos ).toInt();
 		s = s.right( s.length()-pos-1 );
-		pos  = s.find("|");
+		pos  = s.tqfind("|");
 		lang = s.left( pos );
 		s = s.right( s.length()-pos-1 );
 		chan.append(  new CdChannel( name, vpid, apid, ac3, subpid, page, id, type, lang ) );
@@ -302,7 +302,7 @@ void CdWidget::previous()
 
 
 
-void CdWidget::channelSelected( const QString &name )
+void CdWidget::channelSelected( const TQString &name )
 {
 	int i;
 
@@ -324,7 +324,7 @@ void CdWidget::pauseLiveTV()
 	if ( !dump )
 		return;
 	if ( dump->running() ) {
-		timeShiftFileName = cdShiftDir+"DVBClient-"+QDateTime::currentDateTime().toString( Qt::ISODate )+".ts";
+		timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::tqcurrentDateTime().toString( Qt::ISODate )+".ts";
 		if ( dump->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName );
 	}
 }
@@ -348,7 +348,7 @@ void CdWidget::enableLive( bool b )
 
 
 
-void CdWidget::setParam( const QString &ad, int port, int info, const QString &tspath )
+void CdWidget::setParam( const TQString &ad, int port, int info, const TQString &tspath )
 {
 	cdAddress = ad;
 	cdPort = port;
diff --git a/kaffeine/src/input/dvbclient/cdwidget.h b/kaffeine/src/input/dvbclient/cdwidget.h
index 2862320..51d70fa 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.h
+++ b/kaffeine/src/input/dvbclient/cdwidget.h
@@ -21,11 +21,11 @@
 #ifndef CDWIDGET_H
 #define CDWIDGET_H
 
-#include <qlistbox.h>
-#include <qpixmap.h>
-#include <qptrlist.h>
-#include <qvbox.h>
-#include <qsplitter.h>
+#include <tqlistbox.h>
+#include <tqpixmap.h>
+#include <tqptrlist.h>
+#include <tqvbox.h>
+#include <tqsplitter.h>
 
 #include <kconfig.h>
 
@@ -39,34 +39,35 @@
 class CdWidget : public KaffeineInput
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-	CdWidget( const QString &ad, int port, int info, const QString &tspath, QWidget *parent, QObject *objParent, const char *name );
+	CdWidget( const TQString &ad, int port, int info, const TQString &tspath, TQWidget *tqparent, TQObject *objParent, const char *name );
 	~CdWidget();
-	void setParam( const QString &ad, int port, int info, const QString &tspath );
+	void setParam( const TQString &ad, int port, int info, const TQString &tspath );
 	void enableLive( bool b );
 	void playNumChannel( int num );
 	void next();
 	void previous();
 
 	// Reimplemented from KaffeineInput
-	QWidget *wantPlayerWindow();
-	QWidget *inputMainWidget();
+	TQWidget *wantPlayerWindow();
+	TQWidget *inputMainWidget();
 	bool nextTrack( MRL& );
 	bool previousTrack( MRL& );
 	bool currentTrack( MRL& );
 	bool trackNumber( int, MRL& );
 	bool playbackFinished( MRL& );
-	void getTargets( QStringList &uiNames, QStringList &iconNames, QStringList &targetNames );
+	void getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringList &targetNames );
 	void togglePanel();
-	bool execTarget( const QString& );
+	bool execTarget( const TQString& );
 	void saveConfig();
 	//***************************************
 
-	QListBox *channelsLb;
-	QVBox *mainWidget;
-	QVBox *playerBox;
+	TQListBox *channelsLb;
+	TQVBox *mainWidget;
+	TQVBox *playerBox;
 
 public slots:
 
@@ -78,30 +79,30 @@ private:
 	void loadConfig( KConfig* config );
 	void saveConfig( KConfig* config );
 
-	QSplitter *split;
+	TQSplitter *split;
 	CdDump *dump;
 	CdListen *listen;
-	QString cdAddress;
+	TQString cdAddress;
 	int cdPort;
 	int cdInfo;
-	QString cdShiftDir;
-	QPixmap tvPix, raPix;
-	QPtrList<CdChannel> chan;
-	QString fifoName;
-	QString timeShiftFileName;
+	TQString cdShiftDir;
+	TQPixmap tvPix, raPix;
+	TQPtrList<CdChannel> chan;
+	TQString fifoName;
+	TQString timeShiftFileName;
 	CdCleaner *cleaner;
 	int lastChannel;
 
 private slots:
 
-	void updateList( const QString &list );
-	void channelSelected( const QString &name );
+	void updateList( const TQString &list );
+	void channelSelected( const TQString &name );
 
 signals:
 
-	void dvbOpen(const QString&, const QString&, int);
+	void dvbOpen(const TQString&, const TQString&, int);
 	void dvbStop();
-	void setTimeShiftFilename( const QString& );
+	void setTimeShiftFilename( const TQString& );
 };
 
 #endif /* CDWIDGET_H */