summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:05:24 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:05:24 -0600
commitf6d535927fe307583a49286033e26444d6e8ff0d (patch)
treea4422d35c093b933cf42e0a380757439b6dbb245
parentc9f212164b08f3ff5b8f82c78361791da6ea5366 (diff)
downloadamarok-f6d535927fe307583a49286033e26444d6e8ff0d.tar.gz
amarok-f6d535927fe307583a49286033e26444d6e8ff0d.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--ChangeLog2
-rw-r--r--amarok/HACKING6
-rw-r--r--amarok/src/Options2.ui.h2
-rw-r--r--amarok/src/amarok.h14
-rw-r--r--amarok/src/amarokcore/amarokdcophandler.cpp4
-rw-r--r--amarok/src/analyzers/blockanalyzer.cpp2
-rw-r--r--amarok/src/app.cpp20
-rw-r--r--amarok/src/app.h8
-rw-r--r--amarok/src/browserbar.cpp2
-rw-r--r--amarok/src/collectionbrowser.cpp6
-rw-r--r--amarok/src/collectiondb.cpp40
-rw-r--r--amarok/src/collectiondb.h10
-rw-r--r--amarok/src/configdialog.cpp12
-rw-r--r--amarok/src/configdialog.h4
-rw-r--r--amarok/src/contextbrowser.cpp14
-rw-r--r--amarok/src/contextbrowser.h6
-rw-r--r--amarok/src/coverfetcher.cpp22
-rw-r--r--amarok/src/coverfetcher.h8
-rw-r--r--amarok/src/covermanager.cpp2
-rw-r--r--amarok/src/database_refactor/collectiondb.cpp10
-rw-r--r--amarok/src/database_refactor/collectiondb.h2
-rw-r--r--amarok/src/deletedialog.cpp8
-rw-r--r--amarok/src/device/massstorage/massstoragedevicehandler.cpp2
-rw-r--r--amarok/src/device/massstorage/massstoragedevicehandler.h2
-rw-r--r--amarok/src/device/nfs/nfsdevicehandler.cpp2
-rw-r--r--amarok/src/device/nfs/nfsdevicehandler.h2
-rw-r--r--amarok/src/device/smb/smbdevicehandler.cpp2
-rw-r--r--amarok/src/device/smb/smbdevicehandler.h2
-rw-r--r--amarok/src/engine/xine/xine-config.h2
-rw-r--r--amarok/src/enginecontroller.h2
-rw-r--r--amarok/src/filebrowser.cpp2
-rw-r--r--amarok/src/firstrunwizard.ui.h2
-rw-r--r--amarok/src/ktrm.cpp8
-rw-r--r--amarok/src/ktrm.h4
-rw-r--r--amarok/src/lastfm.cpp22
-rw-r--r--amarok/src/lastfm.h8
-rw-r--r--amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp18
-rw-r--r--amarok/src/magnatunebrowser/magnatunealbumdownloader.h8
-rw-r--r--amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp8
-rw-r--r--amarok/src/magnatunebrowser/magnatuneartistinfobox.h6
-rw-r--r--amarok/src/magnatunebrowser/magnatunebrowser.cpp8
-rw-r--r--amarok/src/magnatunebrowser/magnatunebrowser.h4
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp8
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasehandler.h4
-rw-r--r--amarok/src/mediabrowser.cpp34
-rw-r--r--amarok/src/mediabrowser.h8
-rw-r--r--amarok/src/mediadevice/daap/daapclient.cpp2
-rw-r--r--amarok/src/mediadevice/daap/daapclient.h2
-rw-r--r--amarok/src/mediadevice/generic/genericmediadevice.cpp14
-rw-r--r--amarok/src/mediadevice/generic/genericmediadevice.h6
-rw-r--r--amarok/src/mediadevice/ifp/ifpmediadevice.cpp6
-rw-r--r--amarok/src/mediadevice/ifp/ifpmediadevice.h2
-rw-r--r--amarok/src/mediadevice/ipod/ipodmediadevice.cpp14
-rw-r--r--amarok/src/mediadevice/ipod/ipodmediadevice.h4
-rw-r--r--amarok/src/mediadevice/mtp/mtpmediadevice.cpp2
-rw-r--r--amarok/src/mediadevice/mtp/mtpmediadevice.h2
-rw-r--r--amarok/src/mediadevice/njb/njbmediadevice.cpp4
-rw-r--r--amarok/src/mediadevice/njb/njbmediadevice.h2
-rw-r--r--amarok/src/mediadevice/njb/playlist.cpp2
-rw-r--r--amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp2
-rw-r--r--amarok/src/mediadevice/riokarma/riokarmamediadevice.h2
-rw-r--r--amarok/src/mediadevicemanager.cpp2
-rw-r--r--amarok/src/medium.cpp4
-rw-r--r--amarok/src/mediumpluginmanager.cpp6
-rw-r--r--amarok/src/metabundle.cpp2
-rw-r--r--amarok/src/mountpointmanager.cpp4
-rw-r--r--amarok/src/mountpointmanager.h2
-rw-r--r--amarok/src/multitabbar.cpp2
-rw-r--r--amarok/src/osd.cpp2
-rw-r--r--amarok/src/playlist.cpp8
-rw-r--r--amarok/src/playlist.h4
-rw-r--r--amarok/src/playlistbrowser.cpp10
-rw-r--r--amarok/src/playlistbrowseritem.cpp54
-rw-r--r--amarok/src/playlistbrowseritem.h22
-rw-r--r--amarok/src/playlistloader.cpp6
-rw-r--r--amarok/src/playlistloader.h4
-rw-r--r--amarok/src/plugin/pluginconfig.h2
-rw-r--r--amarok/src/prettypopupmenu.cpp2
-rw-r--r--amarok/src/refreshimages.cpp20
-rw-r--r--amarok/src/refreshimages.h6
-rw-r--r--amarok/src/scriptmanager.cpp12
-rw-r--r--amarok/src/scrobbler.cpp40
-rw-r--r--amarok/src/scrobbler.h18
-rw-r--r--amarok/src/statusbar/statusBarBase.cpp14
-rw-r--r--amarok/src/statusbar/statusBarBase.h12
-rw-r--r--amarok/src/tagdialog.cpp2
-rw-r--r--amarok/src/tagguesser.cpp6
-rw-r--r--doc/et/develop.docbook2
-rw-r--r--doc/it/develop.docbook2
-rw-r--r--doc/nl/develop.docbook2
-rw-r--r--doc/pt/develop.docbook2
-rw-r--r--doc/sv/develop.docbook2
92 files changed, 357 insertions, 357 deletions
diff --git a/ChangeLog b/ChangeLog
index 3edbccec..0acb004c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2570,7 +2570,7 @@ VERSION 0.9-beta1:
CHG: amaroK moved out of kdenonbeta. we are now member of KDE Extra Gear 1
ADD: on-screen-display (OSD), shows an overlay with information on the currently playing track
CHG: use KMultiTabBar for browser selection
- CHG: migrated settings system to KConfig XT
+ CHG: migrated settings system to TDEConfig XT
ADD: playlist columns for length and bitrate
ADD: merged new audio engine in. this provides a generic interface class, with multiple
backends. right now there is a backend for aRts and one for GStreamer (still rudimentary)
diff --git a/amarok/HACKING b/amarok/HACKING
index 7b9d57bf..123ca41b 100644
--- a/amarok/HACKING
+++ b/amarok/HACKING
@@ -199,7 +199,7 @@ Usage of Amarok::config()
We provide this method for convenience, but it is important to use it properly. By
inspection, we can see that we may produce very obscure bugs in the wrong case:
- | KConfig
+ | TDEConfig
| *config( const QString &group )
| {
| //Slightly more useful config() that allows setting the group simultaneously
@@ -212,14 +212,14 @@ Take the following example:
| void
| f1()
| {
- | KConfig *config = Amarok::config( "Group 2" );
+ | TDEConfig *config = Amarok::config( "Group 2" );
| config->writeEntry( "Group 2 Variable", true );
| }
|
| void
| doStuff()
| {
- | KConfig *config = Amarok::config( "Group 1" );
+ | TDEConfig *config = Amarok::config( "Group 1" );
| f1();
| config->writeEntry( "Group 1 Variable", true );
| }
diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h
index 16b4d6a7..fd437845 100644
--- a/amarok/src/Options2.ui.h
+++ b/amarok/src/Options2.ui.h
@@ -149,7 +149,7 @@ void Options2::uninstallPushButton_clicked()
KURL themeDir( KURL::fromPathOrURL( Amarok::saveLocation( "themes/" ) ) );
themeDir.addPath( name );
- if( !KIO::NetAccess::del( themeDir, 0 ) ) {
+ if( !TDEIO::NetAccess::del( themeDir, 0 ) ) {
KMessageBox::sorry( 0, i18n( "<p>Could not uninstall this theme.</p>"
"<p>You may not have sufficient permissions to delete the folder <strong>%1<strong></p>."
).arg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) );
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h
index 0067df17..d0bce4de 100644
--- a/amarok/src/amarok.h
+++ b/amarok/src/amarok.h
@@ -14,7 +14,7 @@
#include "amarok_export.h"
class KActionCollection;
-class KConfig;
+class TDEConfig;
class TQColor;
class TQDateTime;
class TQEvent;
@@ -24,7 +24,7 @@ class TQWidget;
class DynamicMode;
class TQListView;
class TQListViewItem;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
namespace Amarok
{
@@ -54,13 +54,13 @@ namespace Amarok
inline TQString xmlVersion() { return "2.4"; }
/**
- * Convenience function to return the TDEApplication instance KConfig object
+ * Convenience function to return the TDEApplication instance TDEConfig object
* pre-set to a specific group.
- * @param group Will pre-set the KConfig object to this group.
+ * @param group Will pre-set the TDEConfig object to this group.
*/
/* FIXME: This function can lead to very bizarre and hard to figure bugs.
While we don`t fix it properly, use it like this: amarok::config( Group )->readNumEntry( ... ) */
- KConfig *config( const TQString &group = "General" ); //defined in app.cpp
+ TDEConfig *config( const TQString &group = "General" ); //defined in app.cpp
/**
* @return the KActionCollection used by Amarok
@@ -122,7 +122,7 @@ namespace Amarok
*/
LIBAMAROK_EXPORT TQString saveLocation( const TQString &directory = TQString() ); //defined in collectionreader.cpp
- KIO::Job *trashFiles( const KURL::List &files ); //defined in app.cpp
+ TDEIO::Job *trashFiles( const KURL::List &files ); //defined in app.cpp
/**
* For recursively expanding the contents of a directory into a KURL::List
@@ -155,7 +155,7 @@ namespace Amarok
#if TDE_VERSION < TDE_MAKE_VERSION(3,5,0)
return url;
#else
- return KIO::NetAccess::mostLocalURL( url, mainWindow() );
+ return TDEIO::NetAccess::mostLocalURL( url, mainWindow() );
#endif
}
diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp
index d468a20d..ed265ad2 100644
--- a/amarok/src/amarokcore/amarokdcophandler.cpp
+++ b/amarok/src/amarokcore/amarokdcophandler.cpp
@@ -937,7 +937,7 @@ namespace Amarok
TQString DcopScriptHandler::readConfig(const TQString& key)
{
TQString cleanKey = key;
- KConfigSkeletonItem* configItem = AmarokConfig::self()->findItem(cleanKey.remove(' '));
+ TDEConfigSkeletonItem* configItem = AmarokConfig::self()->findItem(cleanKey.remove(' '));
if (configItem)
return configItem->property().toString();
else
@@ -947,7 +947,7 @@ namespace Amarok
TQStringList DcopScriptHandler::readListConfig(const TQString& key)
{
TQString cleanKey = key;
- KConfigSkeletonItem* configItem = AmarokConfig::self()->findItem(cleanKey.remove(' '));
+ TDEConfigSkeletonItem* configItem = AmarokConfig::self()->findItem(cleanKey.remove(' '));
TQStringList stringList;
if(configItem)
{
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index db14bbed..8c4c0833 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/amarok/src/analyzers/blockanalyzer.cpp
@@ -26,7 +26,7 @@
static inline uint myMax( uint v1, uint v2 ) { return v1 > v2 ? v1 : v2; }
-namespace Amarok { extern KConfig *config( const TQString& ); }
+namespace Amarok { extern TDEConfig *config( const TQString& ); }
BlockAnalyzer::BlockAnalyzer( TQWidget *parent )
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index 8023b9c5..a97197d9 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -1132,11 +1132,11 @@ void App::slotConfigAmarok( const TQCString& page )
{
DEBUG_THREAD_FUNC_INFO
- AmarokConfigDialog* dialog = static_cast<AmarokConfigDialog*>( KConfigDialog::exists( "settings" ) );
+ AmarokConfigDialog* dialog = static_cast<AmarokConfigDialog*>( TDEConfigDialog::exists( "settings" ) );
if( !dialog )
{
- //KConfigDialog didn't find an instance of this dialog, so lets create it :
+ //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
dialog = new AmarokConfigDialog( m_pPlaylistWindow, "settings", AmarokConfig::self() );
connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_SLOT(applySettings()) );
@@ -1186,7 +1186,7 @@ void App::firstRunWizard()
FirstRunWizard wizard;
setTopWidget( &wizard );
- KConfigDialogManager* config = new KConfigDialogManager(&wizard, AmarokConfig::self(), "wizardconfig");
+ TDEConfigDialogManager* config = new TDEConfigDialogManager(&wizard, AmarokConfig::self(), "wizardconfig");
config->updateWidgets();
// connect(config, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateSettings()));
wizard.setCaption( makeStdCaption( i18n( "First-Run Wizard" ) ) );
@@ -1230,15 +1230,15 @@ void App::setMoodbarPrefs( bool show, bool moodier, int alter, bool withMusic )
emit moodbarPrefs( show, moodier, alter, withMusic );
}
-KIO::Job *App::trashFiles( const KURL::List &files )
+TDEIO::Job *App::trashFiles( const KURL::List &files )
{
#if KDE_IS_VERSION( 3, 3, 91 )
- KIO::Job *job = KIO::trash( files, true /*show progress*/ );
+ TDEIO::Job *job = TDEIO::trash( files, true /*show progress*/ );
Amarok::StatusBar::instance()->newProgressOperation( job ).setDescription( i18n("Moving files to trash") );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotTrashResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotTrashResult( TDEIO::Job* ) ) );
return job;
#else
- KIO::Job* job = KIO::move( files, TDEGlobalSettings::trashPath() );
+ TDEIO::Job* job = TDEIO::move( files, TDEGlobalSettings::trashPath() );
return job;
#endif
}
@@ -1264,7 +1264,7 @@ void App::setRating( int n )
Playlist::instance()->setSelectedRatings( n );
}
-void App::slotTrashResult( KIO::Job *job )
+void App::slotTrashResult( TDEIO::Job *job )
{
if( job->error() )
job->showErrorDialog( PlaylistWindow::self() );
@@ -1302,7 +1302,7 @@ namespace Amarok
return pApp->playlistWindow()->actionCollection();
}
- KConfig *config( const TQString &group )
+ TDEConfig *config( const TQString &group )
{
//Slightly more useful config() that allows setting the group simultaneously
kapp->config()->setGroup( group );
@@ -1488,7 +1488,7 @@ namespace Amarok
void setUseRatings( bool use ) { App::instance()->setUseRatings( use ); }
void setMoodbarPrefs( bool show, bool moodier, int alter, bool withMusic )
{ App::instance()->setMoodbarPrefs( show, moodier, alter, withMusic ); }
- KIO::Job *trashFiles( const KURL::List &files ) { return App::instance()->trashFiles( files ); }
+ TDEIO::Job *trashFiles( const KURL::List &files ) { return App::instance()->trashFiles( files ); }
}
#include "app.moc"
diff --git a/amarok/src/app.h b/amarok/src/app.h
index c921dd50..9b20122b 100644
--- a/amarok/src/app.h
+++ b/amarok/src/app.h
@@ -28,10 +28,10 @@ namespace Amarok {
class TrayIcon;
}
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class KActionCollection;
-class KConfig;
+class TDEConfig;
class TDEGlobalAccel;
class MetaBundle;
class PlayerWidget;
@@ -91,11 +91,11 @@ class LIBAMAROK_EXPORT App : public TDEApplication, public EngineObserver
void setUseScores( bool use );
void setUseRatings( bool use );
void setMoodbarPrefs( bool show, bool moodier, int alter, bool withMusic );
- KIO::Job *trashFiles( const KURL::List &files );
+ TDEIO::Job *trashFiles( const KURL::List &files );
void quit();
private slots:
- void slotTrashResult( KIO::Job *job );
+ void slotTrashResult( TDEIO::Job *job );
private:
/** Workaround for HyperThreading CPU's, @see BUG 99199 */
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp
index 1406a756..0d20000c 100644
--- a/amarok/src/browserbar.cpp
+++ b/amarok/src/browserbar.cpp
@@ -115,7 +115,7 @@ BrowserBar::BrowserBar( TQWidget *parent )
BrowserBar::~BrowserBar()
{
- KConfig* const config = Amarok::config( "BrowserBar" );
+ TDEConfig* const config = Amarok::config( "BrowserBar" );
config->writeEntry( "CurrentPane", m_currentIndex != -1 ? TQString(currentBrowser()->name()) : TQString() );
config->writeEntry( "Width", m_browserBox->width() );
}
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 70afa03c..537c5d6b 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -77,7 +77,7 @@ extern "C"
using namespace CollectionBrowserIds;
-namespace Amarok { extern KConfig *config( const TQString& ); }
+namespace Amarok { extern TDEConfig *config( const TQString& ); }
class CoverFetcher;
@@ -460,7 +460,7 @@ CollectionView::CollectionView( CollectionBrowser* parent )
setAllColumnsShowFocus( true );
//<READ CONFIG>
- KConfig* config = Amarok::config( "Collection Browser" );
+ TDEConfig* config = Amarok::config( "Collection Browser" );
m_cat1 = config->readNumEntry( "Category1", IdArtist );
m_cat2 = config->readNumEntry( "Category2", IdAlbum );
m_cat3 = config->readNumEntry( "Category3", IdNone );
@@ -530,7 +530,7 @@ CollectionView::CollectionView( CollectionBrowser* parent )
CollectionView::~CollectionView() {
DEBUG_FUNC_INFO
- KConfig* const config = Amarok::config( "Collection Browser" );
+ TDEConfig* const config = Amarok::config( "Collection Browser" );
config->writeEntry( "Category1", m_cat1 );
config->writeEntry( "Category2", m_cat2 );
config->writeEntry( "Category3", m_cat3 );
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index a579464f..2588b12c 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -1858,7 +1858,7 @@ CollectionDB::fetchImage( const KURL& url, TQString &/*tmpFile*/ )
if ( url.protocol() != "file" )
{
TQString tmpFile;
- KIO::NetAccess::download( url, tmpFile, 0 ); //TODO set 0 to the window, though it probably doesn't really matter
+ TDEIO::NetAccess::download( url, tmpFile, 0 ); //TODO set 0 to the window, though it probably doesn't really matter
return TQImage( tmpFile );
}
else
@@ -1872,7 +1872,7 @@ CollectionDB::setAlbumImage( const TQString& artist, const TQString& album, cons
{
TQString tmpFile;
bool success = setAlbumImage( artist, album, fetchImage(url, tmpFile) );
- KIO::NetAccess::removeTempFile( tmpFile ); //only removes file if it was created with NetAccess
+ TDEIO::NetAccess::removeTempFile( tmpFile ); //only removes file if it was created with NetAccess
return success;
}
@@ -1941,9 +1941,9 @@ CollectionDB::podcastImage( const TQString &remoteURL, const bool withShadow, ui
const KURL url = KURL::fromPathOrURL( remoteURL );
if( url.isValid() ) //KIO crashes with invalid URLs
{
- KIO::Job *job = KIO::storedGet( url, false, false );
+ TDEIO::Job *job = TDEIO::storedGet( url, false, false );
m_podcastImageJobs[job] = remoteURL;
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( podcastImageResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( podcastImageResult( TDEIO::Job* ) ) );
}
}
@@ -1954,12 +1954,12 @@ CollectionDB::podcastImage( const TQString &remoteURL, const bool withShadow, ui
}
void
-CollectionDB::podcastImageResult( KIO::Job *gjob )
+CollectionDB::podcastImageResult( TDEIO::Job *gjob )
{
TQString url = m_podcastImageJobs[gjob];
m_podcastImageJobs.remove( gjob );
- KIO::StoredTransferJob *job = dynamic_cast<KIO::StoredTransferJob *>( gjob );
+ TDEIO::StoredTransferJob *job = dynamic_cast<TDEIO::StoredTransferJob *>( gjob );
if( !job )
{
debug() << "connected to wrong job type" << endl;
@@ -3964,7 +3964,7 @@ CollectionDB::migrateFile( const TQString &oldURL, const TQString &newURL )
}
void
-CollectionDB::fileOperationResult( KIO::Job *job ) // slot
+CollectionDB::fileOperationResult( TDEIO::Job *job ) // slot
{
if(job->error())
{
@@ -4007,22 +4007,22 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b
} while( TQFile::exists( tmp ) );
tmpSrc = KURL::fromPathOrURL( tmp );
- KIO::FileCopyJob *job = 0;
+ TDEIO::FileCopyJob *job = 0;
if( copy )
{
- job = KIO::file_copy( src, tmpSrc, -1, false, false, false );
+ job = TDEIO::file_copy( src, tmpSrc, -1, false, false, false );
}
else
{
- job = KIO::file_move( src, tmpSrc, -1, false, false, false );
+ job = TDEIO::file_move( src, tmpSrc, -1, false, false, false );
}
- connect( job, TQT_SIGNAL(result( KIO::Job * )), TQT_SLOT(fileOperationResult( KIO::Job * )) );
+ connect( job, TQT_SIGNAL(result( TDEIO::Job * )), TQT_SLOT(fileOperationResult( TDEIO::Job * )) );
m_waitForFileOperation = true;
while( m_waitForFileOperation )
{
if( m_moveFileJobCancelled )
{
- disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) );
+ disconnect( job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(fileOperationResult( TDEIO::Job * )) );
TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() );
job->kill();
@@ -4134,22 +4134,22 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit
}
m_fileOperationFailed = false;
- KIO::FileCopyJob *job = 0;
+ TDEIO::FileCopyJob *job = 0;
if( copy )
{
- job = KIO::file_copy( srcURL, dstURL, -1, overwrite, false, false );
+ job = TDEIO::file_copy( srcURL, dstURL, -1, overwrite, false, false );
}
else
{
- job = KIO::file_move( srcURL, dstURL, -1, overwrite, false, false );
+ job = TDEIO::file_move( srcURL, dstURL, -1, overwrite, false, false );
}
- connect( job, TQT_SIGNAL(result( KIO::Job * )), TQT_SLOT(fileOperationResult( KIO::Job * )) );
+ connect( job, TQT_SIGNAL(result( TDEIO::Job * )), TQT_SLOT(fileOperationResult( TDEIO::Job * )) );
m_waitForFileOperation = true;
while( m_waitForFileOperation )
{
if( m_moveFileJobCancelled )
{
- disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) );
+ disconnect( job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(fileOperationResult( TDEIO::Job * )) );
TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() );
job->kill();
@@ -5413,7 +5413,7 @@ CollectionDB::updateGroupBy()
if ( version && version < 32 )
{
- KConfig* config = Amarok::config( "Collection Browser" );
+ TDEConfig* config = Amarok::config( "Collection Browser" );
int m_cat1 = config->readNumEntry( "Category1" );
int m_cat2 = config->readNumEntry( "Category2" );
int m_cat3 = config->readNumEntry( "Category3" );
@@ -5440,14 +5440,14 @@ CollectionDB::updateStatsTables()
debug() << "Creating a backup of the database in "
<< Amarok::saveLocation()+"collection-backup.db" << '.' << endl;
- bool copied = KIO::NetAccess::file_copy( Amarok::saveLocation()+"collection.db",
+ bool copied = TDEIO::NetAccess::file_copy( Amarok::saveLocation()+"collection.db",
Amarok::saveLocation()+"collection-backup.db",
-1 /*perms*/, true /*overwrite*/, false /*resume*/ );
if( !copied )
{
debug() << "Backup failed! Perhaps the volume is not writable." << endl;
- debug() << "Error was: " << KIO::NetAccess::lastErrorString() << endl;
+ debug() << "Error was: " << TDEIO::NetAccess::lastErrorString() << endl;
}
}
#endif
diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h
index f5a37cea..8244ed77 100644
--- a/amarok/src/collectiondb.h
+++ b/amarok/src/collectiondb.h
@@ -30,7 +30,7 @@
#include <tqthread.h>
#include <tqvaluestack.h>
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class DbConnection;
class CoverFetcher;
@@ -429,7 +429,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
//cover management methods
/** Returns the image from a given URL, network-transparently.
- * You must run KIO::NetAccess::removeTempFile( tmpFile ) when you are finished using the image;
+ * You must run TDEIO::NetAccess::removeTempFile( tmpFile ) when you are finished using the image;
**/
static TQImage fetchImage( const KURL& url, TQString &tmpFile );
/** Saves images located on the user's filesystem */
@@ -523,8 +523,8 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
void dirDirty( const TQString& path );
void coverFetcherResult( CoverFetcher* );
void similarArtistsFetched( const TQString& artist, const TQStringList& suggestions );
- void fileOperationResult( KIO::Job *job ); // moveFile depends on it
- void podcastImageResult( KIO::Job *job ); //for fetching remote podcast images
+ void fileOperationResult( TDEIO::Job *job ); // moveFile depends on it
+ void podcastImageResult( TDEIO::Job *job ); //for fetching remote podcast images
void aftMigratePermanentTablesUrl( const TQString& oldUrl, const TQString& newUrl, const TQString& uniqueid ); //AFT-enable stats
void aftMigratePermanentTablesUniqueId( const TQString& url, const TQString& oldid, const TQString& newid );
@@ -640,7 +640,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
bool m_moveFileJobCancelled;
// for handling podcast image url redirects
- TQMap<KIO::Job *, TQString> m_podcastImageJobs;
+ TQMap<TDEIO::Job *, TQString> m_podcastImageJobs;
// protect against multiple simultaneous queries/inserts
TQMutex m_mutex;
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index a05a8d3b..11c827dd 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -79,8 +79,8 @@ int AmarokConfigDialog::s_currentPage = 0;
// PUBLIC
//////////////////////////////////////////////////////////////////////////////////////////
-AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config )
- : KConfigDialog( parent, name, config )
+AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config )
+ : TDEConfigDialog( parent, name, config )
, m_engineConfig( 0 )
, m_opt4( 0 )
{
@@ -219,13 +219,13 @@ AmarokConfigDialog::~AmarokConfigDialog()
}
-/** Reimplemented from KConfigDialog */
+/** Reimplemented from TDEConfigDialog */
void AmarokConfigDialog::addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, bool manage )
{
// Add the widget pointer to our list, for later reference
m_pageList << page;
- KConfigDialog::addPage( page, itemName, pixmapName, header, manage );
+ TDEConfigDialog::addPage( page, itemName, pixmapName, header, manage );
}
@@ -234,7 +234,7 @@ void AmarokConfigDialog::showPageByName( const TQCString& page )
{
for( uint index = 0; index < m_pageList.count(); index++ ) {
if ( m_pageList[index]->name() == page ) {
- KConfigDialog::showPage( index );
+ TDEConfigDialog::showPage( index );
return;
}
}
@@ -252,7 +252,7 @@ void AmarokConfigDialog::showPageByName( const TQCString& page )
void AmarokConfigDialog::updateButtons()
{
- KConfigDialog::updateButtons();
+ TDEConfigDialog::updateButtons();
}
/**
diff --git a/amarok/src/configdialog.h b/amarok/src/configdialog.h
index d191ee67..8634041f 100644
--- a/amarok/src/configdialog.h
+++ b/amarok/src/configdialog.h
@@ -31,13 +31,13 @@ namespace Amarok {
class MediumPluginManager;
-class AmarokConfigDialog : public KConfigDialog
+class AmarokConfigDialog : public TDEConfigDialog
{
Q_OBJECT
public:
- AmarokConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config );
+ AmarokConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config );
~AmarokConfigDialog();
void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName,
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 3a09ac7e..5e33e390 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -138,7 +138,7 @@ namespace Amarok
return verboseTimeSince( dt );
}
- extern KConfig *config( const TQString& );
+ extern TDEConfig *config( const TQString& );
/**
* Function that must be used when separating contextBrowser escaped urls
@@ -311,7 +311,7 @@ ContextBrowser::ContextBrowser( const char *name )
m_showFavoriteAlbums = Amarok::config( "ContextBrowser" )->readBoolEntry( "ShowFavoriteAlbums", true );
// Delete folder with the cached coverimage shadow pixmaps
- KIO::del( KURL::fromPathOrURL( Amarok::saveLocation( "covershadow-cache/" ) ), false, false );
+ TDEIO::del( KURL::fromPathOrURL( Amarok::saveLocation( "covershadow-cache/" ) ), false, false );
connect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), TQT_SLOT( tabChanged( TQWidget* ) ) );
@@ -3393,7 +3393,7 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT
m_lyricCurrentUrl = el.attribute( "page_url" );
ScriptManager* const sm = ScriptManager::instance();
- KConfig spec( sm->specForScript( sm->lyricsScriptRunning() ), true, false );
+ TDEConfig spec( sm->specForScript( sm->lyricsScriptRunning() ), true, false );
spec.setGroup( "Lyrics" );
if ( el.attribute( "add_url" ).isEmpty() )
@@ -3989,12 +3989,12 @@ void ContextBrowser::showWikipedia( const TQString &url, bool fromHistory, bool
m_wikiToolBar->setItemEnabled( WIKI_FORWARD, m_wikiForwardHistory.size() > 0 );
m_wikiBaseUrl = m_wikiCurrentUrl.mid(0 , m_wikiCurrentUrl.find("wiki/"));
- m_wikiJob = KIO::storedGet( m_wikiCurrentUrl, false, false );
+ m_wikiJob = TDEIO::storedGet( m_wikiCurrentUrl, false, false );
Amarok::StatusBar::instance()->newProgressOperation( m_wikiJob )
.setDescription( i18n( "Fetching Wikipedia Information" ) );
- connect( m_wikiJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( wikiResult( KIO::Job* ) ) );
+ connect( m_wikiJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( wikiResult( TDEIO::Job* ) ) );
}
@@ -4098,7 +4098,7 @@ ContextBrowser::wikiExternalPage() //SLOT
void
-ContextBrowser::wikiResult( KIO::Job* job ) //SLOT
+ContextBrowser::wikiResult( TDEIO::Job* job ) //SLOT
{
DEBUG_BLOCK
@@ -4129,7 +4129,7 @@ ContextBrowser::wikiResult( KIO::Job* job ) //SLOT
if ( job != m_wikiJob )
return; //not the right job, so let's ignore it
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( job );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( job );
m_wiki = TQString( storedJob->data() );
// Enable the Open in a Brower button, Disabled while loading, guz it would open wikipedia main page.
diff --git a/amarok/src/contextbrowser.h b/amarok/src/contextbrowser.h
index 3a312e9a..59dc15cc 100644
--- a/amarok/src/contextbrowser.h
+++ b/amarok/src/contextbrowser.h
@@ -33,7 +33,7 @@ class KTextEdit;
class CueFile;
namespace Browser { class ToolBar; }
-namespace KIO { class Job; class TransferJob; }
+namespace TDEIO { class Job; class TransferJob; }
class ContextBrowser : public KTabWidget, public EngineObserver
@@ -118,7 +118,7 @@ class ContextBrowser : public KTabWidget, public EngineObserver
void wikiAlbumPage();
void wikiTitlePage();
void wikiExternalPage();
- void wikiResult( KIO::Job* job );
+ void wikiResult( TDEIO::Job* job );
void wikiConfigApply();
void wikiConfig();
void wikiConfigChanged( int activeItem );
@@ -185,7 +185,7 @@ class ContextBrowser : public KTabWidget, public EngineObserver
TQStringList m_wikiForwardHistory;
KPopupMenu* m_wikiBackPopup;
KPopupMenu* m_wikiForwardPopup;
- KIO::TransferJob* m_wikiJob;
+ TDEIO::TransferJob* m_wikiJob;
Browser::ToolBar* m_wikiToolBar;
TQLineEdit* m_wikiLocaleEdit;
TQComboBox* m_wikiLocaleCombo;
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index b067b239..0b66dcc8 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -234,8 +234,8 @@ CoverFetcher::startFetch()
+ "&SearchIndex=Music&ResponseGroup=Small,Images";
debug() << url << endl;
- KIO::TransferJob* job = KIO::storedGet( url, false, false );
- connect( job, TQT_SIGNAL(result( KIO::Job* )), TQT_SLOT(finishedXmlFetch( KIO::Job* )) );
+ TDEIO::TransferJob* job = TDEIO::storedGet( url, false, false );
+ connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(finishedXmlFetch( TDEIO::Job* )) );
Amarok::StatusBar::instance()->newProgressOperation( job );
}
@@ -246,7 +246,7 @@ CoverFetcher::startFetch()
//////////////////////////////////////////////////////////////////////////////////////////
void
-CoverFetcher::finishedXmlFetch( KIO::Job *job ) //SLOT
+CoverFetcher::finishedXmlFetch( TDEIO::Job *job ) //SLOT
{
DEBUG_BLOCK
@@ -257,7 +257,7 @@ CoverFetcher::finishedXmlFetch( KIO::Job *job ) //SLOT
return;
}
if ( job ) {
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( job );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( job );
m_xml = TQString::fromUtf8( storedJob->data().data(), storedJob->data().size() );
}
@@ -370,10 +370,10 @@ void CoverFetcher::parseItemNode( const TQDomNode &node )
}
void
-CoverFetcher::finishedImageFetch( KIO::Job *job ) //SLOT
+CoverFetcher::finishedImageFetch( TDEIO::Job *job ) //SLOT
{
if( job->error() ) {
- debug() << "finishedImageFetch(): KIO::error(): " << job->error() << endl;
+ debug() << "finishedImageFetch(): TDEIO::error(): " << job->error() << endl;
m_errors += i18n("The cover could not be retrieved.");
@@ -381,7 +381,7 @@ CoverFetcher::finishedImageFetch( KIO::Job *job ) //SLOT
return;
}
- m_image.loadFromData( static_cast<KIO::StoredTransferJob*>( job )->data() );
+ m_image.loadFromData( static_cast<TDEIO::StoredTransferJob*>( job )->data() );
if( m_image.width() <= 1 ) {
//Amazon seems to offer images of size 1x1 sometimes
@@ -410,8 +410,8 @@ CoverFetcher::attemptAnotherFetch()
// Amazon suggested some more cover URLs to try before we
// try a different query
- KIO::TransferJob* job = KIO::storedGet( KURL(m_coverUrls.front()), false, false );
- connect( job, TQT_SIGNAL(result( KIO::Job* )), TQT_SLOT(finishedImageFetch( KIO::Job* )) );
+ TDEIO::TransferJob* job = TDEIO::storedGet( KURL(m_coverUrls.front()), false, false );
+ connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(finishedImageFetch( TDEIO::Job* )) );
Amarok::StatusBar::instance()->newProgressOperation( job );
@@ -662,10 +662,10 @@ CoverFetcher::finish()
}
void
-CoverFetcher::finishWithError( const TQString &message, KIO::Job *job )
+CoverFetcher::finishWithError( const TQString &message, TDEIO::Job *job )
{
if( job )
- warning() << message << " KIO::error(): " << job->errorText() << endl;
+ warning() << message << " TDEIO::error(): " << job->errorText() << endl;
m_errors += message;
m_success = false;
diff --git a/amarok/src/coverfetcher.h b/amarok/src/coverfetcher.h
index 2eced566..a16c9c24 100644
--- a/amarok/src/coverfetcher.h
+++ b/amarok/src/coverfetcher.h
@@ -35,7 +35,7 @@ class CoverLabel : public TQLabel {
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class CoverFetcher : public TQObject
{
@@ -73,8 +73,8 @@ signals:
void result( CoverFetcher* );
private slots:
- void finishedXmlFetch( KIO::Job* job );
- void finishedImageFetch( KIO::Job* job );
+ void finishedXmlFetch( TDEIO::Job* job );
+ void finishedImageFetch( TDEIO::Job* job );
void changeLocale( int id );
private:
@@ -107,7 +107,7 @@ private:
void parseItemNode( const TQDomNode &node );
/// The fetch failed, finish up and log an error message
- void finishWithError( const TQString &message, KIO::Job *job = 0 );
+ void finishWithError( const TQString &message, TDEIO::Job *job = 0 );
/// Prompt the user for a query
void getUserQuery( TQString explanation = TQString() );
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 4e15b0ff..af530a0c 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -736,7 +736,7 @@ void CoverManager::setCustomSelectedCovers()
CollectionDB::instance()->setAlbumImage( item->artist(), item->album(), image );
item->loadCover();
}
- KIO::NetAccess::removeTempFile( tmpFile );
+ TDEIO::NetAccess::removeTempFile( tmpFile );
}
}
diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp
index 4eda0411..250bf9dc 100644
--- a/amarok/src/database_refactor/collectiondb.cpp
+++ b/amarok/src/database_refactor/collectiondb.cpp
@@ -89,7 +89,7 @@ CollectionDB::CollectionDB()
//</OPEN DATABASE>
// TODO: Should write to config in dtor, but it crashes...
- KConfig* config = amaroK::config( "Collection Browser" );
+ TDEConfig* config = amaroK::config( "Collection Browser" );
config->writeEntry( "Database Version", DATABASE_VERSION );
config->writeEntry( "Database Stats Version", DATABASE_STATS_VERSION );
@@ -107,7 +107,7 @@ CollectionDB::~CollectionDB()
destroy();
// This crashes so it's done at the end of ctor.
-// KConfig* const config = amaroK::config( "Collection Browser" );
+// TDEConfig* const config = amaroK::config( "Collection Browser" );
// config->writeEntry( "Database Version", DATABASE_VERSION );
// config->writeEntry( "Database Stats Version", DATABASE_STATS_VERSION );
}
@@ -693,7 +693,7 @@ CollectionDB::fetchImage(const KURL& url, TQString &/*tmpFile*/)
if(url.protocol() != "file")
{
TQString tmpFile;
- KIO::NetAccess::download( url, tmpFile, 0); //TODO set 0 to the window, though it probably doesn't really matter
+ TDEIO::NetAccess::download( url, tmpFile, 0); //TODO set 0 to the window, though it probably doesn't really matter
return TQImage(tmpFile);
}
else
@@ -707,7 +707,7 @@ CollectionDB::setAlbumImage( const TQString& artist, const TQString& album, cons
{
TQString tmpFile;
bool success = setAlbumImage( artist, album, fetchImage(url, tmpFile) );
- KIO::NetAccess::removeTempFile( tmpFile ); //only removes file if it was created with NetAccess
+ TDEIO::NetAccess::removeTempFile( tmpFile ); //only removes file if it was created with NetAccess
return success;
}
@@ -1802,7 +1802,7 @@ CollectionDB::initialize()
DbConnection *dbConn = m_dbConnPool->getDbConnection();
m_dbConnPool->putDbConnection( dbConn );
- KConfig* config = amaroK::config( "Collection Browser" );
+ TDEConfig* config = amaroK::config( "Collection Browser" );
if(!dbConn->isConnected())
amaroK::MessageQueue::instance()->addMessage(dbConn->lastError());
if ( !dbConn->isInitialized() || !isValid() )
diff --git a/amarok/src/database_refactor/collectiondb.h b/amarok/src/database_refactor/collectiondb.h
index 990c7d3e..c6bcba98 100644
--- a/amarok/src/database_refactor/collectiondb.h
+++ b/amarok/src/database_refactor/collectiondb.h
@@ -150,7 +150,7 @@ class CollectionDB : public TQObject, public EngineObserver
//cover management methods
/** Returns the image from a given URL, network-transparently.
- * You must run KIO::NetAccess::removeTempFile( tmpFile ) when you are finished using the image;
+ * You must run TDEIO::NetAccess::removeTempFile( tmpFile ) when you are finished using the image;
**/
static TQImage fetchImage(const KURL& url, TQString &tmpFile);
/** Saves images located on the user's filesystem */
diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp
index 2d35605f..846a02fa 100644
--- a/amarok/src/deletedialog.cpp
+++ b/amarok/src/deletedialog.cpp
@@ -44,7 +44,7 @@
DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
: DeleteDialogBase(parent, name)
{
- KConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
+ TDEConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
bool deleteInstead = messageGroup.readBoolEntry("deleteInsteadOfTrash", false);
slotShouldDelete(deleteInstead);
@@ -116,7 +116,7 @@ void DeleteDialog::setFiles(const KURL::List &files)
void DeleteDialog::accept()
{
- KConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
+ TDEConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
// Save user's preference
@@ -138,9 +138,9 @@ bool DeleteDialog::showTrashDialog(TQWidget* parent, const KURL::List& files)
if( doDelete )
{
- KIO::Job* job = 0;
+ TDEIO::Job* job = 0;
bool shouldDelete = dialog.shouldDelete();
- if ( ( shouldDelete && (job = KIO::del( files )) ) ||
+ if ( ( shouldDelete && (job = TDEIO::del( files )) ) ||
( job = Amarok::trashFiles( files ) ) )
{
if(shouldDelete) //amarok::trashFiles already does the progress operation
diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.cpp b/amarok/src/device/massstorage/massstoragedevicehandler.cpp
index 57b0c3d4..98d82758 100644
--- a/amarok/src/device/massstorage/massstoragedevicehandler.cpp
+++ b/amarok/src/device/massstorage/massstoragedevicehandler.cpp
@@ -117,7 +117,7 @@ MassStorageDeviceHandlerFactory::~MassStorageDeviceHandlerFactory( )
{
}
-DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const KConfig* ) const
+DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const TDEConfig* ) const
{
return 0;
}
diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.h b/amarok/src/device/massstorage/massstoragedevicehandler.h
index 5e7af650..62afd014 100644
--- a/amarok/src/device/massstorage/massstoragedevicehandler.h
+++ b/amarok/src/device/massstorage/massstoragedevicehandler.h
@@ -34,7 +34,7 @@ public:
virtual bool canCreateFromConfig() const;
- virtual DeviceHandler* createHandler( const KConfig* c ) const;
+ virtual DeviceHandler* createHandler( const TDEConfig* c ) const;
virtual TQString type() const;
diff --git a/amarok/src/device/nfs/nfsdevicehandler.cpp b/amarok/src/device/nfs/nfsdevicehandler.cpp
index ac831d7d..1e90653a 100644
--- a/amarok/src/device/nfs/nfsdevicehandler.cpp
+++ b/amarok/src/device/nfs/nfsdevicehandler.cpp
@@ -122,7 +122,7 @@ NfsDeviceHandlerFactory::~NfsDeviceHandlerFactory( )
}
DeviceHandler *
-NfsDeviceHandlerFactory::createHandler( const KConfig* ) const
+NfsDeviceHandlerFactory::createHandler( const TDEConfig* ) const
{
return 0;
}
diff --git a/amarok/src/device/nfs/nfsdevicehandler.h b/amarok/src/device/nfs/nfsdevicehandler.h
index 165ffe6d..ab930175 100644
--- a/amarok/src/device/nfs/nfsdevicehandler.h
+++ b/amarok/src/device/nfs/nfsdevicehandler.h
@@ -34,7 +34,7 @@ public:
virtual bool canCreateFromConfig() const;
- virtual DeviceHandler* createHandler( const KConfig* c ) const;
+ virtual DeviceHandler* createHandler( const TDEConfig* c ) const;
virtual TQString type() const;
};
diff --git a/amarok/src/device/smb/smbdevicehandler.cpp b/amarok/src/device/smb/smbdevicehandler.cpp
index de5e7cbb..3ee45a0e 100644
--- a/amarok/src/device/smb/smbdevicehandler.cpp
+++ b/amarok/src/device/smb/smbdevicehandler.cpp
@@ -124,7 +124,7 @@ SmbDeviceHandlerFactory::~SmbDeviceHandlerFactory( )
}
DeviceHandler *
-SmbDeviceHandlerFactory::createHandler( const KConfig* ) const
+SmbDeviceHandlerFactory::createHandler( const TDEConfig* ) const
{
return 0;
}
diff --git a/amarok/src/device/smb/smbdevicehandler.h b/amarok/src/device/smb/smbdevicehandler.h
index 8eb6d5ed..576112d8 100644
--- a/amarok/src/device/smb/smbdevicehandler.h
+++ b/amarok/src/device/smb/smbdevicehandler.h
@@ -34,7 +34,7 @@ public:
virtual bool canCreateFromConfig() const;
- virtual DeviceHandler* createHandler( const KConfig* c ) const;
+ virtual DeviceHandler* createHandler( const TDEConfig* c ) const;
virtual TQString type() const;
};
diff --git a/amarok/src/engine/xine/xine-config.h b/amarok/src/engine/xine/xine-config.h
index 8bf952f0..4f4c392d 100644
--- a/amarok/src/engine/xine/xine-config.h
+++ b/amarok/src/engine/xine/xine-config.h
@@ -120,7 +120,7 @@ class XineConfigDialog : public Amarok::PluginConfig
bool isDefault() const;
public slots:
- /** Save view state using, eg KConfig */
+ /** Save view state using, eg TDEConfig */
void save();
void reset(xine_t *xine);
diff --git a/amarok/src/enginecontroller.h b/amarok/src/enginecontroller.h
index 6c484310..cd41112e 100644
--- a/amarok/src/enginecontroller.h
+++ b/amarok/src/enginecontroller.h
@@ -23,7 +23,7 @@
class TQTimer;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
/**
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index 424ed23b..f2a631b5 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -270,7 +270,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
FileBrowser::~FileBrowser()
{
- KConfig* const c = Amarok::config( "Filebrowser" );
+ TDEConfig* const c = Amarok::config( "Filebrowser" );
m_dir->writeConfig( c ); //uses currently set group
diff --git a/amarok/src/firstrunwizard.ui.h b/amarok/src/firstrunwizard.ui.h
index 34dd2b50..97964e4e 100644
--- a/amarok/src/firstrunwizard.ui.h
+++ b/amarok/src/firstrunwizard.ui.h
@@ -24,7 +24,7 @@ namespace Amarok
extern TQPixmap getPNG( const TQString& );
extern TQPixmap getJPG( const TQString& );
- extern KConfig *config( const TQString& );
+ extern TDEConfig *config( const TQString& );
}
void
diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp
index 8419db89..22f76889 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -731,16 +731,16 @@ void KTRMLookup::puidGenerated()
tp_ReleaseTrack(KTRMRequestHandler::instance()->tunePimp(), track);
d->results.clear();
- KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).arg( puid ) , false, false );
+ TDEIO::Job *job = TDEIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).arg( puid ) , false, false );
Amarok::StatusBar::instance()->newProgressOperation( job )
.setDescription( i18n( "MusicBrainz Lookup" ) );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( lookupResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( lookupResult( TDEIO::Job* ) ) );
#endif
}
-void KTRMLookup::lookupResult( KIO::Job* job )
+void KTRMLookup::lookupResult( TDEIO::Job* job )
{
#if HAVE_TUNEPIMP >= 5
DEBUG_BLOCK
@@ -750,7 +750,7 @@ void KTRMLookup::lookupResult( KIO::Job* job )
finished();
return;
}
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( job );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( job );
TQString xml = TQString::fromUtf8( storedJob->data().data(), storedJob->data().size() );
TQDomDocument doc;
diff --git a/amarok/src/ktrm.h b/amarok/src/ktrm.h
index e66cb9b8..4cb39d8d 100644
--- a/amarok/src/ktrm.h
+++ b/amarok/src/ktrm.h
@@ -38,7 +38,7 @@
* at the beginning of the list).
*/
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class KTRMResult
{
@@ -128,7 +128,7 @@ signals:
void sigResult( KTRMResultList, TQString );
protected slots:
- virtual void lookupResult( KIO::Job* );
+ virtual void lookupResult( TDEIO::Job* );
public:
/**
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index 90976b2c..86216c34 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -68,11 +68,11 @@ AmarokHttp::get ( const TQString & path )
m_done = false;
m_error = TQHttp::NoError;
m_state = TQHttp::Connecting;
- KIO::TransferJob *job = KIO::get(uri, true, false);
- connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
- this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&)));
- connect(job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotResult(KIO::Job*)));
+ TDEIO::TransferJob *job = TDEIO::get(uri, true, false);
+ connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+ this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotResult(TDEIO::Job*)));
return 0;
}
@@ -96,7 +96,7 @@ AmarokHttp::error()
}
void
-AmarokHttp::slotData(KIO::Job*, const TQByteArray& data)
+AmarokHttp::slotData(TDEIO::Job*, const TQByteArray& data)
{
if( data.size() == 0 ) {
return;
@@ -110,7 +110,7 @@ AmarokHttp::slotData(KIO::Job*, const TQByteArray& data)
}
void
-AmarokHttp::slotResult(KIO::Job* job)
+AmarokHttp::slotResult(TDEIO::Job* job)
{
bool err = job->error();
if( err || m_error != TQHttp::NoError ) {
@@ -620,13 +620,13 @@ WebService::metaDataFinished( int /*id*/, bool error ) //SLOT
return;
}
- KIO::Job* job = KIO::storedGet( u, true, false );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( fetchImageFinished( KIO::Job* ) ) );
+ TDEIO::Job* job = TDEIO::storedGet( u, true, false );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( fetchImageFinished( TDEIO::Job* ) ) );
}
void
-WebService::fetchImageFinished( KIO::Job* job ) //SLOT
+WebService::fetchImageFinished( TDEIO::Job* job ) //SLOT
{
DEBUG_BLOCK
@@ -634,7 +634,7 @@ WebService::fetchImageFinished( KIO::Job* job ) //SLOT
const TQString path = Amarok::saveLocation() + "lastfm_image.png";
const int size = AmarokConfig::coverPreviewSize();
- TQImage img( static_cast<KIO::StoredTransferJob*>( job )->data() );
+ TQImage img( static_cast<TDEIO::StoredTransferJob*>( job )->data() );
img.smoothScale( size, size ).save( path, "PNG" );
m_metaBundle.lastFmBundle()->setImageUrl( CollectionDB::makeShadowedImage( path, false ) );
diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h
index 1bf6d3fb..2f597d0d 100644
--- a/amarok/src/lastfm.h
+++ b/amarok/src/lastfm.h
@@ -34,7 +34,7 @@ class KURL;
class TQSocket;
class TQTimer;
-namespace KIO { class Job; }
+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. */
@@ -54,8 +54,8 @@ class AmarokHttp : public TQObject
void requestFinished ( int id, bool error );
protected slots:
- void slotData(KIO::Job*, const TQByteArray& );
- void slotResult(KIO::Job*);
+ void slotData(TDEIO::Job*, const TQByteArray& );
+ void slotResult(TDEIO::Job*);
protected:
TQString m_hostname;
@@ -216,7 +216,7 @@ namespace LastFm
private slots:
void readProxy();
void metaDataFinished( int id, bool error );
- void fetchImageFinished( KIO::Job* );
+ void fetchImageFinished( TDEIO::Job* );
void enableScrobblingFinished( int id, bool error );
void loveFinished( int id, bool error );
diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp b/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
index ae0d5ddc..53cd2253 100644
--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
+++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
@@ -49,9 +49,9 @@ void MagnatuneAlbumDownloader::downloadAlbum( MagnatuneDownloadInfo * info )
debug() << "Download: " << downloadUrl.url() << " to: " << m_currentAlbumUnpackLocation << endl;
debug() << "Using temporary location: " << m_tempDir.name() + m_currentAlbumFileName << endl;
- m_albumDownloadJob = KIO::file_copy( downloadUrl, KURL( m_tempDir.name() + m_currentAlbumFileName ), -1, true, false, false );
+ m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( m_tempDir.name() + m_currentAlbumFileName ), -1, true, false, false );
- connect( m_albumDownloadJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( albumDownloadComplete( KIO::Job* ) ) );
+ connect( m_albumDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( albumDownloadComplete( TDEIO::Job* ) ) );
Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob )
.setDescription( i18n( "Downloading album" ) )
@@ -64,9 +64,9 @@ void MagnatuneAlbumDownloader::downloadCover( TQString albumCoverUrlString, TQSt
debug() << "Download Cover: " << downloadUrl.url() << " to: " << m_tempDir.name() << fileName << endl;
- m_albumDownloadJob = KIO::file_copy( downloadUrl, KURL( m_tempDir.name() + fileName ), -1, true, false, false );
+ m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( m_tempDir.name() + fileName ), -1, true, false, false );
- connect( m_albumDownloadJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( coverDownloadComplete( KIO::Job* ) ) );
+ connect( m_albumDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( coverDownloadComplete( TDEIO::Job* ) ) );
Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob )
.setDescription( i18n( "Downloading album cover" ) )
@@ -75,7 +75,7 @@ void MagnatuneAlbumDownloader::downloadCover( TQString albumCoverUrlString, TQSt
-void MagnatuneAlbumDownloader::albumDownloadComplete( KIO::Job * downloadJob )
+void MagnatuneAlbumDownloader::albumDownloadComplete( TDEIO::Job * downloadJob )
{
debug() << "album download complete" << endl;
@@ -115,9 +115,9 @@ void MagnatuneAlbumDownloader::albumDownloadComplete( KIO::Job * downloadJob )
debug() << "Adding cover " << downloadUrl.url() << " to collection at " << finalAlbumPath << endl;
- m_albumDownloadJob = KIO::file_copy( downloadUrl, KURL( finalAlbumPath + "/cover.jpg" ), -1, true, false, false );
+ m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( finalAlbumPath + "/cover.jpg" ), -1, true, false, false );
- connect( m_albumDownloadJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( coverAddComplete( KIO::Job* ) ) );
+ connect( m_albumDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( coverAddComplete( TDEIO::Job* ) ) );
Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob )
.setDescription( i18n( "Adding album cover to collection" ) )
@@ -131,7 +131,7 @@ void MagnatuneAlbumDownloader::albumDownloadComplete( KIO::Job * downloadJob )
}
-void MagnatuneAlbumDownloader::coverDownloadComplete( KIO::Job * downloadJob )
+void MagnatuneAlbumDownloader::coverDownloadComplete( TDEIO::Job * downloadJob )
{
debug() << "cover download complete" << endl;
@@ -170,7 +170,7 @@ void MagnatuneAlbumDownloader::coverDownloadAborted( )
emit( coverDownloadComplete( false ) );
}
-void MagnatuneAlbumDownloader::coverAddComplete(KIO::Job * downloadJob)
+void MagnatuneAlbumDownloader::coverAddComplete(TDEIO::Job * downloadJob)
{
debug() << "cover add complete" << endl;
diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
index 40c63355..a05150a7 100644
--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
+++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
@@ -62,7 +62,7 @@ public slots:
protected:
- KIO::FileCopyJob * m_albumDownloadJob;
+ TDEIO::FileCopyJob * m_albumDownloadJob;
TQString m_currentAlbumUnpackLocation;
TQString m_currentAlbumFileName;
int m_currentAlbumId;
@@ -73,13 +73,13 @@ protected slots:
* Unzip the downloaded album
* @param downLoadJob
*/
- void albumDownloadComplete( KIO::Job* downloadJob );
+ void albumDownloadComplete( TDEIO::Job* downloadJob );
void albumDownloadAborted();
- void coverDownloadComplete( KIO::Job* downloadJob );
+ void coverDownloadComplete( TDEIO::Job* downloadJob );
void coverDownloadAborted();
- void coverAddComplete( KIO::Job* downloadJob );
+ void coverAddComplete( TDEIO::Job* downloadJob );
void coverAddAborted();
};
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
index da56aba1..c2ec0da5 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
@@ -42,9 +42,9 @@ MagnatuneArtistInfoBox::displayArtistInfo( KURL url )
TQString tempFile;
TQString orgHtml;
- m_infoDownloadJob = KIO::storedGet( url, false, false );
+ m_infoDownloadJob = TDEIO::storedGet( url, false, false );
Amarok::StatusBar::instance() ->newProgressOperation( m_infoDownloadJob ).setDescription( i18n( "Fetching Artist Info" ) );
- connect( m_infoDownloadJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( infoDownloadComplete( KIO::Job* ) ) );
+ connect( m_infoDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( infoDownloadComplete( TDEIO::Job* ) ) );
return true;
@@ -82,7 +82,7 @@ MagnatuneArtistInfoBox::displayAlbumInfo( MagnatuneAlbum *album )
}
void
-MagnatuneArtistInfoBox::infoDownloadComplete( KIO::Job * downLoadJob )
+MagnatuneArtistInfoBox::infoDownloadComplete( TDEIO::Job * downLoadJob )
{
if ( !downLoadJob->error() == 0 )
@@ -93,7 +93,7 @@ MagnatuneArtistInfoBox::infoDownloadComplete( KIO::Job * downLoadJob )
if ( downLoadJob != m_infoDownloadJob )
return ; //not the right job, so let's ignore it
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( downLoadJob );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( downLoadJob );
TQString info = TQString( storedJob->data() );
TQString trimmedInfo = extractArtistInfo( info );
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
index 585cc08e..7eddc818 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@@ -71,7 +71,7 @@ public:
protected:
- KIO::TransferJob *m_infoDownloadJob;
+ TDEIO::TransferJob *m_infoDownloadJob;
/**
* Helper function for extracting only the part of the artist page
@@ -91,10 +91,10 @@ protected:
protected slots:
/**
- * Slot for recieving notifications from the download KIO::Job
+ * Slot for recieving notifications from the download TDEIO::Job
* @param downLoadJob The job that has completed
*/
- void infoDownloadComplete( KIO::Job *downLoadJob );
+ void infoDownloadComplete( TDEIO::Job *downLoadJob );
};
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.cpp b/amarok/src/magnatunebrowser/magnatunebrowser.cpp
index 7f125854..0e17c98f 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.cpp
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.cpp
@@ -346,18 +346,18 @@ bool MagnatuneBrowser::updateMagnatuneList()
{
//download new list from magnatune
- m_listDownloadJob = KIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false );
+ m_listDownloadJob = TDEIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false );
Amarok::StatusBar::instance() ->newProgressOperation( m_listDownloadJob )
.setDescription( i18n( "Downloading Magnatune.com Database" ) )
.setAbortSlot( TQT_TQOBJECT(this), TQT_SLOT( listDownloadCancelled() ) );
- connect( m_listDownloadJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( listDownloadComplete( KIO::Job* ) ) );
+ connect( m_listDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( listDownloadComplete( TDEIO::Job* ) ) );
return true;
}
-void MagnatuneBrowser::listDownloadComplete( KIO::Job * downLoadJob )
+void MagnatuneBrowser::listDownloadComplete( TDEIO::Job * downLoadJob )
{
if ( downLoadJob != m_listDownloadJob )
@@ -371,7 +371,7 @@ void MagnatuneBrowser::listDownloadComplete( KIO::Job * downLoadJob )
}
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( downLoadJob );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( downLoadJob );
TQString list = TQString( storedJob->data() );
KTempFile tfile;
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.h b/amarok/src/magnatunebrowser/magnatunebrowser.h
index 88929b18..5c4948ea 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.h
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.h
@@ -139,7 +139,7 @@ private slots:
* Triggers a parse of the file to get the info added to the databse
* @param downLoadJob The calling download Job
*/
- void listDownloadComplete( KIO::Job* downLoadJob);
+ void listDownloadComplete( TDEIO::Job* downLoadJob);
/**
* Slot for catching cancelled list downloads
@@ -247,7 +247,7 @@ private:
TQString m_tempFileName;
- KIO::TransferJob * m_listDownloadJob;
+ TDEIO::TransferJob * m_listDownloadJob;
};
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
index fbfed0ba..cdbfe48a 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
@@ -111,15 +111,15 @@ void MagnatunePurchaseHandler::processPayment( TQString ccNumber, TQString expYe
TQString debugPurchaseURL = "https://magnatune.com/buy/buy_dl_cc_xml?cc=**********&mm=**&yy=**&sku=" + albumCode + "&name=" + name + "&email=********&id=amarok&amount=" + amountString;
debug() << "purchase url : " << debugPurchaseURL << endl;
- m_resultDownloadJob = KIO::storedGet( KURL( purchaseURL ), false, false );
+ m_resultDownloadJob = TDEIO::storedGet( KURL( purchaseURL ), false, false );
Amarok::StatusBar::instance() ->newProgressOperation( m_resultDownloadJob ).setDescription( i18n( "Processing Payment" ) );
- connect( m_resultDownloadJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( xmlDownloadComplete( KIO::Job* ) ) );
+ connect( m_resultDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( xmlDownloadComplete( TDEIO::Job* ) ) );
}
-void MagnatunePurchaseHandler::xmlDownloadComplete( KIO::Job * downloadJob )
+void MagnatunePurchaseHandler::xmlDownloadComplete( TDEIO::Job * downloadJob )
{
debug() << "xml download complete" << endl;
@@ -132,7 +132,7 @@ void MagnatunePurchaseHandler::xmlDownloadComplete( KIO::Job * downloadJob )
if ( downloadJob != m_resultDownloadJob )
return ; //not the right job, so let's ignore it
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( downloadJob );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( downloadJob );
TQString resultXml = TQString( storedJob->data() );
debug() << endl << endl << "result: " << resultXml << endl << endl;
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
index 12918f71..0f1f02c9 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
@@ -55,7 +55,7 @@ signals:
void purchaseCompleted( bool success );
private:
- KIO::TransferJob * m_resultDownloadJob;
+ TDEIO::TransferJob * m_resultDownloadJob;
//need a parent to pass to any dialogs we spawn
@@ -83,7 +83,7 @@ private:
protected slots:
void showPurchaseDialog( TQString coverTempLocation );
- void xmlDownloadComplete( KIO::Job* downLoadJob );
+ void xmlDownloadComplete( TDEIO::Job* downLoadJob );
void albumDownloadComplete(bool success);
void albumPurchaseCancelled();
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index ba5a385a..71f57406 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -171,9 +171,9 @@ class SpaceLabel : public TQLabel {
TQLabel::paintEvent(e);
}
- KIO::filesize_t m_total;
- KIO::filesize_t m_used;
- KIO::filesize_t m_scheduled;
+ TDEIO::filesize_t m_total;
+ TDEIO::filesize_t m_used;
+ TDEIO::filesize_t m_scheduled;
};
class DummyMediaDevice : public MediaDevice
@@ -1740,7 +1740,7 @@ MediaBrowser::configSelectPlugin( int index )
}
else if( currentDevice() )
{
- KConfig *config = Amarok::config( "MediaBrowser" );
+ TDEConfig *config = Amarok::config( "MediaBrowser" );
config->writeEntry( currentDevice()->uniqueId(), m_pluginName[m_configPluginCombo->currentText()] );
}
@@ -1834,18 +1834,18 @@ MediaBrowser::updateStats()
if( !m_stats )
return;
- KIO::filesize_t queued = m_queue->totalSize();
+ TDEIO::filesize_t queued = m_queue->totalSize();
TQString text = i18n( "1 track in queue", "%n tracks in queue", m_queue->childCount() );
if(m_queue->childCount() > 0)
{
- text += i18n(" (%1)").arg( KIO::convertSize( queued ) );
+ text += i18n(" (%1)").arg( TDEIO::convertSize( queued ) );
}
- KIO::filesize_t total, avail;
+ TDEIO::filesize_t total, avail;
if( currentDevice() && currentDevice()->getCapacity(&total, &avail) )
{
- text += i18n( " - %1 of %2 available" ).arg( KIO::convertSize( avail ) ).arg( KIO::convertSize( total ) );
+ text += i18n( " - %1 of %2 available" ).arg( TDEIO::convertSize( avail ) ).arg( TDEIO::convertSize( total ) );
m_stats->m_used = total-avail;
m_stats->m_total = total;
@@ -2014,7 +2014,7 @@ MediaDevice::configString( const TQString &name, const TQString &defValue )
TQString configName = "MediaDevice";
if( !uniqueId().isEmpty() )
configName += '_' + uniqueId();
- KConfig *config = Amarok::config( configName );
+ TDEConfig *config = Amarok::config( configName );
return config->readEntry( name, defValue );
}
@@ -2024,7 +2024,7 @@ MediaDevice::setConfigString( const TQString &name, const TQString &value )
TQString configName = "MediaDevice";
if( !uniqueId().isEmpty() )
configName += '_' + uniqueId();
- KConfig *config = Amarok::config( configName );
+ TDEConfig *config = Amarok::config( configName );
config->writeEntry( name, value );
}
@@ -2034,7 +2034,7 @@ MediaDevice::configBool( const TQString &name, bool defValue )
TQString configName = "MediaDevice";
if( !uniqueId().isEmpty() )
configName += '_' + uniqueId();
- KConfig *config = Amarok::config( configName );
+ TDEConfig *config = Amarok::config( configName );
return config->readBoolEntry( name, defValue );
}
@@ -2044,7 +2044,7 @@ MediaDevice::setConfigBool( const TQString &name, bool value )
TQString configName = "MediaDevice";
if( !uniqueId().isEmpty() )
configName += '_' + uniqueId();
- KConfig *config = Amarok::config( configName );
+ TDEConfig *config = Amarok::config( configName );
config->writeEntry( name, value );
}
@@ -2470,13 +2470,13 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
{
m_wait = true;
- KIO::FileCopyJob *job = KIO::file_copy( src, dst,
+ TDEIO::FileCopyJob *job = TDEIO::file_copy( src, dst,
-1 /* permissions */,
false /* overwrite */,
false /* resume */,
false /* show progress */ );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( fileTransferred( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( fileTransferred( TDEIO::Job * ) ) );
bool tryToRemove = false;
while ( m_wait )
@@ -2528,7 +2528,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
}
void
-MediaDevice::fileTransferred( KIO::Job *job ) //SLOT
+MediaDevice::fileTransferred( TDEIO::Job *job ) //SLOT
{
if(job->error())
{
@@ -3706,7 +3706,7 @@ MediaQueue::computeSize() const
}
}
-KIO::filesize_t
+TDEIO::filesize_t
MediaQueue::totalSize() const
{
return m_totalSize;
diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h
index 7ba3e268..6845b257 100644
--- a/amarok/src/mediabrowser.h
+++ b/amarok/src/mediabrowser.h
@@ -131,7 +131,7 @@ class MediaQueue : public KListView, public DropProxyTarget
MediaQueue(MediaBrowser *parent);
MediaItem *findPath( TQString path );
- KIO::filesize_t totalSize() const; // total size of items to transfer in KB
+ TDEIO::filesize_t totalSize() const; // total size of items to transfer in KB
void computeSize() const; // compute total size of items to transfer in KB
void addItemToSize( const MediaItem *item ) const;
void subtractItemFromSize( const MediaItem *item, bool unconditonally=false ) const;
@@ -165,7 +165,7 @@ class MediaQueue : public KListView, public DropProxyTarget
private:
void keyPressEvent( TQKeyEvent *e );
MediaBrowser *m_parent;
- mutable KIO::filesize_t m_totalSize;
+ mutable TDEIO::filesize_t m_totalSize;
};
@@ -525,7 +525,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
void scheduleDisconnect() { m_scheduledDisconnect = true; }
protected slots:
- void fileTransferred( KIO::Job *job );
+ void fileTransferred( TDEIO::Job *job );
void fileTransferFinished();
private:
@@ -547,7 +547,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
* Get the capacity and freespace available on the device, in bytes
* @return true if successful
*/
- virtual bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available ) { Q_UNUSED(total); Q_UNUSED(available); return false; }
+ virtual bool getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available ) { Q_UNUSED(total); Q_UNUSED(available); return false; }
/**
* Lock device for exclusive access if possible
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp
index c6a32388..e3ed8011 100644
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@@ -112,7 +112,7 @@ DaapClient::isConnected()
}
bool
-DaapClient::getCapacity( KIO::filesize_t* /* total */, KIO::filesize_t* /* available */ )
+DaapClient::getCapacity( TDEIO::filesize_t* /* total */, TDEIO::filesize_t* /* available */ )
{
return false;
}
diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h
index 1eb4d123..c7140396 100644
--- a/amarok/src/mediadevice/daap/daapclient.h
+++ b/amarok/src/mediadevice/daap/daapclient.h
@@ -82,7 +82,7 @@ class DaapClient : public MediaDevice
void passwordPrompt();
protected:
- bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available );
+ bool getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available );
void rmbPressed( TQListViewItem* qitem, const TQPoint& point, int );
bool lockDevice( bool tryOnly = false );
void unlockDevice();
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index b0745c00..17843511 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -440,7 +440,7 @@ GenericMediaDevice::renameItem( TQListViewItem *item ) // SLOT
debug() << "Renaming: " << src << " to: " << dst << endl;
//do we want a progress dialog? If so, set last false to true
- if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, false ) )
+ if( TDEIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, false ) )
{
m_mfm.erase( m_mim[item]->getFullName() );
m_mim[item]->setNamesFromBase( item->text(0) );
@@ -476,7 +476,7 @@ GenericMediaDevice::newDirectory( const TQString &name, MediaItem *parent )
debug() << "Creating directory: " << fullPath << endl;
const KURL url( fullPath );
- if( !KIO::NetAccess::mkdir( url, m_parent ) ) //failed
+ if( !TDEIO::NetAccess::mkdir( url, m_parent ) ) //failed
{
debug() << "Failed to create directory " << fullPath << endl;
return 0;
@@ -516,7 +516,7 @@ GenericMediaDevice::addToDirectory( MediaItem *directory, TQPtrList<MediaItem> i
const KURL srcurl(src);
const KURL dsturl(dst);
- if ( !KIO::NetAccess::file_move( srcurl, dsturl, -1, false, false, m_parent ) )
+ if ( !TDEIO::NetAccess::file_move( srcurl, dsturl, -1, false, false, m_parent ) )
debug() << "Failed moving " << src << " to " << dst << endl;
else
{
@@ -597,10 +597,10 @@ GenericMediaDevice::checkAndBuildLocation( const TQString& location )
TQString secondpart = cleanPath( location.section( '/', i, i ) );
KURL url = KURL::fromPathOrURL( firstpart + '/' + secondpart );
- if( !KIO::NetAccess::exists( url, false, m_parent ) )
+ if( !TDEIO::NetAccess::exists( url, false, m_parent ) )
{
debug() << "directory does not exist, creating..." << url << endl;
- if( !KIO::NetAccess::mkdir(url, m_view ) ) //failed
+ if( !TDEIO::NetAccess::mkdir(url, m_view ) ) //failed
{
debug() << "Failed to create directory " << url << endl;
return;
@@ -735,7 +735,7 @@ GenericMediaDevice::deleteItemFromDevice( MediaItem *item, int /*flags*/ )
TQString path = m_mim[item]->getFullName();
debug() << "Deleting path: " << path << endl;
- if ( !KIO::NetAccess::del( KURL::fromPathOrURL(path), m_view ))
+ if ( !TDEIO::NetAccess::del( KURL::fromPathOrURL(path), m_view ))
{
debug() << "Could not delete!" << endl;
return -1;
@@ -885,7 +885,7 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ )
/// Capacity, in kB
bool
-GenericMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *available )
+GenericMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available )
{
if( !m_connected || !KURL::fromPathOrURL( m_medium.mountPoint() ).isLocalFile() ) return false;
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.h b/amarok/src/mediadevice/generic/genericmediadevice.h
index 7c7c30d9..fee2d1b1 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.h
+++ b/amarok/src/mediadevice/generic/genericmediadevice.h
@@ -78,7 +78,7 @@ class GenericMediaDevice : public MediaDevice
MediaItem *newDirectory( const TQString &name, MediaItem *parent );
void addToDirectory( MediaItem *directory, TQPtrList<MediaItem> items );
- bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available );
+ bool getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available );
TQString fileName( const MetaBundle & );
//methods not implemented/needed
@@ -126,8 +126,8 @@ class GenericMediaDevice : public MediaDevice
GenericMediaFile *m_initialFile;
- KIO::filesize_t m_kBSize;
- KIO::filesize_t m_kBAvail;
+ TDEIO::filesize_t m_kBSize;
+ TDEIO::filesize_t m_kBAvail;
KDirLister *m_dirLister;
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index 7a010f4f..89054a26 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -46,7 +46,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
#include <tqregexp.h>
namespace Amarok {
- extern KConfig *config( const TQString& );
+ extern TDEConfig *config( const TQString& );
extern TQString cleanPath( const TQString&, bool );
}
@@ -451,7 +451,7 @@ IfpMediaDevice::downloadTrack( const TQCString& src, const TQCString& dest )
void
IfpMediaDevice::downloadSelectedItems()
{
-// KConfig *config = Amarok::config( "MediaDevice" );
+// TDEConfig *config = Amarok::config( "MediaDevice" );
// TQString save = config->readEntry( "DownloadLocation", TQString() ); //restore the save directory
TQString save = TQString();
@@ -604,7 +604,7 @@ IfpMediaDevice::addTrackToList( int type, TQString name, int /*size*/ )
/// Capacity, in kB
bool
-IfpMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *available )
+IfpMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available )
{
if( !m_connected ) return false;
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.h b/amarok/src/mediadevice/ifp/ifpmediadevice.h
index 2904a0a1..7cdfb7af 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.h
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h
@@ -57,7 +57,7 @@ class IfpMediaDevice : public MediaDevice
MediaItem *copyTrackToDevice( const MetaBundle& bundle);
int deleteItemFromDevice( MediaItem *item, int flags=DeleteTrack );
- bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available );
+ bool getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available );
MediaItem *newDirectory( const TQString &name, MediaItem *parent );
void addToDirectory( MediaItem *directory, TQPtrList<MediaItem> items );
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
index d5d63480..ef019848 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -2197,7 +2197,7 @@ IpodMediaDevice::removeDBTrack(Itdb_Track *track)
}
bool
-IpodMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *available )
+IpodMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available )
{
if(!m_itdb)
return false;
@@ -2215,8 +2215,8 @@ IpodMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *available
return false;
}
- *total = buf.f_blocks * (KIO::filesize_t)buf.f_frsize;
- *available = buf.f_bavail * (KIO::filesize_t)buf.f_frsize;
+ *total = buf.f_blocks * (TDEIO::filesize_t)buf.f_frsize;
+ *available = buf.f_bavail * (TDEIO::filesize_t)buf.f_frsize;
return *total > 0;
#else
@@ -2673,7 +2673,7 @@ IpodMediaDevice::pathExists( const TQString &ipodPath, TQString *realPath )
}
void
-IpodMediaDevice::fileDeleted( KIO::Job *job ) //SLOT
+IpodMediaDevice::fileDeleted( TDEIO::Job *job ) //SLOT
{
if(job->error())
{
@@ -2688,9 +2688,9 @@ IpodMediaDevice::deleteFile( const KURL &url )
{
debug() << "deleting " << url.prettyURL() << endl;
m_waitForDeletion = true;
- KIO::Job *job = KIO::file_delete( url, false );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( fileDeleted( KIO::Job * ) ) );
+ TDEIO::Job *job = TDEIO::file_delete( url, false );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( fileDeleted( TDEIO::Job * ) ) );
do
{
kapp->processEvents( 100 );
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h
index 66e4d1a0..edfe497c 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.h
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h
@@ -110,14 +110,14 @@ class IpodMediaDevice : public MediaDevice
virtual void deleteFile( const KURL &url );
void addToPlaylist( MediaItem *list, MediaItem *after, TQPtrList<MediaItem> items );
MediaItem *newPlaylist( const TQString &name, MediaItem *list, TQPtrList<MediaItem> items );
- bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available );
+ bool getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available );
void rmbPressed( TQListViewItem* qitem, const TQPoint& point, int );
bool checkIntegrity();
void updateArtwork();
protected slots:
void renameItem( TQListViewItem *item );
- virtual void fileDeleted( KIO::Job *job );
+ virtual void fileDeleted( TDEIO::Job *job );
private:
bool initializeIpod();
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
index 7cf1b494..562c0260 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -1208,7 +1208,7 @@ MtpMediaDevice::closeDevice()
* Get the capacity and freespace available on the device, in KB
*/
bool
-MtpMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *available )
+MtpMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available )
{
if( !isConnected() )
return false;
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.h b/amarok/src/mediadevice/mtp/mtpmediadevice.h
index 53431f07..cb7cb8ff 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.h
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.h
@@ -161,7 +161,7 @@ class MtpMediaDevice : public MediaDevice
int deleteItemFromDevice( MediaItem *mediaitem, int flags=DeleteTrack );
void addToPlaylist( MediaItem *list, MediaItem *after, TQPtrList<MediaItem> items );
MtpMediaItem *newPlaylist( const TQString &name, MediaItem *list, TQPtrList<MediaItem> items );
- bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available );
+ bool getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available );
virtual void updateRootItems() {};
private slots:
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index 04d4ce05..ec2cf48e 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -65,7 +65,7 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
#include <time.h>
#include <unistd.h>
-namespace Amarok { extern KConfig *config( const TQString& ); }
+namespace Amarok { extern TDEConfig *config( const TQString& ); }
njb_t *NjbMediaDevice::m_njb = 0;
// This function has NOT handled the request, so other functions may be called
// upon to do so
@@ -133,7 +133,7 @@ NjbMediaDevice::unlockDevice()
}
bool
-NjbMediaDevice::getCapacity(KIO::filesize_t* total, KIO::filesize_t* available)
+NjbMediaDevice::getCapacity(TDEIO::filesize_t* total, TDEIO::filesize_t* available)
{
if(!m_connected)
return false;
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.h b/amarok/src/mediadevice/njb/njbmediadevice.h
index 3c1f40cf..d52d2536 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.h
+++ b/amarok/src/mediadevice/njb/njbmediadevice.h
@@ -126,7 +126,7 @@ class NjbMediaDevice : public MediaDevice
protected:
virtual bool closeDevice();
- virtual bool getCapacity(KIO::filesize_t* total, KIO::filesize_t* available);
+ virtual bool getCapacity(TDEIO::filesize_t* total, TDEIO::filesize_t* available);
// virtual bool isSpecialItem(MediaItem* item);
diff --git a/amarok/src/mediadevice/njb/playlist.cpp b/amarok/src/mediadevice/njb/playlist.cpp
index 6f82dd7f..b481edaf 100644
--- a/amarok/src/mediadevice/njb/playlist.cpp
+++ b/amarok/src/mediadevice/njb/playlist.cpp
@@ -31,7 +31,7 @@
// KDE
#include <kdebug.h>
-using namespace KIO;
+using namespace TDEIO;
// POSIX
#include <stdlib.h>
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
index 14fccc99..c43e0c8f 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
@@ -336,7 +336,7 @@ RioKarmaMediaDevice::closeDevice()
* Get the capacity and freespace available on the device, in KB
*/
bool
-RioKarmaMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *available )
+RioKarmaMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available )
{
if( !isConnected() )
return false;
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
index b61298d9..9bbed0c2 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
@@ -100,7 +100,7 @@ class RioKarmaMediaDevice : public MediaDevice
int deleteItemFromDevice( MediaItem *item, int flags=DeleteTrack );
void addToPlaylist( MediaItem *list, MediaItem *after, TQPtrList<MediaItem> items );
RioKarmaMediaItem *newPlaylist( const TQString &name, MediaItem *list, TQPtrList<MediaItem> items );
- bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available );
+ bool getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *available );
virtual void updateRootItems() {};
private:
diff --git a/amarok/src/mediadevicemanager.cpp b/amarok/src/mediadevicemanager.cpp
index bc030c18..c9b07110 100644
--- a/amarok/src/mediadevicemanager.cpp
+++ b/amarok/src/mediadevicemanager.cpp
@@ -51,7 +51,7 @@ MediaDeviceManager::MediaDeviceManager()
}
//load manual devices
TQStringList manualDevices;
- KConfig *config = Amarok::config( "MediaBrowser" );
+ TDEConfig *config = Amarok::config( "MediaBrowser" );
TQMap<TQString,TQString> savedDevices = config->entryMap( "MediaBrowser" );
TQMap<TQString,TQString>::Iterator qit;
TQString curr, currMountPoint, currName;
diff --git a/amarok/src/medium.cpp b/amarok/src/medium.cpp
index 9df1d040..b20083b2 100644
--- a/amarok/src/medium.cpp
+++ b/amarok/src/medium.cpp
@@ -166,7 +166,7 @@ void Medium::setFsType(const TQString &type)
void Medium::setUserLabel(const TQString &label)
{
- KConfig cfg("mediamanagerrc");
+ TDEConfig cfg("mediamanagerrc");
cfg.setGroup("UserLabels");
TQString entry_name = m_properties[ID];
@@ -185,7 +185,7 @@ void Medium::setUserLabel(const TQString &label)
void Medium::loadUserLabel()
{
- KConfig cfg("mediamanagerrc");
+ TDEConfig cfg("mediamanagerrc");
cfg.setGroup("UserLabels");
TQString entry_name = m_properties[ID];
diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp
index 1658c6ee..a80d80e1 100644
--- a/amarok/src/mediumpluginmanager.cpp
+++ b/amarok/src/mediumpluginmanager.cpp
@@ -114,7 +114,7 @@ bool
MediumPluginManager::detectDevices( const bool redetect, const bool nographics )
{
bool foundNew = false;
- KConfig *config = Amarok::config( "MediaBrowser" );
+ TDEConfig *config = Amarok::config( "MediaBrowser" );
if( redetect )
DeviceManager::instance()->reconcileMediumMap();
MediumMap mmap = MediaDeviceManager::instance()->getMediumMap();
@@ -210,7 +210,7 @@ MediumPluginManager::finished()
(*it)->configButton()->setEnabled( (*it)->pluginCombo()->currentText() != i18n( "Do not handle" ) );
}
- KConfig *config = Amarok::config( "MediaBrowser" );
+ TDEConfig *config = Amarok::config( "MediaBrowser" );
for( DeletedMap::Iterator dit = m_deletedMap.begin();
dit != m_deletedMap.end();
++dit )
@@ -387,7 +387,7 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr,
if( !m_medium )
return;
- KConfig *config = Amarok::config( "MediaBrowser" );
+ TDEConfig *config = Amarok::config( "MediaBrowser" );
m_oldPlugin = config->readEntry( m_medium->id() );
if( !m_oldPlugin.isEmpty() )
m_new = false;
diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp
index 8ac01799..5e7464ce 100644
--- a/amarok/src/metabundle.cpp
+++ b/amarok/src/metabundle.cpp
@@ -1232,7 +1232,7 @@ MetaBundle::prettyBitrate( int i )
TQString
MetaBundle::prettyFilesize( int s )
{
- return KIO::convertSize( s );
+ return TDEIO::convertSize( s );
}
TQString
diff --git a/amarok/src/mountpointmanager.cpp b/amarok/src/mountpointmanager.cpp
index ab1e6065..8ee71dc6 100644
--- a/amarok/src/mountpointmanager.cpp
+++ b/amarok/src/mountpointmanager.cpp
@@ -404,7 +404,7 @@ MountPointManager::collectionFolders( )
{
//TODO max: cache data
TQStringList result;
- KConfig* const folders = Amarok::config( "Collection Folders" );
+ TDEConfig* const folders = Amarok::config( "Collection Folders" );
IdList ids = getMountedDeviceIds();
foreachType( IdList, ids )
{
@@ -432,7 +432,7 @@ MountPointManager::setCollectionFolders( const TQStringList &folders )
{
//TODO max: cache data
typedef TQMap<int, TQStringList> FolderMap;
- KConfig* const folderConf = Amarok::config( "Collection Folders" );
+ TDEConfig* const folderConf = Amarok::config( "Collection Folders" );
FolderMap folderMap;
foreach( folders )
{
diff --git a/amarok/src/mountpointmanager.h b/amarok/src/mountpointmanager.h
index 1f22a56f..4ea86920 100644
--- a/amarok/src/mountpointmanager.h
+++ b/amarok/src/mountpointmanager.h
@@ -73,7 +73,7 @@ public:
virtual bool canCreateFromConfig() const = 0;
- virtual DeviceHandler* createHandler( const KConfig* c ) const = 0;
+ virtual DeviceHandler* createHandler( const TDEConfig* c ) const = 0;
/**
* returns the type of the DeviceHandler. Should be the same as the value used in
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index 2838d3de..452b3e95 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -50,7 +50,7 @@
#define NEARBYINT(i) ((int(float(i) + 0.5)))
-namespace Amarok { extern KConfig *config( const TQString& ); }
+namespace Amarok { extern TDEConfig *config( const TQString& ); }
class MultiTabBarTabPrivate
{
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp
index 7b080f26..99d0b275 100644
--- a/amarok/src/osd.cpp
+++ b/amarok/src/osd.cpp
@@ -808,7 +808,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot
text = osd.namedOptArgs( args );
- // KDE 3.3 rejects \n in the .kcfg file, and KConfig turns \n into \\n, so...
+ // KDE 3.3 rejects \n in the .kcfg file, and TDEConfig turns \n into \\n, so...
text.replace( "\\n", "\n" );
}
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 529cd4c9..371a0d2c 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -700,9 +700,9 @@ Playlist::restoreSession()
Copyright (C) 2000,2003 Charles Samuels <[email protected]>
Copyright (C) 2000 Peter Putzer
*/
-void Playlist::saveLayout(KConfig *config, const TQString &group) const
+void Playlist::saveLayout(TDEConfig *config, const TQString &group) const
{
- KConfigGroupSaver saver(config, group);
+ TDEConfigGroupSaver saver(config, group);
TQStringList names, widths, order;
const int colCount = columns();
@@ -721,9 +721,9 @@ void Playlist::saveLayout(KConfig *config, const TQString &group) const
config->writeEntry("SortAscending", ascendingSort());
}
-void Playlist::restoreLayout(KConfig *config, const TQString &group)
+void Playlist::restoreLayout(TDEConfig *config, const TQString &group)
{
- KConfigGroupSaver saver(config, group);
+ TDEConfigGroupSaver saver(config, group);
int version = config->readNumEntry("ColumnsVersion", 0);
TQValueList<int> iorder; //internal ordering
diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h
index 4eb39554..710f129a 100644
--- a/amarok/src/playlist.h
+++ b/amarok/src/playlist.h
@@ -171,8 +171,8 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi
void unlock();
//reimplemented to save columns by name instead of index, to be more resilient to reorderings and such
- void saveLayout(KConfig *config, const TQString &group) const;
- void restoreLayout(KConfig *config, const TQString &group);
+ void saveLayout(TDEConfig *config, const TQString &group) const;
+ void restoreLayout(TDEConfig *config, const TQString &group);
//AFT-related functions
bool checkFileStatus( PlaylistItem * item );
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index 2010a57d..dbefffab 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -1139,7 +1139,7 @@ PlaylistCategory* PlaylistBrowser::loadPodcasts()
PlaylistCategory *p = new PlaylistCategory( m_listview, after, e );
p->setId( 0 );
//delete the file, it is deprecated
- KIO::del( KURL::fromPathOrURL( podcastBrowserCache() ) );
+ TDEIO::del( KURL::fromPathOrURL( podcastBrowserCache() ) );
if( !m_podcastItemsToScan.isEmpty() )
m_podcastTimer->start( m_podcastTimerInterval );
@@ -1507,7 +1507,7 @@ bool PlaylistBrowser::deleteSelectedPodcastItems( const bool removeItem, const b
if( silent || button != KMessageBox::Continue )
return false;
- KIO::Job *job = KIO::del( urls );
+ TDEIO::Job *job = TDEIO::del( urls );
PodcastEpisode *item;
for ( item = erasedItems.first(); item; item = erasedItems.next() )
@@ -1518,7 +1518,7 @@ bool PlaylistBrowser::deleteSelectedPodcastItems( const bool removeItem, const b
delete item;
}
else
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ), item, TQT_SLOT( isOnDisk() ) );;
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), item, TQT_SLOT( isOnDisk() ) );;
}
return true;
}
@@ -1548,7 +1548,7 @@ bool PlaylistBrowser::deletePodcasts( TQPtrList<PodcastChannel> items )
}
// TODO We need to check which files have been deleted successfully
if ( urls.count() )
- KIO::del( urls );
+ TDEIO::del( urls );
return true;
}
@@ -1897,7 +1897,7 @@ bool PlaylistBrowser::deletePlaylists( KURL::List items )
continue;
}
}
- KIO::del( items );
+ TDEIO::del( items );
return true;
}
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index 5ab0ed69..82b1bb22 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -1737,7 +1737,7 @@ PodcastChannel::setSettings( PodcastSettings *newSettings )
{
//create the local directory first
PodcastEpisode::createLocalDir( newSettings->saveLocation() );
- KIO::CopyJob* m_podcastMoveJob = KIO::move( copyList, KURL::fromPathOrURL( newSettings->saveLocation() ), false );
+ TDEIO::CopyJob* m_podcastMoveJob = TDEIO::move( copyList, KURL::fromPathOrURL( newSettings->saveLocation() ), false );
Amarok::StatusBar::instance()->newProgressOperation( m_podcastMoveJob )
.setDescription( i18n( "Moving Podcasts" ) );
}
@@ -1798,13 +1798,13 @@ PodcastChannel::fetch()
startAnimation();
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) );
- m_podcastJob = KIO::storedGet( m_url, false, false );
+ m_podcastJob = TDEIO::storedGet( m_url, false, false );
Amarok::StatusBar::instance()->newProgressOperation( m_podcastJob )
.setDescription( i18n( "Fetching Podcast" ) )
.setAbortSlot( this, TQT_SLOT( abortFetch() ) );
- connect( m_podcastJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( fetchResult( KIO::Job* ) ) );
+ connect( m_podcastJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( fetchResult( TDEIO::Job* ) ) );
}
void
@@ -1819,7 +1819,7 @@ PodcastChannel::abortFetch()
}
void
-PodcastChannel::fetchResult( KIO::Job* job ) //SLOT
+PodcastChannel::fetchResult( TDEIO::Job* job ) //SLOT
{
stopAnimation();
if ( job->error() != 0 )
@@ -1835,7 +1835,7 @@ PodcastChannel::fetchResult( KIO::Job* job ) //SLOT
return;
}
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( job );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( job );
TQDomDocument d;
@@ -2213,7 +2213,7 @@ PodcastChannel::purge()
}
if( !urlsToDelete.isEmpty() )
- KIO::del( urlsToDelete );
+ TDEIO::del( urlsToDelete );
}
void
@@ -2560,21 +2560,21 @@ PodcastEpisode::downloadMedia()
//filename might get changed by redirects later.
m_filename = url().fileName();
m_localUrl = localDir;
- m_podcastEpisodeJob = KIO::storedGet( url().url(), false, false);
+ m_podcastEpisodeJob = TDEIO::storedGet( url().url(), false, false);
Amarok::StatusBar::instance()->newProgressOperation( m_podcastEpisodeJob )
.setDescription( title().isEmpty()
? i18n( "Downloading Podcast Media" )
: i18n( "Downloading Podcast \"%1\"" ).arg( title() ) )
.setAbortSlot( this, TQT_SLOT( abortDownload()) )
- .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ) );
+ .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ) );
- connect( m_podcastEpisodeJob, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( downloadResult( KIO::Job * ) ) );
- connect( m_podcastEpisodeJob, TQT_SIGNAL( redirection( KIO::Job *,const KURL& ) ), TQT_SLOT( redirected( KIO::Job *,const KURL& ) ) );
+ connect( m_podcastEpisodeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( downloadResult( TDEIO::Job * ) ) );
+ connect( m_podcastEpisodeJob, TQT_SIGNAL( redirection( TDEIO::Job *,const KURL& ) ), TQT_SLOT( redirected( TDEIO::Job *,const KURL& ) ) );
}
/* change the localurl if redirected, allows us to use the original filename to transfer to mediadevices*/
-void PodcastEpisode::redirected( KIO::Job *, const KURL & redirectedUrl )
+void PodcastEpisode::redirected( TDEIO::Job *, const KURL & redirectedUrl )
{
debug() << "redirecting to " << redirectedUrl << ". filename: " << redirectedUrl.fileName() << endl;
m_filename = redirectedUrl.fileName();
@@ -2608,7 +2608,7 @@ PodcastEpisode::abortDownload() //SLOT
updatePixmap();
}
-void PodcastEpisode::downloadResult( KIO::Job * transferJob )
+void PodcastEpisode::downloadResult( TDEIO::Job * transferJob )
{
emit downloadFinished();
stopAnimation();
@@ -3493,10 +3493,10 @@ void ShoutcastBrowser::setOpen( bool open )
if ( !m_downloading )
{
m_downloading = true;
- m_cj = KIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml", tmpfile, false );
- connect( m_cj, TQT_SIGNAL( copyingDone( KIO::Job*, const KURL&, const KURL&, bool, bool))
- , this, TQT_SLOT(doneGenreDownload(KIO::Job*, const KURL&, const KURL&, bool, bool )));
- connect( m_cj, TQT_SIGNAL( result( KIO::Job* )), this, TQT_SLOT( jobFinished( KIO::Job* )));
+ m_cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml", tmpfile, false );
+ connect( m_cj, TQT_SIGNAL( copyingDone( TDEIO::Job*, const KURL&, const KURL&, bool, bool))
+ , this, TQT_SLOT(doneGenreDownload(TDEIO::Job*, const KURL&, const KURL&, bool, bool )));
+ connect( m_cj, TQT_SIGNAL( result( TDEIO::Job* )), this, TQT_SLOT( jobFinished( TDEIO::Job* )));
}
TQListViewItem::setOpen( open );
@@ -3512,7 +3512,7 @@ void ShoutcastBrowser::slotAnimation()
s_iconCounter++;
}
-void ShoutcastBrowser::doneGenreDownload( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed )
+void ShoutcastBrowser::doneGenreDownload( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed )
{
Q_UNUSED( job ); Q_UNUSED( from ); Q_UNUSED( directory ); Q_UNUSED( renamed );
@@ -3534,7 +3534,7 @@ void ShoutcastBrowser::doneGenreDownload( KIO::Job *job, const KURL &from, const
file.close();
- KIO::del( to, false, false );
+ TDEIO::del( to, false, false );
// We use this list to filter out some obscure genres
TQStringList bannedGenres;
@@ -3602,7 +3602,7 @@ void ShoutcastBrowser::doneGenreDownload( KIO::Job *job, const KURL &from, const
setOpen( true );
}
-void ShoutcastBrowser::jobFinished( KIO::Job *job )
+void ShoutcastBrowser::jobFinished( TDEIO::Job *job )
{
m_downloading = false;
m_animationTimer.stop();
@@ -3660,11 +3660,11 @@ void ShoutcastGenre::setOpen( bool open )
void ShoutcastGenre::startGenreDownload( TQString genre, TQString tmppath )
{
TQString tmpfile = tmppath + "/amarok-list-" + genre + "-" + TDEApplication::randomString(10) + ".xml";
- KIO::CopyJob *cj = KIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml?genre=" + genre, tmpfile, false );
- connect( cj, TQT_SIGNAL( copyingDone ( KIO::Job*, const KURL&, const KURL&, bool, bool ) ),
- this, TQT_SLOT( doneListDownload( KIO::Job*, const KURL&, const KURL&, bool, bool ) ) );
- connect( cj, TQT_SIGNAL( result ( KIO::Job* ) ),
- this, TQT_SLOT( jobFinished( KIO::Job* ) ) );
+ TDEIO::CopyJob *cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml?genre=" + genre, tmpfile, false );
+ connect( cj, TQT_SIGNAL( copyingDone ( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ),
+ this, TQT_SLOT( doneListDownload( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ) );
+ connect( cj, TQT_SIGNAL( result ( TDEIO::Job* ) ),
+ this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) );
m_totalJobs++;
}
@@ -3678,7 +3678,7 @@ void ShoutcastGenre::slotAnimation()
s_iconCounter++;
}
-void ShoutcastGenre::doneListDownload( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed )
+void ShoutcastGenre::doneListDownload( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed )
{
Q_UNUSED( job ); Q_UNUSED( from ); Q_UNUSED( directory ); Q_UNUSED( renamed );
@@ -3702,7 +3702,7 @@ void ShoutcastGenre::doneListDownload( KIO::Job *job, const KURL &from, const KU
file.close();
- KIO::del(to, false, false);
+ TDEIO::del(to, false, false);
//Go through the XML file and add all the stations
TQDomElement docElem = doc.documentElement();
@@ -3733,7 +3733,7 @@ void ShoutcastGenre::doneListDownload( KIO::Job *job, const KURL &from, const KU
}
}
-void ShoutcastGenre::jobFinished( KIO::Job *job )
+void ShoutcastGenre::jobFinished( TDEIO::Job *job )
{
m_downloading = false;
m_animationTimer.stop();
diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h
index 2847f6af..376b8003 100644
--- a/amarok/src/playlistbrowseritem.h
+++ b/amarok/src/playlistbrowseritem.h
@@ -31,7 +31,7 @@ class MetaBundle;
class PlaylistTrackItem;
class TrackItemInfo;
-namespace KIO { class Job; class TransferJob; class CopyJob; } //podcast downloads
+namespace TDEIO { class Job; class TransferJob; class CopyJob; } //podcast downloads
/**
* RTTI VALUES
@@ -313,9 +313,9 @@ class PodcastEpisode : public PlaylistBrowserEntry
private slots:
void abortDownload();
- void downloadResult( KIO::Job * transferJob );
+ void downloadResult( TDEIO::Job * transferJob );
void slotAnimation();
- void redirected( KIO::Job * job,const KURL & redirectedUrl );
+ void redirected( TDEIO::Job * job,const KURL & redirectedUrl );
private:
enum FeedType{ RSS=0, ATOM=1 };
@@ -336,7 +336,7 @@ class PodcastEpisode : public PlaylistBrowserEntry
TQTimer m_animationTimer;
uint m_iconCounter;
- KIO::StoredTransferJob* m_podcastEpisodeJob;
+ TDEIO::StoredTransferJob* m_podcastEpisodeJob;
TQString m_filename;
bool m_downloaded; //marked as downloaded in cached xml
@@ -411,7 +411,7 @@ class PodcastChannel : public PlaylistBrowserEntry
private slots:
void abortFetch();
void downloadChildQueue();
- void fetchResult( KIO::Job* job );
+ void fetchResult( TDEIO::Job* job );
void slotAnimation();
private:
@@ -442,7 +442,7 @@ class PodcastChannel : public PlaylistBrowserEntry
bool m_new;
bool m_hasProblem;
- KIO::TransferJob *m_podcastJob;
+ TDEIO::TransferJob *m_podcastJob;
PlaylistCategory *m_parent; // category it belongs to
TQString m_podcastCurrentUrl;
TQPtrList<PodcastEpisode> m_podcastDownloadQueue;
@@ -599,13 +599,13 @@ class ShoutcastBrowser : public PlaylistCategory
virtual void slotDoubleClicked();
private slots:
- void doneGenreDownload( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed );
- void jobFinished( KIO::Job *job );
+ void doneGenreDownload( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed );
+ void jobFinished( TDEIO::Job *job );
void slotAnimation();
private:
bool m_downloading;
- KIO::CopyJob *m_cj;
+ TDEIO::CopyJob *m_cj;
TQPixmap *m_loading1, *m_loading2; //icons for loading animation
TQTimer m_animationTimer;
};
@@ -630,8 +630,8 @@ class ShoutcastGenre : public PlaylistCategory
virtual void slotDoubleClicked();
private slots:
- void doneListDownload( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed );
- void jobFinished( KIO::Job *job );
+ void doneListDownload( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed );
+ void jobFinished( TDEIO::Job *job );
void slotAnimation();
private:
diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp
index 657cfd40..497d2e76 100644
--- a/amarok/src/playlistloader.cpp
+++ b/amarok/src/playlistloader.cpp
@@ -987,7 +987,7 @@ RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem
m_destination.setPath( m_temp->name() );
- KIO::Job *job = KIO::file_copy( m_source, m_destination,
+ TDEIO::Job *job = TDEIO::file_copy( m_source, m_destination,
-1, /* permissions, this means "do what you think" */
true, /* overwrite */
false, /* resume download */
@@ -996,7 +996,7 @@ RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem
Amarok::StatusBar::instance()->newProgressOperation( job )
.setDescription( i18n("Retrieving Playlist") );
- connect( job, TQT_SIGNAL(result( KIO::Job* )), TQT_SLOT(result( KIO::Job* )) );
+ connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(result( TDEIO::Job* )) );
Playlist::instance()->lock();
}
@@ -1009,7 +1009,7 @@ RemotePlaylistFetcher::~RemotePlaylistFetcher()
}
void
-RemotePlaylistFetcher::result( KIO::Job *job )
+RemotePlaylistFetcher::result( TDEIO::Job *job )
{
if( job->error() ) {
error() << "Couldn't download remote playlist\n";
diff --git a/amarok/src/playlistloader.h b/amarok/src/playlistloader.h
index fc0a9d8a..07c2e3c6 100644
--- a/amarok/src/playlistloader.h
+++ b/amarok/src/playlistloader.h
@@ -21,7 +21,7 @@ class PlaylistItem;
class PLItemList;
class XMLData;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
/**
@@ -195,7 +195,7 @@ public:
~RemotePlaylistFetcher();
private slots:
- void result( KIO::Job* );
+ void result( TDEIO::Job* );
void abort() { delete this; }
};
diff --git a/amarok/src/plugin/pluginconfig.h b/amarok/src/plugin/pluginconfig.h
index 4902fb79..054a12b6 100644
--- a/amarok/src/plugin/pluginconfig.h
+++ b/amarok/src/plugin/pluginconfig.h
@@ -39,7 +39,7 @@ namespace Amarok
virtual bool isDefault() const = 0;
public slots:
- /** Save view state using, eg KConfig */
+ /** Save view state using, eg TDEConfig */
virtual void save() = 0;
};
}
diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp
index 36bb0c5e..4e2d1f21 100644
--- a/amarok/src/prettypopupmenu.cpp
+++ b/amarok/src/prettypopupmenu.cpp
@@ -72,7 +72,7 @@ PrettyPopupMenu::sideImageRect() const
TQColor
PrettyPopupMenu::calcPixmapColor()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("WM");
TQColor color = TQApplication::palette().active().highlight();
// TQColor activeTitle = TQApplication::palette().active().background();
diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp
index cc81b341..51ef48d7 100644
--- a/amarok/src/refreshimages.cpp
+++ b/amarok/src/refreshimages.cpp
@@ -58,20 +58,20 @@ RefreshImages::RefreshImages()
debug() << url << endl;
- KIO::TransferJob* job = KIO::storedGet( url, false, false );
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::TransferJob* job = TDEIO::storedGet( url, false, false );
+ TDEIO::Scheduler::scheduleJob( job );
//Amarok::StatusBar::instance()->newProgressOperation( job );
job->setName( md5sum.ascii() );
it++; //iterate to the next set
m_jobInfo[md5sum] = JobInfo( asin, locale, it == end );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( finishedXmlFetch( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( finishedXmlFetch( TDEIO::Job* ) ) );
}
}
void
-RefreshImages::finishedXmlFetch( KIO::Job* xmlJob ) //SLOT
+RefreshImages::finishedXmlFetch( TDEIO::Job* xmlJob ) //SLOT
{
if ( xmlJob->error() )
{
@@ -82,7 +82,7 @@ RefreshImages::finishedXmlFetch( KIO::Job* xmlJob ) //SLOT
return;
}
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( xmlJob );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( xmlJob );
const TQString xml = TQString::fromUtf8( storedJob->data().data(), storedJob->data().size() );
TQDomDocument doc;
@@ -114,8 +114,8 @@ RefreshImages::finishedXmlFetch( KIO::Job* xmlJob ) //SLOT
return;
}
- KIO::TransferJob* imageJob = KIO::storedGet( imageUrl, false, false );
- KIO::Scheduler::scheduleJob(imageJob);
+ TDEIO::TransferJob* imageJob = TDEIO::storedGet( imageUrl, false, false );
+ TDEIO::Scheduler::scheduleJob(imageJob);
//Amarok::StatusBar::instance()->newProgressOperation( imageJob );
imageJob->setName(xmlJob->name());
//get the URL of the detail page
@@ -123,10 +123,10 @@ RefreshImages::finishedXmlFetch( KIO::Job* xmlJob ) //SLOT
.namedItem( "Items" )
.namedItem( "Item" )
.namedItem( "DetailPageURL" ).firstChild().toText().data();
- connect( imageJob, TQT_SIGNAL( result(KIO::Job*) ), TQT_SLOT( finishedImageFetch(KIO::Job*) ) );
+ connect( imageJob, TQT_SIGNAL( result(TDEIO::Job*) ), TQT_SLOT( finishedImageFetch(TDEIO::Job*) ) );
}
-void RefreshImages::finishedImageFetch(KIO::Job* imageJob)
+void RefreshImages::finishedImageFetch(TDEIO::Job* imageJob)
{
if( imageJob->error() ) {
Amarok::StatusBar::instance()->shortMessage(i18n("There was an error communicating with Amazon."));
@@ -136,7 +136,7 @@ void RefreshImages::finishedImageFetch(KIO::Job* imageJob)
return;
}
TQImage img;
- img.loadFromData(static_cast<KIO::StoredTransferJob*>(imageJob)->data());
+ img.loadFromData(static_cast<TDEIO::StoredTransferJob*>(imageJob)->data());
img.setText( "amazon-url", 0, m_jobInfo[imageJob->name()].m_detailUrl);
img.save( Amarok::saveLocation("albumcovers/large/") + imageJob->name(), "PNG");
diff --git a/amarok/src/refreshimages.h b/amarok/src/refreshimages.h
index c4fc0eec..a83427ca 100644
--- a/amarok/src/refreshimages.h
+++ b/amarok/src/refreshimages.h
@@ -5,7 +5,7 @@
#define AMAROK_REFRESHIMAGES_H
#include <tqobject.h>
-namespace KIO {
+namespace TDEIO {
class StoredTransferJob;
class Job;
}
@@ -30,8 +30,8 @@ class RefreshImages : public TQObject
public:
RefreshImages();
private slots:
- void finishedXmlFetch( KIO::Job* );
- void finishedImageFetch( KIO::Job* );
+ void finishedXmlFetch( TDEIO::Job* );
+ void finishedImageFetch( TDEIO::Job* );
private:
static TQString localeToTLD(const TQString& locale);
TQMap<TQString, JobInfo> m_jobInfo;
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index f2a44639..30fcc75f 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -173,7 +173,7 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name )
m_transcodeCategory->setPixmap( 0, SmallIcon( Amarok::icon( "files" ) ) );
// Restore the open/closed state of the category items
- KConfig* const config = Amarok::config( "ScriptManager" );
+ TDEConfig* const config = Amarok::config( "ScriptManager" );
m_generalCategory ->setOpen( config->readBoolEntry( "General category open" ) );
m_lyricsCategory ->setOpen( config->readBoolEntry( "Lyrics category open" ) );
m_scoreCategory ->setOpen( config->readBoolEntry( "Score category State" ) );
@@ -225,7 +225,7 @@ ScriptManager::~ScriptManager()
}
// Save config
- KConfig* const config = Amarok::config( "ScriptManager" );
+ TDEConfig* const config = Amarok::config( "ScriptManager" );
config->writeEntry( "Running Scripts", runningScripts );
// Save the open/closed state of the category items
@@ -365,7 +365,7 @@ ScriptManager::findScripts() //SLOT
// Handle auto-run:
- KConfig* const config = Amarok::config( "ScriptManager" );
+ TDEConfig* const config = Amarok::config( "ScriptManager" );
const TQStringList runningScripts = config->readListEntry( "Running Scripts" );
{
@@ -453,7 +453,7 @@ ScriptManager::slotInstallScript( const TQString& path )
"Please inform the package maintainer about this error.</p>" ) );
// Delete directory recursively
- KIO::NetAccess::del( KURL::fromPathOrURL( scriptFolder ), 0 );
+ TDEIO::NetAccess::del( KURL::fromPathOrURL( scriptFolder ), 0 );
}
return false;
@@ -537,7 +537,7 @@ ScriptManager::slotUninstallScript()
}
// Delete script directory recursively
- if( !KIO::NetAccess::del( scriptDirURL, 0 ) ) {
+ if( !TDEIO::NetAccess::del( scriptDirURL, 0 ) ) {
KMessageBox::sorry( 0, i18n( "<p>Could not uninstall this script.</p><p>The ScriptManager can only uninstall scripts which have been installed as packages.</p>" ) ); // only true when not running as root (which is reasonable)
return;
}
@@ -879,7 +879,7 @@ ScriptManager::loadScript( const TQString& path )
KListViewItem* li = 0;
const TQString specPath = info.dirPath() + '/' + info.baseName( true ) + ".spec";
if( TQFile::exists( specPath ) ) {
- KConfig spec( specPath, true, false );
+ TDEConfig spec( specPath, true, false );
if( spec.hasKey( "name" ) )
name = spec.readEntry( "name" );
if( spec.hasKey( "type" ) ) {
diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp
index 131ac63b..8039c9bc 100644
--- a/amarok/src/scrobbler.cpp
+++ b/amarok/src/scrobbler.cpp
@@ -77,12 +77,12 @@ void Scrobbler::similarArtists( const TQString & artist )
m_similarArtistsBuffer = TQByteArray();
m_artist = artist;
- m_similarArtistsJob = KIO::get( "http://ws.audioscrobbler.com/1.0/artist/" + safeArtist + "/similar.xml", false, false );
+ m_similarArtistsJob = TDEIO::get( "http://ws.audioscrobbler.com/1.0/artist/" + safeArtist + "/similar.xml", false, false );
- connect( m_similarArtistsJob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( audioScrobblerSimilarArtistsResult( KIO::Job* ) ) );
- connect( m_similarArtistsJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( audioScrobblerSimilarArtistsData( KIO::Job*, const TQByteArray& ) ) );
+ connect( m_similarArtistsJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( audioScrobblerSimilarArtistsResult( TDEIO::Job* ) ) );
+ connect( m_similarArtistsJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( audioScrobblerSimilarArtistsData( TDEIO::Job*, const TQByteArray& ) ) );
}
}
@@ -90,7 +90,7 @@ void Scrobbler::similarArtists( const TQString & artist )
/**
* Called when the similar artists TransferJob finishes.
*/
-void Scrobbler::audioScrobblerSimilarArtistsResult( KIO::Job* job ) //SLOT
+void Scrobbler::audioScrobblerSimilarArtistsResult( TDEIO::Job* job ) //SLOT
{
if ( m_similarArtistsJob != job )
return; //not the right job, so let's ignore it
@@ -140,7 +140,7 @@ void Scrobbler::audioScrobblerSimilarArtistsResult( KIO::Job* job ) //SLOT
/**
* Called when similar artists data is received for the TransferJob.
*/
-void Scrobbler::audioScrobblerSimilarArtistsData( KIO::Job* job, const TQByteArray& data ) //SLOT
+void Scrobbler::audioScrobblerSimilarArtistsData( TDEIO::Job* job, const TQByteArray& data ) //SLOT
{
if ( m_similarArtistsJob != job )
return; //not the right job, so let's ignore it
@@ -484,8 +484,8 @@ void ScrobblerSubmitter::performHandshake()
m_submitResultBuffer = "";
m_inProgress = true;
- KIO::TransferJob* job = KIO::storedGet( handshakeUrl, false, false );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( audioScrobblerHandshakeResult( KIO::Job* ) ) );
+ TDEIO::TransferJob* job = TDEIO::storedGet( handshakeUrl, false, false );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( audioScrobblerHandshakeResult( TDEIO::Job* ) ) );
}
@@ -587,7 +587,7 @@ void ScrobblerSubmitter::performSubmit()
m_submitResultBuffer = "";
m_inProgress = true;
- KIO::TransferJob* job = KIO::http_post( m_submitUrl, data.utf8(), false );
+ TDEIO::TransferJob* job = TDEIO::http_post( m_submitUrl, data.utf8(), false );
job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" );
// Loop in reverse order, which helps when items are later fetched from
@@ -600,10 +600,10 @@ void ScrobblerSubmitter::performSubmit()
Amarok::StatusBar::instance()->newProgressOperation( job )
.setDescription( i18n( "Submitting to last.fm" ) );
- connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( audioScrobblerSubmitResult( KIO::Job* ) ) );
- connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( audioScrobblerSubmitData( KIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( audioScrobblerSubmitResult( TDEIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( audioScrobblerSubmitData( TDEIO::Job*, const TQByteArray& ) ) );
}
@@ -663,7 +663,7 @@ void ScrobblerSubmitter::scheduledTimeReached()
/**
* Called when handshake TransferJob has finished and data is received.
*/
-void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT
+void ScrobblerSubmitter::audioScrobblerHandshakeResult( TDEIO::Job* job ) //SLOT
{
m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
m_inProgress = false;
@@ -674,7 +674,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT
return;
}
- KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( job );
+ TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( job );
m_submitResultBuffer = TQString::fromUtf8( storedJob->data().data(), storedJob->data().size() );
// debug()
@@ -743,7 +743,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT
/**
* Called when submit TransferJob has finished and data is received.
*/
-void ScrobblerSubmitter::audioScrobblerSubmitResult( KIO::Job* job ) //SLOT
+void ScrobblerSubmitter::audioScrobblerSubmitResult( TDEIO::Job* job ) //SLOT
{
m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
m_inProgress = false;
@@ -810,7 +810,7 @@ void ScrobblerSubmitter::audioScrobblerSubmitResult( KIO::Job* job ) //SLOT
* Receives the data from the TransferJob.
*/
void ScrobblerSubmitter::audioScrobblerSubmitData(
- KIO::Job*, const TQByteArray& data ) //SLOT
+ TDEIO::Job*, const TQByteArray& data ) //SLOT
{
// Append new chunk of string
m_submitResultBuffer += TQString::fromUtf8( data, data.size() );
@@ -940,7 +940,7 @@ SubmitItem* ScrobblerSubmitter::dequeueItem()
* Enqueues items associated with the job. This is used when the job
* has failed (e.g. network problems).
*/
-void ScrobblerSubmitter::enqueueJob( KIO::Job* job )
+void ScrobblerSubmitter::enqueueJob( TDEIO::Job* job )
{
SubmitItem *lastItem = 0;
SubmitItem *item = 0;
@@ -964,7 +964,7 @@ void ScrobblerSubmitter::enqueueJob( KIO::Job* job )
* Deletes items associated with the job. This is used when the job
* has succeeded.
*/
-void ScrobblerSubmitter::finishJob( KIO::Job* job )
+void ScrobblerSubmitter::finishJob( TDEIO::Job* job )
{
SubmitItem *firstItem = 0;
SubmitItem *item = 0;
diff --git a/amarok/src/scrobbler.h b/amarok/src/scrobbler.h
index 74b19e79..eaa038b7 100644
--- a/amarok/src/scrobbler.h
+++ b/amarok/src/scrobbler.h
@@ -17,7 +17,7 @@
//some setups require this
#undef PROTOCOL_VERSION
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class TQStringList;
class SubmitItem;
@@ -51,15 +51,15 @@ class Scrobbler : public TQObject, public EngineObserver
void engineTrackPositionChanged( long /*position*/ , bool /*userSeek*/ );
private slots:
- void audioScrobblerSimilarArtistsResult( KIO::Job* /*job*/ );
+ void audioScrobblerSimilarArtistsResult( TDEIO::Job* /*job*/ );
void audioScrobblerSimilarArtistsData(
- KIO::Job* /*job*/, const TQByteArray& /*data*/ );
+ TDEIO::Job* /*job*/, const TQByteArray& /*data*/ );
private:
TQTimer m_timer; //works around xine bug
//http://sourceforge.net/tracker/index.php?func=detail&aid=1401026&group_id=9655&atid=109655
TQByteArray m_similarArtistsBuffer;
- KIO::Job* m_similarArtistsJob;
+ TDEIO::Job* m_similarArtistsJob;
TQString m_artist;
bool m_validForSending;
long m_startPos;
@@ -135,17 +135,17 @@ class ScrobblerSubmitter : public TQObject
private slots:
void scheduledTimeReached();
- void audioScrobblerHandshakeResult( KIO::Job* /*job*/ );
- void audioScrobblerSubmitResult( KIO::Job* /*job*/ );
+ void audioScrobblerHandshakeResult( TDEIO::Job* /*job*/ );
+ void audioScrobblerSubmitResult( TDEIO::Job* /*job*/ );
void audioScrobblerSubmitData(
- KIO::Job* /*job*/, const TQByteArray& /*data*/ );
+ TDEIO::Job* /*job*/, const TQByteArray& /*data*/ );
private:
bool canSubmit() const;
void enqueueItem( SubmitItem* /* item */ );
SubmitItem* dequeueItem();
- void enqueueJob( KIO::Job* /* job */ );
- void finishJob( KIO::Job* /* job */ );
+ void enqueueJob( TDEIO::Job* /* job */ );
+ void finishJob( TDEIO::Job* /* job */ );
void announceSubmit(
SubmitItem* /* item */, int /* tracks */, bool /* success */ ) const;
void saveSubmitQueue();
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index 36cc912d..afdd0fb1 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -398,7 +398,7 @@ StatusBar::newProgressOperation( TQObject *owner )
}
ProgressBar&
-StatusBar::newProgressOperation( KIO::Job *job )
+StatusBar::newProgressOperation( TDEIO::Job *job )
{
SHOULD_BE_GUI
@@ -407,9 +407,9 @@ StatusBar::newProgressOperation( KIO::Job *job )
if(!allDone())
toggleProgressWindowButton()->show();
- connect( job, TQT_SIGNAL(result( KIO::Job* )), TQT_SLOT(endProgressOperation()) );
- //TODO connect( job, TQT_SIGNAL(infoMessage( KIO::Job *job, const TQString& )), TQT_SLOT() );
- connect( job, TQT_SIGNAL(percent( KIO::Job*, unsigned long )), TQT_SLOT(setProgress( KIO::Job*, unsigned long )) );
+ connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(endProgressOperation()) );
+ //TODO connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *job, const TQString& )), TQT_SLOT() );
+ connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )), TQT_SLOT(setProgress( TDEIO::Job*, unsigned long )) );
return bar;
}
@@ -418,9 +418,9 @@ void
StatusBar::endProgressOperation()
{
TQObject *owner = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); //HACK deconsting it
- KIO::Job *job = dynamic_cast<KIO::Job*>( owner );
+ TDEIO::Job *job = dynamic_cast<TDEIO::Job*>( owner );
- //FIXME doesn't seem to work for KIO::DeleteJob, it has it's own error handler and returns no error too
+ //FIXME doesn't seem to work for TDEIO::DeleteJob, it has it's own error handler and returns no error too
// if you try to delete http urls for instance <- KDE SUCKS!
if( job && job->error() )
@@ -513,7 +513,7 @@ StatusBar::setProgress( int steps )
}
void
-StatusBar::setProgress( KIO::Job *job, unsigned long percent )
+StatusBar::setProgress( TDEIO::Job *job, unsigned long percent )
{
setProgress( static_cast<TQObject*>( job ), percent );
}
diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h
index 195a6156..93df08e8 100644
--- a/amarok/src/statusbar/statusBarBase.h
+++ b/amarok/src/statusbar/statusBarBase.h
@@ -29,7 +29,7 @@
class TQLabel;
class TQTimer;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
//TODO
// * concept of a temporary message that is removed when a qobject parent is deleted
@@ -64,7 +64,7 @@ namespace KDE
* the progress for this progress operation. Only one progress operation per
* TQObject!
*
- * You can also follow KIO::Jobs, with built in error handling, and
+ * You can also follow TDEIO::Jobs, with built in error handling, and
* ThreadManager::Jobs have built in thread-safe progress handling.
*
* You can show long status/error messages using longMessage(), these are
@@ -98,9 +98,9 @@ namespace KDE
ProgressBar &newProgressOperation( TQObject *owner );
/**
- * Monitor progress for a KIO::Job, very handy.
+ * Monitor progress for a TDEIO::Job, very handy.
*/
- ProgressBar &newProgressOperation( KIO::Job* );
+ ProgressBar &newProgressOperation( TDEIO::Job* );
void incrementProgressTotalSteps( const TQObject *owner, int inc = 1 );
void incrementProgress( const TQObject *owner );
@@ -171,8 +171,8 @@ namespace KDE
void abortAllProgressOperations();
private slots:
- /** For internal use against KIO::Jobs */
- void setProgress( KIO::Job*, unsigned long percent );
+ /** For internal use against TDEIO::Jobs */
+ void setProgress( TDEIO::Job*, unsigned long percent );
void showMainProgressBar();
void hideMainProgressBar();
void updateProgressAppearance();
diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp
index 5305e8c4..85ff3d74 100644
--- a/amarok/src/tagdialog.cpp
+++ b/amarok/src/tagdialog.cpp
@@ -378,7 +378,7 @@ void TagDialog::init()
// delete itself when closing
setWFlags( getWFlags() | TQt::WDestructiveClose );
- KConfig *config = Amarok::config( "TagDialog" );
+ TDEConfig *config = Amarok::config( "TagDialog" );
kTabWidget->addTab( summaryTab, i18n( "Summary" ) );
kTabWidget->addTab( tagsTab, i18n( "Tags" ) );
diff --git a/amarok/src/tagguesser.cpp b/amarok/src/tagguesser.cpp
index deb85a3d..d37de53a 100644
--- a/amarok/src/tagguesser.cpp
+++ b/amarok/src/tagguesser.cpp
@@ -134,7 +134,7 @@ TQString FileNameScheme::composeRegExp( const TQString &s ) const
{
TQMap<TQString, TQString> substitutions;
- KConfigGroup config(TDEGlobal::config(), "TagGuesser");
+ TDEConfigGroup config(TDEGlobal::config(), "TagGuesser");
substitutions[ "title" ] = config.readEntry( "Title regexp", "([\\w\\s'&_,\\.]+)" );
substitutions[ "artist" ] = config.readEntry( "Artist regexp", "([\\w\\s'&_,\\.]+)" );
@@ -195,9 +195,9 @@ TQStringList TagGuesser::schemeStrings()
void TagGuesser::setSchemeStrings( const TQStringList &schemes )
{
- KConfig *cfg = TDEGlobal::config();
+ TDEConfig *cfg = TDEGlobal::config();
{
- KConfigGroupSaver saver( cfg, "TagGuesser" );
+ TDEConfigGroupSaver saver( cfg, "TagGuesser" );
cfg->writeEntry( "Filename schemes", schemes );
}
cfg->sync();
diff --git a/doc/et/develop.docbook b/doc/et/develop.docbook
index 31a5763e..14742793 100644
--- a/doc/et/develop.docbook
+++ b/doc/et/develop.docbook
@@ -47,7 +47,7 @@
<entry
>amarokconfig.cpp</entry>
<entry
->KConfig-XT</entry>
+>TDEConfig-XT</entry>
</row>
<row>
diff --git a/doc/it/develop.docbook b/doc/it/develop.docbook
index fd440e32..17420da9 100644
--- a/doc/it/develop.docbook
+++ b/doc/it/develop.docbook
@@ -47,7 +47,7 @@
<entry
>amarokconfig.cpp</entry>
<entry
->KConfig-XT</entry>
+>TDEConfig-XT</entry>
</row>
<row>
diff --git a/doc/nl/develop.docbook b/doc/nl/develop.docbook
index 98e9bc5f..de8cb11e 100644
--- a/doc/nl/develop.docbook
+++ b/doc/nl/develop.docbook
@@ -47,7 +47,7 @@
<entry
>amarokconfig.cpp</entry>
<entry
->KConfig-XT</entry>
+>TDEConfig-XT</entry>
</row>
<row>
diff --git a/doc/pt/develop.docbook b/doc/pt/develop.docbook
index 71183b7f..f75eee98 100644
--- a/doc/pt/develop.docbook
+++ b/doc/pt/develop.docbook
@@ -47,7 +47,7 @@
<entry
>amarokconfig.cpp</entry>
<entry
->KConfig-XT</entry>
+>TDEConfig-XT</entry>
</row>
<row>
diff --git a/doc/sv/develop.docbook b/doc/sv/develop.docbook
index 4a03bd92..314daf15 100644
--- a/doc/sv/develop.docbook
+++ b/doc/sv/develop.docbook
@@ -47,7 +47,7 @@
<entry
>amarokconfig.cpp</entry>
<entry
->KConfig-XT</entry>
+>TDEConfig-XT</entry>
</row>
<row>