diff options
Diffstat (limited to 'arts/knotify')
| -rw-r--r-- | arts/knotify/knotify.cpp | 14 | ||||
| -rw-r--r-- | arts/knotify/knotify.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 6105cbf4a..ea20608ba 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); @@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file) // append msg TQTextStream strm( &logFile ); - strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": "; + strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": "; strm << text << endl; // close file @@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text) TQTextStream strm( stderr, IO_WriteOnly ); // output msg - strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": "; + strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": "; strm << text << endl; return true; @@ -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 ); @@ -740,7 +740,7 @@ void KNotify::abortFirstPlayObject() #endif } -void KNotify::soundFinished( int eventId, PlayingFinishedtqStatus reason ) +void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason ) { TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index f35d9ad79..12e699299 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -37,7 +37,7 @@ public: KNotify( bool useArts ); ~KNotify(); - enum PlayingFinishedtqStatus + enum PlayingFinishedStatus { PlayedOK = 0, // success, all following mean failure NoSoundFile, @@ -86,7 +86,7 @@ private: bool isPlaying( const TQString& soundFile ) const; - void soundFinished( int eventId, PlayingFinishedtqStatus reason ); + void soundFinished( int eventId, PlayingFinishedStatus reason ); void abortFirstPlayObject(); WId checkWinId( const TQString& appName, WId senderWinId ); |