From 805c2821ceaddada48b346c6d11bd0dc1351a539 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:33:07 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/modules/mediaplayer/mp_interface.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/modules/mediaplayer/mp_interface.cpp') diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp index 0c0a97a0..c318e632 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 +#include static TQTextCodec * mediaplayer_get_codec() { @@ -82,7 +82,7 @@ TQString KviMediaPlayerInterface::getLocalFile() { TQString ret = mrl(); if(ret.isEmpty())return ret; - if(ret.tqstartsWith("file://",false)) + if(ret.startsWith("file://",false)) { ret.remove(0,7); return ret; @@ -183,7 +183,7 @@ bool KviMediaPlayerInterface::jumpTo(int &iPos) return false; } -KviMediaPlayerInterface::PlayertqStatus KviMediaPlayerInterface::status() +KviMediaPlayerInterface::PlayerStatus KviMediaPlayerInterface::status() { notImplemented(); return KviMediaPlayerInterface::Unknown; @@ -265,12 +265,12 @@ bool KviMediaPlayerInterface::setShuffle(bool &bVal) TQString KviMediaPlayerInterface::mediaType() { TQString ret = mrl(); - 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"; + 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"; else ret = TQString(); return ret; } -- cgit v1.2.1