diff options
Diffstat (limited to 'arts')
| -rw-r--r-- | arts/kde/kplayobjectfactory.cc | 2 | ||||
| -rw-r--r-- | arts/knotify/knotify.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index 3e83d54da..29ee20e3d 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().tqcontains( "application/x-cda" ) ) ) + if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "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 ); diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 7195f9271..c080ba30b 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp, if ( !event.isEmpty() ) { // get config file - if ( d->events.tqcontains( fromApp ) ) { + if ( d->events.contains( fromApp ) ) { eventsFile = d->events[fromApp]; } else { eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false); d->events.insert( fromApp, eventsFile ); } - if ( d->configs.tqcontains( fromApp) ) { + if ( d->configs.contains( fromApp) ) { configFile = d->configs[fromApp]; } else { configFile=new KConfig(fromApp+".eventsrc",true,false); @@ -695,7 +695,7 @@ void KNotify::playTimeout() ++it; if ( (*current)->state() != Arts::posPlaying ) { - TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current ); + TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current ); if ( eit != d->playObjectEventMap.end() ) { soundFinished( *eit, PlayedOK ); @@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc ) void KNotify::abortFirstPlayObject() { #ifndef WITHOUT_ARTS - TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() ); + TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() ); if ( it != d->playObjectEventMap.end() ) { soundFinished( it.data(), Aborted ); |