TDE
/
amarok
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/amarok
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent c9f212164b
commit f6d535927f
92 changed files with 357 additions and 357 deletions
Show Stats Download Patch File Download Diff File

2
ChangeLog
Unescape View File

@ -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)

6
amarok/HACKING
Unescape View File

@ -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 );
| }

2
amarok/src/Options2.ui.h
Unescape View File

@ -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() ) );

14
amarok/src/amarok.h
Unescape View File

@ -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
}

4
amarok/src/amarokcore/amarokdcophandler.cpp
Unescape View File

@ -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)
{

2
amarok/src/analyzers/blockanalyzer.cpp
Unescape View File

@ -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 )

20
amarok/src/app.cpp
Unescape View File

@ -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"

8
amarok/src/app.h
Unescape View File

@ -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 */

2
amarok/src/browserbar.cpp
Unescape View File

@ -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() );
}

6
amarok/src/collectionbrowser.cpp
Unescape View File

@ -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 );

40
amarok/src/collectiondb.cpp
Unescape View File

@ -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

10
amarok/src/collectiondb.h
Unescape View File

@ -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;

12
amarok/src/configdialog.cpp
Unescape View File

@ -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();
}
/**

4
amarok/src/configdialog.h
Unescape View File

@ -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,

14
amarok/src/contextbrowser.cpp
Unescape View File

@ -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.

6
amarok/src/contextbrowser.h
Unescape View File

@ -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;

22
amarok/src/coverfetcher.cpp
Unescape View File

@ -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;

8
amarok/src/coverfetcher.h
Unescape View File

@ -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() );

2
amarok/src/covermanager.cpp
Unescape View File

@ -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 );
}
}

10
amarok/src/database_refactor/collectiondb.cpp
Unescape View File

@ -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() )

2
amarok/src/database_refactor/collectiondb.h
Unescape View File

@ -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 */

8
amarok/src/deletedialog.cpp
Unescape View File

@ -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

2
amarok/src/device/massstorage/massstoragedevicehandler.cpp
Unescape View File

@ -117,7 +117,7 @@ MassStorageDeviceHandlerFactory::~MassStorageDeviceHandlerFactory( )
{
}
DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const KConfig* ) const
DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const TDEConfig* ) const
{
return 0;
}

2
amarok/src/device/massstorage/massstoragedevicehandler.h
Unescape View File

@ -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;

2
amarok/src/device/nfs/nfsdevicehandler.cpp
Unescape View File

@ -122,7 +122,7 @@ NfsDeviceHandlerFactory::~NfsDeviceHandlerFactory( )
}
DeviceHandler *
NfsDeviceHandlerFactory::createHandler( const KConfig* ) const
NfsDeviceHandlerFactory::createHandler( const TDEConfig* ) const
{
return 0;
}

2
amarok/src/device/nfs/nfsdevicehandler.h
Unescape View File

@ -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;
};

2
amarok/src/device/smb/smbdevicehandler.cpp
Unescape View File

@ -124,7 +124,7 @@ SmbDeviceHandlerFactory::~SmbDeviceHandlerFactory( )
}
DeviceHandler *
SmbDeviceHandlerFactory::createHandler( const KConfig* ) const
SmbDeviceHandlerFactory::createHandler( const TDEConfig* ) const
{
return 0;
}

2
amarok/src/device/smb/smbdevicehandler.h
Unescape View File

@ -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;
};

2
amarok/src/engine/xine/xine-config.h
Unescape View File

@ -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);

2
amarok/src/enginecontroller.h
Unescape View File

@ -23,7 +23,7 @@
class TQTimer;
namespace KIO { class Job; }
namespace TDEIO { class Job; }
/**

2
amarok/src/filebrowser.cpp
Unescape View File

@ -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

2
amarok/src/firstrunwizard.ui.h
Unescape View File

@ -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

8
amarok/src/ktrm.cpp
Unescape View File

@ -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;

4
amarok/src/ktrm.h
Unescape View File

@ -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:
/**

22
amarok/src/lastfm.cpp
Unescape View File

@ -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 ) );

8
amarok/src/lastfm.h
Unescape View File

@ -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 );

18
amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
Unescape View File

@ -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