From f7e71d47719ab6094cf4a9fafffa5ea351973522 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 13 Jan 2011 08:32:36 +0000 Subject: Initial conversion for TQt for Qt4 3.4.0 TP2 This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- arts/kde/kplayobjectfactory.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arts/kde/kplayobjectfactory.cc') diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index 99a2e2edb..3e83d54da 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons } // decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd - if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) ) + if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) ) { // we rely on the delivered mimetype if it's a local file d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false ); @@ -202,7 +202,7 @@ TQStringList KDE::PlayObjectFactory::mimeTypes(void) for(vector::iterator mimetype = mimetypes->begin(); mimetype != mimetypes->end(); ++mimetype) { - TQString name = TQString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace(); + TQString name = TQString(TQString::fromLocal8Bit((*mimetype).c_str())).stripWhiteSpace(); if(KMimeType::mimeType(name)) results.append(name); } -- cgit v1.2.1