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

This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.

14 files changed, 26 insertions, 26 deletions

diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 5c04bdc8..91badb3d 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -1401,7 +1401,7 @@ MP_KVS_FUNCTION(localFile)
 	MP_KVS_FAIL_ON_NO_INTERFACE
 	TQString szRet = g_pMPInterface->mrl();
 	if(szRet.isEmpty())return true;
-	if(szRet.startsWith("file://",false))
+	if(szRet.tqstartsWith("file://",false))
 	{
 		szRet.remove(0,7);
 		c->returnValue()->setString(szRet);
@@ -1453,7 +1453,7 @@ MP_KVS_FUNCTION(status)
 	KVSM_PARAMETERS_END(c)
 
 	MP_KVS_FAIL_ON_NO_INTERFACE
-	KviMediaPlayerInterface::PlayerStatus eStat = g_pMPInterface->status();
+	KviMediaPlayerInterface::PlayertqStatus eStat = g_pMPInterface->status();
 	switch(eStat)
 	{
 		case KviMediaPlayerInterface::Stopped:
diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp
index 7bbfa927..699bc74b 100644
--- a/src/modules/mediaplayer/mp_amarokinterface.cpp
+++ b/src/modules/mediaplayer/mp_amarokinterface.cpp
@@ -143,7 +143,7 @@ bool KviAmarokInterface::setShuffle(bool &bVal)
 	return voidRetBoolDCOPCall("player","enableRandomMode(bool)",bVal);
 }
 
-KviMediaPlayerInterface::PlayerStatus KviAmarokInterface::status()
+KviMediaPlayerInterface::PlayertqStatus KviAmarokInterface::status()
 {
 	int ret;
 	if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown;
diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h
index 6dcfec6c..f0169bb0 100644
--- a/src/modules/mediaplayer/mp_amarokinterface.h
+++ b/src/modules/mediaplayer/mp_amarokinterface.h
@@ -62,7 +62,7 @@
 		//virtual int bitRate(); unsupported
 		virtual int sampleRate();
 		virtual bool playMrl(const TQString &mrl);
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual KviMediaPlayerInterface::PlayertqStatus status();
 		virtual bool getRepeat();
 		virtual bool getShuffle();
 		virtual bool setRepeat(bool &bVal);
diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp
index bf028219..3a363ed5 100644
--- a/src/modules/mediaplayer/mp_amipinterface.cpp
+++ b/src/modules/mediaplayer/mp_amipinterface.cpp
@@ -3,7 +3,7 @@
 
 #ifdef COMPILE_ON_WINDOWS
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include "kvi_locale.h"
 #include "kvi_module.h"
@@ -189,7 +189,7 @@ int KviAmipInterface::channels()
   return ret;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviAmipInterface::status()
+KviMediaPlayerInterface::PlayertqStatus KviAmipInterface::status()
 {
   int ret = eval_int("var_stat");
   switch(ret)
diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/mp_amipinterface.h
index 5d49f69d..392d854f 100644
--- a/src/modules/mediaplayer/mp_amipinterface.h
+++ b/src/modules/mediaplayer/mp_amipinterface.h
@@ -48,7 +48,7 @@
     virtual bool setShuffle(bool &bVal);
     virtual bool amipExec(const TQString &cmd);
     virtual TQString amipEval(const TQString &cmd);
-    virtual KviMediaPlayerInterface::PlayerStatus status();
+    virtual KviMediaPlayerInterface::PlayertqStatus status();
   };
   
   MP_DECLARE_DESCRIPTOR(KviAmipInterface)
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp
index c318e632..0c0a97a0 100644
--- a/src/modules/mediaplayer/mp_interface.cpp
+++ b/src/modules/mediaplayer/mp_interface.cpp
@@ -26,7 +26,7 @@
 #include "mp_mp3.h"
 #include "kvi_options.h"
 #include "kvi_locale.h"
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 static TQTextCodec * mediaplayer_get_codec()
 {
@@ -82,7 +82,7 @@ TQString KviMediaPlayerInterface::getLocalFile()
 {
 	TQString ret = mrl();
 	if(ret.isEmpty())return ret;
-	if(ret.startsWith("file://",false))
+	if(ret.tqstartsWith("file://",false))
 	{
 		ret.remove(0,7);
 		return ret;
@@ -183,7 +183,7 @@ bool KviMediaPlayerInterface::jumpTo(int &iPos)
 	return false;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviMediaPlayerInterface::status()
+KviMediaPlayerInterface::PlayertqStatus KviMediaPlayerInterface::status()
 {
 	notImplemented();
 	return KviMediaPlayerInterface::Unknown;
@@ -265,12 +265,12 @@ bool KviMediaPlayerInterface::setShuffle(bool &bVal)
 TQString KviMediaPlayerInterface::mediaType()
 {
 	TQString ret = mrl();
-	if(ret.endsWith(".mp3",false))ret = "MPEG Layer 3";
-	else if(ret.endsWith(".ogg",false))ret = "OGG Vorbis";
-	else if(ret.endsWith(".avi",false))ret = "Audio Video Interleave";
-	else if(ret.endsWith(".mpeg",false))ret = "MPEG Video";
-	else if(ret.endsWith(".mpg",false))ret = "MPEG Video";
-	else if(ret.startsWith("http://",false))ret = "HTTP Audio Stream";
+	if(ret.tqendsWith(".mp3",false))ret = "MPEG Layer 3";
+	else if(ret.tqendsWith(".ogg",false))ret = "OGG Vorbis";
+	else if(ret.tqendsWith(".avi",false))ret = "Audio Video Interleave";
+	else if(ret.tqendsWith(".mpeg",false))ret = "MPEG Video";
+	else if(ret.tqendsWith(".mpg",false))ret = "MPEG Video";
+	else if(ret.tqstartsWith("http://",false))ret = "HTTP Audio Stream";
 	else ret = TQString();
 	return ret;
 }
diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/mp_interface.h
index f1a5479c..593a2490 100644
--- a/src/modules/mediaplayer/mp_interface.h
+++ b/src/modules/mediaplayer/mp_interface.h
@@ -108,8 +108,8 @@ public:
 	// return false only on communication failure
 	virtual bool quit();
 	// return the current player status
-	enum PlayerStatus { Unknown, Stopped, Playing, Paused };
-	virtual KviMediaPlayerInterface::PlayerStatus status();
+	enum PlayertqStatus { Unknown, Stopped, Playing, Paused };
+	virtual KviMediaPlayerInterface::PlayertqStatus status();
 	// current position in the media (msecs)
 	// 0 if the player isn't playing anything and -1 if unknown
 	virtual int position();
diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp
index 0be694cc..5b50a046 100644
--- a/src/modules/mediaplayer/mp_jukinterface.cpp
+++ b/src/modules/mediaplayer/mp_jukinterface.cpp
@@ -140,7 +140,7 @@ int KviJukInterface::position()
 	return ret * 1000;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviJukInterface::status()
+KviMediaPlayerInterface::PlayertqStatus KviJukInterface::status()
 {
 	int ret;
 	if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown;
diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h
index cde06ee8..c2b7fd16 100644
--- a/src/modules/mediaplayer/mp_jukinterface.h
+++ b/src/modules/mediaplayer/mp_jukinterface.h
@@ -67,7 +67,7 @@
 		virtual bool setShuffle(bool &bVal);
 
 		virtual bool playMrl(const TQString &mrl);
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual KviMediaPlayerInterface::PlayertqStatus status();
 	};
 	
 	MP_DECLARE_DESCRIPTOR(KviJukInterface)
diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp
index 0eaa9cfb..4942ee50 100644
--- a/src/modules/mediaplayer/mp_mp3.cpp
+++ b/src/modules/mediaplayer/mp_mp3.cpp
@@ -41,7 +41,7 @@
 #include "kvi_options.h"
 
 #include <tqfileinfo.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #define MAXGENRE   147
 #define GENREROWS  50
diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp
index 4f045417..6bc3e24b 100644
--- a/src/modules/mediaplayer/mp_winampinterface.cpp
+++ b/src/modules/mediaplayer/mp_winampinterface.cpp
@@ -27,7 +27,7 @@
 
 #ifdef COMPILE_ON_WINDOWS
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include "kvi_locale.h"
 #include "kvi_module.h"
@@ -280,7 +280,7 @@ int KviWinampInterface::channels()
 	return ret;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviWinampInterface::status()
+KviMediaPlayerInterface::PlayertqStatus KviWinampInterface::status()
 {
 	HWND hWinamp = find_winamp(this);
 	int ret = 1000;
diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/mp_winampinterface.h
index f1b3cf5f..3f2a62c2 100644
--- a/src/modules/mediaplayer/mp_winampinterface.h
+++ b/src/modules/mediaplayer/mp_winampinterface.h
@@ -66,7 +66,7 @@
 		virtual bool getShuffle();
 		virtual bool setRepeat(bool &bVal);
 		virtual bool setShuffle(bool &bVal);
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual KviMediaPlayerInterface::PlayertqStatus status();
 	};
 	
 	MP_DECLARE_DESCRIPTOR(KviWinampInterface)
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp
index 60820f09..730b4fe6 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.cpp
+++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp
@@ -256,7 +256,7 @@ bool KviXmmsInterface::setShuffle(bool &bVal)
 	return true;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviXmmsInterface::status()
+KviMediaPlayerInterface::PlayertqStatus KviXmmsInterface::status()
 {
 	bool (*sym1)(int) = (bool (*)(int))lookupSymbol("xmms_remote_is_paused");
 	if(sym1)
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.h b/src/modules/mediaplayer/mp_xmmsinterface.h
index 0b3f62b2..e2b2c38f 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.h
+++ b/src/modules/mediaplayer/mp_xmmsinterface.h
@@ -52,7 +52,7 @@
 		virtual bool jumpTo(kvs_int_t &iPos);
 		virtual bool setVol(kvs_int_t &iVol);
 		virtual int getVol();
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual KviMediaPlayerInterface::PlayertqStatus status();
 		virtual TQString nowPlaying();
 		virtual bool playMrl(const TQString &mrl);
 		virtual TQString mrl();