diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
tree | c76702a7f6310fbe9d437e347535422e836e94e9 /arts/kde/kartsserver.cpp | |
parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'arts/kde/kartsserver.cpp')
-rw-r--r-- | arts/kde/kartsserver.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index e030cb411..add7a7595 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -59,8 +59,8 @@ 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; + TDEConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/); + TDEProcess proc; config.setGroup("Arts"); @@ -77,16 +77,16 @@ Arts::SoundServerV2 KArtsServer::server(void) X11CommConfig.sync(); - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data(); + proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data(); if(rt) - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data(); + proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data(); else - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data(); + proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("artsd"))).data(); 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 |