diff options
50 files changed, 55 insertions, 55 deletions
@@ -96,7 +96,7 @@ SHORT-TERM (URGENT): <sebr> More consistent playlistbrowser drag and drop actions; No dropping of default streams, set e->accept( false ) if dropping one type onto another. - <sebr> Use KIO queues for podcast download queues. Should simplify the lot. Problems atm included + <sebr> Use TDEIO queues for podcast download queues. Should simplify the lot. Problems atm included selecting multiple downloads individually, and automatic downloads occuring for more that one podcast item. diff --git a/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/amarok/configure.in.in b/amarok/configure.in.in index 9c7be42d..1e097e78 100644 --- a/amarok/configure.in.in +++ b/amarok/configure.in.in @@ -1059,7 +1059,7 @@ AC_COMPILE_IFELSE([ #endif ], have_trinity4="yes" - DNSSD_LIBS=$LIB_KDNSSD + DNSSD_LIBS=$LIB_TDEDNSSD # echo "yes" , have_trinity4="no" diff --git a/amarok/src/Makefile.am b/amarok/src/Makefile.am index 938f6962..f09b02ff 100644 --- a/amarok/src/Makefile.am +++ b/amarok/src/Makefile.am @@ -158,7 +158,7 @@ libamarok_la_LIBADD = \ $(top_builddir)/amarok/src/statusbar/libstatusbar.la \ $(top_builddir)/amarok/src/metadata/libmetadata.la \ $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \ - $(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \ + $(LIB_QT) $(LIB_TDEPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \ $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \ $(LIB_TUNEPIMP) \ $(mysql_libs) \ diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index 1761f7c1..29db57eb 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -1942,7 +1942,7 @@ CollectionDB::podcastImage( const TQString &remoteURL, const bool withShadow, ui s = notAvailCover( withShadow, width ); const KURL url = KURL::fromPathOrURL( remoteURL ); - if( url.isValid() ) //KIO crashes with invalid URLs + if( url.isValid() ) //TDEIO crashes with invalid URLs { TDEIO::Job *job = TDEIO::storedGet( url, false, false ); m_podcastImageJobs[job] = remoteURL; diff --git a/amarok/src/collectionscanner/Makefile.am b/amarok/src/collectionscanner/Makefile.am index 2b954092..24e724a0 100644 --- a/amarok/src/collectionscanner/Makefile.am +++ b/amarok/src/collectionscanner/Makefile.am @@ -22,7 +22,7 @@ amarokcollectionscanner_LDADD = \ $(LIB_QT) \ $(LIB_TDECORE) \ $(TAGLIB_LIBS) \ - $(LIB_KIO) + $(LIB_TDEIO) amarokcollectionscanner_LDFLAGS = \ $(all_libraries) \ @@ -31,4 +31,4 @@ amarokcollectionscanner_LDFLAGS = \ -lDCOP \ $(LIB_TDECORE) \ $(LIB_TDEUI) \ - $(LIB_KIO) + $(LIB_TDEIO) diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp index 7cdc0318..de4375f0 100644 --- a/amarok/src/contextbrowser.cpp +++ b/amarok/src/contextbrowser.cpp @@ -4123,7 +4123,7 @@ ContextBrowser::wikiResult( TDEIO::Job* job ) //SLOT //m_wikiPage = NULL; // FIXME: what for? leads to crashes saveHtmlData(); // Send html code to file - warning() << "[WikiFetcher] KIO error! errno: " << job->error() << endl; + warning() << "[WikiFetcher] TDEIO error! errno: " << job->error() << endl; return; } if ( job != m_wikiJob ) diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp index f0312807..0cd7e664 100644 --- a/amarok/src/enginecontroller.cpp +++ b/amarok/src/enginecontroller.cpp @@ -392,7 +392,7 @@ void EngineController::play( const MetaBundle &bundle, uint offset ) // WebDAV protocol is HTTP with extensions (and the "webdav" scheme // is a KDE-ism anyway). Most engines cope with HTTP streaming, but - // not through KIO, so they don't support KDE-isms. + // not through TDEIO, so they don't support KDE-isms. if ( url.protocol() == "webdav" ) url.setProtocol( "http" ); else if ( url.protocol() == "webdavs" ) diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp index d33bddc9..4db60218 100644 --- a/amarok/src/filebrowser.cpp +++ b/amarok/src/filebrowser.cpp @@ -1,7 +1,7 @@ /* This file is part of the KDE project Copyright (C) 2004 Mark Kretschmann <markey@web.de> Copyright (C) 2003 Alexander Dymo <cloudtemple@mksat.net> - Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org> + Copyright (C) 2003 Roberto Raggi <roberto@kdevelop.org> Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org> Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org> Copyright (C) 2001 Anders Lund <anders.lund@lund.tdcadsl.dk> @@ -79,7 +79,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) m_medium = 0; location = new KURL( Amarok::config( "Filebrowser" )->readPathEntry( "Location", TQDir::homeDirPath() ) ); KFileItem *currentFolder = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, *location ); - //KIO sucks, NetAccess::exists puts up a dialog and has annoying error message boxes + //TDEIO sucks, NetAccess::exists puts up a dialog and has annoying error message boxes //if there is a problem so there is no point in using it anyways. //so... setting the diroperator to ~ is the least sucky option if ( !location->isLocalFile() || !currentFolder->isReadable() ) { diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h index 3e3b1a6a..fb3eea0b 100644 --- a/amarok/src/filebrowser.h +++ b/amarok/src/filebrowser.h @@ -1,7 +1,7 @@ /* This file is part of the KDE project Copyright (C) 2004 Max Howell Copyright (C) 2004 Mark Kretschmann <markey@web.de> - Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org> + Copyright (C) 2003 Roberto Raggi <roberto@kdevelop.org> Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org> Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org> Copyright (C) 2001 Anders Lund <anders.lund@lund.tdcadsl.dk> diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp index a49c3a6d..9d0c05cb 100644 --- a/amarok/src/ktrm.cpp +++ b/amarok/src/ktrm.cpp @@ -745,7 +745,7 @@ void KTRMLookup::lookupResult( TDEIO::Job* job ) #if HAVE_TUNEPIMP >= 5 DEBUG_BLOCK if ( !job->error() == 0 ) { - warning() << "[MusicBrainzLookup] KIO error! errno: " << job->error() << endl; + warning() << "[MusicBrainzLookup] TDEIO error! errno: " << job->error() << endl; Amarok::StatusBar::instance()->longMessage( "Couldn't connect to MusicBrainz server." ); finished(); return; diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp index d0cfb562..3e03b7a8 100644 --- a/amarok/src/lastfm.cpp +++ b/amarok/src/lastfm.cpp @@ -48,7 +48,7 @@ using namespace LastFm; /////////////////////////////////////////////////////////////////////////////// // CLASS AmarokHttp // AmarokHttp is a hack written so that lastfm code could easily use something proxy aware. -// DO NOT use this class for anything else, use KIO directly instead. +// DO NOT use this class for anything else, use TDEIO directly instead. //////////////////////////////////////////////////////////////////////////////// AmarokHttp::AmarokHttp ( const TQString& hostname, TQ_UINT16 port, TQObject* parent ) diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h index ed9261bb..8cd351e4 100644 --- a/amarok/src/lastfm.h +++ b/amarok/src/lastfm.h @@ -37,7 +37,7 @@ class TQTimer; namespace TDEIO { class Job; } /* AmarokHttp is a hack written so that lastfm code could easily use something proxy aware. - DO NOT use this class for anything else, use KIO directly instead. */ + DO NOT use this class for anything else, use TDEIO directly instead. */ class AmarokHttp : public TQObject { Q_OBJECT diff --git a/amarok/src/loader/Makefile.am b/amarok/src/loader/Makefile.am index e85e0fd8..35958f3a 100644 --- a/amarok/src/loader/Makefile.am +++ b/amarok/src/loader/Makefile.am @@ -10,7 +10,7 @@ amarok_LDADD = \ $(LIB_QT) \ $(LIB_TDEUI) -amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/amarok/src/mediadevice/daap/Makefile.am b/amarok/src/mediadevice/daap/Makefile.am index 1aa46a10..3880df1a 100644 --- a/amarok/src/mediadevice/daap/Makefile.am +++ b/amarok/src/mediadevice/daap/Makefile.am @@ -17,7 +17,7 @@ METASOURCES = AUTO libamarok_daap_mediadevice_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ $(top_builddir)/amarok/src/mediadevice/daap/daapreader/libdaapreader.la \ - $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT) + $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT) libamarok_daap_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ diff --git a/amarok/src/mediadevice/daap/daapreader/Makefile.am b/amarok/src/mediadevice/daap/daapreader/Makefile.am index c7ef3088..6565c09d 100644 --- a/amarok/src/mediadevice/daap/daapreader/Makefile.am +++ b/amarok/src/mediadevice/daap/daapreader/Makefile.am @@ -12,7 +12,7 @@ libdaapreader_la_LIBADD = \ $(LIB_TDEUI) \ $(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la -libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am index f1346d1d..4b81e98e 100644 --- a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am +++ b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am @@ -15,7 +15,7 @@ libauthentication_la_LIBADD = \ $(LIB_TDECORE) \ $(LIB_TDEUI) -libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/amarok/src/mediadevice/generic/Makefile.am b/amarok/src/mediadevice/generic/Makefile.am index 001cd1bb..8ce3fb01 100644 --- a/amarok/src/mediadevice/generic/Makefile.am +++ b/amarok/src/mediadevice/generic/Makefile.am @@ -15,7 +15,7 @@ METASOURCES = AUTO libamarok_generic_mediadevice_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ - $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT) + $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT) libamarok_generic_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index ddd8adb1..81df830c 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -3,7 +3,7 @@ * (C) 2005 Jeff Mitchell <kde-dev@emailgoeshere.com> * * (C) 2005 Seb Ruiz <me@sebruiz.net> * * * - * With some code helpers from KIO_VFAT * + * With some code helpers from TDEIO_VFAT * * (c) 2004 Thomas Loeber <vfat@loeber1.de> * ***************************************************************************/ diff --git a/amarok/src/mediadevice/generic/genericmediadevice.h b/amarok/src/mediadevice/generic/genericmediadevice.h index fee2d1b1..1891626b 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.h +++ b/amarok/src/mediadevice/generic/genericmediadevice.h @@ -3,7 +3,7 @@ * (C) 2005 Jeff Mitchell <kde-dev@emailgoeshere.com> * * (C) 2005 Seb Ruiz <me@sebruiz.net> * * * - * With some code helpers from KIO_GENERIC * + * With some code helpers from TDEIO_GENERIC * * (c) 2004 Thomas Loeber <vfat@loeber1.de> * ***************************************************************************/ diff --git a/amarok/src/mediadevice/ifp/Makefile.am b/amarok/src/mediadevice/ifp/Makefile.am index d4379499..0a572d05 100644 --- a/amarok/src/mediadevice/ifp/Makefile.am +++ b/amarok/src/mediadevice/ifp/Makefile.am @@ -15,7 +15,7 @@ INCLUDES = \ libamarok_ifp_mediadevice_la_LIBADD = \ $(top_builddir)/amarok/src/libamarok.la \ -lusb -lifp \ - $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT) + $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT) libamarok_ifp_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp index 25586595..120829a3 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * copyright : (C) 2005-2006 Seb Ruiz <me@sebruiz.net> * * * - * With some code helpers from KIO_IFP * + * With some code helpers from TDEIO_IFP * * (c) 2004 Thomas Loeber <ifp@loeber1.de> * ***************************************************************************/ diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.h b/amarok/src/mediadevice/ifp/ifpmediadevice.h index 7cdfb7af..b1c7a29c 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.h +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h @@ -1,7 +1,7 @@ /*************************************************************************** * copyright : (C) 2005-2006 Seb Ruiz <me@sebruiz.net> * * * - * With some code helpers from KIO_IFP * + * With some code helpers from TDEIO_IFP * * (c) 2004 Thomas Loeber <ifp@loeber1.de> * ***************************************************************************/ diff --git a/amarok/src/mediadevice/ipod/Makefile.am b/amarok/src/mediadevice/ipod/Makefile.am index e104bc20..cd49a28e 100644 --- a/amarok/src/mediadevice/ipod/Makefile.am +++ b/amarok/src/mediadevice/ipod/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = \ METASOURCES = AUTO libamarok_ipod_mediadevice_la_LIBADD = \ - $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) + $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) libamarok_ipod_mediadevice_la_LDFLAGS = \ $(KDE_PLUGIN) \ diff --git a/amarok/src/mediadevice/njb/Makefile.am b/amarok/src/mediadevice/njb/Makefile.am index 85fb28fd..c9562336 100644 --- a/amarok/src/mediadevice/njb/Makefile.am +++ b/amarok/src/mediadevice/njb/Makefile.am @@ -16,7 +16,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libamarok_njb-mediadevice.la libamarok_njb_mediadevice_la_LIBADD = $(top_builddir)/amarok/src/libamarok.la \ - $(LIB_TDEUI) $(LIB_TDECORE) -lnjb $(LIB_QT) $(LIB_KIO) + $(LIB_TDEUI) $(LIB_TDECORE) -lnjb $(LIB_QT) $(LIB_TDEIO) libamarok_njb_mediadevice_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) diff --git a/amarok/src/metabundle.h b/amarok/src/metabundle.h index d3c5436b..538ac103 100644 --- a/amarok/src/metabundle.h +++ b/amarok/src/metabundle.h @@ -179,10 +179,10 @@ public: /** Returns whether the url referred to is a local file */ bool isFile() const; - /** Returns whether the url referred to can be accessed via kio slaves */ + /** Returns whether the url referred to can be accessed via tdeio slaves */ bool isKioUrl() const; - /** Returns whether url can be accessed via kio slaves */ + /** Returns whether url can be accessed via tdeio slaves */ static bool isKioUrl( const KURL &url ); /** Returns whether composer, disc number and bpm fields are available. */ diff --git a/amarok/src/metabundlesaver.cpp b/amarok/src/metabundlesaver.cpp index 216b6d4e..cd6e8cc0 100644 --- a/amarok/src/metabundlesaver.cpp +++ b/amarok/src/metabundlesaver.cpp @@ -82,7 +82,7 @@ MetaBundleSaver::prepareToSave() ".pid-" + pid.setNum( getpid() ) + ".random-" + randomString + '.' + m_bundle->type(); - //The next long step is to copy the file over. We can't use KIO because it's not thread save, + //The next long step is to copy the file over. We can't use TDEIO because it's not thread save, //and std and TQFile only have provisions for renaming and removing, so manual it is //doing it block-by-block results it not needing a huge amount of memory overhead diff --git a/amarok/src/mountpointmanager.h b/amarok/src/mountpointmanager.h index 54cbe8bb..c4d90ccd 100644 --- a/amarok/src/mountpointmanager.h +++ b/amarok/src/mountpointmanager.h @@ -107,7 +107,7 @@ public: /** * returns an absolute path which is guaranteed to be playable by amarok's current engine. (based on an * idea by andrewt512: this method would only be called when we actually want to play the file, not when we - * simply want to show it to the user. It could for example download a file using KIO and return a path to a + * simply want to show it to the user. It could for example download a file using TDEIO and return a path to a * temporary file. Needs some more thought and is not actually used at the moment. * @param absolutePath * @param relativePath diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index ac8a5854..b66a89c5 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -1830,7 +1830,7 @@ PodcastChannel::fetchResult( TDEIO::Job* job ) //SLOT if ( job->error() != 0 ) { Amarok::StatusBar::instance()->shortMessage( i18n( "Unable to connect to Podcast server." ) ); - debug() << "Unable to retrieve podcast information. KIO Error: " << job->error() << endl; + debug() << "Unable to retrieve podcast information. TDEIO Error: " << job->error() << endl; title().isEmpty() ? setText( 0, m_url.prettyURL() ) : @@ -2622,7 +2622,7 @@ void PodcastEpisode::downloadResult( TDEIO::Job * transferJob ) if( transferJob->error() ) { Amarok::StatusBar::instance()->shortMessage( i18n( "Media download aborted, unable to connect to server." ) ); - debug() << "Unable to retrieve podcast media. KIO Error: " << transferJob->error() << endl; + debug() << "Unable to retrieve podcast media. TDEIO Error: " << transferJob->error() << endl; m_localUrl = KURL(); setPixmap( 0, SmallIcon("cancel") ); diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp index afb1b397..cf38afab 100644 --- a/amarok/src/refreshimages.cpp +++ b/amarok/src/refreshimages.cpp @@ -107,7 +107,7 @@ RefreshImages::finishedXmlFetch( TDEIO::Job* xmlJob ) //SLOT } debug() << imageUrl << endl; KURL testUrl( imageUrl ); - if( !testUrl.isValid() ) //KIO crashs on empty strings!!! + if( !testUrl.isValid() ) //TDEIO crashs on empty strings!!! { //Amazon sometimes takes down covers CollectionDB::instance()->removeInvalidAmazonInfo(xmlJob->name()); diff --git a/amarok/src/scripts/graphequalizer/Makefile.am b/amarok/src/scripts/graphequalizer/Makefile.am index 3b5b878e..d0c5378e 100644 --- a/amarok/src/scripts/graphequalizer/Makefile.am +++ b/amarok/src/scripts/graphequalizer/Makefile.am @@ -21,7 +21,7 @@ graphequalizer_LDADD = \ $(LIB_TDEUI) \ $(LIB_TDECORE) -graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp index e93c67c4..1acab62a 100644 --- a/amarok/src/scrobbler.cpp +++ b/amarok/src/scrobbler.cpp @@ -97,7 +97,7 @@ void Scrobbler::audioScrobblerSimilarArtistsResult( TDEIO::Job* job ) //SLOT if ( job->error() ) { - warning() << "KIO error! errno: " << job->error() << endl; + warning() << "TDEIO error! errno: " << job->error() << endl; return; } @@ -669,7 +669,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( TDEIO::Job* job ) //SLOT m_inProgress = false; if ( job->error() ) { - warning() << "KIO error! errno: " << job->error() << endl; + warning() << "TDEIO error! errno: " << job->error() << endl; schedule( true ); return; } @@ -749,7 +749,7 @@ void ScrobblerSubmitter::audioScrobblerSubmitResult( TDEIO::Job* job ) //SLOT m_inProgress = false; if ( job->error() ) { - warning() << "KIO error! errno: " << job->error() << endl; + warning() << "TDEIO error! errno: " << job->error() << endl; enqueueJob( job ); return; } diff --git a/doc/amarok/faq.docbook b/doc/amarok/faq.docbook index f3db2b99..d5d42c7c 100644 --- a/doc/amarok/faq.docbook +++ b/doc/amarok/faq.docbook @@ -665,7 +665,7 @@ Tray icon is also a song position indicator.</para> <answer> <para>Insert your CD, then click on "Play Audio CD" in the menu. The File-Browser will come up and show a tree with several folders. For normal ripping, go to the "wav" folder, select some tracks and drag them to the desired destination in a Konqueror window. For automatic encoding, drag files from the "mp3" or "ogg" folder instead.</para> -<note><para>CD-ripping requires the "AudioCD KIO-slave" to be installed. It is part of KDE-Multimedia.</para></note> +<note><para>CD-ripping requires the "AudioCD TDEIO-slave" to be installed. It is part of KDE-Multimedia.</para></note> </answer> </qandaentry> diff --git a/doc/es/faq.docbook b/doc/es/faq.docbook index 1bebd5f3..783be26b 100644 --- a/doc/es/faq.docbook +++ b/doc/es/faq.docbook @@ -864,7 +864,7 @@ print "Error al escribir las etiquetas de $ARGV[0]\n" unless $mp3->set_v2tag($v2 >Inserte su CD, pulse sobre «Reproducir CD de audio» en el menú. Aparecerá el navegador de archivos y mostrará un árbol con varias carpetas. Para una extracción normal, vaya a la carpeta «wav», seleccione algunas pistas y arrástrelas al destino deseado en una ventana de Konqueror. Para que se realice la codificación de forma automática arrastre los archivos desde las carpetas «mp3» u «ogg».</para> <note ><para ->La extracción de audio del CD precisa que esté instalado el «KIO-slave AudioCD». Éste forma parte de KDE-Multimedia.</para +>La extracción de audio del CD precisa que esté instalado el «TDEIO-slave AudioCD». Éste forma parte de KDE-Multimedia.</para ></note> </answer> </qandaentry> diff --git a/doc/et/faq.docbook b/doc/et/faq.docbook index f0fd7f6e..535e0729 100644 --- a/doc/et/faq.docbook +++ b/doc/et/faq.docbook @@ -864,7 +864,7 @@ print "Error writing tags of $ARGV[0]\n" unless $mp3->set_v2tag($v2tag,&UTF8 >Sisesta CD ja vali menüükäsk "Esita audio CD". Ilmub failisirvija, kus on näha mitu kataloogi. Tavaliseks rippimiseks mine kataloogi "wav", vali mõned palad ja lohista need vajalikku kohta Konquerori aknas. Automaatseks kodeerimiseks lohista faile aga kataloogidest "mp3" või "ogg".</para> <note ><para ->CD rippimiseks peab olema paigaldatud "AudioCD KIO-moodul". See kuulub KDE-Multimedia koosseisu.</para +>CD rippimiseks peab olema paigaldatud "AudioCD TDEIO-moodul". See kuulub KDE-Multimedia koosseisu.</para ></note> </answer> </qandaentry> diff --git a/doc/fr/faq.docbook b/doc/fr/faq.docbook index 3d5f854f..462dcf7e 100644 --- a/doc/fr/faq.docbook +++ b/doc/fr/faq.docbook @@ -928,7 +928,7 @@ print "Erreur a l'écriture des balises de $ARGV[0]\n" unless $mp3->set_v2tag($v >. Le navigateur de fichiers va apparaître et vous montrer plusieurs dossiers. Pour faire une extraction normale, allez dans le dossier « wav », sélectionnez quelques pistes, et déposez-les dans le dossier désiré dans une fenêtre de votre navigateur de fichiers. Pour un encodage automatique, allez plutôt dans le dossier « mp3 » ou « ogg ».</para> <note ><para ->Pour extraire des CD audio, il faut que le AudioCD KIO-slave soit installé. Il fait partie de KDE-Multimedia.</para +>Pour extraire des CD audio, il faut que le AudioCD TDEIO-slave soit installé. Il fait partie de KDE-Multimedia.</para ></note> </answer> </qandaentry> diff --git a/doc/it/faq.docbook b/doc/it/faq.docbook index 985284cc..28ec8d05 100644 --- a/doc/it/faq.docbook +++ b/doc/it/faq.docbook @@ -866,7 +866,7 @@ print "Error writing tags of $ARGV[0]\n" unless $mp3->set_v2tag($v2tag,&UTF8 >Inserire il CD, poi premere su "Riproduci cd audio" nel menu. Si aprirà il navigatore dei file a mostrare un albero con numerose cartelle. Per estrazioni normali, andare nella cartella "wav", selezionare alcune tracce e trascinarle nella destinazione desiderata in una finestra di Konqueror. Per una codifica automatica, trascinare invece file da cartelle "mp3" o "ogg".</para> <note ><para ->L'estrazione da CD richiede che sia installato "CD audio KIO-slave". Fa parte di KDE-Multimedia.</para +>L'estrazione da CD richiede che sia installato "CD audio TDEIO-slave". Fa parte di KDE-Multimedia.</para ></note> </answer> </qandaentry> diff --git a/doc/nl/using.docbook b/doc/nl/using.docbook index b2894bbf..29b19080 100644 --- a/doc/nl/using.docbook +++ b/doc/nl/using.docbook @@ -781,7 +781,7 @@ ></term> <listitem ><para ->Hiermee kunt u een audio-cd openen en afspelen via de kio-slave audiocd:/.</para +>Hiermee kunt u een audio-cd openen en afspelen via de tdeio-slave audiocd:/.</para ></listitem> </varlistentry> diff --git a/doc/pt/faq.docbook b/doc/pt/faq.docbook index 9706496c..0425ee8c 100644 --- a/doc/pt/faq.docbook +++ b/doc/pt/faq.docbook @@ -872,7 +872,7 @@ print "Erro ao escrever as marcas em $ARGV[0]\n" unless $mp3->set_v2tag($v2tag,& >Introduza o seu CD e carregue depois em "Tocar o CD de Áudio" do menu. O Navegador de Ficheiros irá aparecer e mostrar uma árvore com várias pastas. Para uma extracção normal, vá à pasta "wav", seleccione algumas faixas e arraste-as para o local de destino, numa janela do Konqueror. Para uma codificação automática, arraste os ficheiros da pasta "mp3" em alternativa.</para> <note ><para ->A extracção de áudio dos CDs necessita do "KIO-slave AudioCD" instalado. Este faz parte do KDE-Multimedia.</para +>A extracção de áudio dos CDs necessita do "TDEIO-slave AudioCD" instalado. Este faz parte do KDE-Multimedia.</para ></note> </answer> </qandaentry> diff --git a/po/ca/amarok.po b/po/ca/amarok.po index 5921c760..d2f466fb 100644 --- a/po/ca/amarok.po +++ b/po/ca/amarok.po @@ -13,7 +13,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2008-05-12 12:43+0200\n" "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n" -"Language-Team: Catalan <tde-i18n-ca@kde.org>\n" +"Language-Team: Catalan <kde-i18n-ca@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/de/amarok.po b/po/de/amarok.po index baf22c7f..0d723e5b 100644 --- a/po/de/amarok.po +++ b/po/de/amarok.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2008-07-06 16:25+0200\n" "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n" -"Language-Team: German <tde-i18n-de@kde.org>\n" +"Language-Team: German <kde-i18n-de@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/eo/amarok.po b/po/eo/amarok.po index 5518a7fd..03e5fc8a 100644 --- a/po/eo/amarok.po +++ b/po/eo/amarok.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2007-03-22 00:20+0100\n" "Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n" -"Language-Team: Esperanto <tde-i18n-eo@kde.org>\n" +"Language-Team: Esperanto <kde-i18n-eo@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/fa/amarok.po b/po/fa/amarok.po index e1d10422..92aaf18b 100644 --- a/po/fa/amarok.po +++ b/po/fa/amarok.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2007-02-19 09:46+0330\n" "Last-Translator: MaryamSadat Razavi <razavi@itland.ir>\n" -"Language-Team: Persian <tde-i18n-fa@kde.org>\n" +"Language-Team: Persian <kde-i18n-fa@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/it/amarok.po b/po/it/amarok.po index f4df20c5..d29fb971 100644 --- a/po/it/amarok.po +++ b/po/it/amarok.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2008-06-17 00:59+0100\n" "Last-Translator: Vincenzo Reale <smart2128@baslug.org>\n" -"Language-Team: Italian <tde-i18n-it@mail.kde.org>\n" +"Language-Team: Italian <kde-i18n-it@mail.kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nds/amarok.po b/po/nds/amarok.po index cd2efa5b..0af273e1 100644 --- a/po/nds/amarok.po +++ b/po/nds/amarok.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2008-05-06 23:40+0200\n" "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n" -"Language-Team: Low Saxon <tde-i18n-nds@kde.org>\n" +"Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nl/amarok.po b/po/nl/amarok.po index ebed8610..d800f920 100644 --- a/po/nl/amarok.po +++ b/po/nl/amarok.po @@ -15,7 +15,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2008-04-06 01:39+0200\n" "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n" -"Language-Team: Nederlands <tde-i18n-nl@kde.org>\n" +"Language-Team: Nederlands <kde-i18n-nl@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pl/amarok.po b/po/pl/amarok.po index bf7e5a8d..bebd8967 100644 --- a/po/pl/amarok.po +++ b/po/pl/amarok.po @@ -1,6 +1,6 @@ # translation of amarok.po to Polish # Cezary Morga <cezarym@pf.pl>, 2004, 2005. -# Michal Rudolf <mrudolf@tdewebdev.org>, 2004, 2005. +# Michal Rudolf <mrudolf@kdewebdev.org>, 2004, 2005. # Krzysztof Lichota <lichota@mimuw.edu.pl>, 2005, 2006, 2007. # Łukasz Derkacz <nikko@ift.uni.wroc.pl>, 2005. # Łukasz Derkacz <nibbana@interia.pl>, 2005, 2006. diff --git a/po/pt/amarok.po b/po/pt/amarok.po index 5aaea635..89f4088c 100644 --- a/po/pt/amarok.po +++ b/po/pt/amarok.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2007-11-25 13:18+0000\n" "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n" -"Language-Team: pt <tde-i18n-pt@kde.org>\n" +"Language-Team: pt <kde-i18n-pt@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pt_BR/amarok.po b/po/pt_BR/amarok.po index 0896c5a2..0d69d081 100644 --- a/po/pt_BR/amarok.po +++ b/po/pt_BR/amarok.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2008-04-05 07:29-0300\n" "Last-Translator: doutor.zero <doutor.zero@gmail.com>\n" -"Language-Team: Português do Brasil <tde-i18n-pt_br@kde.org>\n" +"Language-Team: Português do Brasil <kde-i18n-pt_br@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sr/amarok.po b/po/sr/amarok.po index deacfcf0..fc1b2f32 100644 --- a/po/sr/amarok.po +++ b/po/sr/amarok.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2008-07-08 01:26+0200\n" "PO-Revision-Date: 2008-06-19 11:52+0200\n" "Last-Translator: Slobodan Simic <simicsl@verat.net>\n" -"Language-Team: Serbian <tde-i18n-sr@kde.org>\n" +"Language-Team: Serbian <kde-i18n-sr@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" |