diff options
Diffstat (limited to 'arts/knotify/knotify.cpp')
| -rw-r--r-- | arts/knotify/knotify.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 9f50d5870..85b8f36ba 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -62,9 +62,9 @@ #include <kplayobjectfactory.h> #include <kaudiomanagerplay.h> #endif -#include <kprocess.h> -#include <kstandarddirs.h> -#include <kuniqueapplication.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> +#include <tdeuniqueapplication.h> #include <twin.h> #include "knotify.h" @@ -102,7 +102,7 @@ class KNotifyPrivate #endif extern "C"{ - KDE_EXPORT int kdemain(int argc, char **argv) { + TDE_EXPORT int kdemain(int argc, char **argv) { TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"), "3.0", I18N_NOOP("TDE Notification Server"), TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers"); @@ -112,15 +112,15 @@ extern "C"{ aboutdata.addAuthor("Charles Samuels",I18N_NOOP("Previous Maintainer"),"charles@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutdata ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); // initialize application - if ( !KUniqueApplication::start() ) { + if ( !TDEUniqueApplication::start() ) { kdDebug() << "Running knotify found" << endl; return 0; } - KUniqueApplication app; + TDEUniqueApplication app; app.disableSessionManagement(); // KNotify is started on KDE startup and on demand (using @@ -247,7 +247,7 @@ KNotify::KNotify( bool useArts ) d->playObjects.setAutoDelete(true); d->audioManager = 0; if( useArts ) { - connect( soundServer, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( restartedArtsd() ) ); + connect( soundServer, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( restartedArtsd() ) ); restartedArtsd(); //started allready need to initialize d->audioManager } #endif @@ -298,7 +298,7 @@ void KNotify::loadConfig() { void KNotify::reconfigure() { - kapp->config()->reparseConfiguration(); + tdeApp->config()->reparseConfiguration(); loadConfig(); // clear loaded config files @@ -530,7 +530,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int if ( !d->playTimer ) { d->playTimer = new TQTimer( this ); - connect( d->playTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( playTimeout() ) ); + connect( d->playTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( playTimeout() ) ); } if ( !d->playTimer->isActive() ) { d->playTimer->start( 1000 ); @@ -543,7 +543,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int TDEProcess *proc = d->externalPlayerProc; if (!proc) { proc = d->externalPlayerProc = new TDEProcess; - connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), TQT_SLOT( slotPlayerProcessExited( TDEProcess * ))); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * )), TQ_SLOT( slotPlayerProcessExited( TDEProcess * ))); } if (proc->isRunning()) { soundFinished( eventId, PlayerBusy ); @@ -756,12 +756,12 @@ void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason ) WId KNotify::checkWinId( const TQString &appName, WId senderWinId ) { if ( senderWinId == 0 ) { - TQCString senderId = kapp->dcopClient()->senderId(); + TQCString senderId = tdeApp->dcopClient()->senderId(); TQCString compare = (appName + "-mainwindow").latin1(); int len = compare.length(); // kdDebug() << "notifyByPassivePopup: appName=" << appName << " sender=" << senderId << endl; - QCStringList objs = kapp->dcopClient()->remoteObjects( senderId ); + QCStringList objs = tdeApp->dcopClient()->remoteObjects( senderId ); for (QCStringList::ConstIterator it = objs.begin(); it != objs.end(); ++it ) { TQCString obj( *it ); if ( obj.left(len) == compare) { @@ -769,7 +769,7 @@ WId KNotify::checkWinId( const TQString &appName, WId senderWinId ) TQCString replyType; TQByteArray data, replyData; - if ( kapp->dcopClient()->call(senderId, obj, "getWinID()", data, replyType, replyData) ) { + if ( tdeApp->dcopClient()->call(senderId, obj, "getWinID()", data, replyType, replyData) ) { TQDataStream answer(replyData, IO_ReadOnly); if (replyType == "int") { answer >> senderWinId; @@ -800,5 +800,3 @@ void KNotify::sessionReady() } d->inStartup = false; } - -// vim: sw=4 sts=4 ts=8 et |