diff options
Diffstat (limited to 'arts')
| -rw-r--r-- | arts/kde/kartsserver.cpp | 4 | ||||
| -rw-r--r-- | arts/knotify/knotify.cpp | 24 | ||||
| -rw-r--r-- | arts/knotify/knotify.h | 4 | ||||
| -rw-r--r-- | arts/message/artsmessage.cc | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index e030cb411..50a2ae462 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -60,7 +60,7 @@ Arts::SoundServerV2 KArtsServer::server(void) // aRts seems not to be running, let's try to run it // First, let's read the configuration as in kcmarts KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/); - KProcess proc; + TDEProcess proc; config.setGroup("Arts"); @@ -86,7 +86,7 @@ Arts::SoundServerV2 KArtsServer::server(void) proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) ); - if(proc.start(KProcess::Block) && proc.normalExit()) + if(proc.start(TDEProcess::Block) && proc.normalExit()) { // We could have a race-condition here. // The correct way to do it is to make artsd fork-and-exit diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 3fcaff6e0..5ff633516 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -78,7 +78,7 @@ public: TQMap<TQString, KConfig*> events; TQMap<TQString, KConfig*> configs; TQString externalPlayer; - KProcess *externalPlayerProc; + TDEProcess *externalPlayerProc; #ifndef WITHOUT_ARTS TQPtrList<KDE::PlayObject> playObjects; @@ -136,7 +136,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) // abort this. #ifndef WITHOUT_ARTS - KConfigGroup config( KGlobal::config(), "StartProgress" ); + KConfigGroup config( TDEGlobal::config(), "StartProgress" ); KConfig artsKCMConfig( "kcmartsrc" ); artsKCMConfig.setGroup( "Arts" ); bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true ); @@ -285,7 +285,7 @@ KNotify::~KNotify() void KNotify::loadConfig() { // load external player settings - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); kc->setGroup("Misc"); d->useExternal = kc->readBoolEntry( "Use external player", false ); d->externalPlayer = kc->readPathEntry("External player"); @@ -452,7 +452,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int if ( TQFileInfo(sound).isRelative() ) { TQString search = TQString("%1/sounds/%2").arg(appname).arg(sound); - soundFile = KGlobal::instance()->dirs()->findResource("data", search); + soundFile = TDEGlobal::instance()->dirs()->findResource("data", search); if ( soundFile.isEmpty() ) soundFile = locate( "sound", sound ); } @@ -537,12 +537,12 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int } else if(!d->externalPlayer.isEmpty()) { // use an external player to play the sound - KProcess *proc = d->externalPlayerProc; + TDEProcess *proc = d->externalPlayerProc; if (!proc) { - proc = d->externalPlayerProc = new KProcess; - connect( proc, TQT_SIGNAL( processExited( KProcess * )), - TQT_SLOT( slotPlayerProcessExited( KProcess * ))); + proc = d->externalPlayerProc = new TDEProcess; + connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), + TQT_SLOT( slotPlayerProcessExited( TDEProcess * ))); } if (proc->isRunning()) { @@ -552,7 +552,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int proc->clearArguments(); (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data(); d->externalPlayerEventId = eventId; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); return true; } @@ -619,10 +619,10 @@ bool KNotify::notifyByExecute(const TQString &command, const TQString& event, if ( execLine.isEmpty() ) execLine = command; // fallback - KProcess p; + TDEProcess p; p.setUseShell(true); p << execLine; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); return true; } return false; @@ -721,7 +721,7 @@ bool KNotify::isPlaying( const TQString& soundFile ) const return false; } -void KNotify::slotPlayerProcessExited( KProcess *proc ) +void KNotify::slotPlayerProcessExited( TDEProcess *proc ) { soundFinished( d->externalPlayerEventId, (proc->normalExit() && proc->exitStatus() == 0) ? PlayedOK : Unknown ); diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index 12e699299..a6fec6747 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -25,7 +25,7 @@ #include <dcopobject.h> class KNotifyPrivate; -class KProcess; +class TDEProcess; class KConfig; class KNotify : public TQObject, public DCOPObject @@ -98,7 +98,7 @@ private: private slots: void playTimeout(); - void slotPlayerProcessExited( KProcess *proc ); + void slotPlayerProcessExited( TDEProcess *proc ); void restartedArtsd(); private: diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc index 37bf4b75e..77f2a6185 100644 --- a/arts/message/artsmessage.cc +++ b/arts/message/artsmessage.cc @@ -57,7 +57,7 @@ TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1", int main(int argc, char **argv) { aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org"); - KGlobal::locale()->setMainCatalogue("tdelibs"); + TDEGlobal::locale()->setMainCatalogue("tdelibs"); TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); TDEApplication app; |