summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 16:02:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 16:02:28 -0600
commitdeef75a57e49cb53695a40b559b24648edc352be (patch)
tree4d4c6d8b2aad7e249d65a835d3913ab191920bcf
parenta790af0d5e7c2d93f8e82ba5db273a97dfb0eef6 (diff)
downloadtdemultimedia-deef75a57e49cb53695a40b559b24648edc352be.zip
tdemultimedia-deef75a57e49cb53695a40b559b24648edc352be.tar.gz
Rename kioslaves
-rw-r--r--configure.in.in2
-rw-r--r--doc/tdeioslave/audiocd.docbook2
-rw-r--r--juk/ktrm.cpp2
-rw-r--r--libkcddb/cddb.cpp2
-rw-r--r--noatun/library/Makefile.am2
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.cpp2
-rw-r--r--tdeioslave/audiocd/Makefile.am8
-rw-r--r--tdeioslave/audiocd/audiocd.cpp4
-rw-r--r--tdeioslave/audiocd/audiocd.h2
-rw-r--r--tdeioslave/audiocd/audiocd.protocol2
-rw-r--r--tdeioslave/audiocd/plugins/lame/encoderlame.cpp2
-rw-r--r--tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp2
12 files changed, 16 insertions, 16 deletions
diff --git a/configure.in.in b/configure.in.in
index bfaadb2..3d1e15f 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -492,7 +492,7 @@ fi
AM_CONDITIONAL(include_tdeioslave_audiocd, test "x$have_cdparanoia" = xyes)
AM_CONDITIONAL(include_kcm_audiocd, test "x$have_cdparanoia" = xyes)
if test "x$have_cdparanoia" != xyes; then
- # kaudiocreator depends on kio_audiocd
+ # kaudiocreator depends on tdeio_audiocd
DO_NOT_COMPILE="$DO_NOT_COMPILE kaudiocreator"
fi
diff --git a/doc/tdeioslave/audiocd.docbook b/doc/tdeioslave/audiocd.docbook
index 982e1f2..371d0aa 100644
--- a/doc/tdeioslave/audiocd.docbook
+++ b/doc/tdeioslave/audiocd.docbook
@@ -199,7 +199,7 @@ generic <acronym>SCSI</acronym> device, which is probably <filename
class="devicefile">/dev/sg0</filename>, <filename
class="devicefile">/dev/sg1</filename>, &etc;. If it still doesn't work,
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>
</qandaentry>
</qandaset>
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp
index 95d38e6..45399ce 100644
--- a/juk/ktrm.cpp
+++ b/juk/ktrm.cpp
@@ -140,7 +140,7 @@ protected:
KProtocolManager::reparseConfiguration();
if(KProtocolManager::useProxy()) {
- // split code copied from kcm_kio.
+ // split code copied from kcm_tdeio.
TQString noProxiesFor = KProtocolManager::noProxyFor();
TQStringList noProxies = TQStringList::split(TQRegExp("[',''\t'' ']"), noProxiesFor);
bool useProxy = true;
diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index 7cdfee6..e79f74a 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -51,7 +51,7 @@ namespace KCDDB
TQString
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;
int numTracks = list.count() - 2;
diff --git a/noatun/library/Makefile.am b/noatun/library/Makefile.am
index e769964..9e0961e 100644
--- a/noatun/library/Makefile.am
+++ b/noatun/library/Makefile.am
@@ -29,7 +29,7 @@ libnoatun_la_LDFLAGS = \
-version-info 3:0:2 $(KDE_RPATH) $(all_libraries)
libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.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
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index d93cc5d..590d2f1 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -409,7 +409,7 @@ void KJPrefs::installNewSkin( void )
TQString tmpUnpackPath = locateLocal("tmp", srcFile.fileName()+"/" );
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;
// "unzip -d whereToUnpack whatToUnpack"
diff --git a/tdeioslave/audiocd/Makefile.am b/tdeioslave/audiocd/Makefile.am
index 8e190d4..980cd6c 100644
--- a/tdeioslave/audiocd/Makefile.am
+++ b/tdeioslave/audiocd/Makefile.am
@@ -10,13 +10,13 @@ INCLUDES = -I$(top_srcdir)/libkcddb \
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
diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp
index 7898be5..68192e3 100644
--- a/tdeioslave/audiocd/audiocd.cpp
+++ b/tdeioslave/audiocd/audiocd.cpp
@@ -80,7 +80,7 @@ int kdemain(int argc, char ** argv)
// with the user
putenv(strdup("SESSION_MANAGER="));
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);
TDEApplication app(false, true);
@@ -758,7 +758,7 @@ struct cdrom_drive *AudioCDProtocol::getDrive()
else if(!fi.exists())
error(TDEIO::ERR_DOES_NOT_EXIST, d->device);
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;
}
diff --git a/tdeioslave/audiocd/audiocd.h b/tdeioslave/audiocd/audiocd.h
index 75b9bfd..be80537 100644
--- a/tdeioslave/audiocd/audiocd.h
+++ b/tdeioslave/audiocd/audiocd.h
@@ -97,7 +97,7 @@ class AudioCDProtocol : public TDEIO::SlaveBase
* NOTE: if you want to add a file which is the whole CD, give
* trackNo = -1
* 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.
* this function will do the right thing.
*/
diff --git a/tdeioslave/audiocd/audiocd.protocol b/tdeioslave/audiocd/audiocd.protocol
index eb46253..f8963cb 100644
--- a/tdeioslave/audiocd/audiocd.protocol
+++ b/tdeioslave/audiocd/audiocd.protocol
@@ -1,5 +1,5 @@
[Protocol]
-exec=kio_audiocd
+exec=tdeio_audiocd
protocol=audiocd
input=none
output=filesystem
diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
index 8984bb3..a9a6233 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -307,7 +307,7 @@ long EncoderLame::readCleanup(){
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() );
if ( file.open( IO_ReadOnly ) ) {
TQByteArray output;
diff --git a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
index 048a46e..f1a5bad 100644
--- a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
+++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
@@ -96,7 +96,7 @@ bool EncoderVorbis::init(){
(
&d->vc,
const_cast<char *>("kde-encoder"),
- const_cast<char *>("kio_audiocd")
+ const_cast<char *>("tdeio_audiocd")
);
return true;
}