Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 6379d18e0e
commit cb3122eb02

@ -63,9 +63,9 @@ _ KTTSD:
_ I am told that when kttsd crashes, it can take knotify down with it. See about _ I am told that when kttsd crashes, it can take knotify down with it. See about
"disconnecting" knotify from kttsd (using post to Qt event queue). "disconnecting" knotify from kttsd (using post to Qt event queue).
_ Strange msg being produced by TDEIO::move, but it works fine. ?? _ Strange msg being produced by TDEIO::move, but it works fine. ??
kio (KIOJob): stat file:///home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav kio (TDEIOJob): stat file:///home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav
kio (KIOJob): error 11 /home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav kio (TDEIOJob): error 11 /home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav
kio (KIOJob): This seems to be a suitable case for trying to rename before stat+[list+]copy+del kio (TDEIOJob): This seems to be a suitable case for trying to rename before stat+[list+]copy+del
_ While kttsd currently configures a Talker automatically, would be nice if it could _ While kttsd currently configures a Talker automatically, would be nice if it could
autoconfigure talkers for each requested language, if one has not already been configured. autoconfigure talkers for each requested language, if one has not already been configured.
_ Add support for speech markers. _ Add support for speech markers.

@ -1322,9 +1322,9 @@ uttIterator Speaker::deleteUtterance(uttIterator it)
d.rename(it->audioUrl, dest); d.rename(it->audioUrl, dest);
// TODO: This is always producing the following. Why and how to fix? // TODO: This is always producing the following. Why and how to fix?
// It moves the files just fine. // It moves the files just fine.
// kio (KIOJob): stat file:///home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav // kio (TDEIOJob): stat file:///home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav
// kio (KIOJob): error 11 /home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav // kio (TDEIOJob): error 11 /home/kde-devel/.trinity/share/apps/kttsd/audio/kttsd-5-1.wav
// kio (KIOJob): This seems to be a suitable case for trying to rename before stat+[list+]copy+del // kio (TDEIOJob): This seems to be a suitable case for trying to rename before stat+[list+]copy+del
// TDEIO::move(it->audioUrl, dest, false); // TDEIO::move(it->audioUrl, dest, false);
} }
else else

Loading…
Cancel
Save