Rename kioslaves

pull/1/head
Timothy Pearson 12 years ago
parent a790af0d5e
commit deef75a57e

@ -492,7 +492,7 @@ fi
AM_CONDITIONAL(include_tdeioslave_audiocd, test "x$have_cdparanoia" = xyes) AM_CONDITIONAL(include_tdeioslave_audiocd, test "x$have_cdparanoia" = xyes)
AM_CONDITIONAL(include_kcm_audiocd, test "x$have_cdparanoia" = xyes) AM_CONDITIONAL(include_kcm_audiocd, test "x$have_cdparanoia" = xyes)
if test "x$have_cdparanoia" != xyes; then if test "x$have_cdparanoia" != xyes; then
# kaudiocreator depends on kio_audiocd # kaudiocreator depends on tdeio_audiocd
DO_NOT_COMPILE="$DO_NOT_COMPILE kaudiocreator" DO_NOT_COMPILE="$DO_NOT_COMPILE kaudiocreator"
fi fi

@ -199,7 +199,7 @@ generic <acronym>SCSI</acronym> device, which is probably <filename
class="devicefile">/dev/sg0</filename>, <filename class="devicefile">/dev/sg0</filename>, <filename
class="devicefile">/dev/sg1</filename>, &etc;. If it still doesn't work, class="devicefile">/dev/sg1</filename>, &etc;. If it still doesn't work,
try typing <userinput>audiocd:/?device=/dev/sg0</userinput> (or similar) try typing <userinput>audiocd:/?device=/dev/sg0</userinput> (or similar)
to tell kio_audiocd which device your &CD-ROM; is.</para> to tell tdeio_audiocd which device your &CD-ROM; is.</para>
</answer> </answer>
</qandaentry> </qandaentry>
</qandaset> </qandaset>

