|
|
|
|
@ -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 |
|
|
|
|
|
Timothy Pearson
10 years ago