TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


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

1 files changed, 24 insertions, 23 deletions

diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index 6becfa38..79f6b47a 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -25,7 +25,7 @@
 
 #include "kvi_settings.h"
 
-#include <qobject.h>
+#include <tqobject.h>
 
 #include "kvi_thread.h"
 #include "kvi_string.h"
@@ -37,10 +37,10 @@
 //class KviWavSoundFileReader
 //{
 //public:
-//	KviWavSoundFileReader(QFile * f);
+//	KviWavSoundFileReader(TQFile * f);
 //	~KviWavSoundFileReader();
 //protected:
-//	QFile * m_pFile;
+//	TQFile * m_pFile;
 //public:
 //	static bool recognize(KviFile * f);
 //	bool readHeader();
@@ -107,10 +107,10 @@
 class KviSoundThread : public KviThread
 {
 public:
-	KviSoundThread(const QString &szFileName);
+	KviSoundThread(const TQString &szFileName);
 	virtual ~KviSoundThread();
 protected:
-	QString m_szFileName;
+	TQString m_szFileName;
 protected:
 	virtual void play();
 	virtual void run();
@@ -121,7 +121,7 @@ protected:
 		class KviOssSoundThread : public KviSoundThread
 		{
 		public:
-			KviOssSoundThread(const QString &szFileName);
+			KviOssSoundThread(const TQString &szFileName);
 			virtual ~KviOssSoundThread();
 		protected:
 			virtual void play();
@@ -131,7 +131,7 @@ protected:
 			class KviOssAudiofileSoundThread : public KviSoundThread
 			{
 			public:
-				KviOssAudiofileSoundThread(const QString &szFileName);
+				KviOssAudiofileSoundThread(const TQString &szFileName);
 				virtual ~KviOssAudiofileSoundThread();
 			protected:
 				virtual void play();
@@ -143,7 +143,7 @@ protected:
 		class KviEsdSoundThread : public KviSoundThread
 		{
 		public:
-			KviEsdSoundThread(const QString &szFileName);
+			KviEsdSoundThread(const TQString &szFileName);
 			virtual ~KviEsdSoundThread();
 		protected:
 			virtual void play();
@@ -154,7 +154,7 @@ protected:
 		class KviArtsSoundThread : public KviSoundThread
 		{
 		public:
-			KviArtsSoundThread(const QString &szFileName);
+			KviArtsSoundThread(const TQString &szFileName);
 			virtual ~KviArtsSoundThread();
 		protected:
 			virtual void play();
@@ -164,49 +164,50 @@ protected:
 
 class KviSoundPlayer;
 
-typedef bool (KviSoundPlayer::*SoundSystemRoutine)(const QString &szFileName);
+typedef bool (KviSoundPlayer::*SoundSystemRoutine)(const TQString &szFileName);
 
-class KviSoundPlayer : public QObject
+class KviSoundPlayer : public TQObject
 {
 	friend class KviSoundThread;
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviSoundPlayer();
 	virtual ~KviSoundPlayer();
 public:
-	bool play(const QString &szFileName);
+	bool play(const TQString &szFileName);
 	void detectSoundSystem();
 	bool havePlayingSounds();
-	//void getAvailableSoundSystems(KviPointerList<QString> * l);
-	void getAvailableSoundSystems(QStringList * l);
+	//void getAvailableSoundSystems(KviPointerList<TQString> * l);
+	void getAvailableSoundSystems(TQStringList * l);
 	bool isMuted() {return KVI_OPTION_BOOL(KviOption_boolMuteAllSounds); };
 	void setMuted(bool muted) {KVI_OPTION_BOOL(KviOption_boolMuteAllSounds)=muted;};
 protected:
 	KviPointerList<KviSoundThread> * m_pThreadList;
-	KviPointerHashTable<QString,SoundSystemRoutine> * m_pSoundSystemDict;
+	KviPointerHashTable<TQString,SoundSystemRoutine> * m_pSoundSystemDict;
 protected:
 	void registerSoundThread(KviSoundThread * t);
 	void unregisterSoundThread(KviSoundThread * t);
-	virtual bool event(QEvent *e);
+	virtual bool event(TQEvent *e);
 protected:
 #ifdef COMPILE_ON_WINDOWS
-	bool playWinmm(const QString &szFileName);
+	bool playWinmm(const TQString &szFileName);
 #else //!COMPILE_ON_WINDOWS
 	#ifdef COMPILE_OSS_SUPPORT
-		bool playOss(const QString &szFileName);
+		bool playOss(const TQString &szFileName);
 		#ifdef COMPILE_AUDIOFILE_SUPPORT
-			bool playOssAudiofile(const QString &szFileName);
+			bool playOssAudiofile(const TQString &szFileName);
 		#endif //COMPILE_AUDIOFILE_SUPPORT
 	#endif //COMPILE_OSS_SUPPORT
 	#ifdef COMPILE_ARTS_SUPPORT
-		bool playArts(const QString &szFileName);
+		bool playArts(const TQString &szFileName);
 	#endif //COMPILE_ARTS_SUPPORT
 	#ifdef COMPILE_ESD_SUPPORT
-		bool playEsd(const QString &szFileName);
+		bool playEsd(const TQString &szFileName);
 	#endif //COMPILE_ESD_SUPPORT
 #endif //!COMPILE_ON_WINDOWS
-	bool playQt(const QString &szFileName);
-	bool playNull(const QString &szFileName);
+	bool playTQt(const TQString &szFileName);
+	bool playNull(const TQString &szFileName);
 };