summaryrefslogtreecommitdiffstats
path: root/amarok/src
diff options
context:
space:
mode:
Diffstat (limited to 'amarok/src')
-rw-r--r--amarok/src/Makefile.am2
-rw-r--r--amarok/src/collectiondb.cpp2
-rw-r--r--amarok/src/collectionscanner/Makefile.am4
-rw-r--r--amarok/src/contextbrowser.cpp2
-rw-r--r--amarok/src/enginecontroller.cpp2
-rw-r--r--amarok/src/filebrowser.cpp4
-rw-r--r--amarok/src/filebrowser.h2
-rw-r--r--amarok/src/ktrm.cpp2
-rw-r--r--amarok/src/lastfm.cpp2
-rw-r--r--amarok/src/lastfm.h2
-rw-r--r--amarok/src/loader/Makefile.am2
-rw-r--r--amarok/src/mediadevice/daap/Makefile.am2
-rw-r--r--amarok/src/mediadevice/daap/daapreader/Makefile.am2
-rw-r--r--amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am2
-rw-r--r--amarok/src/mediadevice/generic/Makefile.am2
-rw-r--r--amarok/src/mediadevice/generic/genericmediadevice.cpp2
-rw-r--r--amarok/src/mediadevice/generic/genericmediadevice.h2
-rw-r--r--amarok/src/mediadevice/ifp/Makefile.am2
-rw-r--r--amarok/src/mediadevice/ifp/ifpmediadevice.cpp2
-rw-r--r--amarok/src/mediadevice/ifp/ifpmediadevice.h2
-rw-r--r--amarok/src/mediadevice/ipod/Makefile.am2
-rw-r--r--amarok/src/mediadevice/njb/Makefile.am2
-rw-r--r--amarok/src/metabundle.h4
-rw-r--r--amarok/src/metabundlesaver.cpp2
-rw-r--r--amarok/src/mountpointmanager.h2
-rw-r--r--amarok/src/playlistbrowseritem.cpp4
-rw-r--r--amarok/src/refreshimages.cpp2
-rw-r--r--amarok/src/scripts/graphequalizer/Makefile.am2
-rw-r--r--amarok/src/scrobbler.cpp6
29 files changed, 35 insertions, 35 deletions
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;
}