diff options
86 files changed, 215 insertions, 215 deletions
diff --git a/amarok/HACKING b/amarok/HACKING index 4162afc5..b3de6a48 100644 --- a/amarok/HACKING +++ b/amarok/HACKING @@ -203,8 +203,8 @@ inspection, we can see that we may produce very obscure bugs in the wrong case: | *config( const TQString &group ) | { | //Slightly more useful config() that allows setting the group simultaneously - | kapp->config()->setGroup( group ); - | return kapp->config(); + | tdeApp->config()->setGroup( group ); + | return tdeApp->config(); | } Take the following example: diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h index 405dc928..2719f6eb 100644 --- a/amarok/src/Options2.ui.h +++ b/amarok/src/Options2.ui.h @@ -81,8 +81,8 @@ void Options2::init() void Options2::installPushButton_clicked() { KFileDialog dia( TQString(), "*.tar *.tar.bz2 *.tar.gz|" + i18n( "Style Packages (*.tar, *.tar.bz2, *.tar.gz)" ), 0, 0, true ); - kapp->setTopWidget( &dia ); - dia.setCaption( kapp->makeStdCaption( i18n( "Select Style Package" ) ) ); + tdeApp->setTopWidget( &dia ); + dia.setCaption( tdeApp->makeStdCaption( i18n( "Select Style Package" ) ) ); dia.setMode( KFile::File | KFile::ExistingOnly ); if ( !dia.exec() ) return; @@ -177,7 +177,7 @@ void Options2::updateStyleComboBox() styleComboBox->clear(); - const TQStringList styleList = kapp->dirs()->findAllResources("data","amarok/themes/*/stylesheet.css", false); + const TQStringList styleList = tdeApp->dirs()->findAllResources("data","amarok/themes/*/stylesheet.css", false); TQStringList sortedList; foreach (styleList) sortedList.append(TQFileInfo( *it ).dir().dirName()); sortedList.append( "Default" ); diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h index 1104a112..c7485ccd 100644 --- a/amarok/src/Options5.ui.h +++ b/amarok/src/Options5.ui.h @@ -132,7 +132,7 @@ Options5::useCustomColorsToggled( bool on ) void Options5::useFakeTransparencyToggled( bool on ) { - if (kapp->isX11CompositionAvailable()) + if (tdeApp->isX11CompositionAvailable()) m_pOSDPreview->setTranslucency( on ); else m_pOSDPreview->setTranslucency( false ); diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp index 05f597d5..8f825850 100644 --- a/amarok/src/actionclasses.cpp +++ b/amarok/src/actionclasses.cpp @@ -79,7 +79,7 @@ MenuAction::plug( TQWidget *w, int index ) { TDEToolBar *bar = dynamic_cast<TDEToolBar*>(w); - if( bar && kapp->authorizeTDEAction( name() ) ) + if( bar && tdeApp->authorizeTDEAction( name() ) ) { const int id = TDEAction::getToolButtonID(); @@ -122,7 +122,7 @@ Menu::Menu() insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n( "C&over Manager" ), ID_SHOW_COVER_MANAGER ); safePlug( ac, "queue_manager", this ); insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n( "&Visualizations" ), ID_SHOW_VIS_SELECTOR ); - insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), kapp, TQ_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_EQUALIZER ); + insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), tdeApp, TQ_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_EQUALIZER ); safePlug( ac, "script_manager", this ); safePlug( ac, "statistics", this ); @@ -272,7 +272,7 @@ AnalyzerAction::plug( TQWidget *w, int index ) TDEToolBar *bar = dynamic_cast<TDEToolBar*>(w); - if( bar && kapp->authorizeTDEAction( name() ) ) + if( bar && tdeApp->authorizeTDEAction( name() ) ) { const int id = TDEAction::getToolButtonID(); @@ -398,7 +398,7 @@ void SelectAction::setIcons( TQStringList icons ) { m_icons = icons; for( int i = 0, n = items().count(); i < n; ++i ) - popupMenu()->changeItem( i, kapp->iconLoader()->loadIconSet( *icons.at( i ), TDEIcon::Small ), popupMenu()->text( i ) ); + popupMenu()->changeItem( i, tdeApp->iconLoader()->loadIconSet( *icons.at( i ), TDEIcon::Small ), popupMenu()->text( i ) ); } TQStringList SelectAction::icons() const { return m_icons; } @@ -514,7 +514,7 @@ BurnMenuAction::plug( TQWidget *w, int index ) { TDEToolBar *bar = dynamic_cast<TDEToolBar*>(w); - if( bar && kapp->authorizeTDEAction( name() ) ) + if( bar && tdeApp->authorizeTDEAction( name() ) ) { const int id = TDEAction::getToolButtonID(); @@ -582,7 +582,7 @@ StopAction::plug( TQWidget *w, int index ) { TDEToolBar *bar = dynamic_cast<TDEToolBar*>(w); - if( bar && kapp->authorizeTDEAction( name() ) ) + if( bar && tdeApp->authorizeTDEAction( name() ) ) { const int id = TDEAction::getToolButtonID(); diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp index 7cb55e34..62a18955 100644 --- a/amarok/src/amarokcore/amarokdcophandler.cpp +++ b/amarok/src/amarokcore/amarokdcophandler.cpp @@ -58,12 +58,12 @@ namespace Amarok DcopPlayerHandler::DcopPlayerHandler() : DCOPObject( "player" ) - , TQObject( kapp ) + , TQObject( tdeApp ) { // Register with DCOP - if ( !kapp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs( "amarok", false ); - kapp->dcopClient()->setDefaultObject( objId() ); + if ( !tdeApp->dcopClient()->isRegistered() ) { + tdeApp->dcopClient()->registerAs( "amarok", false ); + tdeApp->dcopClient()->setDefaultObject( objId() ); } } @@ -520,7 +520,7 @@ namespace Amarok //NOTE I have no idea why we need to do this, I never get startup notification from //the amarok binary anyway --mxcl debug() << "Startup ID: " << args.first() << endl; - kapp->setStartupId( args.first().local8Bit() ); + tdeApp->setStartupId( args.first().local8Bit() ); #ifdef TQ_WS_X11 // currently X11 only TDEStartupInfo::appStarted(); @@ -556,7 +556,7 @@ namespace Amarok DcopPlaylistHandler::DcopPlaylistHandler() : DCOPObject( "playlist" ) - , TQObject( kapp ) + , TQObject( tdeApp ) {} int DcopPlaylistHandler::getActiveIndex() @@ -697,7 +697,7 @@ namespace Amarok DcopPlaylistBrowserHandler::DcopPlaylistBrowserHandler() : DCOPObject( "playlistbrowser" ) - , TQObject( kapp ) + , TQObject( tdeApp ) {} void DcopPlaylistBrowserHandler::addPodcast( const TQString &url ) @@ -726,7 +726,7 @@ namespace Amarok DcopContextBrowserHandler::DcopContextBrowserHandler() : DCOPObject( "contextbrowser" ) - , TQObject( kapp ) + , TQObject( tdeApp ) {} void DcopContextBrowserHandler::showCurrentTrack() @@ -755,7 +755,7 @@ namespace Amarok DcopCollectionHandler::DcopCollectionHandler() : DCOPObject( "collection" ) - , TQObject( kapp ) + , TQObject( tdeApp ) {} int DcopCollectionHandler::totalAlbums() @@ -906,7 +906,7 @@ namespace Amarok DcopScriptHandler::DcopScriptHandler() : DCOPObject( "script" ) - , TQObject( kapp ) + , TQObject( tdeApp ) {} bool DcopScriptHandler::runScript(const TQString& name) @@ -978,7 +978,7 @@ namespace Amarok DcopDevicesHandler::DcopDevicesHandler() : DCOPObject( "devices" ) - , TQObject( kapp ) + , TQObject( tdeApp ) {} void DcopDevicesHandler::mediumAdded(TQString name) @@ -1007,7 +1007,7 @@ namespace Amarok DcopMediaBrowserHandler::DcopMediaBrowserHandler() : DCOPObject( "mediabrowser" ) - , TQObject( kapp ) + , TQObject( tdeApp ) {} void DcopMediaBrowserHandler::deviceConnect() diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp index 9f44682d..e493c34c 100644 --- a/amarok/src/amarokcore/crashhandler.cpp +++ b/amarok/src/amarokcore/crashhandler.cpp @@ -218,7 +218,7 @@ namespace Amarok body += kdBacktrace(); //TODO startup notification - kapp->invokeMailer( + tdeApp->invokeMailer( /*to*/ "[email protected]", /*cc*/ TQString(), /*bcc*/ TQString(), diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index 55842b9d..2f663c47 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -478,7 +478,7 @@ void App::initGlobalShortcuts() this, TQ_SLOT( setRating5() ), true, true ); m_pGlobalAccel->setConfigGroup( "Shortcuts" ); - m_pGlobalAccel->readSettings( kapp->config() ); + m_pGlobalAccel->readSettings( tdeApp->config() ); m_pGlobalAccel->updateConnections(); //TODO fix kde accel system so that tdeactions find appropriate global shortcuts @@ -632,7 +632,7 @@ void App::applySettings( bool firstTime ) //the player Window becomes the main Window //it is the focus for hideWithMainWindow behaviour etc. //it gets the majestic "Amarok" caption - m_pPlaylistWindow->setCaption( kapp->makeStdCaption( i18n("Playlist") ) ); + m_pPlaylistWindow->setCaption( tdeApp->makeStdCaption( i18n("Playlist") ) ); m_pPlayerWindow = new PlayerWidget( m_pPlaylistWindow, "PlayerWindow", firstTime && AmarokConfig::playlistWindowEnabled() ); @@ -706,7 +706,7 @@ void App::applySettings( bool firstTime ) main_window->show(); //takes longer but feels shorter. Crazy eh? :) - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); } @@ -1047,7 +1047,7 @@ bool Amarok::genericEventHandler( TQWidget *recipient, TQEvent *e ) static_cast<TQCloseEvent*>(e)->accept(); //if we don't do this the info box appears on quit()! - if( AmarokConfig::showTrayIcon() && !e->spontaneous() && !kapp->sessionSaving() ) + if( AmarokConfig::showTrayIcon() && !e->spontaneous() && !tdeApp->sessionSaving() ) { KMessageBox::information( recipient, i18n( "<qt>Closing the main-window will keep Amarok running in the System Tray. " @@ -1073,7 +1073,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState ) { case Engine::Empty: if ( AmarokConfig::showPlayerWindow() ) - m_pPlaylistWindow->setCaption( kapp->makeStdCaption( i18n("Playlist") ) ); + m_pPlaylistWindow->setCaption( tdeApp->makeStdCaption( i18n("Playlist") ) ); else m_pPlaylistWindow->setCaption( "Amarok" ); TrackToolTip::instance()->clear(); Amarok::OSD::instance()->setImage( TDEIconLoader().iconPath( "amarok", -TDEIcon::SizeHuge ) ); @@ -1092,7 +1092,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState ) case Engine::Idle: if ( AmarokConfig::showPlayerWindow() ) - m_pPlaylistWindow->setCaption( kapp->makeStdCaption( i18n("Playlist") ) ); + m_pPlaylistWindow->setCaption( tdeApp->makeStdCaption( i18n("Playlist") ) ); else m_pPlaylistWindow->setCaption( "Amarok" ); break; @@ -1304,8 +1304,8 @@ namespace Amarok TDEConfig *config( const TQString &group ) { //Slightly more useful config() that allows setting the group simultaneously - kapp->config()->setGroup( group ); - return kapp->config(); + tdeApp->config()->setGroup( group ); + return tdeApp->config(); } bool invokeBrowser( const TQString& url ) diff --git a/amarok/src/app.h b/amarok/src/app.h index 1679ecea..12dbb2f4 100644 --- a/amarok/src/app.h +++ b/amarok/src/app.h @@ -120,7 +120,7 @@ class LIBAMAROK_EXPORT App : public TDEApplication, public EngineObserver MediaDeviceManager *m_pMediaDeviceManager; }; -#define pApp static_cast<App*>(kapp) +#define pApp static_cast<App*>(tdeApp) #endif // AMAROK_APP_H diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp index 1bc9b7a5..a459bbbc 100644 --- a/amarok/src/browserbar.cpp +++ b/amarok/src/browserbar.cpp @@ -15,7 +15,7 @@ #include "enginecontroller.h" #include "multitabbar.h" //m_tabBar -#include <tdeapplication.h> //kapp +#include <tdeapplication.h> //tdeApp #include <tdeconfig.h> #include <kiconloader.h> //multiTabBar icons #include <tdelocale.h> diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index 8da6556a..4f61a103 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -51,7 +51,7 @@ #include <tqregexp.h> #include <tdeactioncollection.h> -#include <tdeapplication.h> //kapp +#include <tdeapplication.h> //tdeApp #include <tdeconfig.h> #include <kcombobox.h> #include <kcursor.h> @@ -255,7 +255,7 @@ void CollectionBrowser::slotClearFilter() //SLOT { m_searchEdit->clear(); - kapp->processEvents(); //Let the search bar redraw fully. + tdeApp->processEvents(); //Let the search bar redraw fully. TQTimer::singleShot( 0, this, TQ_SLOT( slotSetFilter() ) ); //Filter instantly TQTimer::singleShot( 0, m_view, TQ_SLOT( slotEnsureSelectedItemVisible() ) ); } @@ -284,7 +284,7 @@ void CollectionBrowser::slotSetFilter( const TQString &filter ) //SLOT { m_searchEdit->setText( filter ); - kapp->processEvents(); //Let the search bar redraw fully. + tdeApp->processEvents(); //Let the search bar redraw fully. TQTimer::singleShot( 0, this, TQ_SLOT( slotSetFilter() ) ); //Filter instantly TQTimer::singleShot( 0, m_view, TQ_SLOT( slotEnsureSelectedItemVisible() ) ); } @@ -709,8 +709,8 @@ void CollectionView::setupDirs() //SLOT { KDialogBase dialog( this, 0, false ); - kapp->setTopWidget( &dialog ); - dialog.setCaption( kapp->makeStdCaption( i18n("Configure Collection") ) ); + tdeApp->setTopWidget( &dialog ); + dialog.setCaption( tdeApp->makeStdCaption( i18n("Configure Collection") ) ); CollectionSetup *setup = new CollectionSetup( &dialog ); dialog.setMainWidget( setup ); diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index 3f4ec328..f3fffe62 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -4037,7 +4037,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b } usleep( 10000 ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } if( m_fileOperationFailed ) @@ -4164,7 +4164,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit } usleep( 10000 ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } if( !m_fileOperationFailed ) @@ -5364,7 +5364,7 @@ CollectionDB::checkDatabase() label->show(); TQTimer::singleShot( 0, dialog, TQ_SLOT( show() ) ); //process events in the main event loop so that the dialog actually gets shown - kapp->processEvents(); + tdeApp->processEvents(); debug() << "Beginning database update" << endl; updateStatsTables(); diff --git a/amarok/src/collectionscanner/collectionscanner.cpp b/amarok/src/collectionscanner/collectionscanner.cpp index ce3dee14..3b11a219 100644 --- a/amarok/src/collectionscanner/collectionscanner.cpp +++ b/amarok/src/collectionscanner/collectionscanner.cpp @@ -62,7 +62,7 @@ CollectionScanner::CollectionScanner( const TQStringList& folders, DcopCollectionScannerHandler* dcsh = new DcopCollectionScannerHandler(); connect( dcsh, TQ_SIGNAL(pauseRequest()), this, TQ_SLOT(pause()) ); connect( dcsh, TQ_SIGNAL(unpauseRequest()), this, TQ_SLOT(resume()) ); - kapp->setName( TQString( "amarokcollectionscanner" ).ascii() ); + tdeApp->setName( TQString( "amarokcollectionscanner" ).ascii() ); if( !restart ) TQFile::remove( m_logfile ); @@ -375,14 +375,14 @@ CollectionScanner::scanFiles( const TQStringList& entries ) if( itemCount % 20 == 0 ) { - kapp->processEvents(); // let DCOP through! + tdeApp->processEvents(); // let DCOP through! if( m_pause ) { dcopRef.send( "scannerAcknowledged" ); while( m_pause ) { sleep( 1 ); - kapp->processEvents(); + tdeApp->processEvents(); } dcopRef.send( "scannerAcknowledged" ); } diff --git a/amarok/src/collectionscanner/collectionscannerdcophandler.cpp b/amarok/src/collectionscanner/collectionscannerdcophandler.cpp index 390fa22f..077f9fd2 100644 --- a/amarok/src/collectionscanner/collectionscannerdcophandler.cpp +++ b/amarok/src/collectionscanner/collectionscannerdcophandler.cpp @@ -25,12 +25,12 @@ DcopCollectionScannerHandler::DcopCollectionScannerHandler() : DCOPObject( "scanner" ) - , TQObject( kapp ) + , TQObject( tdeApp ) { // Register with DCOP - if ( !kapp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs( "amarokcollectionscanner", false ); - kapp->dcopClient()->setDefaultObject( objId() ); + if ( !tdeApp->dcopClient()->isRegistered() ) { + tdeApp->dcopClient()->registerAs( "amarokcollectionscanner", false ); + tdeApp->dcopClient()->setDefaultObject( objId() ); } } diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp index 50344251..a66c002d 100644 --- a/amarok/src/configdialog.cpp +++ b/amarok/src/configdialog.cpp @@ -51,7 +51,7 @@ email : [email protected] #include <tqtooltip.h> #include <tqvbox.h> -#include <tdeapplication.h> //kapp +#include <tdeapplication.h> //tdeApp #include <kcombobox.h> #include <kiconloader.h> #include <klineedit.h> diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp index da9a071c..e293a14f 100644 --- a/amarok/src/contextbrowser.cpp +++ b/amarok/src/contextbrowser.cpp @@ -53,7 +53,7 @@ #include <tqtooltip.h> #include <tdeaction.h> -#include <tdeapplication.h> //kapp +#include <tdeapplication.h> //tdeApp #include <kcalendarsystem.h> // for Amarok::verboseTimeSince() #include <tdeconfig.h> // suggested/related/favorite box visibility #include <kdialog.h> @@ -3689,8 +3689,8 @@ ContextBrowser::wikiConfig() // SLOT index = 6; m_wikiConfigDialog = new KDialogBase( this, 0, true, 0, KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel ); - kapp->setTopWidget( m_wikiConfigDialog ); - m_wikiConfigDialog->setCaption( kapp->makeStdCaption( i18n( "Wikipedia Locale" ) ) ); + tdeApp->setTopWidget( m_wikiConfigDialog ); + m_wikiConfigDialog->setCaption( tdeApp->makeStdCaption( i18n( "Wikipedia Locale" ) ) ); TQVBox *box = m_wikiConfigDialog->makeVBoxMainWidget(); m_wikiLocaleCombo = new TQComboBox( box ); diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp index 691f66e3..1b8bb8ea 100644 --- a/amarok/src/covermanager.cpp +++ b/amarok/src/covermanager.cpp @@ -95,8 +95,8 @@ CoverManager::CoverManager() s_instance = this; // Sets caption and icon correctly (needed e.g. for GNOME) - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n("Cover Manager") ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n("Cover Manager") ) ); setWFlags( WDestructiveClose ); setMargin( 4 ); @@ -275,8 +275,8 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album, , m_pixmap( CollectionDB::instance()->albumImage( artist, album, false, 0 ) ) { KWin::setType( winId(), NET::Utility ); - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) ); m_layout = new TQHBoxLayout( this ); m_layout->setAutoAdd( true ); @@ -400,7 +400,7 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT //this is an extra processEvent call for the sake of init() and aesthetics //it isn't necessary - kapp->processEvents(); + tdeApp->processEvents(); //this can be a bit slow TQApplication::setOverrideCursor( KCursor::waitCursor() ); @@ -457,7 +457,7 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT if ( ++x % 50 == 0 ) { progress.setProgress( x / 5 ); // we do it less often due to bug in TQt, ask Max - kapp->processEvents(); // TQProgressDialog also calls this, but not always due to TQt bug! + tdeApp->processEvents(); // TQProgressDialog also calls this, but not always due to TQt bug! //only worth testing for after processEvents() is called if( progress.wasCancelled() ) @@ -468,7 +468,7 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT //now, load the thumbnails for( TQIconViewItem *item = m_coverView->firstItem(); item; item = item->nextItem() ) { progress.setProgress( progress.progress() + 1 ); - kapp->processEvents(); + tdeApp->processEvents(); if( progress.wasCancelled() ) break; diff --git a/amarok/src/deviceconfiguredialog.cpp b/amarok/src/deviceconfiguredialog.cpp index cf036fee..2f1cb8a6 100644 --- a/amarok/src/deviceconfiguredialog.cpp +++ b/amarok/src/deviceconfiguredialog.cpp @@ -36,8 +36,8 @@ DeviceConfigureDialog::DeviceConfigureDialog( const Medium &medium ) : KDialogBase( Amarok::mainWindow(), "deviceconfiguredialog", true, TQString("Select Plugin for " + medium.name()), Ok|Cancel, Ok, false ) { m_medium = new Medium( medium ); - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n( "Configure Media Device" ) ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n( "Configure Media Device" ) ) ); showButtonApply( false ); TQVBox* vbox = makeVBoxMainWidget(); diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp index b74ba733..39208a0b 100644 --- a/amarok/src/enginecontroller.cpp +++ b/amarok/src/enginecontroller.cpp @@ -178,7 +178,7 @@ EngineController::loadEngine( const TQString &engineName ) connect( engine, TQ_SIGNAL(metaData( const Engine::SimpleMetaBundle& )), this, TQ_SLOT(slotEngineMetaData( const Engine::SimpleMetaBundle& )) ); connect( engine, TQ_SIGNAL(showConfigDialog( const TQCString& )), - kapp, TQ_SLOT(slotConfigAmarok( const TQCString& )) ); + tdeApp, TQ_SLOT(slotConfigAmarok( const TQCString& )) ); if( engine->init() ) return engine; diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp index b6d463da..87a91ecc 100644 --- a/amarok/src/equalizersetup.cpp +++ b/amarok/src/equalizersetup.cpp @@ -56,8 +56,8 @@ EqualizerSetup::EqualizerSetup() s_instance = this; - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n( "Equalizer" ) ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n( "Equalizer" ) ) ); // Gives the window a small title bar, and skips a taskbar entry KWin::setType( winId(), NET::Utility ); diff --git a/amarok/src/firstrunwizard.ui.h b/amarok/src/firstrunwizard.ui.h index c37c560c..10a831da 100644 --- a/amarok/src/firstrunwizard.ui.h +++ b/amarok/src/firstrunwizard.ui.h @@ -63,7 +63,7 @@ inline void FirstRunWizard::invokeHandbook() //SLOT { // Show handbook - kapp->invokeHelp( TQString(), TQString(), 0 ); + tdeApp->invokeHelp( TQString(), TQString(), 0 ); } void diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp index 3223fb98..0da7db6a 100644 --- a/amarok/src/htmlview.cpp +++ b/amarok/src/htmlview.cpp @@ -14,9 +14,9 @@ #include <tqfile.h> // External CSS opening #include <tqimage.h> // External CSS opening -#include <tdeapplication.h> //kapp +#include <tdeapplication.h> //tdeApp #include <tdeactioncollection.h> -#include <tdeglobal.h> //kapp +#include <tdeglobal.h> //tdeApp #include <kimageeffect.h> // gradient background image #include <tdepopupmenu.h> #include <kstandarddirs.h> //locate file @@ -98,12 +98,12 @@ TQString HTMLView::loadStyleSheet() { TQString themeName = AmarokConfig::contextBrowserStyleSheet().latin1(); - const TQString file = kapp->dirs()->findResource( "data","amarok/themes/" + themeName + "/stylesheet.css" ); + const TQString file = tdeApp->dirs()->findResource( "data","amarok/themes/" + themeName + "/stylesheet.css" ); TQString styleSheet; if ( themeName != "Default" && TQFile::exists( file ) ) { - const TQString CSSLocation = kapp->dirs()->findResource( "data","amarok/themes/" + themeName + "/stylesheet.css" ); + const TQString CSSLocation = tdeApp->dirs()->findResource( "data","amarok/themes/" + themeName + "/stylesheet.css" ); TQFile ExternalCSS( CSSLocation ); if ( !ExternalCSS.open( IO_ReadOnly ) ) return TQString(); //FIXME: should actually return the default style sheet, then diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp index 6fc7fc92..66b8b494 100644 --- a/amarok/src/lastfm.cpp +++ b/amarok/src/lastfm.cpp @@ -189,7 +189,7 @@ Controller::getNewProxy( TQString genreUrl, bool useProxy ) } } if (service->wasCanceled()) { - // It was canceled before (during kapp->processEvents() loop) + // It was canceled before (during tdeApp->processEvents() loop) delete service; return KURL("lastfm://"); // construct invalid url } @@ -441,7 +441,7 @@ WebService::handshake( const TQString& username, const TQString& password ) // Therefore this service instance must be protected from deletion. m_deletionUnsafe = true; do - kapp->processEvents(); + tdeApp->processEvents(); while( http.state() != TQHttp::Unconnected ); m_deletionUnsafe = false; if (this->wasCanceled()) @@ -497,7 +497,7 @@ WebService::handshake( const TQString& username, const TQString& password ) TQString line; m_deletionUnsafe = true; while( true ) { - kapp->processEvents(); + tdeApp->processEvents(); m_server->readln( line ); if( line == "AMAROK_PROXY: startup" ) break; } @@ -528,7 +528,7 @@ WebService::changeStation( TQString url ) m_deletionUnsafe = true; do - kapp->processEvents(); + tdeApp->processEvents(); while( http.state() != TQHttp::Unconnected ); m_deletionUnsafe = false; if (this->wasCanceled()) diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index e13440d2..d523ee30 100644 --- a/amarok/src/mediabrowser.cpp +++ b/amarok/src/mediabrowser.cpp @@ -57,7 +57,7 @@ #include <tqtimer.h> #include <tqtooltip.h> //TQToolTip::add() -#include <tdeapplication.h> //kapp +#include <tdeapplication.h> //tdeApp #include <kcombobox.h> #include <kdirlister.h> #include <tdefiledialog.h> @@ -721,7 +721,7 @@ MediaBrowser::transcode( const KURL &src, const TQString &filetype ) while( m_waitForTranscode && sm->transcodeScriptRunning() != TQString() ) { usleep( 10000 ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } return m_transcodedUrl; @@ -2490,7 +2490,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) else { usleep(10000); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } } @@ -2783,7 +2783,7 @@ MediaDevice::syncStatsFromDevice( MediaItem *root ) it = static_cast<MediaItem *>( root->firstChild() ); } - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); for( ; it; it = static_cast<MediaItem *>( it->nextSibling() ) ) { @@ -2885,7 +2885,7 @@ MediaDevice::syncStatsToDevice( MediaItem *root ) it = static_cast<MediaItem *>( root->firstChild() ); } - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); for( ; it; it = static_cast<MediaItem *>( it->nextSibling() ) ) { @@ -2958,7 +2958,7 @@ MediaDevice::transferFiles() delete transferredItem; setProgress( progress() + 1 ); m_parent->m_queue->itemCountChanged(); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); continue; } @@ -3132,7 +3132,7 @@ MediaDevice::transferFiles() } m_parent->updateStats(); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } synchronizeDevice(); unlockDevice(); diff --git a/amarok/src/mediadevice/daap/proxy.cpp b/amarok/src/mediadevice/daap/proxy.cpp index 11831be8..d937eb50 100644 --- a/amarok/src/mediadevice/daap/proxy.cpp +++ b/amarok/src/mediadevice/daap/proxy.cpp @@ -75,7 +75,7 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name) TQString line; while( true ) { - kapp->processEvents(); + tdeApp->processEvents(); m_proxy->readln( line ); if( line == "AMAROK_PROXY: startup" ) break; } diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index 2c05db7a..05d6bc0f 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -653,7 +653,7 @@ GenericMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) const KURL desturl = KURL::fromPathOrURL( path ); - //kapp->processEvents( 100 ); + //tdeApp->processEvents( 100 ); if( !kioCopyTrack( bundle.url(), desturl ) ) { @@ -667,7 +667,7 @@ GenericMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) //other than to see if it is NULL or not //if we're here the transfer shouldn't have failed, so we shouldn't get into a loop by waiting... while( !m_view->firstChild() ) - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); return static_cast<MediaItem*>(m_view->firstChild()); } @@ -774,7 +774,7 @@ GenericMediaDevice::expandItem( TQListViewItem *item ) // SLOT while( !m_dirListerComplete ) { - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); usleep(10000); } } @@ -898,7 +898,7 @@ GenericMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *av while( m_kBSize == 0 && m_kBAvail == 0){ usleep( 10000 ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); count++; if (count > 120){ debug() << "KDiskFreeSp taking too long. Returning false from getCapacity()" << endl; diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp index 120829a3..2f674dfb 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp @@ -419,7 +419,7 @@ IfpMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) const TQCString dest = TQFile::encodeName( cleanPath(directory + newFilename) ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); int result = uploadTrack( src, dest ); if( !result ) //success @@ -456,7 +456,7 @@ IfpMediaDevice::downloadSelectedItems() TQString save = TQString(); KURLRequesterDlg dialog( save, 0, 0 ); - dialog.setCaption( kapp->makeStdCaption( i18n( "Choose a Download Directory" ) ) ); + dialog.setCaption( tdeApp->makeStdCaption( i18n( "Choose a Download Directory" ) ) ); dialog.urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly ); dialog.exec(); @@ -486,7 +486,7 @@ IfpMediaDevice::filetransferCallback( void *pData, struct ifp_transfer_status *p { // will be called by 'ifp_upload_file' by callback - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); IfpMediaDevice *that = static_cast<IfpMediaDevice *>(pData); diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index 6797ae60..a14bcb74 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -1244,7 +1244,7 @@ IpodMediaDevice::openDevice( bool silent ) } if( !silent ) - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); initView(); GList *cur = m_itdb->playlists; @@ -1255,7 +1255,7 @@ IpodMediaDevice::openDevice( bool silent ) } if( !silent ) - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); for( cur = m_itdb->tracks; cur; cur = cur->next ) { @@ -1264,7 +1264,7 @@ IpodMediaDevice::openDevice( bool silent ) } if( !silent ) - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); updateRootItems(); m_customAction->setEnabled( true ); @@ -1972,7 +1972,7 @@ IpodMediaDevice::writeITunesDB( bool threaded ) ThreadManager::instance()->queueJob( new IpodWriteDBJob( this, m_itdb, m_isShuffle, &ok ) ); while( ThreadManager::instance()->isJobPending( "IpodWriteDBJob" ) ) { - kapp->processEvents(); + tdeApp->processEvents(); usleep( 10000 ); } } @@ -2693,7 +2693,7 @@ IpodMediaDevice::deleteFile( const KURL &url ) this, TQ_SLOT( fileDeleted( TDEIO::Job * ) ) ); do { - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); if( isCanceled() ) break; usleep( 10000 ); diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp index 6adbe56b..c36fba9f 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -141,7 +141,7 @@ MtpMediaDevice::progressCallback( uint64_t const sent, uint64_t const total, voi Q_UNUSED( sent ); Q_UNUSED( total ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); MtpMediaDevice *dev = (MtpMediaDevice*)(data); @@ -323,7 +323,7 @@ MediaItem LIBMTP_destroy_track_t( trackmeta ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); // add track to view and to new tracks list MediaItem *newItem = addTrackToView( taggedTrack ); @@ -438,7 +438,7 @@ MtpMediaDevice::updateAlbumArt( TQPtrList<MediaItem> *items ) setCanceled( false ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); TQMap< TQString, TQPtrList<MediaItem> > albumList; for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it && !(m_canceled); it = dynamic_cast<MtpMediaItem*>(items->next()) ) @@ -455,14 +455,14 @@ MtpMediaDevice::updateAlbumArt( TQPtrList<MediaItem> *items ) } int i = 0; setProgress( i, albumList.count() ); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); TQMap< TQString, TQPtrList<MediaItem> >::Iterator it; for( it = albumList.begin(); it != albumList.end(); ++it ) { sendAlbumArt( &it.data() ); setProgress( ++i ); if( i % 20 == 0 ) - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } hideProgress(); } @@ -1055,7 +1055,7 @@ MtpMediaDevice::deleteObject( MtpMediaItem *deleteItem ) m_fileNameToItem.remove( TQString( "%1/%2" ).arg( deleteItem->track()->folderId() ).arg( deleteItem->bundle()->filename() ) ); // remove from the media view delete deleteItem; - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); return 1; } @@ -1480,7 +1480,7 @@ MtpMediaDevice::readMtpMusic() int progress = 0; setProgress( progress, total ); // we don't know how many tracks. fake progress bar. - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); LIBMTP_track_t *tracks = LIBMTP_Get_Tracklisting_With_Callback( m_device, progressCallback, this ); @@ -1514,7 +1514,7 @@ MtpMediaDevice::readMtpMusic() progress++; setProgress( progress ); if( progress % 50 == 0 ) - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } } @@ -1564,7 +1564,7 @@ MtpMediaDevice::readPlaylists() tmp = playlists; playlists = playlists->next; LIBMTP_destroy_playlist_t( tmp ); - kapp->processEvents( 50 ); + tdeApp->processEvents( 50 ); } } } @@ -1587,7 +1587,7 @@ MtpMediaDevice::readAlbums() tmp = albums; albums = albums->next; LIBMTP_destroy_album_t( tmp ); - kapp->processEvents( 50 ); + tdeApp->processEvents( 50 ); } } } diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp index badd2e55..b13c736f 100644 --- a/amarok/src/mediadevice/njb/njbmediadevice.cpp +++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp @@ -338,7 +338,7 @@ NjbMediaDevice::downloadSelectedItems() TQString save = TQString(); KURLRequesterDlg dialog( save, 0, 0 ); - dialog.setCaption( kapp->makeStdCaption( i18n( "Choose a Download Directory" ) ) ); + dialog.setCaption( tdeApp->makeStdCaption( i18n( "Choose a Download Directory" ) ) ); dialog.urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly ); dialog.exec(); @@ -452,7 +452,7 @@ NjbMediaDevice::copyTrackToDevice(const MetaBundle& bundle) njb_songid_t* songid = NJB_Songid_New(); taggedTrack->writeToSongid( songid ); m_busy = true; - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); if(NJB_Send_Track (m_njb, bundle.url().path().utf8(), songid, progressCallback, this, &id) != NJB_SUCCESS) { debug() << ": NJB_Send_Track failed\n"; @@ -687,7 +687,7 @@ NjbMediaDevice::runTransferDialog() int NjbMediaDevice::progressCallback( u_int64_t sent, u_int64_t total, const char* /*buf*/, unsigned /*len*/, void* data) { - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); NjbMediaDevice *njb_media = reinterpret_cast<NjbMediaDevice*>(data); @@ -733,7 +733,7 @@ NjbMediaDevice::readJukeboxMusic( void ) m_playlistItem->m_order = -5; m_playlistItem->setType( MediaItem::PLAYLISTSROOT );*/ - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); for( trackValueList::iterator it = trackList.begin(); it != trackList.end(); it++ ) { diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp index f4466cd5..51aa7f9c 100644 --- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp +++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp @@ -269,7 +269,7 @@ RioKarmaMediaDevice::deleteRioTrack( RioKarmaMediaItem *trackItem ) // remove from the listview delete trackItem; - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); return 1; } @@ -468,14 +468,14 @@ RioKarmaMediaDevice::readKarmaMusic() int progress = 0; setProgress( progress, total ); // we don't know how many tracks. fake progress bar. - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); lk_karma_load_database( m_rio ); int i; uint32_t *ret; - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); ret = lk_properties_andOrSearch( 0, 0, "fid", "" ); @@ -513,7 +513,7 @@ RioKarmaMediaDevice::readKarmaMusic() progress++; setProgress( progress ); if( progress % 50 == 0 ) - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } setProgress( total ); hideProgress(); diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp index 2e364cae..ead4da43 100644 --- a/amarok/src/mediumpluginmanager.cpp +++ b/amarok/src/mediumpluginmanager.cpp @@ -47,8 +47,8 @@ typedef TQMap<TQString, Medium*> MediumMap; MediumPluginManagerDialog::MediumPluginManagerDialog() : KDialogBase( Amarok::mainWindow(), "mediumpluginmanagerdialog", false, TQString(), Ok|Cancel, Ok ) { - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n( "Manage Devices and Plugins" ) ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n( "Manage Devices and Plugins" ) ) ); TQVBox* vbox = makeVBoxMainWidget(); vbox->setSpacing( KDialog::spacingHint() ); @@ -256,8 +256,8 @@ ManualDeviceAdder::ManualDeviceAdder( MediumPluginManager* mpm ) m_successful = false; m_newMed = 0; - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n( "Add New Device") ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n( "Add New Device") ) ); TQHBox* hbox = makeHBoxMainWidget(); hbox->setSpacing( KDialog::spacingHint() ); diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index 3468246d..a44cfb2a 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -1063,7 +1063,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) // Apply icon effect when widget disabled. Should really be cached, but *shrug*. if( !isEnabled() ) - icon = kapp->iconLoader()->iconEffect()->apply( icon, TDEIcon::Small, TDEIcon::DisabledState ); + icon = tdeApp->iconLoader()->iconEffect()->apply( icon, TDEIcon::Small, TDEIcon::DisabledState ); if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right ) { TQPixmap pixmap( height(), width() ); diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index 74bfa51e..dec06d19 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -69,7 +69,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name ) this, TQ_SLOT( ratingChanged( const TQString&, int ) ) ); //or crashes, KWin bug I think, crashes in TQWidget::icon() - kapp->setTopWidget( this ); + tdeApp->setTopWidget( this ); } void @@ -153,7 +153,7 @@ OSDWidget::show() //virtual m_screenshot.resize( newGeometry.size() ); p = newGeometry.topLeft() - unite.topLeft(); - if (!kapp->isX11CompositionAvailable()) + if (!tdeApp->isX11CompositionAvailable()) bitBlt( &m_screenshot, 0, 0, &pix, p.x(), p.y() ); } @@ -312,13 +312,13 @@ OSDWidget::render( const uint M, const TQSize &size ) m_buffer.resize( rect.size() ); TQPainter p( &m_buffer ); - if (( m_translucency ) && (!kapp->isX11CompositionAvailable())) + if (( m_translucency ) && (!tdeApp->isX11CompositionAvailable())) { KPixmap background( m_screenshot ); KPixmapEffect::fade( background, 0.80, backgroundColor() ); p.drawPixmap( 0, 0, background ); } - else if (( m_translucency ) && (kapp->isX11CompositionAvailable())) + else if (( m_translucency ) && (tdeApp->isX11CompositionAvailable())) { // Make the background semi-transparent TQPixmap background( m_screenshot.width(), m_screenshot.height(), 32 ); @@ -400,13 +400,13 @@ OSDWidget::render( const uint M, const TQSize &size ) pixmapGradient.setMask( mask ); } - if (( m_translucency ) && (!kapp->isX11CompositionAvailable())) + if (( m_translucency ) && (!tdeApp->isX11CompositionAvailable())) { KPixmap background( m_screenshot ); KPixmapEffect::fade( background, 0.80, backgroundColor() ); bitBlt( &vol, -r.left(), -r.top(), &background ); } - else if (( m_translucency ) && (kapp->isX11CompositionAvailable())) + else if (( m_translucency ) && (tdeApp->isX11CompositionAvailable())) { // Make the background semi-transparent TQPixmap background( m_screenshot.width(), m_screenshot.height(), 32 ); @@ -514,7 +514,7 @@ OSDWidget::render( const uint M, const TQSize &size ) void OSDWidget::paintMe() { - if ((m_translucency) && (kapp->isX11CompositionAvailable())) { + if ((m_translucency) && (tdeApp->isX11CompositionAvailable())) { // We have true composition support, so make the OSD truly transparent TQImage blendedImage = m_buffer.convertToImage(); blendedImage = blendedImage.convertDepth(32); diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 2178a011..bf4e66bd 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -103,7 +103,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl //createWidget just creates a widget which has it's geometry set too // Sets caption and icon correctly (needed e.g. for GNOME) - kapp->setTopWidget( this ); + tdeApp->setTopWidget( this ); parent->installEventFilter( this ); //for hidePLaylistWithMainWindow mode @@ -119,7 +119,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl //another quit shortcut because the other window has all the accels TQAccel *accel = new TQAccel( this ); accel->insertItem( CTRL + Key_Q ); - connect( accel, TQ_SIGNAL( activated( int ) ), kapp, TQ_SLOT( quit() ) ); + connect( accel, TQ_SIGNAL( activated( int ) ), tdeApp, TQ_SLOT( quit() ) ); TQFont font; font.setBold( true ); @@ -562,7 +562,7 @@ bool PlayerWidget::event( TQEvent *e ) if( m_pAnalyzer->parent() ) { m_pAnalyzer->reparent( 0, TQPoint(50,50), true ); - m_pAnalyzer->setCaption( kapp->makeStdCaption( i18n("Analyzer") ) ); + m_pAnalyzer->setCaption( tdeApp->makeStdCaption( i18n("Analyzer") ) ); m_pAnalyzer->installEventFilter( this ); m_pAnalyzer->setPaletteBackgroundColor( paletteBackgroundColor() ); TQToolTip::remove( m_pAnalyzer ); @@ -838,7 +838,7 @@ void PlayerWidget::slotShowEqualizer( bool show ) //SLOT KMessageBox::sorry( 0, i18n( "Equalizer is not available with this engine." ) ); else - TQTimer::singleShot( 0, kapp, TQ_SLOT( slotConfigEqualizer() ) ); + TQTimer::singleShot( 0, tdeApp, TQ_SLOT( slotConfigEqualizer() ) ); } } diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index c1374263..4915c2ac 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -4867,7 +4867,7 @@ Playlist::addCustomColumn() debug() << args << endl; TQProcess p( args ); - for( p.start(); p.isRunning(); /*kapp->processEvents()*/ ) + for( p.start(); p.isRunning(); /*tdeApp->processEvents()*/ ) ::usleep( 5000 ); (*it)->setExactText( index, p.readStdout() ); diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp index c3a4d7fe..37f9b25c 100644 --- a/amarok/src/playlistbrowser.cpp +++ b/amarok/src/playlistbrowser.cpp @@ -2434,7 +2434,7 @@ KURL::List PlaylistBrowser::recurse( const KURL &url ) lister.openURL( url ); while( !lister.isFinished() ) - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); KFileItemList items = lister.items(); //returns TQPtrList, so we MUST only do it once! KURL::List urls; diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index c07f6e4b..167e07f5 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -989,7 +989,7 @@ void PlaylistItem::imageTransparency( TQImage& image, float factor ) //static data[i] = tqRgba( tqRed( c ), tqGreen( c ), tqBlue( c ), table[tqAlpha( c )] ); } - if (kapp->isX11CompositionAvailable()) { + if (tdeApp->isX11CompositionAvailable()) { image = KImageEffect::convertToPremultipliedAlpha(image); } } diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp index 11943a0b..a58b4b49 100644 --- a/amarok/src/playlistloader.cpp +++ b/amarok/src/playlistloader.cpp @@ -358,7 +358,7 @@ UrlLoader::recurse( const KURL &url ) watchdog.start(); while( !lister.isFinished() && !isAborted() && watchdog.elapsed() < timeout ) - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); KFileItemList items = lister.items(); //returns TQPtrList, so we MUST only do it once! KURL::List urls; @@ -402,7 +402,7 @@ recursiveUrlExpand( const KURL &url, int maxURLs ) watchdog.start(); while( !lister.isFinished() && watchdog.elapsed() < timeout ) - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); KFileItemList items = lister.items(); //returns TQPtrList, so we MUST only do it once! KURL::List urls; diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp index 977189d4..21e65cbf 100644 --- a/amarok/src/playlistselection.cpp +++ b/amarok/src/playlistselection.cpp @@ -77,7 +77,7 @@ namespace ConfigDynamic i18n("Create Dynamic Playlist"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); - kapp->setTopWidget( dialog ); + tdeApp->setTopWidget( dialog ); dialog->setCaption( i18n("Dynamic Mode") ); NewDynamic* nd = new NewDynamic( dialog, "new dynamic"); //TQSizePolicy policy; diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp index f955cb7a..8fa1782b 100644 --- a/amarok/src/playlistwindow.cpp +++ b/amarok/src/playlistwindow.cpp @@ -56,7 +56,7 @@ #include <tqvbox.h> //contains the playlist #include <tdeaction.h> //m_actionCollection -#include <tdeapplication.h> //kapp +#include <tdeapplication.h> //tdeApp #include <tdefiledialog.h> //savePlaylist(), openPlaylist() #include <tdeglobal.h> #include <tdehtml_part.h> //Welcome Tab @@ -113,7 +113,7 @@ PlaylistWindow::PlaylistWindow() s_instance = this; // Sets caption and icon correctly (needed e.g. for GNOME) - kapp->setTopWidget( this ); + tdeApp->setTopWidget( this ); TDEActionCollection* const ac = actionCollection(); const EngineController* const ec = EngineController::instance(); @@ -123,16 +123,16 @@ PlaylistWindow::PlaylistWindow() new K3bExporter(); - KStdAction::configureToolbars( kapp, TQ_SLOT( slotConfigToolBars() ), ac ); - KStdAction::keyBindings( kapp, TQ_SLOT( slotConfigShortcuts() ), ac ); - KStdAction::keyBindings( kapp, TQ_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); - KStdAction::preferences( kapp, TQ_SLOT( slotConfigAmarok() ), ac ); + KStdAction::configureToolbars( tdeApp, TQ_SLOT( slotConfigToolBars() ), ac ); + KStdAction::keyBindings( tdeApp, TQ_SLOT( slotConfigShortcuts() ), ac ); + KStdAction::keyBindings( tdeApp, TQ_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); + KStdAction::preferences( tdeApp, TQ_SLOT( slotConfigAmarok() ), ac ); ac->action("options_configure_globals")->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::KeyBindings))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::ConfigureToolbars))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::Preferences))->setIcon( Amarok::icon( "configure" ) ); - KStdAction::quit( kapp, TQ_SLOT( quit() ), ac ); + KStdAction::quit( tdeApp, TQ_SLOT( quit() ), ac ); KStdAction::open( this, TQ_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); ac->action( "playlist_add" )->setIcon( Amarok::icon( "files" ) ); KStdAction::open( this, TQ_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") ); @@ -368,7 +368,7 @@ void PlaylistWindow::init() m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER ); actionCollection()->action("queue_manager")->plug( m_toolsMenu ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR ); - m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), kapp, TQ_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER ); + m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), tdeApp, TQ_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER ); actionCollection()->action("script_manager")->plug( m_toolsMenu ); actionCollection()->action("statistics")->plug( m_toolsMenu ); m_toolsMenu->insertSeparator(); @@ -1079,7 +1079,7 @@ void PlaylistWindow::slotMenuActivated( int index ) //SLOT case ID_SHOW_PLAYERWINDOW: AmarokConfig::setShowPlayerWindow( !AmarokConfig::showPlayerWindow() ); m_settingsMenu->changeItem( index, AmarokConfig::showPlayerWindow() ? i18n("Hide Player &Window") : i18n("Show Player &Window") ); - TQTimer::singleShot( 0, kapp, TQ_SLOT( applySettings() ) ); + TQTimer::singleShot( 0, tdeApp, TQ_SLOT( applySettings() ) ); break; case Amarok::Menu::ID_RESCAN_COLLECTION: CollectionDB::instance()->startScan(); diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp index afa63ca4..8e7a0a52 100644 --- a/amarok/src/queuemanager.cpp +++ b/amarok/src/queuemanager.cpp @@ -287,8 +287,8 @@ QueueManager::QueueManager( TQWidget *parent, const char *name ) KWin::setType( winId(), NET::Utility ); KWin::setState( winId(), NET::SkipTaskbar ); - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n("Queue Manager") ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n("Queue Manager") ) ); setInitialSize( TQSize( 400, 260 ) ); TQVBox *mainBox = new TQVBox( this ); diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp index 6a3faf11..fff9b7d3 100644 --- a/amarok/src/scancontroller.cpp +++ b/amarok/src/scancontroller.cpp @@ -213,7 +213,7 @@ ScanController::initIncremental() debug() << "Collection dir removed: " << folder << endl; } - kapp->processEvents(); // Don't block the GUI + tdeApp->processEvents(); // Don't block the GUI } if ( !m_folders.isEmpty() ) @@ -310,7 +310,7 @@ main_loop: else { if( m_crashedFiles.size() <= MAX_RESTARTS || m_crashedFiles.size() <= (m_scanCount * MAX_FAILURE_PERCENTAGE) / 100 ) { - kapp->postEvent( this, new RestartEvent() ); + tdeApp->postEvent( this, new RestartEvent() ); sleep( 3 ); } else diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp index e25c219d..2de8efe4 100644 --- a/amarok/src/scriptmanager.cpp +++ b/amarok/src/scriptmanager.cpp @@ -143,8 +143,8 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name ) s_instance = this; - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n( "Script Manager" ) ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n( "Script Manager" ) ) ); // Gives the window a small title bar, and skips a taskbar entry KWin::setType( winId(), NET::Utility ); @@ -354,7 +354,7 @@ ScriptManager::requestNewScore( const TQString &url, double prevscore, int playc void ScriptManager::findScripts() //SLOT { - const TQStringList allFiles = kapp->dirs()->findAllResources( "data", "amarok/scripts/*", true ); + const TQStringList allFiles = tdeApp->dirs()->findAllResources( "data", "amarok/scripts/*", true ); // Add found scripts to listview: { @@ -673,8 +673,8 @@ ScriptManager::slotAboutScript() TDEAboutDialog* about = new TDEAboutDialog( TDEAboutDialog::AbtTabbed|TDEAboutDialog::AbtProduct, TQString(), KDialogBase::Ok, KDialogBase::Ok, this ); - kapp->setTopWidget( about ); - about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).arg( name ) ) ); + tdeApp->setTopWidget( about ); + about->setCaption( tdeApp->makeStdCaption( i18n( "About %1" ).arg( name ) ) ); about->setProduct( "", "", "", "" ); // Get rid of the confusing KDE version text TQLabel* product = static_cast<TQLabel*>( about->mainWidget()->child( "version" ) ); @@ -725,8 +725,8 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos ) it.data().log += line; KTextEdit* editor = new KTextEdit( it.data().log ); - kapp->setTopWidget( editor ); - editor->setCaption( kapp->makeStdCaption( i18n( "Output Log for %1" ).arg( it.key() ) ) ); + tdeApp->setTopWidget( editor ); + editor->setCaption( tdeApp->makeStdCaption( i18n( "Output Log for %1" ).arg( it.key() ) ) ); editor->setReadOnly( true ); TQFont font( "fixed" ); diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp index e571f15f..79a1ca3f 100644 --- a/amarok/src/sliderwidget.cpp +++ b/amarok/src/sliderwidget.cpp @@ -442,7 +442,7 @@ Amarok::VolumeSlider::contextMenuEvent( TQContextMenuEvent *e ) { menu.insertSeparator(); menu.insertItem( SmallIconSet( "equalizer" ), i18n( "&Equalizer" ), - kapp, TQ_SLOT( slotConfigEqualizer() ) ); + tdeApp, TQ_SLOT( slotConfigEqualizer() ) ); } const int n = menu.exec( mapToGlobal( e->pos() ) ); diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp index bd742059..8305c5dd 100644 --- a/amarok/src/socketserver.cpp +++ b/amarok/src/socketserver.cpp @@ -159,7 +159,7 @@ Vis::Selector::Selector( TQWidget *parent ) { Amarok::OverrideCursor waitcursor; - setCaption( kapp->makeStdCaption( i18n( "Visualizations" ) ) ); + setCaption( tdeApp->makeStdCaption( i18n( "Visualizations" ) ) ); // Gives the window a small title bar, and skips a taskbar entry KWin::setType( winId(), NET::Utility ); diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index c2ce71d8..838018be 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -58,8 +58,8 @@ Statistics::Statistics( TQWidget *parent, const char *name ) KWin::setType( winId(), NET::Utility ); KWin::setState( winId(), NET::SkipTaskbar ); - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n("Collection Statistics") ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n("Collection Statistics") ) ); setInitialSize( TQSize( 400, 550 ) ); TQVBox *mainBox = new TQVBox( this ); @@ -700,7 +700,7 @@ StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, TDEListVi void StatisticsItem::setIcon( const TQString &icon ) { - TQString path = kapp->iconLoader()->iconPath( icon, -TDEIcon::SizeHuge ); + TQString path = tdeApp->iconLoader()->iconPath( icon, -TDEIcon::SizeHuge ); path.replace( "32x32", "48x48" ); //HACK: TDEIconLoader only returns 32x32 max. Why? // debug() << "ICONPATH: " << path << endl; diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp index 01d46b9a..9a723083 100644 --- a/amarok/src/systray.cpp +++ b/amarok/src/systray.cpp @@ -53,7 +53,7 @@ Amarok::TrayIcon::TrayIcon( TQWidget *playerWidget ) //seems to be necessary TDEAction *quit = actionCollection()->action( "file_quit" ); quit->disconnect(); - connect( quit, TQ_SIGNAL(activated()), kapp, TQ_SLOT(quit()) ); + connect( quit, TQ_SIGNAL(activated()), tdeApp, TQ_SLOT(quit()) ); baseIcon = KSystemTray::loadIcon( "amarok" ); playOverlay = Amarok::loadOverlay( "play", baseIcon.width() ); diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp index 3b9375bd..34bab9af 100644 --- a/amarok/src/tagdialog.cpp +++ b/amarok/src/tagdialog.cpp @@ -627,7 +627,7 @@ void TagDialog::readTags() { bool local = m_bundle.url().isLocalFile(); - setCaption( kapp->makeStdCaption( i18n("Track Information: %1 by %2").arg( m_bundle.title(), m_bundle.artist() ) ) ); + setCaption( tdeApp->makeStdCaption( i18n("Track Information: %1 by %2").arg( m_bundle.title(), m_bundle.artist() ) ) ); TQString niceTitle; if ( m_bundle.album().isEmpty() ) { @@ -817,7 +817,7 @@ void TagDialog::readMultipleTracks() { - setCaption( kapp->makeStdCaption( i18n("1 Track", "Information for %n Tracks", m_urlList.count()) ) ); + setCaption( tdeApp->makeStdCaption( i18n("1 Track", "Information for %n Tracks", m_urlList.count()) ) ); //Check which fields are the same for all selected tracks const KURL::List::ConstIterator end = m_urlList.end(); diff --git a/amarok/src/trackpickerdialog.cpp b/amarok/src/trackpickerdialog.cpp index 4daf2dc1..5e6e47e9 100644 --- a/amarok/src/trackpickerdialog.cpp +++ b/amarok/src/trackpickerdialog.cpp @@ -54,8 +54,8 @@ private: TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *parent) : KDialogBase(parent, name.latin1(), true, TQString(), Ok | Cancel, Ok, true) { - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n("MusicBrainz Results") ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n("MusicBrainz Results") ) ); m_base = new TrackPickerDialogBase(this); setMainWidget(m_base); diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp index f766e6a8..1aa62fc3 100644 --- a/amarok/src/transferdialog.cpp +++ b/amarok/src/transferdialog.cpp @@ -34,8 +34,8 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) m_accepted = false; m_sort1LastIndex = m_sort2LastIndex = -1; - kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n( "Transfer Queue to Device" ) ) ); + tdeApp->setTopWidget( this ); + setCaption( tdeApp->makeStdCaption( i18n( "Transfer Queue to Device" ) ) ); TQVBox* vbox = makeVBoxMainWidget(); vbox->setSpacing( KDialog::spacingHint() ); diff --git a/doc/da/config.docbook b/doc/da/config.docbook index 1ad39ffe..c711c8dc 100644 --- a/doc/da/config.docbook +++ b/doc/da/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >Indstilling af &amarok;</title> <para diff --git a/doc/da/index.docbook b/doc/da/index.docbook index d52caa33..02a1c050 100644 --- a/doc/da/index.docbook +++ b/doc/da/index.docbook @@ -457,7 +457,7 @@ <title >Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Hvordan får man fat i &amarok;</title> diff --git a/doc/da/using.docbook b/doc/da/using.docbook index 80e21adb..f5e752b2 100644 --- a/doc/da/using.docbook +++ b/doc/da/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Brug af &amarok;</title> @@ -1825,7 +1825,7 @@ ></term> <listitem> <para ->Ved at klikke på dette åbnes <link linkend="configuring-kapp" +>Ved at klikke på dette åbnes <link linkend="configuring-tdeApp" >indstillingsdialogen for &amarok;</link >.</para> </listitem> diff --git a/doc/de/config.docbook b/doc/de/config.docbook index 215acec6..761380a1 100644 --- a/doc/de/config.docbook +++ b/doc/de/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >&amarok; einrichten</title> <para diff --git a/doc/de/index.docbook b/doc/de/index.docbook index 52b4f93f..86b28fa4 100644 --- a/doc/de/index.docbook +++ b/doc/de/index.docbook @@ -471,7 +471,7 @@ <title >Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Wie kann man &amarok; bekommen</title> diff --git a/doc/de/using.docbook b/doc/de/using.docbook index eb02ae22..4f93956b 100644 --- a/doc/de/using.docbook +++ b/doc/de/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Verwenden von &amarok;</title> @@ -1855,7 +1855,7 @@ Abspielzähler = ></term> <listitem> <para ->Ein Klick auf diesen Eintrag öffnet den <link linkend="configuring-kapp" +>Ein Klick auf diesen Eintrag öffnet den <link linkend="configuring-tdeApp" >Einrichtungs-Dialog</link > von &amarok;.</para> </listitem> diff --git a/doc/en/config.docbook b/doc/en/config.docbook index 5a43ce7d..96081216 100644 --- a/doc/en/config.docbook +++ b/doc/en/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title>Configuring &amarok;</title> <para>&amarok; is easily configured from the configuration dialog. The configuration dialog has multiple tabs for setting up different functions of &amarok;.</para> <para>The configuration dialog can be found by selecting <guimenuitem>Configure &amarok;</guimenuitem> in the player <link linkend="rmb-menu">&RMB; menu</link>, diff --git a/doc/en/index.docbook b/doc/en/index.docbook index b94fd6a0..5ca7e1de 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -264,7 +264,7 @@ and The AmaroK Team.</para> <appendix id="installation"> <title>Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>How to obtain &amarok;</title> <para>&amarok; can be downloaded from <ulink diff --git a/doc/en/using.docbook b/doc/en/using.docbook index 03bb95cb..31cad37c 100644 --- a/doc/en/using.docbook +++ b/doc/en/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Using &amarok;</title> <para>&amarok; is a versatile audio player that offers many different ways of controlling your music collection. Like any ordinary audio player, &amarok; has a player window for controlling your most basic functions. &amarok; also has a playlist that is second to none. The playlist window has multiple browsers for creating and browsing your entire audio collection.</para> @@ -997,7 +997,7 @@ This way, it will only search for items that have the word amarok in the title, <varlistentry> <term><menuchoice><guimenu>Configure Global Amarok...</guimenu></menuchoice></term> <listitem> -<para>Clicking this options opens the <link linkend="configuring-kapp">&amarok; Configuration Dialog</link>.</para> +<para>Clicking this options opens the <link linkend="configuring-tdeApp">&amarok; Configuration Dialog</link>.</para> </listitem> </varlistentry> diff --git a/doc/es/config.docbook b/doc/es/config.docbook index 16d653c5..0c049928 100644 --- a/doc/es/config.docbook +++ b/doc/es/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >Configurar &amarok;</title> <para diff --git a/doc/es/index.docbook b/doc/es/index.docbook index 1bdde3b6..eaa4d475 100644 --- a/doc/es/index.docbook +++ b/doc/es/index.docbook @@ -467,7 +467,7 @@ <title >Instalación</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Cómo obtener &amarok;</title> diff --git a/doc/es/using.docbook b/doc/es/using.docbook index c5b9b4d9..b0b72fde 100644 --- a/doc/es/using.docbook +++ b/doc/es/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Uso de &amarok;</title> @@ -1803,7 +1803,7 @@ ></term> <listitem> <para ->Pulsando sobre esta opción se abre el <link linkend="configuring-kapp" +>Pulsando sobre esta opción se abre el <link linkend="configuring-tdeApp" > cuadro de diálogo de configuración de &amarok;</link >.</para> </listitem> diff --git a/doc/et/config.docbook b/doc/et/config.docbook index 171ad303..63eba57d 100644 --- a/doc/et/config.docbook +++ b/doc/et/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >&amarok;i seadistamine</title> <para diff --git a/doc/et/index.docbook b/doc/et/index.docbook index cbeab055..4312e9a8 100644 --- a/doc/et/index.docbook +++ b/doc/et/index.docbook @@ -471,7 +471,7 @@ <title >Paigaldamine</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >&amarok;i hankimine</title> diff --git a/doc/et/using.docbook b/doc/et/using.docbook index 243b5c25..9fbd30b2 100644 --- a/doc/et/using.docbook +++ b/doc/et/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >&amarok;i kasutamine</title> @@ -1827,7 +1827,7 @@ ></term> <listitem> <para ->Sellele klõpsates avaneb <link linkend="configuring-kapp" +>Sellele klõpsates avaneb <link linkend="configuring-tdeApp" >&amarok;i seadistustedialoog</link >.</para> </listitem> diff --git a/doc/fr/config.docbook b/doc/fr/config.docbook index 69ed60ac..c2e6a674 100644 --- a/doc/fr/config.docbook +++ b/doc/fr/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >Configurer &amarok;</title> <para diff --git a/doc/fr/index.docbook b/doc/fr/index.docbook index e7ce0a4c..e48f45ec 100644 --- a/doc/fr/index.docbook +++ b/doc/fr/index.docbook @@ -422,7 +422,7 @@ <title >Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Comment obtenir &amarok;</title> diff --git a/doc/fr/using.docbook b/doc/fr/using.docbook index 7acac7f0..9236b313 100644 --- a/doc/fr/using.docbook +++ b/doc/fr/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Utiliser &amarok;</title> @@ -1560,7 +1560,7 @@ ></term> <listitem> <para ->Cliquer sur cette option ouvre la <link linkend="configuring-kapp" +>Cliquer sur cette option ouvre la <link linkend="configuring-tdeApp" >Fenêtre de Configuration d'&amarok;</link >.</para> </listitem> diff --git a/doc/it/config.docbook b/doc/it/config.docbook index 4e609b66..e2ad147b 100644 --- a/doc/it/config.docbook +++ b/doc/it/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >Configurare &amarok;</title> <para diff --git a/doc/it/index.docbook b/doc/it/index.docbook index 06a45475..1bee8baa 100644 --- a/doc/it/index.docbook +++ b/doc/it/index.docbook @@ -513,7 +513,7 @@ <title >Installazione</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Come ottenere &amarok;</title> diff --git a/doc/it/using.docbook b/doc/it/using.docbook index 3ad9e7d8..e6ce6b67 100644 --- a/doc/it/using.docbook +++ b/doc/it/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Usare &amarok;</title> @@ -1823,7 +1823,7 @@ ></term> <listitem> <para ->Facendo clic su questa opzione apre la finestra di dialogo <link linkend="configuring-kapp" +>Facendo clic su questa opzione apre la finestra di dialogo <link linkend="configuring-tdeApp" >Configurazione di &amarok;</link >.</para> </listitem> diff --git a/doc/nl/config.docbook b/doc/nl/config.docbook index 81f2dd3b..c7a00608 100644 --- a/doc/nl/config.docbook +++ b/doc/nl/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >&amarok; instellen</title> <para diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook index 95ee37ce..706136d8 100644 --- a/doc/nl/index.docbook +++ b/doc/nl/index.docbook @@ -471,7 +471,7 @@ <title >Installatie</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Hoe u &amarok; kunt verkrijgen</title> diff --git a/doc/nl/using.docbook b/doc/nl/using.docbook index 2b054d9d..1ed492ad 100644 --- a/doc/nl/using.docbook +++ b/doc/nl/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >&amarok; gebruiken</title> @@ -1823,7 +1823,7 @@ ></term> <listitem> <para ->Klik op deze menuoptie om de <link linkend="configuring-kapp" +>Klik op deze menuoptie om de <link linkend="configuring-tdeApp" >configuratiedialoog van &amarok;</link > te openen.</para> </listitem> diff --git a/doc/pl/config.docbook b/doc/pl/config.docbook index 2254a147..2a640d7d 100644 --- a/doc/pl/config.docbook +++ b/doc/pl/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >Konfiguracja programu &amarok-mianownik;</title> <para diff --git a/doc/pl/index.docbook b/doc/pl/index.docbook index b8f2e4fb..9d47030b 100644 --- a/doc/pl/index.docbook +++ b/doc/pl/index.docbook @@ -513,7 +513,7 @@ <title >Instalacja</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Jak zdobyć program &amarok-mianownik;</title> diff --git a/doc/pl/using.docbook b/doc/pl/using.docbook index 27da9f3a..f8cecce0 100644 --- a/doc/pl/using.docbook +++ b/doc/pl/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Korzystanie z programu &amarok-mianownik;</title> @@ -1825,7 +1825,7 @@ ></term> <listitem> <para ->Kliknięcie tej opcji spowoduje otwarcie <link linkend="configuring-kapp" +>Kliknięcie tej opcji spowoduje otwarcie <link linkend="configuring-tdeApp" >Okna konfiguracji programu &amarok-mianownik;</link >.</para> </listitem> diff --git a/doc/pt/config.docbook b/doc/pt/config.docbook index e59cfda1..51519867 100644 --- a/doc/pt/config.docbook +++ b/doc/pt/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >Configurar o &amarok;</title> <para diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook index 4f6248ac..c26f2ced 100644 --- a/doc/pt/index.docbook +++ b/doc/pt/index.docbook @@ -471,7 +471,7 @@ <title >Instalação</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Como obter o &amarok;</title> diff --git a/doc/pt/using.docbook b/doc/pt/using.docbook index c0e43da1..ffd7dcd9 100644 --- a/doc/pt/using.docbook +++ b/doc/pt/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Utilizar o &amarok;</title> @@ -1827,7 +1827,7 @@ ></term> <listitem> <para ->Se carregar nesta opção irá abrir a <link linkend="configuring-kapp" +>Se carregar nesta opção irá abrir a <link linkend="configuring-tdeApp" >Janela de Configuração do &amarok;</link >.</para> </listitem> diff --git a/doc/pt_BR/config.docbook b/doc/pt_BR/config.docbook index 04cd6cd1..db283f1f 100644 --- a/doc/pt_BR/config.docbook +++ b/doc/pt_BR/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >Configurando o &amarok;</title> diff --git a/doc/pt_BR/index.docbook b/doc/pt_BR/index.docbook index 11bace61..e0e47883 100644 --- a/doc/pt_BR/index.docbook +++ b/doc/pt_BR/index.docbook @@ -366,7 +366,7 @@ <title >Instalação</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Como obter o &amarok;</title> diff --git a/doc/pt_BR/using.docbook b/doc/pt_BR/using.docbook index e3a4cd7d..844ab4e4 100644 --- a/doc/pt_BR/using.docbook +++ b/doc/pt_BR/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Usando o &amarok;</title> @@ -1560,7 +1560,7 @@ ></term> <listitem> <para ->Clicando nesta opção irá abrir o <link linkend="configuring-kapp" +>Clicando nesta opção irá abrir o <link linkend="configuring-tdeApp" >Diálogo de Configuração do &amarok;</link >.</para> </listitem> diff --git a/doc/sv/config.docbook b/doc/sv/config.docbook index aa716379..455f573d 100644 --- a/doc/sv/config.docbook +++ b/doc/sv/config.docbook @@ -1,4 +1,4 @@ -<chapter id="configuring-kapp"> +<chapter id="configuring-tdeApp"> <title >Anpassa &amarok;</title> <para diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook index bcb424dd..75d58955 100644 --- a/doc/sv/index.docbook +++ b/doc/sv/index.docbook @@ -471,7 +471,7 @@ <title >Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title >Hur man skaffar &amarok;</title> diff --git a/doc/sv/using.docbook b/doc/sv/using.docbook index 8c5e56f6..67b29723 100644 --- a/doc/sv/using.docbook +++ b/doc/sv/using.docbook @@ -1,4 +1,4 @@ -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title >Använda &amarok;</title> @@ -1825,7 +1825,7 @@ ></term> <listitem> <para ->Genom att klicka på det här alternativet öppnas <link linkend="configuring-kapp" +>Genom att klicka på det här alternativet öppnas <link linkend="configuring-tdeApp" >inställningsdialogrutan i &amarok;</link >.</para> </listitem> |