@ -140,7 +140,7 @@ protected:
KProtocolManager::reparseConfiguration(); KProtocolManager::reparseConfiguration();
if(KProtocolManager::useProxy()) { if(KProtocolManager::useProxy()) {
// split code copied from kcm_kio. // split code copied from kcm_tdeio.
TQString noProxiesFor = KProtocolManager::noProxyFor(); TQString noProxiesFor = KProtocolManager::noProxyFor();
TQStringList noProxies = TQStringList::split(TQRegExp("[',''\t'' ']"), noProxiesFor); TQStringList noProxies = TQStringList::split(TQRegExp("[',''\t'' ']"), noProxiesFor);
bool useProxy = true; bool useProxy = true;

@ -51,7 +51,7 @@ namespace KCDDB
TQString TQString
CDDB::trackOffsetListToId( const TrackOffsetList & list ) CDDB::trackOffsetListToId( const TrackOffsetList & list )
{ {
// Taken from version by Michael Matz in kio_audiocd. // Taken from version by Michael Matz in tdeio_audiocd.
unsigned int id = 0; unsigned int id = 0;
int numTracks = list.count() - 2; int numTracks = list.count() - 2;

@ -29,7 +29,7 @@ libnoatun_la_LDFLAGS = \
-version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 $(KDE_RPATH) $(all_libraries)
libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \ libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \ -ltdeio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
-lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIB_QT) -lDCOP -lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIB_QT) -lDCOP
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp

@ -409,7 +409,7 @@ void KJPrefs::installNewSkin( void )
TQString tmpUnpackPath = locateLocal("tmp", srcFile.fileName()+"/" ); TQString tmpUnpackPath = locateLocal("tmp", srcFile.fileName()+"/" );
kdDebug(66666) << "tmpUnpackPath: " << tmpUnpackPath.latin1() << endl; kdDebug(66666) << "tmpUnpackPath: " << tmpUnpackPath.latin1() << endl;
// Our extract-process, TODO: wanna have kio_(un)zip instead :) // Our extract-process, TODO: wanna have tdeio_(un)zip instead :)
KShellProcess proc; KShellProcess proc;
// "unzip -d whereToUnpack whatToUnpack" // "unzip -d whereToUnpack whatToUnpack"

@ -10,13 +10,13 @@ INCLUDES = -I$(top_srcdir)/libkcddb \
KDE_CXXFLAGS=$(ENABLE_PERMISSIVE_FLAG) KDE_CXXFLAGS=$(ENABLE_PERMISSIVE_FLAG)
kde_module_LTLIBRARIES = kio_audiocd.la kde_module_LTLIBRARIES = tdeio_audiocd.la
kio_audiocd_la_SOURCES = audiocd.cpp tdeio_audiocd_la_SOURCES = audiocd.cpp
kio_audiocd_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_audiocd_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kio_audiocd_la_LIBADD = ./plugins/libaudiocdplugins.la $(LIB_KIO) $(CDPARANOIA_LIBS) $(top_builddir)/libkcddb/libkcddb.la $(top_builddir)/kscd/libkcompactdisc.la tdeio_audiocd_la_LIBADD = ./plugins/libaudiocdplugins.la $(LIB_KIO) $(CDPARANOIA_LIBS) $(top_builddir)/libkcddb/libkcddb.la $(top_builddir)/kscd/libkcompactdisc.la
noinst_HEADERS = audiocd.h noinst_HEADERS = audiocd.h

@ -80,7 +80,7 @@ int kdemain(int argc, char ** argv)
// with the user // with the user
putenv(strdup("SESSION_MANAGER=")); putenv(strdup("SESSION_MANAGER="));
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc, argv, "kio_audiocd", 0, 0, 0, 0); TDECmdLineArgs::init(argc, argv, "tdeio_audiocd", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
TDEApplication app(false, true); TDEApplication app(false, true);
@ -758,7 +758,7 @@ struct cdrom_drive *AudioCDProtocol::getDrive()
else if(!fi.exists()) else if(!fi.exists())
error(TDEIO::ERR_DOES_NOT_EXIST, d->device); error(TDEIO::ERR_DOES_NOT_EXIST, d->device);
else error(TDEIO::ERR_SLAVE_DEFINED, else error(TDEIO::ERR_SLAVE_DEFINED,
i18n("Unknown error. If you have a cd in the drive try running cdparanoia -vsQ as yourself (not root). Do you see a track list? If not, make sure you have permission to access the CD device. If you are using SCSI emulation (possible if you have an IDE CD writer) then make sure you check that you have read and write permissions on the generic SCSI device, which is probably /dev/sg0, /dev/sg1, etc.. If it still does not work, try typing audiocd:/?device=/dev/sg0 (or similar) to tell kio_audiocd which device your CD-ROM is.")); i18n("Unknown error. If you have a cd in the drive try running cdparanoia -vsQ as yourself (not root). Do you see a track list? If not, make sure you have permission to access the CD device. If you are using SCSI emulation (possible if you have an IDE CD writer) then make sure you check that you have read and write permissions on the generic SCSI device, which is probably /dev/sg0, /dev/sg1, etc.. If it still does not work, try typing audiocd:/?device=/dev/sg0 (or similar) to tell tdeio_audiocd which device your CD-ROM is."));
return 0; return 0;
} }

@ -97,7 +97,7 @@ class AudioCDProtocol : public TDEIO::SlaveBase
* NOTE: if you want to add a file which is the whole CD, give * NOTE: if you want to add a file which is the whole CD, give
* trackNo = -1 * trackNo = -1
* NOTE2: you can safely add MP3 or OGG files always. the function * NOTE2: you can safely add MP3 or OGG files always. the function
* will check if kio_audiocd was compiled with support for those, * will check if tdeio_audiocd was compiled with support for those,
* so NO NEED to wrap your calls with #ifdef for lame or vorbis. * so NO NEED to wrap your calls with #ifdef for lame or vorbis.
* this function will do the right thing. * this function will do the right thing.
*/ */

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_audiocd exec=tdeio_audiocd
protocol=audiocd protocol=audiocd
input=none input=none
output=filesystem output=filesystem

@ -307,7 +307,7 @@ long EncoderLame::readCleanup(){
usleep(1); usleep(1);
} }
// Now copy the file out of the temp into kio // Now copy the file out of the temp into tdeio
TQFile file( d->tempFile->name() ); TQFile file( d->tempFile->name() );
if ( file.open( IO_ReadOnly ) ) { if ( file.open( IO_ReadOnly ) ) {
TQByteArray output; TQByteArray output;

@ -96,7 +96,7 @@ bool EncoderVorbis::init(){
( (
&d->vc, &d->vc,
const_cast<char *>("kde-encoder"), const_cast<char *>("kde-encoder"),
const_cast<char *>("kio_audiocd") const_cast<char *>("tdeio_audiocd")
); );
return true; return true;
} }

Loading…
Cancel
Save