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

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/56/head
Michele Calgaro 11 months ago
parent 00fe96f093
commit f52f91d7ba
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
101 changed files with 1104 additions and 1104 deletions
Show Stats Download Patch File Download Diff File

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

@ -117,15 +117,15 @@ void Options2::retrievePushButton_clicked()
d->setType( "amarok/theme" ); d->setType( "amarok/theme" );
// you have to do this by hand when providing your own Engine // you have to do this by hand when providing your own Engine
KNS::ProviderLoader *p = new KNS::ProviderLoader( this ); KNS::ProviderLoader *p = new KNS::ProviderLoader( this );
connect( p, TQT_SIGNAL( providersLoaded(Provider::List*) ), d, TQT_SLOT( slotProviders(Provider::List *) ) ); connect( p, TQ_SIGNAL( providersLoaded(Provider::List*) ), d, TQ_SLOT( slotProviders(Provider::List *) ) );
p->load( "amarok theme", "https://www.trinitydesktop.org/ocs/providers.xml" ); p->load( "amarok theme", "https://www.trinitydesktop.org/ocs/providers.xml" );
connect( d, TQT_SIGNAL( finished() ), d, TQT_SLOT( delayedDestruct() ) ); connect( d, TQ_SIGNAL( finished() ), d, TQ_SLOT( delayedDestruct() ) );
connect( d, TQT_SIGNAL( finished() ), this, TQT_SLOT( updateStyleComboBox() ) ); connect( d, TQ_SIGNAL( finished() ), this, TQ_SLOT( updateStyleComboBox() ) );
// Due to tdelibs idiocy, KNS::DownloadDialog is /always/ non-modal. So we have to // Due to tdelibs idiocy, KNS::DownloadDialog is /always/ non-modal. So we have to
// ensure that closing the settings dialog before the DownloadDialog doesn't crash. // ensure that closing the settings dialog before the DownloadDialog doesn't crash.
TQTimer::singleShot( 0, d, TQT_SLOT( exec() ) ); TQTimer::singleShot( 0, d, TQ_SLOT( exec() ) );
} }

34
amarok/src/Options5.ui.h
Unescape View File

@ -36,28 +36,28 @@ void Options5::init()
m_pOSDPreview->setAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) ); m_pOSDPreview->setAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) );
m_pOSDPreview->setOffset( AmarokConfig::osdYOffset() ); m_pOSDPreview->setOffset( AmarokConfig::osdYOffset() );
connect( m_pOSDPreview, TQT_SIGNAL( positionChanged() ), TQT_SLOT( slotPositionChanged() ) ); connect( m_pOSDPreview, TQ_SIGNAL( positionChanged() ), TQ_SLOT( slotPositionChanged() ) );
const int numScreens = TQApplication::desktop()->numScreens(); const int numScreens = TQApplication::desktop()->numScreens();
for( int i = 0; i < numScreens; i++ ) for( int i = 0; i < numScreens; i++ )
kcfg_OsdScreen->insertItem( TQString::number( i ) ); kcfg_OsdScreen->insertItem( TQString::number( i ) );
connect( kcfg_OsdDrawShadow, TQT_SIGNAL( toggled(bool) ), connect( kcfg_OsdDrawShadow, TQ_SIGNAL( toggled(bool) ),
m_pOSDPreview, TQT_SLOT( setDrawShadow(bool) ) ); m_pOSDPreview, TQ_SLOT( setDrawShadow(bool) ) );
connect( kcfg_OsdTextColor, TQT_SIGNAL( changed(const TQColor&) ), connect( kcfg_OsdTextColor, TQ_SIGNAL( changed(const TQColor&) ),
m_pOSDPreview, TQT_SLOT( setTextColor(const TQColor&) ) ); m_pOSDPreview, TQ_SLOT( setTextColor(const TQColor&) ) );
connect( kcfg_OsdUseCustomColors, TQT_SIGNAL( toggled(bool) ), connect( kcfg_OsdUseCustomColors, TQ_SIGNAL( toggled(bool) ),
this, TQT_SLOT( useCustomColorsToggled(bool) ) ); this, TQ_SLOT( useCustomColorsToggled(bool) ) );
connect( kcfg_OsdUseFakeTranslucency, TQT_SIGNAL( toggled(bool) ), connect( kcfg_OsdUseFakeTranslucency, TQ_SIGNAL( toggled(bool) ),
this, TQT_SLOT( useFakeTransparencyToggled(bool) ) ); this, TQ_SLOT( useFakeTransparencyToggled(bool) ) );
connect( kcfg_OsdBackgroundColor, TQT_SIGNAL( changed(const TQColor&) ), connect( kcfg_OsdBackgroundColor, TQ_SIGNAL( changed(const TQColor&) ),
m_pOSDPreview, TQT_SLOT( setBackgroundColor(const TQColor&) ) ); m_pOSDPreview, TQ_SLOT( setBackgroundColor(const TQColor&) ) );
connect( kcfg_OsdFont, TQT_SIGNAL( fontSelected(const TQFont&) ), connect( kcfg_OsdFont, TQ_SIGNAL( fontSelected(const TQFont&) ),
m_pOSDPreview, TQT_SLOT( setFont(const TQFont&) ) ); m_pOSDPreview, TQ_SLOT( setFont(const TQFont&) ) );
connect( kcfg_OsdScreen, TQT_SIGNAL( activated(int) ), connect( kcfg_OsdScreen, TQ_SIGNAL( activated(int) ),
m_pOSDPreview, TQT_SLOT( setScreen(int) ) ); m_pOSDPreview, TQ_SLOT( setScreen(int) ) );
connect( kcfg_OsdEnabled, TQT_SIGNAL( toggled(bool) ), connect( kcfg_OsdEnabled, TQ_SIGNAL( toggled(bool) ),
m_pOSDPreview, TQT_SLOT( setShown(bool) ) ); m_pOSDPreview, TQ_SLOT( setShown(bool) ) );
Amarok::QStringx text = i18n( Amarok::QStringx text = i18n(
"<h3>Tags Displayed in OSD</h3>" "<h3>Tags Displayed in OSD</h3>"

32
amarok/src/actionclasses.cpp
Unescape View File

@ -84,7 +84,7 @@ MenuAction::plug( TQWidget *w, int index )
const int id = TDEAction::getToolButtonID(); const int id = TDEAction::getToolButtonID();
addContainer( bar, id ); addContainer( bar, id );
connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) ); connect( bar, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotDestroyed() ) );
//TODO create menu on demand //TODO create menu on demand
//TODO create menu above and aligned within window //TODO create menu above and aligned within window
@ -122,7 +122,7 @@ Menu::Menu()
insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n( "C&over Manager" ), ID_SHOW_COVER_MANAGER ); insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n( "C&over Manager" ), ID_SHOW_COVER_MANAGER );
safePlug( ac, "queue_manager", this ); safePlug( ac, "queue_manager", this );
insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n( "&Visualizations" ), ID_SHOW_VIS_SELECTOR ); insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n( "&Visualizations" ), ID_SHOW_VIS_SELECTOR );
insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_EQUALIZER ); insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), kapp, TQ_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_EQUALIZER );
safePlug( ac, "script_manager", this ); safePlug( ac, "script_manager", this );
safePlug( ac, "statistics", this ); safePlug( ac, "statistics", this );
@ -154,8 +154,8 @@ Menu::Menu()
safePlug( ac, KStdAction::name(KStdAction::Quit), this ); safePlug( ac, KStdAction::name(KStdAction::Quit), this );
connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) );
setItemEnabled( ID_SHOW_VIS_SELECTOR, false ); setItemEnabled( ID_SHOW_VIS_SELECTOR, false );
#ifdef HAVE_LIBVISUAL #ifdef HAVE_LIBVISUAL
@ -213,7 +213,7 @@ PlayPauseAction::PlayPauseAction( TDEActionCollection *ac )
{ {
engineStateChanged( EngineController::engine()->state() ); engineStateChanged( EngineController::engine()->state() );
connect( this, TQT_SIGNAL(activated()), EngineController::instance(), TQT_SLOT(playPause()) ); connect( this, TQ_SIGNAL(activated()), EngineController::instance(), TQ_SLOT(playPause()) );
} }
void void
@ -277,7 +277,7 @@ AnalyzerAction::plug( TQWidget *w, int index )
const int id = TDEAction::getToolButtonID(); const int id = TDEAction::getToolButtonID();
addContainer( w, id ); addContainer( w, id );
connect( w, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) ); connect( w, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotDestroyed() ) );
TQWidget *container = new AnalyzerContainer( w ); TQWidget *container = new AnalyzerContainer( w );
bar->insertWidget( id, 0, container, index ); bar->insertWidget( id, 0, container, index );
bar->setItemAutoSized( id, true ); bar->setItemAutoSized( id, true );
@ -439,8 +439,8 @@ VolumeAction::plug( TQWidget *w, int index )
TQToolTip::add( m_slider, i18n( "Volume control" ) ); TQToolTip::add( m_slider, i18n( "Volume control" ) );
EngineController* const ec = EngineController::instance(); EngineController* const ec = EngineController::instance();
connect( m_slider, TQT_SIGNAL(sliderMoved( int )), ec, TQT_SLOT(setVolume( int )) ); connect( m_slider, TQ_SIGNAL(sliderMoved( int )), ec, TQ_SLOT(setVolume( int )) );
connect( m_slider, TQT_SIGNAL(sliderReleased( int )), ec, TQT_SLOT(setVolume( int )) ); connect( m_slider, TQ_SIGNAL(sliderReleased( int )), ec, TQ_SLOT(setVolume( int )) );
static_cast<TDEToolBar*>(w)->insertWidget( TDEAction::getToolButtonID(), 0, m_slider, index ); static_cast<TDEToolBar*>(w)->insertWidget( TDEAction::getToolButtonID(), 0, m_slider, index );
@ -519,7 +519,7 @@ BurnMenuAction::plug( TQWidget *w, int index )
const int id = TDEAction::getToolButtonID(); const int id = TDEAction::getToolButtonID();
addContainer( bar, id ); addContainer( bar, id );
connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) ); connect( bar, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotDestroyed() ) );
bar->insertButton( TQString(), id, true, i18n( "Burn" ), index ); bar->insertButton( TQString(), id, true, i18n( "Burn" ), index );
@ -539,8 +539,8 @@ BurnMenu::BurnMenu()
insertItem( i18n("Selected Tracks"), SELECTED_TRACKS ); insertItem( i18n("Selected Tracks"), SELECTED_TRACKS );
//TODO add "album" and "all tracks by artist" //TODO add "album" and "all tracks by artist"
connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) );
} }
TDEPopupMenu* TDEPopupMenu*
@ -574,7 +574,7 @@ BurnMenu::slotActivated( int index )
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
StopAction::StopAction( TDEActionCollection *ac ) StopAction::StopAction( TDEActionCollection *ac )
: TDEAction( i18n( "Stop" ), Amarok::icon( "stop" ), 0, EngineController::instance(), TQT_SLOT( stop() ), ac, "stop" ) : TDEAction( i18n( "Stop" ), Amarok::icon( "stop" ), 0, EngineController::instance(), TQ_SLOT( stop() ), ac, "stop" )
{} {}
int int
@ -587,9 +587,9 @@ StopAction::plug( TQWidget *w, int index )
const int id = TDEAction::getToolButtonID(); const int id = TDEAction::getToolButtonID();
addContainer( bar, id ); addContainer( bar, id );
connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) ); connect( bar, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotDestroyed() ) );
bar->insertButton( TQString(), id, TQT_SIGNAL( clicked() ), EngineController::instance(), TQT_SLOT( stop() ), bar->insertButton( TQString(), id, TQ_SIGNAL( clicked() ), EngineController::instance(), TQ_SLOT( stop() ),
true, i18n( "Stop" ), index ); true, i18n( "Stop" ), index );
TDEToolBarButton* button = bar->getButton( id ); TDEToolBarButton* button = bar->getButton( id );
@ -610,8 +610,8 @@ StopMenu::StopMenu()
insertItem( i18n("After Current Track"), AFTER_TRACK ); insertItem( i18n("After Current Track"), AFTER_TRACK );
insertItem( i18n("After Queue"), AFTER_QUEUE ); insertItem( i18n("After Queue"), AFTER_QUEUE );
connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) );
} }
TDEPopupMenu* TDEPopupMenu*

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

@ -293,8 +293,8 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
static_cast<TQPushButton*>(child("email"))->setDefault( true ); static_cast<TQPushButton*>(child("email"))->setDefault( true );
connect( child( "email" ), TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect( child( "email" ), TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
connect( child( "close" ), TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); connect( child( "close" ), TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
setCaption( i18n("Crash Handler") ); setCaption( i18n("Crash Handler") );
setFixedSize( sizeHint() ); setFixedSize( sizeHint() );

4
amarok/src/analyzers/analyzerbase.cpp
Unescape View File

@ -193,7 +193,7 @@ Analyzer::Base2D::Base2D( TQWidget *parent, uint timeout, uint scopeSize )
{ {
setWFlags( TQt::WNoAutoErase ); //no flicker setWFlags( TQt::WNoAutoErase ); //no flicker
connect( &m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( draw() ) ); connect( &m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( draw() ) );
} }
void void
@ -232,7 +232,7 @@ Analyzer::Base2D::paletteChange( const TQPalette& )
Analyzer::Base3D::Base3D( TQWidget *parent, uint timeout, uint scopeSize ) Analyzer::Base3D::Base3D( TQWidget *parent, uint timeout, uint scopeSize )
: Base<TQGLWidget>( parent, timeout, scopeSize ) : Base<TQGLWidget>( parent, timeout, scopeSize )
{ {
connect( &m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( draw() ) ); connect( &m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( draw() ) );
} }
#endif #endif

8
amarok/src/analyzers/boomanalyzer.cpp
Unescape View File

@ -30,15 +30,15 @@ BoomAnalyzer::BoomAnalyzer( TQWidget *parent )
new TQLabel( "Bar fall-rate:", box ); new TQLabel( "Bar fall-rate:", box );
o = new TQSlider( 100, 2000, 100, v, TQt::Horizontal, box ); o = new TQSlider( 100, 2000, 100, v, TQt::Horizontal, box );
(m = new TQSpinBox( 100, 2000, 1, box ))->setValue( v ); (m = new TQSpinBox( 100, 2000, 1, box ))->setValue( v );
connect( o, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeK_barHeight( int )) ); connect( o, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeK_barHeight( int )) );
connect( o, TQT_SIGNAL(valueChanged(int)), m, TQT_SLOT(setValue( int )) ); connect( o, TQ_SIGNAL(valueChanged(int)), m, TQ_SLOT(setValue( int )) );
v = int(F_peakSpeed*1000); v = int(F_peakSpeed*1000);
new TQLabel( "Peak acceleration: ", box ); new TQLabel( "Peak acceleration: ", box );
o = new TQSlider( 1000, 1300, 50, v, TQt::Horizontal, box ); o = new TQSlider( 1000, 1300, 50, v, TQt::Horizontal, box );
(m = new TQSpinBox( 1000, 1300, 1, box ))->setValue( v ); (m = new TQSpinBox( 1000, 1300, 1, box ))->setValue( v );
connect( o, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeF_peakSpeed( int )) ); connect( o, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeF_peakSpeed( int )) );
connect( o, TQT_SIGNAL(valueChanged(int)), m, TQT_SLOT(setValue( int )) ); connect( o, TQ_SIGNAL(valueChanged(int)), m, TQ_SLOT(setValue( int )) );
//box->show(); //box->show();
} }

62
amarok/src/app.cpp
Unescape View File

@ -197,7 +197,7 @@ App::App()
AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, appleEventProcessorUPP, (long)this, true); AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, appleEventProcessorUPP, (long)this, true);
#endif #endif
TQTimer::singleShot( 0, this, TQT_SLOT( continueInit() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( continueInit() ) );
} }
App::~App() App::~App()
@ -434,48 +434,48 @@ void App::initGlobalShortcuts()
EngineController* const ec = EngineController::instance(); EngineController* const ec = EngineController::instance();
m_pGlobalAccel->insert( "play", i18n( "Play" ), 0, KKey("WIN+x"), 0, m_pGlobalAccel->insert( "play", i18n( "Play" ), 0, KKey("WIN+x"), 0,
ec, TQT_SLOT( play() ), true, true ); ec, TQ_SLOT( play() ), true, true );
m_pGlobalAccel->insert( "pause", i18n( "Pause" ), 0, 0, 0, m_pGlobalAccel->insert( "pause", i18n( "Pause" ), 0, 0, 0,
ec, TQT_SLOT( pause() ), true, true ); ec, TQ_SLOT( pause() ), true, true );
m_pGlobalAccel->insert( "play_pause", i18n( "Play/Pause" ), 0, KKey("WIN+c"), 0, m_pGlobalAccel->insert( "play_pause", i18n( "Play/Pause" ), 0, KKey("WIN+c"), 0,
ec, TQT_SLOT( playPause() ), true, true ); ec, TQ_SLOT( playPause() ), true, true );
m_pGlobalAccel->insert( "stop", i18n( "Stop" ), 0, KKey("WIN+v"), 0, m_pGlobalAccel->insert( "stop", i18n( "Stop" ), 0, KKey("WIN+v"), 0,
ec, TQT_SLOT( stop() ), true, true ); ec, TQ_SLOT( stop() ), true, true );
m_pGlobalAccel->insert( "stop_after_global", i18n( "Stop Playing After Current Track" ), 0, KKey("WIN+CTRL+v"), 0, m_pGlobalAccel->insert( "stop_after_global", i18n( "Stop Playing After Current Track" ), 0, KKey("WIN+CTRL+v"), 0,
Playlist::instance()->qscrollview(), TQT_SLOT( toggleStopAfterCurrentTrack() ), true, true ); Playlist::instance()->qscrollview(), TQ_SLOT( toggleStopAfterCurrentTrack() ), true, true );
m_pGlobalAccel->insert( "next", i18n( "Next Track" ), 0, KKey("WIN+b"), 0, m_pGlobalAccel->insert( "next", i18n( "Next Track" ), 0, KKey("WIN+b"), 0,
ec, TQT_SLOT( next() ), true, true ); ec, TQ_SLOT( next() ), true, true );
m_pGlobalAccel->insert( "prev", i18n( "Previous Track" ), 0, KKey("WIN+z"), 0, m_pGlobalAccel->insert( "prev", i18n( "Previous Track" ), 0, KKey("WIN+z"), 0,
ec, TQT_SLOT( previous() ), true, true ); ec, TQ_SLOT( previous() ), true, true );
m_pGlobalAccel->insert( "volup", i18n( "Increase Volume" ), 0, KKey("WIN+KP_Add"), 0, m_pGlobalAccel->insert( "volup", i18n( "Increase Volume" ), 0, KKey("WIN+KP_Add"), 0,
ec, TQT_SLOT( increaseVolume() ), true, true ); ec, TQ_SLOT( increaseVolume() ), true, true );
m_pGlobalAccel->insert( "voldn", i18n( "Decrease Volume" ), 0, KKey("WIN+KP_Subtract"), 0, m_pGlobalAccel->insert( "voldn", i18n( "Decrease Volume" ), 0, KKey("WIN+KP_Subtract"), 0,
ec, TQT_SLOT( decreaseVolume() ), true, true ); ec, TQ_SLOT( decreaseVolume() ), true, true );
m_pGlobalAccel->insert( "seekforward", i18n( "Seek Forward" ), 0, KKey("WIN+Shift+KP_Add"), 0, m_pGlobalAccel->insert( "seekforward", i18n( "Seek Forward" ), 0, KKey("WIN+Shift+KP_Add"), 0,
ec, TQT_SLOT( seekForward() ), true, true ); ec, TQ_SLOT( seekForward() ), true, true );
m_pGlobalAccel->insert( "seekbackward", i18n( "Seek Backward" ), 0, KKey("WIN+Shift+KP_Subtract"), 0, m_pGlobalAccel->insert( "seekbackward", i18n( "Seek Backward" ), 0, KKey("WIN+Shift+KP_Subtract"), 0,
ec, TQT_SLOT( seekBackward() ), true, true ); ec, TQ_SLOT( seekBackward() ), true, true );
m_pGlobalAccel->insert( "playlist_add", i18n( "Add Media..." ), 0, KKey("WIN+a"), 0, m_pGlobalAccel->insert( "playlist_add", i18n( "Add Media..." ), 0, KKey("WIN+a"), 0,
m_pPlaylistWindow, TQT_SLOT( slotAddLocation() ), true, true ); m_pPlaylistWindow, TQ_SLOT( slotAddLocation() ), true, true );
m_pGlobalAccel->insert( "show", i18n( "Toggle Playlist Window" ), 0, KKey("WIN+p"), 0, m_pGlobalAccel->insert( "show", i18n( "Toggle Playlist Window" ), 0, KKey("WIN+p"), 0,
m_pPlaylistWindow, TQT_SLOT( showHide() ), true, true ); m_pPlaylistWindow, TQ_SLOT( showHide() ), true, true );
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
m_pGlobalAccel->insert( "osd", i18n( "Show OSD" ), 0, KKey("WIN+o"), 0, m_pGlobalAccel->insert( "osd", i18n( "Show OSD" ), 0, KKey("WIN+o"), 0,
Amarok::OSD::instance(), TQT_SLOT( forceToggleOSD() ), true, true ); Amarok::OSD::instance(), TQ_SLOT( forceToggleOSD() ), true, true );
#endif #endif
m_pGlobalAccel->insert( "mute", i18n( "Mute Volume" ), 0, KKey("WIN+m"), 0, m_pGlobalAccel->insert( "mute", i18n( "Mute Volume" ), 0, KKey("WIN+m"), 0,
ec, TQT_SLOT( mute() ), true, true ); ec, TQ_SLOT( mute() ), true, true );
m_pGlobalAccel->insert( "rating1", i18n( "Rate Current Track: 1" ), 0, KKey("WIN+1"), 0, m_pGlobalAccel->insert( "rating1", i18n( "Rate Current Track: 1" ), 0, KKey("WIN+1"), 0,
this, TQT_SLOT( setRating1() ), true, true ); this, TQ_SLOT( setRating1() ), true, true );
m_pGlobalAccel->insert( "rating2", i18n( "Rate Current Track: 2" ), 0, KKey("WIN+2"), 0, m_pGlobalAccel->insert( "rating2", i18n( "Rate Current Track: 2" ), 0, KKey("WIN+2"), 0,
this, TQT_SLOT( setRating2() ), true, true ); this, TQ_SLOT( setRating2() ), true, true );
m_pGlobalAccel->insert( "rating3", i18n( "Rate Current Track: 3" ), 0, KKey("WIN+3"), 0, m_pGlobalAccel->insert( "rating3", i18n( "Rate Current Track: 3" ), 0, KKey("WIN+3"), 0,
this, TQT_SLOT( setRating3() ), true, true ); this, TQ_SLOT( setRating3() ), true, true );
m_pGlobalAccel->insert( "rating4", i18n( "Rate Current Track: 4" ), 0, KKey("WIN+4"), 0, m_pGlobalAccel->insert( "rating4", i18n( "Rate Current Track: 4" ), 0, KKey("WIN+4"), 0,
this, TQT_SLOT( setRating4() ), true, true ); this, TQ_SLOT( setRating4() ), true, true );
m_pGlobalAccel->insert( "rating5", i18n( "Rate Current Track: 5" ), 0, KKey("WIN+5"), 0, m_pGlobalAccel->insert( "rating5", i18n( "Rate Current Track: 5" ), 0, KKey("WIN+5"), 0,
this, TQT_SLOT( setRating5() ), true, true ); this, TQ_SLOT( setRating5() ), true, true );
m_pGlobalAccel->setConfigGroup( "Shortcuts" ); m_pGlobalAccel->setConfigGroup( "Shortcuts" );
m_pGlobalAccel->readSettings( kapp->config() ); m_pGlobalAccel->readSettings( kapp->config() );
@ -540,12 +540,12 @@ void App::fixHyperThreading()
#endif //SCHEDAFFINITY_3PARAMS #endif //SCHEDAFFINITY_3PARAMS
{ {
warning() << "sched_setaffinity() call failed with error code: " << errno << endl; warning() << "sched_setaffinity() call failed with error code: " << errno << endl;
TQTimer::singleShot( 0, this, TQT_SLOT( showHyperThreadingWarning() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( showHyperThreadingWarning() ) );
return; return;
} }
#else //SCHEDAFFINITY_SUPPORT #else //SCHEDAFFINITY_SUPPORT
warning()<<"glibc failed checks for sched_setaffinity" << endl; warning()<<"glibc failed checks for sched_setaffinity" << endl;
TQTimer::singleShot( 0, this, TQT_SLOT( showHyperThreadingWarning() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( showHyperThreadingWarning() ) );
#endif //SCHEDAFFINITY_SUPPORT #endif //SCHEDAFFINITY_SUPPORT
} }
else { debug() << "Workaround not enabled" << endl; } else { debug() << "Workaround not enabled" << endl; }
@ -641,7 +641,7 @@ void App::applySettings( bool firstTime )
if( !firstTime ) m_pPlayerWindow->show(); if( !firstTime ) m_pPlayerWindow->show();
connect( m_pPlayerWindow, TQT_SIGNAL(playlistToggled( bool )), m_pPlaylistWindow, TQT_SLOT(showHide()) ); connect( m_pPlayerWindow, TQ_SIGNAL(playlistToggled( bool )), m_pPlaylistWindow, TQ_SLOT(showHide()) );
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
//TODO get this to work! //TODO get this to work!
@ -786,7 +786,7 @@ App::continueInit()
#endif #endif
m_pPlaylistWindow->init(); //creates the playlist, browsers, etc. m_pPlaylistWindow->init(); //creates the playlist, browsers, etc.
//init playlist window as soon as the database is guaranteed to be usable //init playlist window as soon as the database is guaranteed to be usable
//connect( CollectionDB::instance(), TQT_SIGNAL( databaseUpdateDone() ), m_pPlaylistWindow, TQT_SLOT( init() ) ); //connect( CollectionDB::instance(), TQ_SIGNAL( databaseUpdateDone() ), m_pPlaylistWindow, TQ_SLOT( init() ) );
initGlobalShortcuts(); initGlobalShortcuts();
//load previous playlist in separate thread //load previous playlist in separate thread
if ( restoreSession && AmarokConfig::savePlaylist() ) if ( restoreSession && AmarokConfig::savePlaylist() )
@ -837,11 +837,11 @@ App::continueInit()
// (e.g. deleted collection.db) // (e.g. deleted collection.db)
if ( CollectionDB::instance()->isEmpty() ) if ( CollectionDB::instance()->isEmpty() )
{ {
//connect( collDB, TQT_SIGNAL( databaseUpdateDone() ), collDB, TQT_SLOT( startScan() ) ); //connect( collDB, TQ_SIGNAL( databaseUpdateDone() ), collDB, TQ_SLOT( startScan() ) );
collDB->startScan(); collDB->startScan();
} }
else if ( AmarokConfig::monitorChanges() ) else if ( AmarokConfig::monitorChanges() )
//connect( collDB, TQT_SIGNAL( databaseUpdateDone() ), collDB, TQT_SLOT( scanModifiedDirs() ) ); //connect( collDB, TQ_SIGNAL( databaseUpdateDone() ), collDB, TQ_SLOT( scanModifiedDirs() ) );
collDB->scanModifiedDirs(); collDB->scanModifiedDirs();
@ -1138,7 +1138,7 @@ void App::slotConfigAmarok( const TQCString& page )
//TDEConfigDialog 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() ); dialog = new AmarokConfigDialog( m_pPlaylistWindow, "settings", AmarokConfig::self() );
connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_SLOT(applySettings()) ); connect( dialog, TQ_SIGNAL(settingsChanged()), TQ_SLOT(applySettings()) );
} }
//FIXME it seems that if the dialog is on a different desktop it gets lost //FIXME it seems that if the dialog is on a different desktop it gets lost
@ -1187,7 +1187,7 @@ void App::firstRunWizard()
setTopWidget( &wizard ); setTopWidget( &wizard );
TDEConfigDialogManager* config = new TDEConfigDialogManager(&wizard, AmarokConfig::self(), "wizardconfig"); TDEConfigDialogManager* config = new TDEConfigDialogManager(&wizard, AmarokConfig::self(), "wizardconfig");
config->updateWidgets(); config->updateWidgets();
// connect(config, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateSettings())); // connect(config, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateSettings()));
wizard.setCaption( makeStdCaption( i18n( "First-Run Wizard" ) ) ); wizard.setCaption( makeStdCaption( i18n( "First-Run Wizard" ) ) );
if( wizard.exec() != TQDialog::Rejected ) if( wizard.exec() != TQDialog::Rejected )
@ -1234,7 +1234,7 @@ TDEIO::Job *App::trashFiles( const KURL::List &files )
#if KDE_IS_VERSION( 3, 3, 91 ) #if KDE_IS_VERSION( 3, 3, 91 )
TDEIO::Job *job = TDEIO::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") ); Amarok::StatusBar::instance()->newProgressOperation( job ).setDescription( i18n("Moving files to trash") );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotTrashResult( TDEIO::Job* ) ) ); connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotTrashResult( TDEIO::Job* ) ) );
return job; return job;
#else #else
TDEIO::Job* job = TDEIO::move( files, TDEGlobalSettings::trashPath() ); TDEIO::Job* job = TDEIO::move( files, TDEGlobalSettings::trashPath() );
@ -1281,7 +1281,7 @@ void App::quit()
if( MediaBrowser::instance()->blockQuit() ) if( MediaBrowser::instance()->blockQuit() )
{ {
// don't quit yet, as some media devices still have to finish transferring data // don't quit yet, as some media devices still have to finish transferring data
TQTimer::singleShot( 100, this, TQT_SLOT( quit() ) ); TQTimer::singleShot( 100, this, TQ_SLOT( quit() ) );
return; return;
} }
TDEApplication::quit(); TDEApplication::quit();

8
amarok/src/browserbar.cpp
Unescape View File

@ -72,7 +72,7 @@ BrowserBar::BrowserBar( TQWidget *parent )
, m_mapper( new TQSignalMapper( this ) ) , m_mapper( new TQSignalMapper( this ) )
{ {
m_tabManagementButton = new TQPushButton( SmallIconSet(Amarok::icon( "configure" )), 0, this, "tab_managment_button" ); m_tabManagementButton = new TQPushButton( SmallIconSet(Amarok::icon( "configure" )), 0, this, "tab_managment_button" );
connect (m_tabManagementButton, TQT_SIGNAL(clicked()), TQT_SLOT(showBrowserSelectionMenu())); connect (m_tabManagementButton, TQ_SIGNAL(clicked()), TQ_SLOT(showBrowserSelectionMenu()));
m_tabManagementButton->setIsMenuButton ( true ); //deprecated, but since I cannot add menu directly to button it is needed. m_tabManagementButton->setIsMenuButton ( true ); //deprecated, but since I cannot add menu directly to button it is needed.
TQToolTip::add (m_tabManagementButton, i18n("Manage tabs")); TQToolTip::add (m_tabManagementButton, i18n("Manage tabs"));
@ -105,7 +105,7 @@ BrowserBar::BrowserBar( TQWidget *parent )
m_divider->hide(); m_divider->hide();
m_playlistBox->setSpacing( 1 ); m_playlistBox->setSpacing( 1 );
connect( m_mapper, TQT_SIGNAL(mapped( int )), TQT_SLOT(showHideBrowser( int )) ); connect( m_mapper, TQ_SIGNAL(mapped( int )), TQ_SLOT(showHideBrowser( int )) );
@ -258,9 +258,9 @@ BrowserBar::addBrowser( const TQString &identifier, TQWidget *widget, const TQSt
tab->setFocusPolicy( TQWidget::NoFocus ); //FIXME you can focus on the tab, but they respond to no input! tab->setFocusPolicy( TQWidget::NoFocus ); //FIXME you can focus on the tab, but they respond to no input!
//we use a SignalMapper to show/hide the corresponding browser when tabs are clicked //we use a SignalMapper to show/hide the corresponding browser when tabs are clicked
connect( tab, TQT_SIGNAL(clicked()), m_mapper, TQT_SLOT(map()) ); connect( tab, TQ_SIGNAL(clicked()), m_mapper, TQ_SLOT(map()) );
m_mapper->setMapping( tab, id ); m_mapper->setMapping( tab, id );
connect( tab, TQT_SIGNAL(initiateDrag ( int ) ), this, TQT_SLOT( showBrowser( int )) ); connect( tab, TQ_SIGNAL(initiateDrag ( int ) ), this, TQ_SLOT( showBrowser( int )) );
m_browsers.push_back( widget ); m_browsers.push_back( widget );
} }

176
amarok/src/collectionbrowser.cpp
Unescape View File

@ -108,8 +108,8 @@ CollectionBrowser::CollectionBrowser( const char* name )
searchToolBar->setStretchableWidget( m_searchEdit ); searchToolBar->setStretchableWidget( m_searchEdit );
m_searchEdit->setFrame( TQFrame::Sunken ); m_searchEdit->setFrame( TQFrame::Sunken );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClearFilter() ) ); connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClearFilter() ) );
connect( filterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFilter() ) ); connect( filterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFilter() ) );
TQToolTip::add( button, i18n( "Clear search field" ) ); TQToolTip::add( button, i18n( "Clear search field" ) );
TQToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search in the collection" ) ); TQToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search in the collection" ) );
@ -149,10 +149,10 @@ CollectionBrowser::CollectionBrowser( const char* name )
m_view = new CollectionView( this ); m_view = new CollectionView( this );
m_view->installEventFilter( this ); m_view->installEventFilter( this );
m_configureAction = new TDEAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, this, TQT_SLOT( setupDirs() ), ac, "Configure" ); m_configureAction = new TDEAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, this, TQ_SLOT( setupDirs() ), ac, "Configure" );
m_treeViewAction = new TDERadioAction( i18n( "Tree View" ), "view_tree", 0, m_view, TQT_SLOT( setTreeMode() ), ac, "Tree View" ); m_treeViewAction = new TDERadioAction( i18n( "Tree View" ), "view_tree", 0, m_view, TQ_SLOT( setTreeMode() ), ac, "Tree View" );
m_flatViewAction = new TDERadioAction( i18n( "Flat View" ), "view_detailed", 0, m_view, TQT_SLOT( setFlatMode() ), ac, "Flat View" ); m_flatViewAction = new TDERadioAction( i18n( "Flat View" ), "view_detailed", 0, m_view, TQ_SLOT( setFlatMode() ), ac, "Flat View" );
m_ipodViewAction = new TDERadioAction( i18n( "iPod View" ), Amarok::icon("device"), 0, m_view, TQT_SLOT( setIpodMode() ), ac, "iPod View" ); m_ipodViewAction = new TDERadioAction( i18n( "iPod View" ), Amarok::icon("device"), 0, m_view, TQ_SLOT( setIpodMode() ), ac, "iPod View" );
m_treeViewAction->setExclusiveGroup("view mode"); m_treeViewAction->setExclusiveGroup("view mode");
m_flatViewAction->setExclusiveGroup("view mode"); m_flatViewAction->setExclusiveGroup("view mode");
m_ipodViewAction->setExclusiveGroup("view mode"); m_ipodViewAction->setExclusiveGroup("view mode");
@ -169,7 +169,7 @@ CollectionBrowser::CollectionBrowser( const char* name )
break; break;
} }
m_showDividerAction = new TDEToggleAction( i18n( "Show Divider" ), "format-justify-left", 0, this, TQT_SLOT( toggleDivider() ), ac, "Show Divider" ); m_showDividerAction = new TDEToggleAction( i18n( "Show Divider" ), "format-justify-left", 0, this, TQ_SLOT( toggleDivider() ), ac, "Show Divider" );
m_showDividerAction->setChecked(m_view->m_showDivider); m_showDividerAction->setChecked(m_view->m_showDivider);
@ -178,11 +178,11 @@ CollectionBrowser::CollectionBrowser( const char* name )
// browser window; see the "For iPod-style navigation" comments below. // browser window; see the "For iPod-style navigation" comments below.
m_ipodDecrement = new TDEAction( i18n( "Browse backward" ), m_ipodDecrement = new TDEAction( i18n( "Browse backward" ),
TQIconSet( m_view->ipodDecrementIcon(), TQIconSet::Small ), TQIconSet( m_view->ipodDecrementIcon(), TQIconSet::Small ),
0, m_view, TQT_SLOT( decrementDepth() ), ac, 0, m_view, TQ_SLOT( decrementDepth() ), ac,
"iPod Decrement" ); "iPod Decrement" );
m_ipodIncrement = new TDEAction( i18n( "Browse forward" ), m_ipodIncrement = new TDEAction( i18n( "Browse forward" ),
TQIconSet( m_view->ipodIncrementIcon(), TQIconSet::Small ), TQIconSet( m_view->ipodIncrementIcon(), TQIconSet::Small ),
0, m_view, TQT_SLOT( incrementDepth() ), ac, 0, m_view, TQ_SLOT( incrementDepth() ), ac,
"iPod Increment" ); "iPod Increment" );
m_ipodDecrement->plug( m_ipodToolbar ); m_ipodDecrement->plug( m_ipodToolbar );
m_ipodIncrement->plug( m_ipodToolbar ); m_ipodIncrement->plug( m_ipodToolbar );
@ -195,17 +195,17 @@ CollectionBrowser::CollectionBrowser( const char* name )
m_tagfilterMenuButton->setDelayed( false ); m_tagfilterMenuButton->setDelayed( false );
// FIXME: either both or nothing // FIXME: either both or nothing
//m_tagfilterMenuButton->setEnabled( m_view->m_viewMode == CollectionView::modeTreeView ); //m_tagfilterMenuButton->setEnabled( m_view->m_viewMode == CollectionView::modeTreeView );
//connect ( m_treeViewAction, TQT_SIGNAL ( toggled(bool) ), m_tagfilterMenuButton, TQT_SLOT( setEnabled (bool) ) ); //connect ( m_treeViewAction, TQ_SIGNAL ( toggled(bool) ), m_tagfilterMenuButton, TQ_SLOT( setEnabled (bool) ) );
layoutToolbar(); layoutToolbar();
m_categoryMenu = m_tagfilterMenuButton->popupMenu(); m_categoryMenu = m_tagfilterMenuButton->popupMenu();
m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtist ); m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdArtist );
m_categoryMenu->insertItem( i18n( "Artist / Album" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtistAlbum ); m_categoryMenu->insertItem( i18n( "Artist / Album" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdArtistAlbum );
m_categoryMenu->insertItem( i18n( "Artist" )+" / "+ i18n( "Year" ) + i18n( " - " ) + i18n( "Album" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtistVisYearAlbum ); m_categoryMenu->insertItem( i18n( "Artist" )+" / "+ i18n( "Year" ) + i18n( " - " ) + i18n( "Album" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdArtistVisYearAlbum );
m_categoryMenu->insertItem( i18n( "Album" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdAlbum ); m_categoryMenu->insertItem( i18n( "Album" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdAlbum );
m_categoryMenu->insertItem( i18n( "Genre / Artist" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdGenreArtist ); m_categoryMenu->insertItem( i18n( "Genre / Artist" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdGenreArtist );
m_categoryMenu->insertItem( i18n( "Genre / Artist / Album" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdGenreArtistAlbum ); m_categoryMenu->insertItem( i18n( "Genre / Artist / Album" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdGenreArtistAlbum );
m_categoryMenu->insertSeparator(); m_categoryMenu->insertSeparator();
@ -213,42 +213,42 @@ CollectionBrowser::CollectionBrowser( const char* name )
m_categoryMenu->insertItem( i18n( "&Second Level"), m_cat2Menu ); m_categoryMenu->insertItem( i18n( "&Second Level"), m_cat2Menu );
m_categoryMenu->insertItem( i18n( "&Third Level" ), m_cat3Menu ); m_categoryMenu->insertItem( i18n( "&Third Level" ), m_cat3Menu );
m_cat1Menu ->insertItem( i18n( "&Album" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdAlbum ); m_cat1Menu ->insertItem( i18n( "&Album" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdAlbum );
m_cat1Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdVisYearAlbum); m_cat1Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdVisYearAlbum);
m_cat1Menu ->insertItem( i18n( "A&rtist"), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdArtist ); m_cat1Menu ->insertItem( i18n( "A&rtist"), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdArtist );
m_cat1Menu ->insertItem( i18n( "&Composer"), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdComposer ); m_cat1Menu ->insertItem( i18n( "&Composer"), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdComposer );
m_cat1Menu ->insertItem( i18n( "&Genre" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdGenre ); m_cat1Menu ->insertItem( i18n( "&Genre" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdGenre );
m_cat1Menu ->insertItem( i18n( "&Year" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdYear ); m_cat1Menu ->insertItem( i18n( "&Year" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdYear );
m_cat1Menu ->insertItem( i18n( "&Label" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdLabel ); m_cat1Menu ->insertItem( i18n( "&Label" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdLabel );
m_cat2Menu ->insertItem( i18n( "&None" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdNone ); m_cat2Menu ->insertItem( i18n( "&None" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdNone );
m_cat2Menu ->insertSeparator(); m_cat2Menu ->insertSeparator();
m_cat2Menu ->insertItem( i18n( "&Album" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdAlbum ); m_cat2Menu ->insertItem( i18n( "&Album" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdAlbum );
m_cat2Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdVisYearAlbum); m_cat2Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdVisYearAlbum);
m_cat2Menu ->insertItem( i18n( "A&rtist" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdArtist ); m_cat2Menu ->insertItem( i18n( "A&rtist" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdArtist );
m_cat2Menu ->insertItem( i18n( "&Composer"), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdComposer ); m_cat2Menu ->insertItem( i18n( "&Composer"), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdComposer );
m_cat2Menu ->insertItem( i18n( "&Genre" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdGenre ); m_cat2Menu ->insertItem( i18n( "&Genre" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdGenre );
m_cat2Menu ->insertItem( i18n( "&Year" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdYear ); m_cat2Menu ->insertItem( i18n( "&Year" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdYear );
m_cat2Menu ->insertItem( i18n( "&Label" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdLabel ); m_cat2Menu ->insertItem( i18n( "&Label" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdLabel );
m_cat3Menu ->insertItem( i18n( "&None" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdNone ); m_cat3Menu ->insertItem( i18n( "&None" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdNone );
m_cat3Menu ->insertSeparator(); m_cat3Menu ->insertSeparator();
m_cat3Menu ->insertItem( i18n( "A&lbum" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdAlbum ); m_cat3Menu ->insertItem( i18n( "A&lbum" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdAlbum );
m_cat3Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdVisYearAlbum); m_cat3Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdVisYearAlbum);
m_cat3Menu ->insertItem( i18n( "A&rtist" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdArtist ); m_cat3Menu ->insertItem( i18n( "A&rtist" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdArtist );
m_cat3Menu ->insertItem( i18n( "&Composer"), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdComposer ); m_cat3Menu ->insertItem( i18n( "&Composer"), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdComposer );
m_cat3Menu ->insertItem( i18n( "&Genre" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdGenre ); m_cat3Menu ->insertItem( i18n( "&Genre" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdGenre );
m_cat3Menu ->insertItem( i18n( "&Year" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdYear ); m_cat3Menu ->insertItem( i18n( "&Year" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdYear );
m_cat3Menu ->insertItem( i18n( "&Label" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdLabel ); m_cat3Menu ->insertItem( i18n( "&Label" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdLabel );
m_view->cat1Menu( m_view->m_cat1, false ); m_view->cat1Menu( m_view->m_cat1, false );
m_view->cat2Menu( m_view->m_cat2, false ); m_view->cat2Menu( m_view->m_cat2, false );
m_view->cat3Menu( m_view->m_cat3, false ); m_view->cat3Menu( m_view->m_cat3, false );
m_view->setViewMode( m_view->m_viewMode ); m_view->setViewMode( m_view->m_viewMode );
connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSetFilter() ) ); connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSetFilter() ) );
connect( m_searchEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotSetFilterTimeout() ) ); connect( m_searchEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotSetFilterTimeout() ) );
connect( m_timeFilter, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSetFilter() ) ); connect( m_timeFilter, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotSetFilter() ) );
setFocusProxy( m_view ); //default object to get focus setFocusProxy( m_view ); //default object to get focus
} }
@ -258,8 +258,8 @@ CollectionBrowser::slotClearFilter() //SLOT
{ {
m_searchEdit->clear(); m_searchEdit->clear();
kapp->processEvents(); //Let the search bar redraw fully. kapp->processEvents(); //Let the search bar redraw fully.
TQTimer::singleShot( 0, this, TQT_SLOT( slotSetFilter() ) ); //Filter instantly TQTimer::singleShot( 0, this, TQ_SLOT( slotSetFilter() ) ); //Filter instantly
TQTimer::singleShot( 0, m_view, TQT_SLOT( slotEnsureSelectedItemVisible() ) ); TQTimer::singleShot( 0, m_view, TQ_SLOT( slotEnsureSelectedItemVisible() ) );
} }
void void
@ -287,15 +287,15 @@ CollectionBrowser::slotSetFilter( const TQString &filter ) //SLOT
{ {
m_searchEdit->setText( filter ); m_searchEdit->setText( filter );
kapp->processEvents(); //Let the search bar redraw fully. kapp->processEvents(); //Let the search bar redraw fully.
TQTimer::singleShot( 0, this, TQT_SLOT( slotSetFilter() ) ); //Filter instantly TQTimer::singleShot( 0, this, TQ_SLOT( slotSetFilter() ) ); //Filter instantly
TQTimer::singleShot( 0, m_view, TQT_SLOT( slotEnsureSelectedItemVisible() ) ); TQTimer::singleShot( 0, m_view, TQ_SLOT( slotEnsureSelectedItemVisible() ) );
} }
void void
CollectionBrowser::slotEditFilter() //SLOT CollectionBrowser::slotEditFilter() //SLOT
{ {
EditFilterDialog *cod = new EditFilterDialog( this, false, m_searchEdit->text() ); EditFilterDialog *cod = new EditFilterDialog( this, false, m_searchEdit->text() );
connect( cod, TQT_SIGNAL(filterChanged(const TQString &)), TQT_SLOT(slotSetFilter(const TQString &)) ); connect( cod, TQ_SIGNAL(filterChanged(const TQString &)), TQ_SLOT(slotSetFilter(const TQString &)) );
if( cod->exec() ) if( cod->exec() )
m_searchEdit->setText( cod->filter() ); m_searchEdit->setText( cod->filter() );
delete cod; delete cod;
@ -359,7 +359,7 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e )
//Immediately filter and add results //Immediately filter and add results
m_timer->stop(); m_timer->stop();
m_returnPressed = true; m_returnPressed = true;
TQTimer::singleShot( 0, this, TQT_SLOT( slotSetFilter() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( slotSetFilter() ) );
} }
else else
{ {
@ -494,36 +494,36 @@ CollectionView::CollectionView( CollectionBrowser* parent )
//</READ CONFIG> //</READ CONFIG>
TDEActionCollection* ac = new TDEActionCollection( this ); TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "collectionview_select_all" ); KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "collectionview_select_all" );
connect( CollectionDB::instance(), TQT_SIGNAL( scanStarted() ), connect( CollectionDB::instance(), TQ_SIGNAL( scanStarted() ),
this, TQT_SLOT( scanStarted() ) ); this, TQ_SLOT( scanStarted() ) );
connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), connect( CollectionDB::instance(), TQ_SIGNAL( scanDone( bool ) ),
this, TQT_SLOT( scanDone( bool ) ) ); this, TQ_SLOT( scanDone( bool ) ) );
connect( BrowserBar::instance(), TQT_SIGNAL( browserActivated( int ) ), connect( BrowserBar::instance(), TQ_SIGNAL( browserActivated( int ) ),
this, TQT_SLOT( renderView() ) ); // renderView() checks if current tab is this this, TQ_SLOT( renderView() ) ); // renderView() checks if current tab is this
connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ),
this, TQT_SLOT( ratingChanged( const TQString&, int ) ) ); this, TQ_SLOT( ratingChanged( const TQString&, int ) ) );
connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ), connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ),
this, TQT_SLOT( slotExpand( TQListViewItem* ) ) ); this, TQ_SLOT( slotExpand( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( collapsed( TQListViewItem* ) ), connect( this, TQ_SIGNAL( collapsed( TQListViewItem* ) ),
this, TQT_SLOT( slotCollapse( TQListViewItem* ) ) ); this, TQ_SLOT( slotCollapse( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ),
this, TQT_SLOT( invokeItem( TQListViewItem* ) ) ); this, TQ_SLOT( invokeItem( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( invokeItem( TQListViewItem*, const TQPoint&, int ) ) ); this, TQ_SLOT( invokeItem( TQListViewItem*, const TQPoint&, int ) ) );
connect( this, TQT_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQ_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( ipodItemClicked( TQListViewItem*, const TQPoint&, int ) ) ); this, TQ_SLOT( ipodItemClicked( TQListViewItem*, const TQPoint&, int ) ) );
connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) ); this, TQ_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) );
connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ),
this, TQT_SLOT( triggerUpdate() ) ); this, TQ_SLOT( triggerUpdate() ) );
connect( MountPointManager::instance(), TQT_SIGNAL( mediumConnected( int ) ), connect( MountPointManager::instance(), TQ_SIGNAL( mediumConnected( int ) ),
this, TQT_SLOT( databaseChanged() ) ); this, TQ_SLOT( databaseChanged() ) );
connect( MountPointManager::instance(), TQT_SIGNAL( mediumRemoved( int ) ), connect( MountPointManager::instance(), TQ_SIGNAL( mediumRemoved( int ) ),
this, TQT_SLOT( databaseChanged() ) ); this, TQ_SLOT( databaseChanged() ) );
} }
@ -1186,7 +1186,7 @@ void
CollectionView::ratingChanged( const TQString&, int ) CollectionView::ratingChanged( const TQString&, int )
{ {
m_dirty = true; m_dirty = true;
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) );
} }
void void
@ -1372,7 +1372,7 @@ CollectionView::ipodItemClicked( TQListViewItem *item, const TQPoint&, int c )
return; return;
// The TQt manual says NOT to delete items from within this slot // The TQt manual says NOT to delete items from within this slot
TQTimer::singleShot( 0, m_parent->m_ipodIncrement, TQT_SLOT( activate() ) ); TQTimer::singleShot( 0, m_parent->m_ipodIncrement, TQ_SLOT( activate() ) );
} }
@ -1469,7 +1469,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) //
if( (cat == IdAlbum || cat == IdVisYearAlbum) && siblingSelection.count() == 1 ) // cover fetch isn't multiselection capable if( (cat == IdAlbum || cat == IdVisYearAlbum) && siblingSelection.count() == 1 ) // cover fetch isn't multiselection capable
{ {
menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).arg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH ); menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).arg( CoverManager::amazonTld() ), this, TQ_SLOT( fetchCover() ), 0, FETCH );
#ifndef AMAZON_SUPPORT #ifndef AMAZON_SUPPORT
menu.setItemEnabled( FETCH, false ); menu.setItemEnabled( FETCH, false );
#endif #endif
@ -1489,7 +1489,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) //
menu.insertItem( SmallIconSet( Amarok::icon( "info" ) ) menu.insertItem( SmallIconSet( Amarok::icon( "info" ) )
, i18n( "Edit Track &Information...", "Edit &Information for %n Tracks...", selection.count()) , i18n( "Edit Track &Information...", "Edit &Information for %n Tracks...", selection.count())
, this, TQT_SLOT( showTrackInfo() ), 0, INFO ); , this, TQ_SLOT( showTrackInfo() ), 0, INFO );
switch( menu.exec( point ) ) switch( menu.exec( point ) )
{ {
@ -1551,7 +1551,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) //
CollectionDB::instance()->emitFileDeleted( (*it).path() ); CollectionDB::instance()->emitFileDeleted( (*it).path() );
} }
m_dirty = true; m_dirty = true;
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) );
break; break;
} }
} }
@ -1791,7 +1791,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
dialog.formatEdit->setText( AmarokConfig::customScheme() ); dialog.formatEdit->setText( AmarokConfig::customScheme() );
dialog.regexpEdit->setText( AmarokConfig::replacementRegexp() ); dialog.regexpEdit->setText( AmarokConfig::replacementRegexp() );
dialog.replaceEdit->setText( AmarokConfig::replacementString() ); dialog.replaceEdit->setText( AmarokConfig::replacementString() );
connect( &base, TQT_SIGNAL(detailsClicked()), &dialog, TQT_SLOT(slotDetails()) ); connect( &base, TQ_SIGNAL(detailsClicked()), &dialog, TQ_SLOT(slotDetails()) );
if( dialog.customschemeCheck->isChecked() ) if( dialog.customschemeCheck->isChecked() )
{ {
@ -1833,7 +1833,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
CollectionDB::instance()->createTables( true ); // create temp tables CollectionDB::instance()->createTables( true ); // create temp tables
Amarok::StatusBar::instance()->newProgressOperation( this ) Amarok::StatusBar::instance()->newProgressOperation( this )
.setDescription( caption ) .setDescription( caption )
.setAbortSlot( this, TQT_SLOT( cancelOrganizingFiles() ) ) .setAbortSlot( this, TQ_SLOT( cancelOrganizingFiles() ) )
.setTotalSteps( m_organizeURLs.count() ); .setTotalSteps( m_organizeURLs.count() );
while( !m_organizeURLs.empty() && !m_organizingFileCancelled ) while( !m_organizeURLs.empty() && !m_organizingFileCancelled )
@ -1856,7 +1856,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
CollectionDB::instance()->dropTables( true ); // and drop them CollectionDB::instance()->dropTables( true ); // and drop them
// and now do an incremental scan since this was disabled while organizing files // and now do an incremental scan since this was disabled while organizing files
TQTimer::singleShot( 0, CollectionDB::instance(), TQT_SLOT( scanMonitor() ) ); TQTimer::singleShot( 0, CollectionDB::instance(), TQ_SLOT( scanMonitor() ) );
if( !m_organizingFileCancelled && skipped.count() > 0 ) if( !m_organizingFileCancelled && skipped.count() > 0 )
{ {
@ -1886,7 +1886,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
} }
m_dirty = true; m_dirty = true;
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) );
Amarok::StatusBar::instance()->endProgressOperation( this ); Amarok::StatusBar::instance()->endProgressOperation( this );
} }
} }

44
amarok/src/collectiondb.cpp
Unescape View File

@ -184,7 +184,7 @@ INotify::doJob()
i += EVENT_SIZE + event->len; i += EVENT_SIZE + event->len;
} }
TQTimer::singleShot( 0, m_parent, TQT_SLOT( scanMonitor() ) ); TQTimer::singleShot( 0, m_parent, TQ_SLOT( scanMonitor() ) );
} }
} }
} }
@ -224,7 +224,7 @@ CollectionDB::CollectionDB()
, m_moveFileJobCancelled( false ) , m_moveFileJobCancelled( false )
{ {
// Enable cross thread requests for scrobbler // Enable cross thread requests for scrobbler
connect(this, SIGNAL(startScrobblerSimilarArtistsFetch(const TQString &)), Scrobbler::instance(), SLOT(similarArtists(const TQString &))); connect(this, TQ_SIGNAL(startScrobblerSimilarArtistsFetch(const TQString &)), Scrobbler::instance(), TQ_SLOT(similarArtists(const TQString &)));
DEBUG_BLOCK DEBUG_BLOCK
@ -255,21 +255,21 @@ CollectionDB::CollectionDB()
cacheCoverDir().remove( *it ); cacheCoverDir().remove( *it );
connect( this, TQT_SIGNAL(fileMoved(const TQString&, const TQString&, const TQString&)), connect( this, TQ_SIGNAL(fileMoved(const TQString&, const TQString&, const TQString&)),
this, TQT_SLOT(aftMigratePermanentTablesUrl(const TQString&, const TQString&, const TQString&)) ); this, TQ_SLOT(aftMigratePermanentTablesUrl(const TQString&, const TQString&, const TQString&)) );
connect( this, TQT_SIGNAL(uniqueIdChanged(const TQString&, const TQString&, const TQString&)), connect( this, TQ_SIGNAL(uniqueIdChanged(const TQString&, const TQString&, const TQString&)),
this, TQT_SLOT(aftMigratePermanentTablesUniqueId(const TQString&, const TQString&, const TQString&)) ); this, TQ_SLOT(aftMigratePermanentTablesUniqueId(const TQString&, const TQString&, const TQString&)) );
connect( tqApp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( disableAutoScoring() ) ); connect( tqApp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( disableAutoScoring() ) );
connect( this, TQT_SIGNAL( coverRemoved( const TQString&, const TQString& ) ), connect( this, TQ_SIGNAL( coverRemoved( const TQString&, const TQString& ) ),
TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ) ); TQ_SIGNAL( coverChanged( const TQString&, const TQString& ) ) );
connect( Scrobbler::instance(), TQT_SIGNAL( similarArtistsFetched( const TQString&, const TQStringList& ) ), connect( Scrobbler::instance(), TQ_SIGNAL( similarArtistsFetched( const TQString&, const TQStringList& ) ),
this, TQT_SLOT( similarArtistsFetched( const TQString&, const TQStringList& ) ) ); this, TQ_SLOT( similarArtistsFetched( const TQString&, const TQStringList& ) ) );
// If we're supposed to monitor dirs for changes, make sure we run it once // If we're supposed to monitor dirs for changes, make sure we run it once
// on startup, since inotify can't inform us about old events // on startup, since inotify can't inform us about old events
// TQTimer::singleShot( 0, this, TQT_SLOT( scanMonitor() ) ) // TQTimer::singleShot( 0, this, TQ_SLOT( scanMonitor() ) )
initDirOperations(); initDirOperations();
m_aftEnabledPersistentTables << "lyrics" << "statistics" << "tags_labels"; m_aftEnabledPersistentTables << "lyrics" << "statistics" << "tags_labels";
} }
@ -1945,7 +1945,7 @@ CollectionDB::podcastImage( const TQString &remoteURL, const bool withShadow, ui
{ {
TDEIO::Job *job = TDEIO::storedGet( url, false, false ); TDEIO::Job *job = TDEIO::storedGet( url, false, false );
m_podcastImageJobs[job] = remoteURL; m_podcastImageJobs[job] = remoteURL;
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( podcastImageResult( TDEIO::Job* ) ) ); connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( podcastImageResult( TDEIO::Job* ) ) );
} }
} }
@ -4018,13 +4018,13 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b
{ {
job = TDEIO::file_move( src, tmpSrc, -1, false, false, false ); job = TDEIO::file_move( src, tmpSrc, -1, false, false, false );
} }
connect( job, TQT_SIGNAL(result( TDEIO::Job * )), TQT_SLOT(fileOperationResult( TDEIO::Job * )) ); connect( job, TQ_SIGNAL(result( TDEIO::Job * )), TQ_SLOT(fileOperationResult( TDEIO::Job * )) );
m_waitForFileOperation = true; m_waitForFileOperation = true;
while( m_waitForFileOperation ) while( m_waitForFileOperation )
{ {
if( m_moveFileJobCancelled ) if( m_moveFileJobCancelled )
{ {
disconnect( job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(fileOperationResult( TDEIO::Job * )) ); disconnect( job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(fileOperationResult( TDEIO::Job * )) );
TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() ); TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() );
job->kill(); job->kill();
@ -4145,13 +4145,13 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit
{ {
job = TDEIO::file_move( srcURL, dstURL, -1, overwrite, false, false ); job = TDEIO::file_move( srcURL, dstURL, -1, overwrite, false, false );
} }
connect( job, TQT_SIGNAL(result( TDEIO::Job * )), TQT_SLOT(fileOperationResult( TDEIO::Job * )) ); connect( job, TQ_SIGNAL(result( TDEIO::Job * )), TQ_SLOT(fileOperationResult( TDEIO::Job * )) );
m_waitForFileOperation = true; m_waitForFileOperation = true;
while( m_waitForFileOperation ) while( m_waitForFileOperation )
{ {
if( m_moveFileJobCancelled ) if( m_moveFileJobCancelled )
{ {
disconnect( job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(fileOperationResult( TDEIO::Job * )) ); disconnect( job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(fileOperationResult( TDEIO::Job * )) );
TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() ); TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() );
job->kill(); job->kill();
@ -4429,7 +4429,7 @@ CollectionDB::setCompilation( const KURL::List &urls, bool enabled, bool updateV
// Update the Collection-Browser view, // Update the Collection-Browser view,
// using TQTimer to make sure we don't manipulate the GUI from a thread // using TQTimer to make sure we don't manipulate the GUI from a thread
if ( updateView ) if ( updateView )
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) );
} }
@ -4599,7 +4599,7 @@ CollectionDB::updateTags( const TQString &url, const MetaBundle &bundle, const b
// Update the Collection-Browser view, // Update the Collection-Browser view,
// using TQTimer to make sure we don't manipulate the GUI from a thread // using TQTimer to make sure we don't manipulate the GUI from a thread
if ( updateView ) if ( updateView )
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( databaseChanged() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( databaseChanged() ) );
if( art || alb ) if( art || alb )
emit tagsChanged( values[12], values[14] ); emit tagsChanged( values[12], values[14] );
@ -4934,7 +4934,7 @@ CollectionDB::fetchCover( TQWidget* parent, const TQString& artist, const TQStri
itemCoverMap->insert( item, fetcher ); itemCoverMap->insert( item, fetcher );
itemCoverMapMutex->unlock(); itemCoverMapMutex->unlock();
} }
connect( fetcher, TQT_SIGNAL(result( CoverFetcher* )), TQT_SLOT(coverFetcherResult( CoverFetcher* )) ); connect( fetcher, TQ_SIGNAL(result( CoverFetcher* )), TQ_SLOT(coverFetcherResult( CoverFetcher* )) );
fetcher->setUserCanEditQuery( !noedit ); fetcher->setUserCanEditQuery( !noedit );
fetcher->startFetch(); fetcher->startFetch();
#endif #endif
@ -5362,7 +5362,7 @@ CollectionDB::checkDatabase()
TQLabel *label = new TQLabel( i18n( "Updating database" ), dialog ); TQLabel *label = new TQLabel( i18n( "Updating database" ), dialog );
dialog->setMainWidget( label ); dialog->setMainWidget( label );
label->show(); label->show();
TQTimer::singleShot( 0, dialog, TQT_SLOT( show() ) ); TQTimer::singleShot( 0, dialog, TQ_SLOT( show() ) );
//process events in the main event loop so that the dialog actually gets shown //process events in the main event loop so that the dialog actually gets shown
kapp->processEvents(); kapp->processEvents();
debug() << "Beginning database update" << endl; debug() << "Beginning database update" << endl;
@ -5822,7 +5822,7 @@ CollectionDB::customEvent( TQCustomEvent *e )
// check if something changed while we were scanning. in this case we should // check if something changed while we were scanning. in this case we should
// rescan again, now. // rescan again, now.
if ( m_rescanRequired ) if ( m_rescanRequired )
TQTimer::singleShot( 0, CollectionDB::instance(), TQT_SLOT( scanMonitor() ) ); TQTimer::singleShot( 0, CollectionDB::instance(), TQ_SLOT( scanMonitor() ) );
} }
else else
{ {

6
amarok/src/collectionscanner/collectionscanner.cpp
Unescape View File

@ -60,13 +60,13 @@ CollectionScanner::CollectionScanner( const TQStringList& folders,
, m_pause( false ) , m_pause( false )
{ {
DcopCollectionScannerHandler* dcsh = new DcopCollectionScannerHandler(); DcopCollectionScannerHandler* dcsh = new DcopCollectionScannerHandler();
connect( dcsh, TQT_SIGNAL(pauseRequest()), this, TQT_SLOT(pause()) ); connect( dcsh, TQ_SIGNAL(pauseRequest()), this, TQ_SLOT(pause()) );
connect( dcsh, TQT_SIGNAL(unpauseRequest()), this, TQT_SLOT(resume()) ); connect( dcsh, TQ_SIGNAL(unpauseRequest()), this, TQ_SLOT(resume()) );
kapp->setName( TQString( "amarokcollectionscanner" ).ascii() ); kapp->setName( TQString( "amarokcollectionscanner" ).ascii() );
if( !restart ) if( !restart )
TQFile::remove( m_logfile ); TQFile::remove( m_logfile );
TQTimer::singleShot( 0, this, TQT_SLOT( doJob() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( doJob() ) );
} }

12
amarok/src/columnlist.cpp
Unescape View File

@ -65,11 +65,11 @@ ColumnList::ColumnList( TQWidget *parent, const char *name )
m_up = new KPushButton( KGuiItem( TQString(), "go-up" ), buttonbox ); m_up = new KPushButton( KGuiItem( TQString(), "go-up" ), buttonbox );
TQToolTip::add( m_up, i18n( "Move column up" ) ); TQToolTip::add( m_up, i18n( "Move column up" ) );
connect( m_up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUp() ) ); connect( m_up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveUp() ) );
m_down = new KPushButton( KGuiItem( TQString(), "go-down" ), buttonbox ); m_down = new KPushButton( KGuiItem( TQString(), "go-down" ), buttonbox );
TQToolTip::add( m_down, i18n( "Move column down" ) ); TQToolTip::add( m_down, i18n( "Move column down" ) );
connect( m_down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDown() ) ); connect( m_down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveDown() ) );
m_list = new TDEListView( this ); m_list = new TDEListView( this );
m_list->addColumn(""); m_list->addColumn("");
@ -81,9 +81,9 @@ ColumnList::ColumnList( TQWidget *parent, const char *name )
m_list->setDragEnabled( true ); m_list->setDragEnabled( true );
m_list->setDropVisualizer( true ); m_list->setDropVisualizer( true );
m_list->setDropVisualizerWidth( 3 ); m_list->setDropVisualizerWidth( 3 );
connect( m_list, TQT_SIGNAL( moved() ), this, TQT_SLOT( updateUI() ) ); connect( m_list, TQ_SIGNAL( moved() ), this, TQ_SLOT( updateUI() ) );
connect( m_list, TQT_SIGNAL( moved() ), this, TQT_SLOT( setChanged() ) ); connect( m_list, TQ_SIGNAL( moved() ), this, TQ_SLOT( setChanged() ) );
connect( m_list, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), this, TQT_SLOT( updateUI() ) ); connect( m_list, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), this, TQ_SLOT( updateUI() ) );
TQHeader* const h = Playlist::instance()->header(); TQHeader* const h = Playlist::instance()->header();
for( int i = h->count() - 1; i >= 0; --i ) for( int i = h->count() - 1; i >= 0; --i )
@ -176,7 +176,7 @@ ColumnsDialog::ColumnsDialog()
{ {
setMainWidget( m_list ); setMainWidget( m_list );
enableButtonApply( false ); enableButtonApply( false );
connect( m_list, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); connect( m_list, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
} }
ColumnsDialog::~ColumnsDialog() ColumnsDialog::~ColumnsDialog()

26
amarok/src/configdialog.cpp
Unescape View File

@ -163,10 +163,10 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC
hbox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); hbox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
KPushButton *autodetect = new KPushButton( i18n( "Autodetect Devices" ), hbox ); KPushButton *autodetect = new KPushButton( i18n( "Autodetect Devices" ), hbox );
autodetect->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); autodetect->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( autodetect, TQT_SIGNAL(clicked()), m_deviceManager, TQT_SLOT(redetectDevices()) ); connect( autodetect, TQ_SIGNAL(clicked()), m_deviceManager, TQ_SLOT(redetectDevices()) );
KPushButton *add = new KPushButton( i18n( "Add Device..." ), hbox ); KPushButton *add = new KPushButton( i18n( "Add Device..." ), hbox );
add->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); add->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( add, TQT_SIGNAL(clicked()), m_deviceManager, TQT_SLOT(newDevice()) ); connect( add, TQ_SIGNAL(clicked()), m_deviceManager, TQ_SLOT(newDevice()) );
TQFrame *frame = new TQFrame( topbox ); TQFrame *frame = new TQFrame( topbox );
frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
@ -196,16 +196,16 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC
static_cast<TQLabel*>(label)->setMaximumWidth( 250 ); static_cast<TQLabel*>(label)->setMaximumWidth( 250 );
delete list; delete list;
connect( m_deviceManager, TQT_SIGNAL(changed()), TQT_SLOT(updateButtons()) ); connect( m_deviceManager, TQ_SIGNAL(changed()), TQ_SLOT(updateButtons()) );
connect( m_soundSystem, TQT_SIGNAL(activated( int )), TQT_SLOT(updateButtons()) ); connect( m_soundSystem, TQ_SIGNAL(activated( int )), TQ_SLOT(updateButtons()) );
connect( aboutEngineButton, TQT_SIGNAL(clicked()), TQT_SLOT(aboutEngine()) ); connect( aboutEngineButton, TQ_SIGNAL(clicked()), TQ_SLOT(aboutEngine()) );
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
connect( opt5, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateButtons()) ); //see options5.ui.h connect( opt5, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateButtons()) ); //see options5.ui.h
#endif #endif
connect( m_opt2->styleComboBox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateButtons() ) ); connect( m_opt2->styleComboBox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateButtons() ) );
connect( m_opt7->dbSetupFrame->databaseEngine, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateButtons() ) ); connect( m_opt7->dbSetupFrame->databaseEngine, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateButtons() ) );
connect( m_opt1->kComboBox_browser, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateButtons() ) ); connect( m_opt1->kComboBox_browser, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateButtons() ) );
connect( m_opt1->kLineEdit_customBrowser, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( updateButtons() ) ); connect( m_opt1->kLineEdit_customBrowser, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( updateButtons() ) );
} }
AmarokConfigDialog::~AmarokConfigDialog() AmarokConfigDialog::~AmarokConfigDialog()
@ -300,8 +300,8 @@ void AmarokConfigDialog::updateSettings()
{ {
PlaylistWindow::self()->addBrowser( "MediaBrowser", MediaBrowser::instance(), i18n( "Media Device" ), Amarok::icon( "device" ) ); PlaylistWindow::self()->addBrowser( "MediaBrowser", MediaBrowser::instance(), i18n( "Media Device" ), Amarok::icon( "device" ) );
//to re-enable mediabrowser hiding, uncomment this: //to re-enable mediabrowser hiding, uncomment this:
//connect( MediaBrowser::instance(), TQT_SIGNAL( availabilityChanged( bool ) ), //connect( MediaBrowser::instance(), TQ_SIGNAL( availabilityChanged( bool ) ),
// PlaylistWindow::self(), TQT_SLOT( mbAvailabilityChanged( bool ) ) ); // PlaylistWindow::self(), TQ_SLOT( mbAvailabilityChanged( bool ) ) );
} }
@ -410,7 +410,7 @@ void AmarokConfigDialog::soundSystemChanged()
m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).arg( m_soundSystem->currentText() ) ); m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).arg( m_soundSystem->currentText() ) );
m_engineConfigFrame->show(); m_engineConfigFrame->show();
connect( m_engineConfig, TQT_SIGNAL(viewChanged()), TQT_SLOT(updateButtons()) ); connect( m_engineConfig, TQ_SIGNAL(viewChanged()), TQ_SLOT(updateButtons()) );
} }
else { else {
m_engineConfig = 0; m_engineConfig = 0;

156
amarok/src/contextbrowser.cpp
Unescape View File

@ -248,18 +248,18 @@ ContextBrowser::ContextBrowser( const char *name )
m_lyricsSearchText->setFrame( TQFrame::Sunken ); m_lyricsSearchText->setFrame( TQFrame::Sunken );
m_lyricsSearchText->installEventFilter( this ); //we intercept keyEvents m_lyricsSearchText->installEventFilter( this ); //we intercept keyEvents
connect( button, TQT_SIGNAL(clicked()), m_lyricsSearchText, TQT_SLOT(clear()) ); connect( button, TQ_SIGNAL(clicked()), m_lyricsSearchText, TQ_SLOT(clear()) );
TQToolTip::add( button, i18n( "Clear search" ) ); TQToolTip::add( button, i18n( "Clear search" ) );
TQString filtertip = i18n( "Enter text to search for. Press enter to advance to the next match." ); TQString filtertip = i18n( "Enter text to search for. Press enter to advance to the next match." );
TQToolTip::add( m_lyricsSearchText, filtertip ); TQToolTip::add( m_lyricsSearchText, filtertip );
connect ( button, TQT_SIGNAL(clicked()), m_lyricsSearchText, TQT_SLOT(clear()) ); connect ( button, TQ_SIGNAL(clicked()), m_lyricsSearchText, TQ_SLOT(clear()) );
connect ( m_lyricsSearchText, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(lyricsSearchText(const TQString & )) ); connect ( m_lyricsSearchText, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(lyricsSearchText(const TQString & )) );
connect ( m_lyricsSearchText, TQT_SIGNAL(returnPressed()), this, (TQT_SLOT(lyricsSearchTextNext())) ); connect ( m_lyricsSearchText, TQ_SIGNAL(returnPressed()), this, (TQ_SLOT(lyricsSearchTextNext())) );
Amarok::actionCollection()->setAutoConnectShortcuts ( true ); Amarok::actionCollection()->setAutoConnectShortcuts ( true );
new TDEAction( i18n("Search text in lyrics"), TDEShortcut("/"), this,TQT_SLOT( lyricsSearchTextShow() ), Amarok::actionCollection(), "search_text_lyric"); new TDEAction( i18n("Search text in lyrics"), TDEShortcut("/"), this,TQ_SLOT( lyricsSearchTextShow() ), Amarok::actionCollection(), "search_text_lyric");
Amarok::actionCollection()->setAutoConnectShortcuts ( false ); Amarok::actionCollection()->setAutoConnectShortcuts ( false );
} }
@ -289,10 +289,10 @@ ContextBrowser::ContextBrowser( const char *name )
m_wikiPage = new HTMLView( m_wikiTab, "wiki_page", true /* DNDEnabled */, false /* JScriptEnabled */ ); m_wikiPage = new HTMLView( m_wikiTab, "wiki_page", true /* DNDEnabled */, false /* JScriptEnabled */ );
m_cuefile = CueFile::instance(); m_cuefile = CueFile::instance();
connect( m_cuefile, TQT_SIGNAL(metaData( const MetaBundle& )), connect( m_cuefile, TQ_SIGNAL(metaData( const MetaBundle& )),
EngineController::instance(), TQT_SLOT(currentTrackMetaDataChanged( const MetaBundle& )) ); EngineController::instance(), TQ_SLOT(currentTrackMetaDataChanged( const MetaBundle& )) );
connect( m_cuefile, TQT_SIGNAL(newCuePoint( long, long, long )), connect( m_cuefile, TQ_SIGNAL(newCuePoint( long, long, long )),
Scrobbler::instance(), TQT_SLOT(subTrack( long, long, long )) ); Scrobbler::instance(), TQ_SLOT(subTrack( long, long, long )) );
addTab( m_contextTab, SmallIconSet( Amarok::icon( "music" ) ), i18n( "Music" ) ); addTab( m_contextTab, SmallIconSet( Amarok::icon( "music" ) ), i18n( "Music" ) );
addTab( m_lyricsTab, SmallIconSet( Amarok::icon( "lyrics" ) ), i18n( "Lyrics" ) ); addTab( m_lyricsTab, SmallIconSet( Amarok::icon( "lyrics" ) ), i18n( "Lyrics" ) );
@ -313,72 +313,72 @@ ContextBrowser::ContextBrowser( const char *name )
// Delete folder with the cached coverimage shadow pixmaps // Delete folder with the cached coverimage shadow pixmaps
TDEIO::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* ) ) ); connect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), TQ_SLOT( tabChanged( TQWidget* ) ) );
connect( m_currentTrackPage->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), connect( m_currentTrackPage->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
this, TQT_SLOT( openURLRequest( const KURL & ) ) ); this, TQ_SLOT( openURLRequest( const KURL & ) ) );
connect( m_lyricsPage->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), connect( m_lyricsPage->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
this, TQT_SLOT( openURLRequest( const KURL & ) ) ); this, TQ_SLOT( openURLRequest( const KURL & ) ) );
connect( m_wikiPage->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), connect( m_wikiPage->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
this, TQT_SLOT( openURLRequest( const KURL & ) ) ); this, TQ_SLOT( openURLRequest( const KURL & ) ) );
connect( m_currentTrackPage, TQT_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), connect( m_currentTrackPage, TQ_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ),
this, TQT_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); this, TQ_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) );
connect( m_lyricsPage, TQT_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), connect( m_lyricsPage, TQ_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ),
this, TQT_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); this, TQ_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) );
connect( m_wikiPage, TQT_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), connect( m_wikiPage, TQ_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ),
this, TQT_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); this, TQ_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) );
connect( m_lyricsToolBar->getButton( LYRICS_ADD ), TQT_SIGNAL(clicked( int )), TQT_SLOT(lyricsAdd()) ); connect( m_lyricsToolBar->getButton( LYRICS_ADD ), TQ_SIGNAL(clicked( int )), TQ_SLOT(lyricsAdd()) );
connect( m_lyricsToolBar->getButton( LYRICS_EDIT ), TQT_SIGNAL(toggled( int )), TQT_SLOT(lyricsEditToggle()) ); connect( m_lyricsToolBar->getButton( LYRICS_EDIT ), TQ_SIGNAL(toggled( int )), TQ_SLOT(lyricsEditToggle()) );
connect( m_lyricsToolBar->getButton( LYRICS_SEARCH ), TQT_SIGNAL(clicked( int )), TQT_SLOT(lyricsSearch()) ); connect( m_lyricsToolBar->getButton( LYRICS_SEARCH ), TQ_SIGNAL(clicked( int )), TQ_SLOT(lyricsSearch()) );
connect( m_lyricsToolBar->getButton( LYRICS_REFRESH ), TQT_SIGNAL(clicked( int )), TQT_SLOT(lyricsRefresh()) ); connect( m_lyricsToolBar->getButton( LYRICS_REFRESH ), TQ_SIGNAL(clicked( int )), TQ_SLOT(lyricsRefresh()) );
connect( m_lyricsToolBar->getButton( LYRICS_BROWSER ), TQT_SIGNAL(clicked( int )), TQT_SLOT(lyricsExternalPage()) ); connect( m_lyricsToolBar->getButton( LYRICS_BROWSER ), TQ_SIGNAL(clicked( int )), TQ_SLOT(lyricsExternalPage()) );
connect( m_wikiToolBar->getButton( WIKI_BACK ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiHistoryBack()) ); connect( m_wikiToolBar->getButton( WIKI_BACK ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiHistoryBack()) );
connect( m_wikiToolBar->getButton( WIKI_FORWARD ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiHistoryForward()) ); connect( m_wikiToolBar->getButton( WIKI_FORWARD ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiHistoryForward()) );
connect( m_wikiToolBar->getButton( WIKI_ARTIST ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiArtistPage()) ); connect( m_wikiToolBar->getButton( WIKI_ARTIST ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiArtistPage()) );
connect( m_wikiToolBar->getButton( WIKI_ALBUM ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiAlbumPage()) ); connect( m_wikiToolBar->getButton( WIKI_ALBUM ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiAlbumPage()) );
connect( m_wikiToolBar->getButton( WIKI_TITLE ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiTitlePage()) ); connect( m_wikiToolBar->getButton( WIKI_TITLE ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiTitlePage()) );
connect( m_wikiToolBar->getButton( WIKI_BROWSER ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiExternalPage()) ); connect( m_wikiToolBar->getButton( WIKI_BROWSER ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiExternalPage()) );
connect( m_wikiToolBar->getButton( WIKI_CONFIG ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiConfig()) ); connect( m_wikiToolBar->getButton( WIKI_CONFIG ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiConfig()) );
connect( m_wikiBackPopup, TQT_SIGNAL(activated( int )), TQT_SLOT(wikiBackPopupActivated( int )) ); connect( m_wikiBackPopup, TQ_SIGNAL(activated( int )), TQ_SLOT(wikiBackPopupActivated( int )) );
connect( m_wikiForwardPopup, TQT_SIGNAL(activated( int )), TQT_SLOT(wikiForwardPopupActivated( int )) ); connect( m_wikiForwardPopup, TQ_SIGNAL(activated( int )), TQ_SLOT(wikiForwardPopupActivated( int )) );
connect( CollectionDB::instance(), TQT_SIGNAL( scanStarted() ), TQT_SLOT( collectionScanStarted() ) ); connect( CollectionDB::instance(), TQ_SIGNAL( scanStarted() ), TQ_SLOT( collectionScanStarted() ) );
connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), TQT_SLOT( collectionScanDone( bool ) ) ); connect( CollectionDB::instance(), TQ_SIGNAL( scanDone( bool ) ), TQ_SLOT( collectionScanDone( bool ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( databaseEngineChanged() ), TQT_SLOT( renderView() ) ); connect( CollectionDB::instance(), TQ_SIGNAL( databaseEngineChanged() ), TQ_SLOT( renderView() ) );
connect( CollectionDB::instance(), TQT_SIGNAL( coverFetched( const TQString&, const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( coverFetched( const TQString&, const TQString& ) ),
this, TQT_SLOT( coverFetched( const TQString&, const TQString& ) ) ); this, TQ_SLOT( coverFetched( const TQString&, const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString&, const TQString& ) ),
this, TQT_SLOT( coverRemoved( const TQString&, const TQString& ) ) ); this, TQ_SLOT( coverRemoved( const TQString&, const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( similarArtistsFetched( const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( similarArtistsFetched( const TQString& ) ),
this, TQT_SLOT( similarArtistsFetched( const TQString& ) ) ); this, TQ_SLOT( similarArtistsFetched( const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( tagsChanged( const MetaBundle& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( tagsChanged( const MetaBundle& ) ),
this, TQT_SLOT( tagsChanged( const MetaBundle& ) ) ); this, TQ_SLOT( tagsChanged( const MetaBundle& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( tagsChanged( const TQString&, const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( tagsChanged( const TQString&, const TQString& ) ),
this, TQT_SLOT( tagsChanged( const TQString&, const TQString& ) ) ); this, TQ_SLOT( tagsChanged( const TQString&, const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ),
this, TQT_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); this, TQ_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) );
connect( StarManager::instance(), TQT_SIGNAL( ratingsColorsChanged( const TQString& ) ), connect( StarManager::instance(), TQ_SIGNAL( ratingsColorsChanged( const TQString& ) ),
this, TQT_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); this, TQ_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( scoreChanged( const TQString&, float ) ), connect( CollectionDB::instance(), TQ_SIGNAL( scoreChanged( const TQString&, float ) ),
this, TQT_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); this, TQ_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( labelsChanged( const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( labelsChanged( const TQString& ) ),
this, TQT_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); this, TQ_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( imageFetched( const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( imageFetched( const TQString& ) ),
this, TQT_SLOT( imageFetched( const TQString& ) ) ); this, TQ_SLOT( imageFetched( const TQString& ) ) );
connect( App::instance(), TQT_SIGNAL( useScores( bool ) ), connect( App::instance(), TQ_SIGNAL( useScores( bool ) ),
this, TQT_SLOT( refreshCurrentTrackPage() ) ); this, TQ_SLOT( refreshCurrentTrackPage() ) );
connect( App::instance(), TQT_SIGNAL( useRatings( bool ) ), connect( App::instance(), TQ_SIGNAL( useRatings( bool ) ),
this, TQT_SLOT( refreshCurrentTrackPage() ) ); this, TQ_SLOT( refreshCurrentTrackPage() ) );
connect( MountPointManager::instance(), TQT_SIGNAL( mediumConnected( int ) ), connect( MountPointManager::instance(), TQ_SIGNAL( mediumConnected( int ) ),
this, TQT_SLOT( renderView() ) ); this, TQ_SLOT( renderView() ) );
connect( MountPointManager::instance(), TQT_SIGNAL( mediumRemoved( int ) ), connect( MountPointManager::instance(), TQ_SIGNAL( mediumRemoved( int ) ),
this, TQT_SLOT( renderView() ) ); this, TQ_SLOT( renderView() ) );
showContext( KURL( "current://track" ) ); showContext( KURL( "current://track" ) );
@ -3703,8 +3703,8 @@ ContextBrowser::wikiConfig() // SLOT
otherLabel->setBuddy( m_wikiLocaleEdit ); otherLabel->setBuddy( m_wikiLocaleEdit );
TQToolTip::add( m_wikiLocaleEdit, i18n( "2-letter language code for your Wikipedia locale" ) ); TQToolTip::add( m_wikiLocaleEdit, i18n( "2-letter language code for your Wikipedia locale" ) );
connect( m_wikiLocaleCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( wikiConfigChanged(int) ) ); connect( m_wikiLocaleCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( wikiConfigChanged(int) ) );
connect( m_wikiConfigDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( wikiConfigApply() ) ); connect( m_wikiConfigDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( wikiConfigApply() ) );
m_wikiLocaleEdit->setText( wikiLocale() ); m_wikiLocaleEdit->setText( wikiLocale() );
m_wikiLocaleCombo->setCurrentItem( index ); m_wikiLocaleCombo->setCurrentItem( index );
@ -3994,7 +3994,7 @@ void ContextBrowser::showWikipedia( const TQString &url, bool fromHistory, bool
Amarok::StatusBar::instance()->newProgressOperation( m_wikiJob ) Amarok::StatusBar::instance()->newProgressOperation( m_wikiJob )
.setDescription( i18n( "Fetching Wikipedia Information" ) ); .setDescription( i18n( "Fetching Wikipedia Information" ) );
connect( m_wikiJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( wikiResult( TDEIO::Job* ) ) ); connect( m_wikiJob, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( wikiResult( TDEIO::Job* ) ) );
} }

24
amarok/src/coverfetcher.cpp
Unescape View File

@ -235,7 +235,7 @@ CoverFetcher::startFetch()
debug() << url << endl; debug() << url << endl;
TDEIO::TransferJob* job = TDEIO::storedGet( url, false, false ); TDEIO::TransferJob* job = TDEIO::storedGet( url, false, false );
connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(finishedXmlFetch( TDEIO::Job* )) ); connect( job, TQ_SIGNAL(result( TDEIO::Job* )), TQ_SLOT(finishedXmlFetch( TDEIO::Job* )) );
Amarok::StatusBar::instance()->newProgressOperation( job ); Amarok::StatusBar::instance()->newProgressOperation( job );
} }
@ -411,7 +411,7 @@ CoverFetcher::attemptAnotherFetch()
// try a different query // try a different query
TDEIO::TransferJob* job = TDEIO::storedGet( KURL(m_coverUrls.front()), false, false ); TDEIO::TransferJob* job = TDEIO::storedGet( KURL(m_coverUrls.front()), false, false );
connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(finishedImageFetch( TDEIO::Job* )) ); connect( job, TQ_SIGNAL(result( TDEIO::Job* )), TQ_SLOT(finishedImageFetch( TDEIO::Job* )) );
Amarok::StatusBar::instance()->newProgressOperation( job ); Amarok::StatusBar::instance()->newProgressOperation( job );
@ -473,11 +473,11 @@ CoverFetcher::attemptAnotherFetch()
amazonLocale->insertItem( i18n("Japan"), CoverFetcher::Japan); amazonLocale->insertItem( i18n("Japan"), CoverFetcher::Japan);
amazonLocale->insertItem( i18n("United Kingdom"), CoverFetcher::UK ); amazonLocale->insertItem( i18n("United Kingdom"), CoverFetcher::UK );
if( CoverManager::instance() ) if( CoverManager::instance() )
connect( amazonLocale, TQT_SIGNAL( activated(int) ), connect( amazonLocale, TQ_SIGNAL( activated(int) ),
CoverManager::instance(), TQT_SLOT( changeLocale(int) ) ); CoverManager::instance(), TQ_SLOT( changeLocale(int) ) );
else else
connect( amazonLocale, TQT_SIGNAL( activated(int) ), connect( amazonLocale, TQ_SIGNAL( activated(int) ),
fetcher, TQT_SLOT( changeLocale(int) ) ); fetcher, TQ_SLOT( changeLocale(int) ) );
TQHBoxLayout *hbox1 = new TQHBoxLayout( 8 ); TQHBoxLayout *hbox1 = new TQHBoxLayout( 8 );
hbox1->addWidget( new TQLabel( i18n( "Amazon Locale: " ), this ) ); hbox1->addWidget( new TQLabel( i18n( "Amazon Locale: " ), this ) );
hbox1->addWidget( amazonLocale ); hbox1->addWidget( amazonLocale );
@ -504,8 +504,8 @@ CoverFetcher::attemptAnotherFetch()
adjustSize(); adjustSize();
setFixedHeight( height() ); setFixedHeight( height() );
connect( searchButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect( searchButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
} }
TQString query() { return static_cast<KLineEdit*>(child( "Query" ))->text(); } TQString query() { return static_cast<KLineEdit*>(child( "Query" ))->text(); }
@ -608,10 +608,10 @@ CoverFetcher::getUserQuery( TQString explanation )
this->setFixedSize( sizeHint() ); this->setFixedSize( sizeHint() );
this->setCaption( i18n("Cover Found") ); this->setCaption( i18n("Cover Found") );
connect( save, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect( save, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
connect( newsearch, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect( newsearch, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
connect( nextcover, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect( nextcover, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
connect( cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); connect( cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
} }
virtual void accept() virtual void accept()

52
amarok/src/covermanager.cpp
Unescape View File

@ -147,7 +147,7 @@ CoverManager::CoverManager()
m_searchEdit->setFrame( TQFrame::Sunken ); m_searchEdit->setFrame( TQFrame::Sunken );
searchToolBar->setStretchableWidget( m_searchEdit ); searchToolBar->setStretchableWidget( m_searchEdit );
connect( button, TQT_SIGNAL(clicked()), m_searchEdit, TQT_SLOT(clear()) ); connect( button, TQ_SIGNAL(clicked()), m_searchEdit, TQ_SLOT(clear()) );
TQToolTip::add( button, i18n( "Clear search field" ) ); TQToolTip::add( button, i18n( "Clear search field" ) );
TQToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search in the albums" ) ); TQToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search in the albums" ) );
@ -161,7 +161,7 @@ CoverManager::CoverManager()
m_viewMenu->insertItem( i18n("Albums With Cover"), AlbumsWithCover ); m_viewMenu->insertItem( i18n("Albums With Cover"), AlbumsWithCover );
m_viewMenu->insertItem( i18n("Albums Without Cover"), AlbumsWithoutCover ); m_viewMenu->insertItem( i18n("Albums Without Cover"), AlbumsWithoutCover );
m_viewMenu->setItemChecked( AllAlbums, true ); m_viewMenu->setItemChecked( AllAlbums, true );
connect( m_viewMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( changeView(int) ) ); connect( m_viewMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( changeView(int) ) );
#ifdef AMAZON_SUPPORT #ifdef AMAZON_SUPPORT
// amazon locale menu // amazon locale menu
@ -172,7 +172,7 @@ CoverManager::CoverManager()
m_amazonLocaleMenu->insertItem( i18n("Germany"), CoverFetcher::Germany ); m_amazonLocaleMenu->insertItem( i18n("Germany"), CoverFetcher::Germany );
m_amazonLocaleMenu->insertItem( i18n("Japan"), CoverFetcher::Japan); m_amazonLocaleMenu->insertItem( i18n("Japan"), CoverFetcher::Japan);
m_amazonLocaleMenu->insertItem( i18n("United Kingdom"), CoverFetcher::UK ); m_amazonLocaleMenu->insertItem( i18n("United Kingdom"), CoverFetcher::UK );
connect( m_amazonLocaleMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( changeLocale(int) ) ); connect( m_amazonLocaleMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( changeLocale(int) ) );
#endif #endif
TDEToolBar* toolBar = new TDEToolBar( hbox ); TDEToolBar* toolBar = new TDEToolBar( hbox );
@ -188,7 +188,7 @@ CoverManager::CoverManager()
//fetch missing covers button //fetch missing covers button
m_fetchButton = new KPushButton( KGuiItem( i18n("Fetch Missing Covers"), Amarok::icon( "download" ) ), hbox ); m_fetchButton = new KPushButton( KGuiItem( i18n("Fetch Missing Covers"), Amarok::icon( "download" ) ), hbox );
connect( m_fetchButton, TQT_SIGNAL(clicked()), TQT_SLOT(fetchMissingCovers()) ); connect( m_fetchButton, TQ_SIGNAL(clicked()), TQ_SLOT(fetchMissingCovers()) );
#endif #endif
//cover view //cover view
@ -200,7 +200,7 @@ CoverManager::CoverManager()
m_statusLabel->setIndent( 3 ); m_statusLabel->setIndent( 3 );
m_statusBar->addWidget( m_progressBox = new TQHBox( m_statusBar ), 1, true ); m_statusBar->addWidget( m_progressBox = new TQHBox( m_statusBar ), 1, true );
KPushButton *stopButton = new KPushButton( KGuiItem(i18n("Abort"), "process-stop"), m_progressBox ); KPushButton *stopButton = new KPushButton( KGuiItem(i18n("Abort"), "process-stop"), m_progressBox );
connect( stopButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopFetching()) ); connect( stopButton, TQ_SIGNAL(clicked()), TQ_SLOT(stopFetching()) );
m_progress = new KProgress( m_progressBox ); m_progress = new KProgress( m_progressBox );
m_progress->setCenterIndicator( true ); m_progress->setCenterIndicator( true );
@ -211,24 +211,24 @@ CoverManager::CoverManager()
// signals and slots connections // signals and slots connections
connect( m_artistView, TQT_SIGNAL(selectionChanged( TQListViewItem* ) ), connect( m_artistView, TQ_SIGNAL(selectionChanged( TQListViewItem* ) ),
TQT_SLOT(slotArtistSelected( TQListViewItem* )) ); TQ_SLOT(slotArtistSelected( TQListViewItem* )) );
connect( m_coverView, TQT_SIGNAL(contextMenuRequested( TQIconViewItem*, const TQPoint& )), connect( m_coverView, TQ_SIGNAL(contextMenuRequested( TQIconViewItem*, const TQPoint& )),
TQT_SLOT(showCoverMenu( TQIconViewItem*, const TQPoint& )) ); TQ_SLOT(showCoverMenu( TQIconViewItem*, const TQPoint& )) );
connect( m_coverView, TQT_SIGNAL(executed( TQIconViewItem* )), connect( m_coverView, TQ_SIGNAL(executed( TQIconViewItem* )),
TQT_SLOT(coverItemExecuted( TQIconViewItem* )) ); TQ_SLOT(coverItemExecuted( TQIconViewItem* )) );
connect( m_timer, TQT_SIGNAL(timeout()), connect( m_timer, TQ_SIGNAL(timeout()),
TQT_SLOT(slotSetFilter()) ); TQ_SLOT(slotSetFilter()) );
connect( m_searchEdit, TQT_SIGNAL(textChanged( const TQString& )), connect( m_searchEdit, TQ_SIGNAL(textChanged( const TQString& )),
TQT_SLOT(slotSetFilterTimeout()) ); TQ_SLOT(slotSetFilterTimeout()) );
#ifdef AMAZON_SUPPORT #ifdef AMAZON_SUPPORT
connect( CollectionDB::instance(), TQT_SIGNAL(coverFetched( const TQString&, const TQString& )), connect( CollectionDB::instance(), TQ_SIGNAL(coverFetched( const TQString&, const TQString& )),
TQT_SLOT(coverFetched( const TQString&, const TQString& )) ); TQ_SLOT(coverFetched( const TQString&, const TQString& )) );
connect( CollectionDB::instance(), TQT_SIGNAL(coverRemoved( const TQString&, const TQString& )), connect( CollectionDB::instance(), TQ_SIGNAL(coverRemoved( const TQString&, const TQString& )),
TQT_SLOT(coverRemoved( const TQString&, const TQString& )) ); TQ_SLOT(coverRemoved( const TQString&, const TQString& )) );
connect( CollectionDB::instance(), TQT_SIGNAL(coverFetcherError( const TQString& )), connect( CollectionDB::instance(), TQ_SIGNAL(coverFetcherError( const TQString& )),
TQT_SLOT(coverFetcherError()) ); TQ_SLOT(coverFetcherError()) );
#endif #endif
m_currentView = AllAlbums; m_currentView = AllAlbums;
@ -238,7 +238,7 @@ CoverManager::CoverManager()
show(); show();
TQTimer::singleShot( 0, this, TQT_SLOT(init()) ); TQTimer::singleShot( 0, this, TQ_SLOT(init()) );
} }
@ -347,7 +347,7 @@ void CoverManager::fetchCoversLoop() //SLOT
m_fetchCounter++; m_fetchCounter++;
// Wait 1 second, since amazon caps the number of accesses per client // Wait 1 second, since amazon caps the number of accesses per client
TQTimer::singleShot( 1000, this, TQT_SLOT( fetchCoversLoop() ) ); TQTimer::singleShot( 1000, this, TQ_SLOT( fetchCoversLoop() ) );
} }
else { else {
m_fetchCovers.clear(); m_fetchCovers.clear();
@ -809,7 +809,7 @@ void CoverManager::updateStatusBar()
m_fetchingCovers = 0; m_fetchingCovers = 0;
m_coversFetched = 0; m_coversFetched = 0;
m_coverErrors = 0; m_coverErrors = 0;
TQTimer::singleShot( 2000, this, TQT_SLOT( updateStatusBar() ) ); TQTimer::singleShot( 2000, this, TQ_SLOT( updateStatusBar() ) );
} }
if( m_fetchingCovers == 1 ) { if( m_fetchingCovers == 1 ) {
@ -900,8 +900,8 @@ CoverView::CoverView( TQWidget *parent, const char *name, WFlags f )
// icon (and not the text), we have to create our own tooltips // icon (and not the text), we have to create our own tooltips
setShowToolTips( false ); setShowToolTips( false );
connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), TQT_SLOT( setStatusText( TQIconViewItem * ) ) ); connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), TQ_SLOT( setStatusText( TQIconViewItem * ) ) );
connect( this, TQT_SIGNAL( onViewport() ), CoverManager::instance(), TQT_SLOT( updateStatusBar() ) ); connect( this, TQ_SIGNAL( onViewport() ), CoverManager::instance(), TQ_SLOT( updateStatusBar() ) );
} }

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

@ -95,8 +95,8 @@ CollectionDB::CollectionDB()
startTimer( MONITOR_INTERVAL * 1000 ); startTimer( MONITOR_INTERVAL * 1000 );
connect( Scrobbler::instance(), TQT_SIGNAL( similarArtistsFetched( const TQString&, const TQStringList& ) ), connect( Scrobbler::instance(), TQ_SIGNAL( similarArtistsFetched( const TQString&, const TQStringList& ) ),
this, TQT_SLOT( similarArtistsFetched( const TQString&, const TQStringList& ) ) ); this, TQ_SLOT( similarArtistsFetched( const TQString&, const TQStringList& ) ) );
} }
@ -1514,7 +1514,7 @@ CollectionDB::setCompilation( const TQString &album, const bool enabled, const b
// Update the Collection-Browser view, // Update the Collection-Browser view,
// using TQTimer to make sure we don't manipulate the GUI from a thread // using TQTimer to make sure we don't manipulate the GUI from a thread
if ( updateView ) if ( updateView )
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) );
} }
@ -1554,7 +1554,7 @@ CollectionDB::updateTags( const TQString &url, const MetaBundle &bundle, const b
// Update the Collection-Browser view, // Update the Collection-Browser view,
// using TQTimer to make sure we don't manipulate the GUI from a thread // using TQTimer to make sure we don't manipulate the GUI from a thread
if ( updateView ) if ( updateView )
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) );
} }
@ -1681,7 +1681,7 @@ CollectionDB::fetchCover( TQWidget* parent, const TQString& artist, const TQStri
debug() << "Fetching cover for " << artist << " - " << album << endl; debug() << "Fetching cover for " << artist << " - " << album << endl;
CoverFetcher* fetcher = new CoverFetcher( parent, artist, album ); CoverFetcher* fetcher = new CoverFetcher( parent, artist, album );
connect( fetcher, TQT_SIGNAL(result( CoverFetcher* )), TQT_SLOT(coverFetcherResult( CoverFetcher* )) ); connect( fetcher, TQ_SIGNAL(result( CoverFetcher* )), TQ_SLOT(coverFetcherResult( CoverFetcher* )) );
fetcher->setUserCanEditQuery( !noedit ); fetcher->setUserCanEditQuery( !noedit );
fetcher->startFetch(); fetcher->startFetch();
#endif #endif

2
amarok/src/deletedialog.cpp
Unescape View File

@ -98,7 +98,7 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) :
adjustSize(); adjustSize();
slotShouldDelete(shouldDelete()); slotShouldDelete(shouldDelete());
connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShouldDelete(bool))); connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShouldDelete(bool)));
} }

4
amarok/src/deviceconfiguredialog.cpp
Unescape View File

@ -90,8 +90,8 @@ DeviceConfigureDialog::DeviceConfigureDialog( const Medium &medium )
m_transcodeWhenNecessary = new TQRadioButton( transcodeGroup ); m_transcodeWhenNecessary = new TQRadioButton( transcodeGroup );
m_transcodeWhenNecessary->setText( i18n( "When necessary" ) ); m_transcodeWhenNecessary->setText( i18n( "When necessary" ) );
m_transcodeWhenNecessary->setChecked( !device->m_transcodeAlways ); m_transcodeWhenNecessary->setChecked( !device->m_transcodeAlways );
connect( m_transcodeCheck, TQT_SIGNAL(toggled( bool )), connect( m_transcodeCheck, TQ_SIGNAL(toggled( bool )),
transcodeGroup, TQT_SLOT(setEnabled( bool )) ); transcodeGroup, TQ_SLOT(setEnabled( bool )) );
transcodeGroup->insert( m_transcodeAlways ); transcodeGroup->insert( m_transcodeAlways );
transcodeGroup->insert( m_transcodeWhenNecessary ); transcodeGroup->insert( m_transcodeWhenNecessary );
m_transcodeRemove = new TQCheckBox( transcodeGroup ); m_transcodeRemove = new TQCheckBox( transcodeGroup );

8
amarok/src/directorylist.cpp
Unescape View File

@ -123,7 +123,7 @@ Item::Item( TQListView *parent )
if ( CollectionSetup::instance()->m_dirs.contains( "/" ) ) if ( CollectionSetup::instance()->m_dirs.contains( "/" ) )
static_cast<TQCheckListItem*>( this )->setOn(true); static_cast<TQCheckListItem*>( this )->setOn(true);
m_lister.setDirOnlyMode( true ); m_lister.setDirOnlyMode( true );
connect( &m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(newItems( const KFileItemList& )) ); connect( &m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(newItems( const KFileItemList& )) );
setOpen( true ); setOpen( true );
setVisible( true ); setVisible( true );
} }
@ -138,9 +138,9 @@ Item::Item( TQListViewItem *parent, const KURL &url , bool full_disable /* defau
{ {
m_lister.setDirOnlyMode( true ); m_lister.setDirOnlyMode( true );
setExpandable( true ); setExpandable( true );
connect( &m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(newItems( const KFileItemList& )) ); connect( &m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(newItems( const KFileItemList& )) );
connect( &m_lister, TQT_SIGNAL(completed()), TQT_SLOT(completed()) ); connect( &m_lister, TQ_SIGNAL(completed()), TQ_SLOT(completed()) );
connect( &m_lister, TQT_SIGNAL(canceled()), TQT_SLOT(completed()) ); connect( &m_lister, TQ_SIGNAL(canceled()), TQ_SLOT(completed()) );
} }

22
amarok/src/editfilterdialog.cpp
Unescape View File

@ -178,7 +178,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
keywordLayout->addWidget( m_editKeyword ); keywordLayout->addWidget( m_editKeyword );
m_mainLay->addLayout( keywordLayout ); m_mainLay->addLayout( keywordLayout );
m_mainLay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); m_mainLay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
connect(m_comboKeyword, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectedKeyword(int))); connect(m_comboKeyword, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectedKeyword(int)));
// group of options on numeric attribute keywords: a value <,>,= ... or a value between Min and Max // group of options on numeric attribute keywords: a value <,>,= ... or a value between Min and Max
m_groupBox = new TQGroupBox( plainPage(), "groupBox" ); m_groupBox = new TQGroupBox( plainPage(), "groupBox" );
@ -207,7 +207,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
paramLayout->addWidget( m_spinMin2 ); paramLayout->addWidget( m_spinMin2 );
paramLayout->addItem( new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); paramLayout->addItem( new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
connect(m_spinMin1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minSpinChanged(int))); connect(m_spinMin1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(minSpinChanged(int)));
m_andLabel = new TQLabel( i18n("and"), m_groupBox, "andLabel"); m_andLabel = new TQLabel( i18n("and"), m_groupBox, "andLabel");
paramLayout->addWidget( m_andLabel ); paramLayout->addWidget( m_andLabel );
@ -220,7 +220,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
m_spinMax2 = new TQSpinBox( m_groupBox, "maximum2" ); m_spinMax2 = new TQSpinBox( m_groupBox, "maximum2" );
paramLayout->addWidget( m_spinMax2 ); paramLayout->addWidget( m_spinMax2 );
connect(m_spinMax1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxSpinChanged(int))); connect(m_spinMax1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(maxSpinChanged(int)));
TQHBoxLayout *filesizeLayout = new TQHBoxLayout( vertLayout ); TQHBoxLayout *filesizeLayout = new TQHBoxLayout( vertLayout );
filesizeLayout->setAlignment( AlignLeft ); filesizeLayout->setAlignment( AlignLeft );
@ -240,7 +240,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
// check the "One Value Choosing" by default // check the "One Value Choosing" by default
chooseOneValue(); chooseOneValue();
connect( m_comboCondition, TQT_SIGNAL(activated(int)), TQT_SLOT(chooseCondition(int)) ); connect( m_comboCondition, TQ_SIGNAL(activated(int)), TQ_SLOT(chooseCondition(int)) );
TQHBoxLayout *otherOptionsLayout = new TQHBoxLayout( plainPage() ); TQHBoxLayout *otherOptionsLayout = new TQHBoxLayout( plainPage() );
otherOptionsLayout->setAlignment( AlignHCenter ); otherOptionsLayout->setAlignment( AlignHCenter );
@ -282,10 +282,10 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
m_actionCheck << m_checkExactly; m_actionCheck << m_checkExactly;
m_actionCheck << m_checkExclude; m_actionCheck << m_checkExclude;
connect( m_checkALL, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckAll()) ); connect( m_checkALL, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckAll()) );
connect( m_checkAtLeastOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckAtLeastOne()) ); connect( m_checkAtLeastOne, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckAtLeastOne()) );
connect( m_checkExactly, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckExactly()) ); connect( m_checkExactly, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckExactly()) );
connect( m_checkExclude, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckExclude()) ); connect( m_checkExclude, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckExclude()) );
// check "select all words" as default // check "select all words" as default
slotCheckAll(); slotCheckAll();
@ -325,7 +325,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
verticalCondLay->addWidget( m_prefixNOT ); verticalCondLay->addWidget( m_prefixNOT );
m_prefixNOT->setEnabled( false ); m_prefixNOT->setEnabled( false );
connect(m_prefixNOT, TQT_SIGNAL(clicked()), TQT_SLOT(assignPrefixNOT())); connect(m_prefixNOT, TQ_SIGNAL(clicked()), TQ_SLOT(assignPrefixNOT()));
m_mainLay->addItem( new TQSpacerItem( 10, 20, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); m_mainLay->addItem( new TQSpacerItem( 10, 20, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
@ -334,8 +334,8 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
if (m_filterText.isEmpty()) if (m_filterText.isEmpty())
m_groupBox3->setEnabled( false ); m_groupBox3->setEnabled( false );
connect( m_checkAND, TQT_SIGNAL(clicked()), TQT_SLOT(slotCheckAND()) ); connect( m_checkAND, TQ_SIGNAL(clicked()), TQ_SLOT(slotCheckAND()) );
connect( m_checkOR, TQT_SIGNAL(clicked()), TQT_SLOT(slotCheckOR()) ); connect( m_checkOR, TQ_SIGNAL(clicked()), TQ_SLOT(slotCheckOR()) );
// check "AND" condition as default // check "AND" condition as default
slotCheckAND(); slotCheckAND();

22
amarok/src/engine/helix/helix-configdialog.cpp
Unescape View File

@ -56,8 +56,8 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
TQGridLayout *grid = (TQGridLayout*)parent->layout(); TQGridLayout *grid = (TQGridLayout*)parent->layout();
m_w = new KLineEdit( m_stringValue, parent ); m_w = new KLineEdit( m_stringValue, parent );
connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); connect( (TQWidget *) m_w, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotStringChanged( const TQString& )) );
connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); connect( (TQWidget *) m_w, TQ_SIGNAL(textChanged( const TQString& )), pluginConfig, TQ_SIGNAL(viewChanged()) );
TQToolTip::add( (TQWidget *) m_w, "<qt>" + tooltip ); TQToolTip::add( (TQWidget *) m_w, "<qt>" + tooltip );
@ -84,8 +84,8 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
m_key = str; m_key = str;
m_w = new KLineEdit( str, parent ); m_w = new KLineEdit( str, parent );
connect( m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); connect( m_w, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotStringChanged( const TQString& )) );
connect( m_w, TQT_SIGNAL(textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); connect( m_w, TQ_SIGNAL(textChanged( const TQString& )), pluginConfig, TQ_SIGNAL(viewChanged()) );
TQToolTip::add( m_w, "<qt>" + tooltip ); TQToolTip::add( m_w, "<qt>" + tooltip );
@ -122,8 +122,8 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
op->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); op->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget( op, row, 0 ); grid->addWidget( op, row, 0 );
grid->addWidget( deviceComboBox, row, 1); grid->addWidget( deviceComboBox, row, 1);
connect( (TQWidget *)deviceComboBox, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( slotNewDevice( const TQString& )) ); connect( (TQWidget *)deviceComboBox, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( slotNewDevice( const TQString& )) );
connect( (TQWidget *)deviceComboBox, TQT_SIGNAL( activated( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); connect( (TQWidget *)deviceComboBox, TQ_SIGNAL( activated( const TQString& )), pluginConfig, TQ_SIGNAL(viewChanged()) );
++row; ++row;
@ -133,12 +133,12 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
checkBox_outputDevice->setText( i18n( "Device:" ) ); checkBox_outputDevice->setText( i18n( "Device:" ) );
lineEdit_outputDevice = new KLineEdit( HelixConfig::device(), parent ); lineEdit_outputDevice = new KLineEdit( HelixConfig::device(), parent );
connect( (TQWidget *) lineEdit_outputDevice, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); connect( (TQWidget *) lineEdit_outputDevice, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotStringChanged( const TQString& )) );
connect( (TQWidget *) lineEdit_outputDevice, TQT_SIGNAL( textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); connect( (TQWidget *) lineEdit_outputDevice, TQ_SIGNAL( textChanged( const TQString& )), pluginConfig, TQ_SIGNAL(viewChanged()) );
connect( checkBox_outputDevice, TQT_SIGNAL( toggled(bool) ), lineEdit_outputDevice, TQT_SLOT( setEnabled(bool) ) ); connect( checkBox_outputDevice, TQ_SIGNAL( toggled(bool) ), lineEdit_outputDevice, TQ_SLOT( setEnabled(bool) ) );
connect( checkBox_outputDevice, TQT_SIGNAL( toggled(bool) ), pluginConfig, TQT_SIGNAL(viewChanged()) ); connect( checkBox_outputDevice, TQ_SIGNAL( toggled(bool) ), pluginConfig, TQ_SIGNAL(viewChanged()) );
connect( checkBox_outputDevice, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotDeviceChecked(bool) ) ); connect( checkBox_outputDevice, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotDeviceChecked(bool) ) );
grid->addWidget( (TQWidget *) lineEdit_outputDevice, row, 1 ); grid->addWidget( (TQWidget *) lineEdit_outputDevice, row, 1 );
if (HelixConfig::deviceenabled()) if (HelixConfig::deviceenabled())

2
amarok/src/engine/kdemm/kdemmengine.cpp
Unescape View File

@ -85,7 +85,7 @@ bool KDEMMEngine::init()
m_mixerHW = -1; //initialize m_mixerHW = -1; //initialize
*/ */
connect ( m_pPlayingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( playingTimeout() ) ); connect ( m_pPlayingTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( playingTimeout() ) );
kdDebug() << "END " << k_funcinfo << endl; kdDebug() << "END " << k_funcinfo << endl;
return true; return true;

2
amarok/src/engine/mas/masengine.cpp
Unescape View File

@ -97,7 +97,7 @@ bool MasEngine::init()
} }
m_inited=true; // we connected to MAS m_inited=true; // we connected to MAS
connect ( m_pPlayingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( playingTimeout() ) ); connect ( m_pPlayingTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( playingTimeout() ) );
emit statusText( "MAS Engine inited :-)"); emit statusText( "MAS Engine inited :-)");
return true; return true;

12
amarok/src/engine/nmm/ServerregistryPing.cpp
Unescape View File

@ -29,12 +29,12 @@
ServerregistryPing::ServerregistryPing(const TQString &host, TQ_UINT16 port) ServerregistryPing::ServerregistryPing(const TQString &host, TQ_UINT16 port)
: TQSocket() : TQSocket()
{ {
connect( this, TQT_SIGNAL(connected()), connect( this, TQ_SIGNAL(connected()),
TQT_SLOT(socketConnected()) ); TQ_SLOT(socketConnected()) );
connect( this, TQT_SIGNAL(connectionClosed()), connect( this, TQ_SIGNAL(connectionClosed()),
TQT_SLOT(socketConnectionClosed()) ); TQ_SLOT(socketConnectionClosed()) );
connect( this, TQT_SIGNAL(error(int)), connect( this, TQ_SIGNAL(error(int)),
TQT_SLOT(socketError(int)) ); TQ_SLOT(socketError(int)) );
connectToHost(host, port); connectToHost(host, port);
} }

16
amarok/src/engine/nmm/nmm_configdialog.cpp
Unescape View File

@ -57,7 +57,7 @@ NmmConfigDialog::NmmConfigDialog()
m_user_list = new HostList( m_view->audioGroup, "TheUserList" ); m_user_list = new HostList( m_view->audioGroup, "TheUserList" );
m_user_list->setSelectionMode( TQListView::Single ); m_user_list->setSelectionMode( TQListView::Single );
connect( m_user_list, TQT_SIGNAL( viewChanged() ), this, TQT_SLOT( hostListModified() ) ); connect( m_user_list, TQ_SIGNAL( viewChanged() ), this, TQ_SLOT( hostListModified() ) );
m_view->hostListStack->addWidget( m_environment_list ); m_view->hostListStack->addWidget( m_environment_list );
m_view->hostListStack->addWidget( m_user_list ); m_view->hostListStack->addWidget( m_user_list );
@ -74,17 +74,17 @@ NmmConfigDialog::NmmConfigDialog()
createHostLists(); createHostLists();
/* connect 'Add...' and 'Remove' buttons */ /* connect 'Add...' and 'Remove' buttons */
connect( m_view->addLocationButton, TQT_SIGNAL( released() ), TQT_SLOT( addHost() ) ); connect( m_view->addLocationButton, TQ_SIGNAL( released() ), TQ_SLOT( addHost() ) );
connect( m_view->removeHostButton, TQT_SIGNAL( released() ), TQT_SLOT( removeHost() ) ); connect( m_view->removeHostButton, TQ_SIGNAL( released() ), TQ_SLOT( removeHost() ) );
connect( m_user_list, TQT_SIGNAL( selectionChanged() ) , this, TQT_SLOT( enableRemoveButton() ) ); connect( m_user_list, TQ_SIGNAL( selectionChanged() ) , this, TQ_SLOT( enableRemoveButton() ) );
/* connect audioGroup selection */ /* connect audioGroup selection */
connect( m_view->audioGroup, TQT_SIGNAL( released(int) ), TQT_SLOT( clickedAudioGroup(int) ) ); connect( m_view->audioGroup, TQ_SIGNAL( released(int) ), TQ_SLOT( clickedAudioGroup(int) ) );
PluginConfig::connect( m_view->audioPlaybackNode, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( viewChanged() ) ); PluginConfig::connect( m_view->audioPlaybackNode, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( viewChanged() ) );
PluginConfig::connect( m_view->audioGroup, TQT_SIGNAL( released( int ) ), TQT_SIGNAL( viewChanged() ) ); PluginConfig::connect( m_view->audioGroup, TQ_SIGNAL( released( int ) ), TQ_SIGNAL( viewChanged() ) );
// connect( this, TQT_SIGNAL( viewChanged() ) ) // connect( this, TQ_SIGNAL( viewChanged() ) )
} }
NmmConfigDialog::~NmmConfigDialog() NmmConfigDialog::~NmmConfigDialog()

8
amarok/src/engine/nmm/nmm_engine.cpp
Unescape View File

@ -98,7 +98,7 @@ bool NmmEngine::init()
createEnvironmentHostList(); createEnvironmentHostList();
createUserHostList(); createUserHostList();
connect( this, TQT_SIGNAL( hostError( TQString, int ) ), TQT_SLOT( notifyHostError( TQString, int ) ) ); connect( this, TQ_SIGNAL( hostError( TQString, int ) ), TQ_SLOT( notifyHostError( TQString, int ) ) );
return true; return true;
} }
@ -177,7 +177,7 @@ Engine::State NmmEngine::state() const
Amarok::PluginConfig* NmmEngine::configure() const Amarok::PluginConfig* NmmEngine::configure() const
{ {
NmmConfigDialog* dialog = new NmmConfigDialog(); NmmConfigDialog* dialog = new NmmConfigDialog();
connect( this, TQT_SIGNAL( hostError( TQString, int ) ), dialog, TQT_SLOT( notifyHostError(TQString, int ) ) ); connect( this, TQ_SIGNAL( hostError( TQString, int ) ), dialog, TQ_SLOT( notifyHostError(TQString, int ) ) );
return dialog; return dialog;
} }
@ -191,7 +191,7 @@ bool NmmEngine::load(const KURL& url, bool stream)
// check security options // check security options
static bool already_checked = false; static bool already_checked = false;
if( !already_checked) { if( !already_checked) {
TQTimer::singleShot(100, this, TQT_SLOT( checkSecurity() ) ); TQTimer::singleShot(100, this, TQ_SLOT( checkSecurity() ) );
already_checked = true; already_checked = true;
} }
@ -690,7 +690,7 @@ Result NmmEngine::endTrack()
__position = 0; __position = 0;
// cleanup after this method returned // cleanup after this method returned
TQTimer::singleShot( 0, instance(), TQT_SLOT( endOfStreamReached() ) ); TQTimer::singleShot( 0, instance(), TQ_SLOT( endOfStreamReached() ) );
return SUCCESS; return SUCCESS;
} }

10
amarok/src/engine/xine/xine-config.cpp
Unescape View File

@ -30,7 +30,7 @@ XineGeneralEntry::XineGeneralEntry(const TQString& key, xine_t *xine, XineConfig
, m_xine(xine) , m_xine(xine)
{ {
debug() << "new entry " << m_key << endl; debug() << "new entry " << m_key << endl;
connect(this, TQT_SIGNAL(viewChanged()), xcf, TQT_SIGNAL(viewChanged() ) ); connect(this, TQ_SIGNAL(viewChanged()), xcf, TQ_SIGNAL(viewChanged() ) );
} }
@ -85,7 +85,7 @@ XineStrEntry::XineStrEntry(TQLineEdit* input, const TQCString & key, xine_t *xin
input->setText(ent.str_value); input->setText(ent.str_value);
m_val = ent.str_value; m_val = ent.str_value;
} }
connect( input, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( entryChanged(const TQString &) ) ); connect( input, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( entryChanged(const TQString &) ) );
} }
@ -117,7 +117,7 @@ XineIntEntry::XineIntEntry(KIntSpinBox* input, const TQCString & key, xine_t *xi
input->setValue(ent.num_value); input->setValue(ent.num_value);
m_val = ent.num_value; m_val = ent.num_value;
} }
connect( input, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( entryChanged( int ) ) ); connect( input, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( entryChanged( int ) ) );
} }
@ -159,7 +159,7 @@ XineEnumEntry::XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *x
input->setCurrentItem( ent.num_value ); input->setCurrentItem( ent.num_value );
m_val = ent.num_value; m_val = ent.num_value;
} }
connect( input, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( entryChanged( int ) ) ); connect( input, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( entryChanged( int ) ) );
} }
/////////////////////// ///////////////////////
@ -181,7 +181,7 @@ XineConfigDialog::XineConfigDialog( const xine_t* const xine)
m_view->deviceComboBox->insertItem(drivers[i]); m_view->deviceComboBox->insertItem(drivers[i]);
} }
connect( m_view->deviceComboBox, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( viewChanged() ) ); connect( m_view->deviceComboBox, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( viewChanged() ) );
m_entries.setAutoDelete(true); m_entries.setAutoDelete(true);
m_view->deviceComboBox->setCurrentItem( (XineCfg::outputPlugin() == "auto" ) ? "Autodetect" : XineCfg::outputPlugin() ); m_view->deviceComboBox->setCurrentItem( (XineCfg::outputPlugin() == "auto" ) ? "Autodetect" : XineCfg::outputPlugin() );
init(); init();

4
amarok/src/engine/xine/xine-engine.cpp
Unescape View File

@ -859,8 +859,8 @@ Amarok::PluginConfig*
XineEngine::configure() const XineEngine::configure() const
{ {
XineConfigDialog* xcf = new XineConfigDialog( m_xine ); XineConfigDialog* xcf = new XineConfigDialog( m_xine );
connect(xcf, TQT_SIGNAL( settingsSaved() ), this, TQT_SLOT( configChanged() )); connect(xcf, TQ_SIGNAL( settingsSaved() ), this, TQ_SLOT( configChanged() ));
connect(this, TQT_SIGNAL( resetConfig(xine_t*) ), xcf, TQT_SLOT( reset(xine_t*) )); connect(this, TQ_SIGNAL( resetConfig(xine_t*) ), xcf, TQ_SLOT( reset(xine_t*) ));
return xcf; return xcf;
} }

4
amarok/src/engine/yauap/yauap-engine.cpp
Unescape View File

@ -47,7 +47,7 @@ signal_handler( DBusConnection * /*con*/, DBusMessage *msg, void *data )
const char *interface = dbus_message_get_interface(msg); const char *interface = dbus_message_get_interface(msg);
bool handled = true; bool handled = true;
debug() << "TQT_SIGNAL member " << member << " interface " << interface << " objpath " << objectpath << endl; debug() << "TQ_SIGNAL member " << member << " interface " << interface << " objpath " << objectpath << endl;
if (dbus_message_is_signal( msg, "org.yauap.CommandInterface", "MetadataSignal")) if (dbus_message_is_signal( msg, "org.yauap.CommandInterface", "MetadataSignal"))
TQApplication::postEvent(engine, new TQCustomEvent(3004)); TQApplication::postEvent(engine, new TQCustomEvent(3004));
@ -473,7 +473,7 @@ yauapEngine::init()
m_state = Engine::Idle; m_state = Engine::Idle;
connect(&helper, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(yauapProcessExited())); connect(&helper, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(yauapProcessExited()));
if (initDbusConnection()) if (initDbusConnection())
return true; return true;

46
amarok/src/enginecontroller.cpp
Unescape View File

@ -67,7 +67,7 @@ EngineController::EngineController()
{ {
m_voidEngine = m_engine = loadEngine( "void-engine" ); m_voidEngine = m_engine = loadEngine( "void-engine" );
connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotMainTimer() ) ); connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotMainTimer() ) );
} }
EngineController::~EngineController() EngineController::~EngineController()
@ -164,21 +164,21 @@ EngineController::loadEngine( const TQString &engineName )
TQObject *bar = Amarok::StatusBar::instance(); TQObject *bar = Amarok::StatusBar::instance();
EngineBase *engine = static_cast<EngineBase*>( plugin ); EngineBase *engine = static_cast<EngineBase*>( plugin );
connect( engine, TQT_SIGNAL(stateChanged( Engine::State )), connect( engine, TQ_SIGNAL(stateChanged( Engine::State )),
this, TQT_SLOT(slotStateChanged( Engine::State )) ); this, TQ_SLOT(slotStateChanged( Engine::State )) );
connect( engine, TQT_SIGNAL(trackEnded()), connect( engine, TQ_SIGNAL(trackEnded()),
this, TQT_SLOT(slotTrackEnded()) ); this, TQ_SLOT(slotTrackEnded()) );
if( bar ) if( bar )
{ {
connect( engine, TQT_SIGNAL(statusText( const TQString& )), connect( engine, TQ_SIGNAL(statusText( const TQString& )),
bar, TQT_SLOT(shortMessage( const TQString& )) ); bar, TQ_SLOT(shortMessage( const TQString& )) );
connect( engine, TQT_SIGNAL(infoMessage( const TQString& )), connect( engine, TQ_SIGNAL(infoMessage( const TQString& )),
bar, TQT_SLOT(longMessage( const TQString& )) ); bar, TQ_SLOT(longMessage( const TQString& )) );
} }
connect( engine, TQT_SIGNAL(metaData( const Engine::SimpleMetaBundle& )), connect( engine, TQ_SIGNAL(metaData( const Engine::SimpleMetaBundle& )),
this, TQT_SLOT(slotEngineMetaData( const Engine::SimpleMetaBundle& )) ); this, TQ_SLOT(slotEngineMetaData( const Engine::SimpleMetaBundle& )) );
connect( engine, TQT_SIGNAL(showConfigDialog( const TQCString& )), connect( engine, TQ_SIGNAL(showConfigDialog( const TQCString& )),
kapp, TQT_SLOT(slotConfigAmarok( const TQCString& )) ); kapp, TQ_SLOT(slotConfigAmarok( const TQCString& )) );
if( engine->init() ) if( engine->init() )
return engine; return engine;
@ -406,10 +406,10 @@ void EngineController::play( const MetaBundle &bundle, uint offset )
if (LastFm::Controller::instance()->changeStation( url.url() ) == -1) if (LastFm::Controller::instance()->changeStation( url.url() ) == -1)
// Request was canceled, return immediately. // Request was canceled, return immediately.
return; return;
connect( m_engine, TQT_SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService() connect( m_engine, TQ_SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService()
, TQT_SLOT( requestMetaData() ) ); , TQ_SLOT( requestMetaData() ) );
connect( LastFm::Controller::instance()->getService(), TQT_SIGNAL( metaDataResult( const MetaBundle& ) ), connect( LastFm::Controller::instance()->getService(), TQ_SIGNAL( metaDataResult( const MetaBundle& ) ),
this, TQT_SLOT( slotStreamMetaData( const MetaBundle& ) ) ); this, TQ_SLOT( slotStreamMetaData( const MetaBundle& ) ) );
return; return;
} }
else else
@ -422,10 +422,10 @@ void EngineController::play( const MetaBundle &bundle, uint offset )
return; return;
m_lastFm = true; m_lastFm = true;
connect( m_engine, TQT_SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService() connect( m_engine, TQ_SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService()
, TQT_SLOT( requestMetaData() ) ); , TQ_SLOT( requestMetaData() ) );
connect( LastFm::Controller::instance()->getService(), TQT_SIGNAL( metaDataResult( const MetaBundle& ) ), connect( LastFm::Controller::instance()->getService(), TQ_SIGNAL( metaDataResult( const MetaBundle& ) ),
this, TQT_SLOT( slotStreamMetaData( const MetaBundle& ) ) ); this, TQ_SLOT( slotStreamMetaData( const MetaBundle& ) ) );
} }
debug() << "New URL is " << url.url() << endl; debug() << "New URL is " << url.url() << endl;
} }
@ -500,7 +500,7 @@ void EngineController::play( const MetaBundle &bundle, uint offset )
{ {
//False gives behaviour as if track played successfully //False gives behaviour as if track played successfully
next( false ); next( false );
TQTimer::singleShot( 0, this, TQT_SLOT(play()) ); TQTimer::singleShot( 0, this, TQ_SLOT(play()) );
} }
else else
{ {
@ -747,7 +747,7 @@ void EngineController::slotTrackEnded() //SLOT
//FIXME not perfect //FIXME not perfect
if ( !m_isTiming ) if ( !m_isTiming )
{ {
TQTimer::singleShot( AmarokConfig::trackDelayLength(), this, TQT_SLOT(trackFinished()) ); TQTimer::singleShot( AmarokConfig::trackDelayLength(), this, TQ_SLOT(trackFinished()) );
m_isTiming = true; m_isTiming = true;
} }

10
amarok/src/equalizerpresetmanager.cpp
Unescape View File

@ -42,8 +42,8 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na
m_presetsView = new TDEListView( mainWidget, "presetListView" ); m_presetsView = new TDEListView( mainWidget, "presetListView" );
m_presetsView->addColumn( i18n( "Presets" ) ); m_presetsView->addColumn( i18n( "Presets" ) );
m_presetsView->setFullWidth( true ); m_presetsView->setFullWidth( true );
connect(m_presetsView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateButtonState() )); connect(m_presetsView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( updateButtonState() ));
connect(m_presetsView, TQT_SIGNAL( doubleClicked ( TQListViewItem*, const TQPoint&, int ) ), TQT_SLOT( slotRename() )); connect(m_presetsView, TQ_SIGNAL( doubleClicked ( TQListViewItem*, const TQPoint&, int ) ), TQ_SLOT( slotRename() ));
mainLayout->addWidget( m_presetsView ); mainLayout->addWidget( m_presetsView );
TQVBoxLayout* buttonsLayout = new TQVBoxLayout( mainLayout ); TQVBoxLayout* buttonsLayout = new TQVBoxLayout( mainLayout );
@ -54,9 +54,9 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na
buttonsLayout->addWidget( m_renameBtn ); buttonsLayout->addWidget( m_renameBtn );
buttonsLayout->addWidget( m_deleteBtn ); buttonsLayout->addWidget( m_deleteBtn );
connect(m_renameBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRename() )); connect(m_renameBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRename() ));
connect(m_deleteBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDelete() )); connect(m_deleteBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDelete() ));
connect(this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( slotDefault() )); connect(this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( slotDefault() ));
TQSpacerItem* spacer = new TQSpacerItem( 20, 40, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); TQSpacerItem* spacer = new TQSpacerItem( 20, 40, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
buttonsLayout->addItem( spacer ); buttonsLayout->addItem( spacer );

14
amarok/src/equalizersetup.cpp
Unescape View File

@ -78,15 +78,15 @@ EqualizerSetup::EqualizerSetup()
TQPushButton* presetAdd = new TQPushButton( presetBox ); TQPushButton* presetAdd = new TQPushButton( presetBox );
presetAdd->setIconSet( SmallIconSet( Amarok::icon( "add_playlist" ) ) ); presetAdd->setIconSet( SmallIconSet( Amarok::icon( "add_playlist" ) ) );
TQToolTip::add( presetAdd, i18n("Add new preset") ); TQToolTip::add( presetAdd, i18n("Add new preset") );
connect( presetAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( addPreset() ) ); connect( presetAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( addPreset() ) );
TQPushButton* presetConf = new TQPushButton( presetBox ); TQPushButton* presetConf = new TQPushButton( presetBox );
presetConf->setIconSet( SmallIconSet( Amarok::icon( "configure" ) ) ); presetConf->setIconSet( SmallIconSet( Amarok::icon( "configure" ) ) );
TQToolTip::add( presetConf, i18n("Manage presets") ); TQToolTip::add( presetConf, i18n("Manage presets") );
connect( presetConf, TQT_SIGNAL( clicked() ), TQT_SLOT( editPresets() ) ); connect( presetConf, TQ_SIGNAL( clicked() ), TQ_SLOT( editPresets() ) );
loadPresets(); loadPresets();
connect( m_presetCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( presetChanged(int) ) ); connect( m_presetCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( presetChanged(int) ) );
// END Presets // END Presets
// BEGIN GroupBox // BEGIN GroupBox
@ -94,7 +94,7 @@ EqualizerSetup::EqualizerSetup()
m_groupBoxSliders->setCheckable( true ); m_groupBoxSliders->setCheckable( true );
m_groupBoxSliders->setChecked( AmarokConfig::equalizerEnabled() ); m_groupBoxSliders->setChecked( AmarokConfig::equalizerEnabled() );
m_groupBoxSliders->setInsideMargin( KDialog::marginHint() ); m_groupBoxSliders->setInsideMargin( KDialog::marginHint() );
connect( m_groupBoxSliders, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setEqualizerEnabled( bool ) ) ); connect( m_groupBoxSliders, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setEqualizerEnabled( bool ) ) );
// Helper widget for layouting inside the groupbox // Helper widget for layouting inside the groupbox
TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders ); TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders );
@ -107,7 +107,7 @@ EqualizerSetup::EqualizerSetup()
m_slider_preamp->setMinValue( -100 ); m_slider_preamp->setMinValue( -100 );
m_slider_preamp->setTickmarks( TQSlider::Right ); m_slider_preamp->setTickmarks( TQSlider::Right );
m_slider_preamp->setTickInterval( 100 ); m_slider_preamp->setTickInterval( 100 );
connect( m_slider_preamp, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( setEqualizerParameters() ) ); connect( m_slider_preamp, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( setEqualizerParameters() ) );
slidersGridLayout->addMultiCellWidget(m_slider_preamp, 0, 0, 0, 1, TQt::AlignHCenter ); slidersGridLayout->addMultiCellWidget(m_slider_preamp, 0, 0, 0, 1, TQt::AlignHCenter );
TQLabel* preampLabel = new TQLabel( i18n("Pre-amp"), slidersLayoutWidget ); TQLabel* preampLabel = new TQLabel( i18n("Pre-amp"), slidersLayoutWidget );
@ -136,8 +136,8 @@ EqualizerSetup::EqualizerSetup()
slidersGridLayout->addMultiCellWidget(label, 1, 1, 2 * i + 2, 2 * i + 3, TQt::AlignHCenter ); slidersGridLayout->addMultiCellWidget(label, 1, 1, 2 * i + 2, 2 * i + 3, TQt::AlignHCenter );
m_bandSliders.append( slider ); m_bandSliders.append( slider );
connect( slider, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( setEqualizerParameters() ) ); connect( slider, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( setEqualizerParameters() ) );
connect( slider, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( sliderChanged() ) ); connect( slider, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( sliderChanged() ) );
} }
// END // END

48
amarok/src/filebrowser.cpp
Unescape View File

@ -93,7 +93,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
} }
TDEActionCollection* ac = new TDEActionCollection( this ); TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "filebrowser_select_all" ); KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "filebrowser_select_all" );
TDEToolBar *toolbar = new Browser::ToolBar( this ); TDEToolBar *toolbar = new Browser::ToolBar( this );
@ -104,7 +104,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
searchToolBar->setStretchableWidget( m_filter ); searchToolBar->setStretchableWidget( m_filter );
connect( button, TQT_SIGNAL(clicked()), m_filter, TQT_SLOT(clear()) ); connect( button, TQ_SIGNAL(clicked()), m_filter, TQ_SLOT(clear()) );
TQToolTip::add( button, i18n( "Clear search field" ) ); TQToolTip::add( button, i18n( "Clear search field" ) );
TQToolTip::add( m_filter, i18n( "Enter space-separated terms to search in the directory-listing" ) ); TQToolTip::add( m_filter, i18n( "Enter space-separated terms to search in the directory-listing" ) );
@ -193,8 +193,8 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
menu->setItemEnabled( BurnCd, K3bExporter::isAvailable() ); menu->setItemEnabled( BurnCd, K3bExporter::isAvailable() );
connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(prepareContextMenu()) ); connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(prepareContextMenu()) );
connect( menu, TQT_SIGNAL(activated( int )), TQT_SLOT(contextMenuActivated( int )) ); connect( menu, TQ_SIGNAL(activated( int )), TQ_SLOT(contextMenuActivated( int )) );
} }
{ {
@ -242,24 +242,24 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
TDEAction *gotoCurrent = new TDEAction( i18n("Go To Current Track Folder"), Amarok::icon( "music" ), 0, TDEAction *gotoCurrent = new TDEAction( i18n("Go To Current Track Folder"), Amarok::icon( "music" ), 0,
this, TQT_SLOT( gotoCurrentFolder() ), actionCollection ); this, TQ_SLOT( gotoCurrentFolder() ), actionCollection );
gotoCurrent->plug( toolbar ); gotoCurrent->plug( toolbar );
disconnect( actionCollection->action( "up" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( cdUp() ) ); disconnect( actionCollection->action( "up" ), TQ_SIGNAL( activated() ), m_dir, TQ_SLOT( cdUp() ) );
connect( actionCollection->action( "up" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( myCdUp() ) ); connect( actionCollection->action( "up" ), TQ_SIGNAL( activated() ), m_dir, TQ_SLOT( myCdUp() ) );
disconnect( actionCollection->action( "home" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( home() ) ); disconnect( actionCollection->action( "home" ), TQ_SIGNAL( activated() ), m_dir, TQ_SLOT( home() ) );
connect( actionCollection->action( "home" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( myHome() ) ); connect( actionCollection->action( "home" ), TQ_SIGNAL( activated() ), m_dir, TQ_SLOT( myHome() ) );
} }
connect( m_filter, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(setFilter( const TQString& )) ); connect( m_filter, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(setFilter( const TQString& )) );
connect( m_combo, TQT_SIGNAL(urlActivated( const KURL& )), TQT_SLOT(setUrl( const KURL& )) ); connect( m_combo, TQ_SIGNAL(urlActivated( const KURL& )), TQ_SLOT(setUrl( const KURL& )) );
connect( m_combo, TQT_SIGNAL(returnPressed( const TQString& )), TQT_SLOT(setUrl( const TQString& )) ); connect( m_combo, TQ_SIGNAL(returnPressed( const TQString& )), TQ_SLOT(setUrl( const TQString& )) );
connect( m_dir, TQT_SIGNAL(viewChanged( KFileView* )), TQT_SLOT(slotViewChanged( KFileView* )) ); connect( m_dir, TQ_SIGNAL(viewChanged( KFileView* )), TQ_SLOT(slotViewChanged( KFileView* )) );
connect( m_dir, TQT_SIGNAL(fileSelected( const KFileItem* )), TQT_SLOT(activate( const KFileItem* )) ); connect( m_dir, TQ_SIGNAL(fileSelected( const KFileItem* )), TQ_SLOT(activate( const KFileItem* )) );
connect( m_dir, TQT_SIGNAL(urlEntered( const KURL& )), TQT_SLOT(urlChanged( const KURL& )) ); connect( m_dir, TQ_SIGNAL(urlEntered( const KURL& )), TQ_SLOT(urlChanged( const KURL& )) );
connect( m_dir, TQT_SIGNAL(urlEntered( const KURL& )), searchPane, TQT_SLOT(urlChanged( const KURL& )) ); connect( m_dir, TQ_SIGNAL(urlEntered( const KURL& )), searchPane, TQ_SLOT(urlChanged( const KURL& )) );
connect( m_dir, TQT_SIGNAL(dropped( const KFileItem*, TQDropEvent*, const KURL::List& )), connect( m_dir, TQ_SIGNAL(dropped( const KFileItem*, TQDropEvent*, const KURL::List& )),
TQT_SLOT(dropped( const KFileItem*, TQDropEvent*, const KURL::List& )) ); TQ_SLOT(dropped( const KFileItem*, TQDropEvent*, const KURL::List& )) );
setSpacing( 4 ); setSpacing( 4 );
setFocusProxy( m_dir ); //so the dirOperator is focused when we get focus events setFocusProxy( m_dir ); //so the dirOperator is focused when we get focus events
@ -610,7 +610,7 @@ SearchPane::SearchPane( FileBrowser *parent )
box->setBackgroundMode( TQt::PaletteBase ); box->setBackgroundMode( TQt::PaletteBase );
m_lineEdit = new ClickLineEdit( i18n("Search here..."), box ); m_lineEdit = new ClickLineEdit( i18n("Search here..."), box );
connect( m_lineEdit, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(searchTextChanged( const TQString& )) ); connect( m_lineEdit, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(searchTextChanged( const TQString& )) );
m_listView = new KURLView( container ); m_listView = new KURLView( container );
@ -619,17 +619,17 @@ SearchPane::SearchPane( FileBrowser *parent )
container->setBackgroundMode( TQt::PaletteBase ); container->setBackgroundMode( TQt::PaletteBase );
m_listView->setFrameStyle( TQFrame::NoFrame ); m_listView->setFrameStyle( TQFrame::NoFrame );
connect( m_listView, TQT_SIGNAL(executed( TQListViewItem* )), TQT_SLOT(activate( TQListViewItem* )) ); connect( m_listView, TQ_SIGNAL(executed( TQListViewItem* )), TQ_SLOT(activate( TQListViewItem* )) );
} }
KPushButton *button = new KPushButton( KGuiItem( i18n("&Show Search Panel"), "edit-find" ), this ); KPushButton *button = new KPushButton( KGuiItem( i18n("&Show Search Panel"), "edit-find" ), this );
button->setToggleButton( true ); button->setToggleButton( true );
connect( button, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggle( bool )) ); connect( button, TQ_SIGNAL(toggled( bool )), TQ_SLOT(toggle( bool )) );
m_lister = new MyDirLister( true /*delay mimetypes*/ ); m_lister = new MyDirLister( true /*delay mimetypes*/ );
insertChild( m_lister ); insertChild( m_lister );
connect( m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(searchMatches( const KFileItemList& )) ); connect( m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(searchMatches( const KFileItemList& )) );
connect( m_lister, TQT_SIGNAL(completed()), TQT_SLOT(searchComplete()) ); connect( m_lister, TQ_SIGNAL(completed()), TQ_SLOT(searchComplete()) );
} }
void void
@ -686,7 +686,7 @@ SearchPane::searchComplete()
//connected to KDirLister::complete() //connected to KDirLister::complete()
//TODO fix crappy KDElibs //TODO fix crappy KDElibs
TQTimer::singleShot( 0, this, TQT_SLOT(_searchComplete()) ); TQTimer::singleShot( 0, this, TQ_SLOT(_searchComplete()) );
} }
void void

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

@ -40,10 +40,10 @@ FirstRunWizard::init()
WizardPageLayout_2->addWidget( m_folderSetup = new CollectionSetup( WizardPage_2 ) ); WizardPageLayout_2->addWidget( m_folderSetup = new CollectionSetup( WizardPage_2 ) );
text4->disconnect( TQT_SIGNAL(linkClicked( const TQString& )) ); text4->disconnect( TQ_SIGNAL(linkClicked( const TQString& )) );
connect( text4, TQT_SIGNAL(linkClicked( const TQString& )), TQT_SLOT(invokeHandbook()) ); connect( text4, TQ_SIGNAL(linkClicked( const TQString& )), TQ_SLOT(invokeHandbook()) );
dbActiveLabel->disconnect( TQT_SIGNAL(linkClicked( const TQString& )) ); dbActiveLabel->disconnect( TQ_SIGNAL(linkClicked( const TQString& )) );
connect( dbActiveLabel, TQT_SIGNAL(linkClicked( const TQString& )), TQT_SLOT(openLink( const TQString &)) ); connect( dbActiveLabel, TQ_SIGNAL(linkClicked( const TQString& )), TQ_SLOT(openLink( const TQString &)) );
setFinishEnabled ( WizardPage_4, true ); setFinishEnabled ( WizardPage_4, true );
#if !defined(USE_MYSQL) && !defined(USE_POSTGRESQL) #if !defined(USE_MYSQL) && !defined(USE_POSTGRESQL)
removePage(WizardPage_3); removePage(WizardPage_3);

6
amarok/src/htmlview.cpp
Unescape View File

@ -39,8 +39,8 @@ HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool D
TDEActionCollection* ac = actionCollection(); TDEActionCollection* ac = actionCollection();
ac->setAutoConnectShortcuts( true ); ac->setAutoConnectShortcuts( true );
m_copy = KStdAction::copy( this, TQT_SLOT( copyText() ), ac, "htmlview_copy" ); m_copy = KStdAction::copy( this, TQ_SLOT( copyText() ), ac, "htmlview_copy" );
m_selectAll = KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "htmlview_select_all" ); m_selectAll = KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "htmlview_select_all" );
{ {
TDEPopupMenu m; TDEPopupMenu m;
m_copy->plug( &m ); m_copy->plug( &m );
@ -50,7 +50,7 @@ HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool D
m_selectAll->unplug( &m ); m_selectAll->unplug( &m );
} }
connect( this, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( enableCopyAction() ) ); connect( this, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( enableCopyAction() ) );
enableCopyAction(); enableCopyAction();
} }

30
amarok/src/konquisidebar/universalamarok.cpp
Unescape View File

@ -84,9 +84,9 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi
// widgetParent->resize(580,300); // widgetParent->resize(580,300);
TDEToolBar *topBar = new TDEToolBar( widget, "Topbar" ); TDEToolBar *topBar = new TDEToolBar( widget, "Topbar" );
topBar->setIconSize(16); topBar->setIconSize(16);
topBar->insertButton( "today", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( currentTrack() ) ); topBar->insertButton( "today", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( currentTrack() ) );
topBar->insertButton( "text-x-generic", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( lyrics() ) ); topBar->insertButton( "text-x-generic", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( lyrics() ) );
topBar->insertButton( "preferences-desktop-personal", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( wiki() ) ); topBar->insertButton( "preferences-desktop-personal", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( wiki() ) );
browser = new TDEHTMLPart(widget, "widget-browser"); browser = new TDEHTMLPart(widget, "widget-browser");
//browser=new TDEHTMLPart(widget); //browser=new TDEHTMLPart(widget);
@ -105,32 +105,32 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi
TDEToolBar* toolBar=new TDEToolBar(widget, "PlayerControls"); TDEToolBar* toolBar=new TDEToolBar(widget, "PlayerControls");
toolBar->setIconSize(16); toolBar->setIconSize(16);
toolBar->insertButton( "media-skip-backward",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPrev() ) ); toolBar->insertButton( "media-skip-backward",0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendPrev() ) );
toolBar->insertButton( "media-playback-start", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPlay() ) ); toolBar->insertButton( "media-playback-start", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendPlay() ) );
toolBar->insertButton( "media-playback-pause",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPause() ) ); toolBar->insertButton( "media-playback-pause",0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendPause() ) );
toolBar->insertButton( "media-playback-stop", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendStop() ) ); toolBar->insertButton( "media-playback-stop", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendStop() ) );
toolBar->insertButton( "media-skip-forward", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendNext() ) ); toolBar->insertButton( "media-skip-forward", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendNext() ) );
toolBar->insertSeparator(); toolBar->insertSeparator();
toolBar->insertButton( "arts", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendMute() ) ); toolBar->insertButton( "arts", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendMute() ) );
vol_slider = new TQSlider(0,100,1,0,TQt::Horizontal, toolBar,"volume"); vol_slider = new TQSlider(0,100,1,0,TQt::Horizontal, toolBar,"volume");
vol_slider->setLineStep(2); vol_slider->setLineStep(2);
connect(vol_slider, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(volChanged(int ) ) ); connect(vol_slider, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(volChanged(int ) ) );
toolBar->insertWidget(1,2, vol_slider); toolBar->insertWidget(1,2, vol_slider);
fileInfo = new TQFileInfo(HTML_FILE); fileInfo = new TQFileInfo(HTML_FILE);
TQTimer *t = new TQTimer( this ); TQTimer *t = new TQTimer( this );
connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updateStatus() ) ); connect( t, TQ_SIGNAL(timeout()), TQ_SLOT(updateStatus() ) );
t->start( 2000, false ); t->start( 2000, false );
kdDebug() << "Connecting widget signal" << endl; kdDebug() << "Connecting widget signal" << endl;
connect( widget, TQT_SIGNAL( emitURL( const KURL &)), connect( widget, TQ_SIGNAL( emitURL( const KURL &)),
this, TQT_SLOT( openURLRequest( const KURL &) ) ); this, TQ_SLOT( openURLRequest( const KURL &) ) );
connect( browser->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), connect( browser->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
this, TQT_SLOT( openURLRequest( const KURL & ) ) ); this, TQ_SLOT( openURLRequest( const KURL & ) ) );
widget->show(); widget->show();
} }

2
amarok/src/ktrm.cpp
Unescape View File

@ -736,7 +736,7 @@ void KTRMLookup::puidGenerated()
Amarok::StatusBar::instance()->newProgressOperation( job ) Amarok::StatusBar::instance()->newProgressOperation( job )
.setDescription( i18n( "MusicBrainz Lookup" ) ); .setDescription( i18n( "MusicBrainz Lookup" ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( lookupResult( TDEIO::Job* ) ) ); connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( lookupResult( TDEIO::Job* ) ) );
#endif #endif
} }

40
amarok/src/lastfm.cpp
Unescape View File

@ -69,10 +69,10 @@ AmarokHttp::get ( const TQString & path )
m_error = TQHttp::NoError; m_error = TQHttp::NoError;
m_state = TQHttp::Connecting; m_state = TQHttp::Connecting;
TDEIO::TransferJob *job = TDEIO::get(uri, true, false); TDEIO::TransferJob *job = TDEIO::get(uri, true, false);
connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
connect(job, TQT_SIGNAL(result(TDEIO::Job*)), connect(job, TQ_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(slotResult(TDEIO::Job*))); this, TQ_SLOT(slotResult(TDEIO::Job*)));
return 0; return 0;
} }
@ -138,13 +138,13 @@ Controller::Controller()
{ {
TDEActionCollection* ac = Amarok::actionCollection(); TDEActionCollection* ac = Amarok::actionCollection();
m_actionList.append( new TDEAction( i18n( "Ban" ), Amarok::icon( "remove" ), m_actionList.append( new TDEAction( i18n( "Ban" ), Amarok::icon( "remove" ),
KKey( TQt::CTRL | TQt::Key_B ), this, TQT_SLOT( ban() ), ac, "ban" ) ); KKey( TQt::CTRL | TQt::Key_B ), this, TQ_SLOT( ban() ), ac, "ban" ) );
m_actionList.append( new TDEAction( i18n( "Love" ), Amarok::icon( "love" ), m_actionList.append( new TDEAction( i18n( "Love" ), Amarok::icon( "love" ),
KKey( TQt::CTRL | TQt::Key_L ), this, TQT_SLOT( love() ), ac, "love" ) ); KKey( TQt::CTRL | TQt::Key_L ), this, TQ_SLOT( love() ), ac, "love" ) );
m_actionList.append( new TDEAction( i18n( "Skip" ), Amarok::icon( "next" ), m_actionList.append( new TDEAction( i18n( "Skip" ), Amarok::icon( "next" ),
KKey( TQt::CTRL | TQt::Key_K ), this, TQT_SLOT( skip() ), ac, "skip" ) ); KKey( TQt::CTRL | TQt::Key_K ), this, TQ_SLOT( skip() ), ac, "skip" ) );
setActionsEnabled( false ); setActionsEnabled( false );
} }
@ -505,8 +505,8 @@ WebService::handshake( const TQString& username, const TQString& password )
if (this->wasCanceled()) if (this->wasCanceled())
return false; return false;
connect( m_server, TQT_SIGNAL( readReady( KProcIO* ) ), this, TQT_SLOT( readProxy() ) ); connect( m_server, TQ_SIGNAL( readReady( KProcIO* ) ), this, TQ_SLOT( readProxy() ) );
connect( m_server, TQT_SIGNAL( processExited( TDEProcess* ) ), Controller::instance(), TQT_SLOT( playbackStopped() ) ); connect( m_server, TQ_SIGNAL( processExited( TDEProcess* ) ), Controller::instance(), TQ_SLOT( playbackStopped() ) );
} }
else else
m_proxyUrl = m_streamUrl.toString(); m_proxyUrl = m_streamUrl.toString();
@ -565,7 +565,7 @@ void
WebService::requestMetaData() //SLOT WebService::requestMetaData() //SLOT
{ {
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( metaDataFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( metaDataFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/np.php?session=%1&debug=%2" ) http->get( TQString( m_basePath + "/np.php?session=%1&debug=%2" )
.arg( m_session ) .arg( m_session )
@ -621,7 +621,7 @@ WebService::metaDataFinished( int /*id*/, bool error ) //SLOT
} }
TDEIO::Job* job = TDEIO::storedGet( u, true, false ); TDEIO::Job* job = TDEIO::storedGet( u, true, false );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( fetchImageFinished( TDEIO::Job* ) ) ); connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( fetchImageFinished( TDEIO::Job* ) ) );
} }
@ -652,7 +652,7 @@ WebService::enableScrobbling( bool enabled ) //SLOT
debug() << "Disabling Scrobbling!" << endl; debug() << "Disabling Scrobbling!" << endl;
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( enableScrobblingFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( enableScrobblingFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/control.php?session=%1&command=%2&debug=%3" ) http->get( TQString( m_basePath + "/control.php?session=%1&command=%2&debug=%3" )
.arg( m_session ) .arg( m_session )
@ -676,7 +676,7 @@ void
WebService::love() //SLOT WebService::love() //SLOT
{ {
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( loveFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( loveFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/control.php?session=%1&command=love&debug=%2" ) http->get( TQString( m_basePath + "/control.php?session=%1&command=love&debug=%2" )
.arg( m_session ) .arg( m_session )
@ -689,7 +689,7 @@ void
WebService::skip() //SLOT WebService::skip() //SLOT
{ {
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( skipFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( skipFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/control.php?session=%1&command=skip&debug=%2" ) http->get( TQString( m_basePath + "/control.php?session=%1&command=skip&debug=%2" )
.arg( m_session ) .arg( m_session )
@ -702,7 +702,7 @@ void
WebService::ban() //SLOT WebService::ban() //SLOT
{ {
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( banFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( banFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/control.php?session=%1&command=ban&debug=%2" ) http->get( TQString( m_basePath + "/control.php?session=%1&command=ban&debug=%2" )
.arg( m_session ) .arg( m_session )
@ -760,7 +760,7 @@ WebService::friends( TQString username )
username = m_username; username = m_username;
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( friendsFinished( bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( bool ) ), this, TQ_SLOT( friendsFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/friends.xml" ) http->get( TQString( "/1.0/user/%1/friends.xml" )
.arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
@ -802,7 +802,7 @@ WebService::neighbours( TQString username )
username = m_username; username = m_username;
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( neighboursFinished( bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( bool ) ), this, TQ_SLOT( neighboursFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/neighbours.xml" ) http->get( TQString( "/1.0/user/%1/neighbours.xml" )
.arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
@ -844,7 +844,7 @@ WebService::userTags( TQString username )
username = m_username; username = m_username;
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( userTagsFinished( bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( bool ) ), this, TQ_SLOT( userTagsFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/tags.xml?debug=%2" ) http->get( TQString( "/1.0/user/%1/tags.xml?debug=%2" )
.arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
@ -886,7 +886,7 @@ WebService::recentTracks( TQString username )
username = m_username; username = m_username;
AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this ); AmarokHttp *http = new AmarokHttp( m_baseHost, 80, this );
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recentTracksFinished( bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( bool ) ), this, TQ_SLOT( recentTracksFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/recenttracks.xml" ) http->get( TQString( "/1.0/user/%1/recenttracks.xml" )
.arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
@ -948,7 +948,7 @@ WebService::recommend( int type, TQString username, TQString artist, TQString to
} }
TQHttp *http = new TQHttp( "wsdev.audioscrobbler.com", 80, this ); TQHttp *http = new TQHttp( "wsdev.audioscrobbler.com", 80, this );
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recommendFinished( bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( bool ) ), this, TQ_SLOT( recommendFinished( bool ) ) );
uint currentTime = TQDateTime::currentDateTime( TQt::UTC ).toTime_t(); uint currentTime = TQDateTime::currentDateTime( TQt::UTC ).toTime_t();
TQString challenge = TQString::number( currentTime ); TQString challenge = TQString::number( currentTime );

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

@ -51,11 +51,11 @@ void MagnatuneAlbumDownloader::downloadAlbum( MagnatuneDownloadInfo * info )
m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( m_tempDir.name() + m_currentAlbumFileName ), -1, true, false, false ); m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( m_tempDir.name() + m_currentAlbumFileName ), -1, true, false, false );
connect( m_albumDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( albumDownloadComplete( TDEIO::Job* ) ) ); connect( m_albumDownloadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( albumDownloadComplete( TDEIO::Job* ) ) );
Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob ) Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob )
.setDescription( i18n( "Downloading album" ) ) .setDescription( i18n( "Downloading album" ) )
.setAbortSlot( this, TQT_SLOT( albumDownloadAborted() ) ); .setAbortSlot( this, TQ_SLOT( albumDownloadAborted() ) );
} }
void MagnatuneAlbumDownloader::downloadCover( TQString albumCoverUrlString, TQString fileName ) void MagnatuneAlbumDownloader::downloadCover( TQString albumCoverUrlString, TQString fileName )
@ -66,11 +66,11 @@ void MagnatuneAlbumDownloader::downloadCover( TQString albumCoverUrlString, TQSt
m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( m_tempDir.name() + fileName ), -1, true, false, false ); m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( m_tempDir.name() + fileName ), -1, true, false, false );
connect( m_albumDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( coverDownloadComplete( TDEIO::Job* ) ) ); connect( m_albumDownloadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( coverDownloadComplete( TDEIO::Job* ) ) );
Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob ) Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob )
.setDescription( i18n( "Downloading album cover" ) ) .setDescription( i18n( "Downloading album cover" ) )
.setAbortSlot( this, TQT_SLOT( coverDownloadAborted() ) ); .setAbortSlot( this, TQ_SLOT( coverDownloadAborted() ) );
} }
@ -117,11 +117,11 @@ void MagnatuneAlbumDownloader::albumDownloadComplete( TDEIO::Job * downloadJob )
m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( finalAlbumPath + "/cover.jpg" ), -1, true, false, false ); m_albumDownloadJob = TDEIO::file_copy( downloadUrl, KURL( finalAlbumPath + "/cover.jpg" ), -1, true, false, false );
connect( m_albumDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( coverAddComplete( TDEIO::Job* ) ) ); connect( m_albumDownloadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( coverAddComplete( TDEIO::Job* ) ) );
Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob ) Amarok::StatusBar::instance() ->newProgressOperation( m_albumDownloadJob )
.setDescription( i18n( "Adding album cover to collection" ) ) .setDescription( i18n( "Adding album cover to collection" ) )
.setAbortSlot( this, TQT_SLOT( coverAddAborted() ) ); .setAbortSlot( this, TQ_SLOT( coverAddAborted() ) );
} else { } else {

2
amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
Unescape View File

@ -44,7 +44,7 @@ MagnatuneArtistInfoBox::displayArtistInfo( KURL url )
m_infoDownloadJob = TDEIO::storedGet( url, false, false ); m_infoDownloadJob = TDEIO::storedGet( url, false, false );
Amarok::StatusBar::instance() ->newProgressOperation( m_infoDownloadJob ).setDescription( i18n( "Fetching Artist Info" ) ); Amarok::StatusBar::instance() ->newProgressOperation( m_infoDownloadJob ).setDescription( i18n( "Fetching Artist Info" ) );
connect( m_infoDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( infoDownloadComplete( TDEIO::Job* ) ) ); connect( m_infoDownloadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( infoDownloadComplete( TDEIO::Job* ) ) );
return true; return true;

48
amarok/src/magnatunebrowser/magnatunebrowser.cpp
Unescape View File

@ -52,15 +52,15 @@ MagnatuneBrowser::MagnatuneBrowser( const char *name )
initBottomPanel(); initBottomPanel();
//connect (m_listView, TQT_SIGNAL(executed(TDEListViewItem *)), this, TQT_SLOT(itemExecuted(TDEListViewItem *))); //connect (m_listView, TQ_SIGNAL(executed(TDEListViewItem *)), this, TQ_SLOT(itemExecuted(TDEListViewItem *)));
connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
this, TQT_SLOT( itemExecuted( TQListViewItem * ) ) ); this, TQ_SLOT( itemExecuted( TQListViewItem * ) ) );
connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), connect( m_listView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
this, TQT_SLOT( selectionChanged( TQListViewItem * ) ) ); this, TQ_SLOT( selectionChanged( TQListViewItem * ) ) );
connect( m_listView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int ) ), connect( m_listView, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int ) ),
this, TQT_SLOT( showPopupMenu( TQListViewItem *, const TQPoint &, int ) ) ); this, TQ_SLOT( showPopupMenu( TQListViewItem *, const TQPoint &, int ) ) );
connect( m_popupMenu, TQT_SIGNAL( aboutToShow() ), connect( m_popupMenu, TQ_SIGNAL( aboutToShow() ),
this, TQT_SLOT( menuAboutToShow() ) ); this, TQ_SLOT( menuAboutToShow() ) );
m_currentInfoUrl = ""; m_currentInfoUrl = "";
@ -225,15 +225,15 @@ void MagnatuneBrowser::menuAboutToShow( )
switch ( selectedItem->depth() ) switch ( selectedItem->depth() )
{ {
case 0: case 0:
m_popupMenu->insertItem( i18n( "Add artist to playlist" ), this, TQT_SLOT( addSelectionToPlaylist() ) ); m_popupMenu->insertItem( i18n( "Add artist to playlist" ), this, TQ_SLOT( addSelectionToPlaylist() ) );
break; break;
case 1: case 1:
m_popupMenu->insertItem( i18n( "Add album to playlist" ), this, TQT_SLOT( addSelectionToPlaylist() ) ); m_popupMenu->insertItem( i18n( "Add album to playlist" ), this, TQ_SLOT( addSelectionToPlaylist() ) );
m_popupMenu->insertItem( i18n( "Purchase album" ), this, TQT_SLOT( purchaseSelectedAlbum() ) ); m_popupMenu->insertItem( i18n( "Purchase album" ), this, TQ_SLOT( purchaseSelectedAlbum() ) );
break; break;
case 2: case 2:
m_popupMenu->insertItem( i18n( "Add track to playlist" ), this, TQT_SLOT( addSelectionToPlaylist() ) ); m_popupMenu->insertItem( i18n( "Add track to playlist" ), this, TQ_SLOT( addSelectionToPlaylist() ) );
m_popupMenu->insertItem( i18n( "Purchase album" ), this, TQT_SLOT( purchaseAlbumContainingSelectedTrack() ) ); m_popupMenu->insertItem( i18n( "Purchase album" ), this, TQ_SLOT( purchaseAlbumContainingSelectedTrack() ) );
} }
} }
@ -258,7 +258,7 @@ void MagnatuneBrowser::purchaseSelectedAlbum( )
{ {
m_purchaseHandler = new MagnatunePurchaseHandler(); m_purchaseHandler = new MagnatunePurchaseHandler();
m_purchaseHandler->setParent( this ); m_purchaseHandler->setParent( this );
connect( m_purchaseHandler, TQT_SIGNAL( purchaseCompleted( bool ) ), this, TQT_SLOT( purchaseCompleted( bool ) ) ); connect( m_purchaseHandler, TQ_SIGNAL( purchaseCompleted( bool ) ), this, TQ_SLOT( purchaseCompleted( bool ) ) );
} }
MagnatuneListViewAlbumItem *selectedAlbum = dynamic_cast<MagnatuneListViewAlbumItem *>( m_listView->selectedItem() ); MagnatuneListViewAlbumItem *selectedAlbum = dynamic_cast<MagnatuneListViewAlbumItem *>( m_listView->selectedItem() );
@ -273,7 +273,7 @@ void MagnatuneBrowser::purchaseAlbumContainingSelectedTrack( )
{ {
m_purchaseHandler = new MagnatunePurchaseHandler(); m_purchaseHandler = new MagnatunePurchaseHandler();
m_purchaseHandler->setParent( this ); m_purchaseHandler->setParent( this );
connect( m_purchaseHandler, TQT_SIGNAL( purchaseCompleted( bool ) ), this, TQT_SLOT( purchaseCompleted( bool ) ) ); connect( m_purchaseHandler, TQ_SIGNAL( purchaseCompleted( bool ) ), this, TQ_SLOT( purchaseCompleted( bool ) ) );
} }
MagnatuneListViewTrackItem *selectedTrack = dynamic_cast<MagnatuneListViewTrackItem *>( m_listView->selectedItem() ); MagnatuneListViewTrackItem *selectedTrack = dynamic_cast<MagnatuneListViewTrackItem *>( m_listView->selectedItem() );
@ -300,9 +300,9 @@ void MagnatuneBrowser::initTopPanel( )
updateGenreBox(); updateGenreBox();
m_advancedFeaturesButton = new TQPushButton( i18n( "Redownload" ), m_topPanel, "advancedButton" ); m_advancedFeaturesButton = new TQPushButton( i18n( "Redownload" ), m_topPanel, "advancedButton" );
connect( m_advancedFeaturesButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( processRedownload() ) ); connect( m_advancedFeaturesButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( processRedownload() ) );
connect( m_genreComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( genreChanged() ) ); connect( m_genreComboBox, TQ_SIGNAL( activated ( int ) ), this, TQ_SLOT( genreChanged() ) );
} }
void MagnatuneBrowser::initBottomPanel() void MagnatuneBrowser::initBottomPanel()
@ -331,9 +331,9 @@ void MagnatuneBrowser::initBottomPanel()
m_isInfoShown = true; m_isInfoShown = true;
connect( m_showInfoToggleButton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( showInfo( bool ) ) ); connect( m_showInfoToggleButton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( showInfo( bool ) ) );
connect( m_updateListButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updateButtonClicked() ) ); connect( m_updateListButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updateButtonClicked() ) );
connect( m_purchaseAlbumButton, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( purchaseButtonClicked() ) ); connect( m_purchaseAlbumButton, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( purchaseButtonClicked() ) );
} }
void MagnatuneBrowser::updateButtonClicked() void MagnatuneBrowser::updateButtonClicked()
@ -349,9 +349,9 @@ bool MagnatuneBrowser::updateMagnatuneList()
m_listDownloadJob = TDEIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false ); m_listDownloadJob = TDEIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false );
Amarok::StatusBar::instance() ->newProgressOperation( m_listDownloadJob ) Amarok::StatusBar::instance() ->newProgressOperation( m_listDownloadJob )
.setDescription( i18n( "Downloading Magnatune.com Database" ) ) .setDescription( i18n( "Downloading Magnatune.com Database" ) )
.setAbortSlot( this, TQT_SLOT( listDownloadCancelled() ) ); .setAbortSlot( this, TQ_SLOT( listDownloadCancelled() ) );
connect( m_listDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( listDownloadComplete( TDEIO::Job* ) ) ); connect( m_listDownloadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( listDownloadComplete( TDEIO::Job* ) ) );
return true; return true;
} }
@ -387,7 +387,7 @@ void MagnatuneBrowser::listDownloadComplete( TDEIO::Job * downLoadJob )
MagnatuneXmlParser * parser = new MagnatuneXmlParser( m_tempFileName ); MagnatuneXmlParser * parser = new MagnatuneXmlParser( m_tempFileName );
connect( parser, TQT_SIGNAL( doneParsing() ), TQT_SLOT( doneParsing() ) ); connect( parser, TQ_SIGNAL( doneParsing() ), TQ_SLOT( doneParsing() ) );
ThreadManager::instance() ->queueJob( parser ); ThreadManager::instance() ->queueJob( parser );
} }

12
amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
Unescape View File

@ -60,7 +60,7 @@ void MagnatunePurchaseHandler::purchaseAlbum( const MagnatuneAlbum &album )
if ( m_albumDownloader == 0 ) if ( m_albumDownloader == 0 )
{ {
m_albumDownloader = new MagnatuneAlbumDownloader(); m_albumDownloader = new MagnatuneAlbumDownloader();
connect( m_albumDownloader, TQT_SIGNAL( coverDownloadCompleted( TQString ) ), this, TQT_SLOT( showPurchaseDialog( TQString ) ) ); connect( m_albumDownloader, TQ_SIGNAL( coverDownloadCompleted( TQString ) ), this, TQ_SLOT( showPurchaseDialog( TQString ) ) );
} }
m_currentAlbumCoverName = album.getName() + " - cover.jpg"; m_currentAlbumCoverName = album.getName() + " - cover.jpg";
@ -83,8 +83,8 @@ void MagnatunePurchaseHandler::showPurchaseDialog( TQString coverTempLocation )
{ {
m_purchaseDialog = new MagnatunePurchaseDialog( m_parent, "PurchaseDialog", true, 0 ); m_purchaseDialog = new MagnatunePurchaseDialog( m_parent, "PurchaseDialog", true, 0 );
connect( m_purchaseDialog, TQT_SIGNAL( makePurchase( TQString, TQString, TQString, TQString, TQString, TQString, int ) ), this, TQT_SLOT( processPayment( TQString, TQString, TQString, TQString, TQString, TQString, int ) ) ); connect( m_purchaseDialog, TQ_SIGNAL( makePurchase( TQString, TQString, TQString, TQString, TQString, TQString, int ) ), this, TQ_SLOT( processPayment( TQString, TQString, TQString, TQString, TQString, TQString, int ) ) );
connect ( m_purchaseDialog, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( albumPurchaseCancelled() ) ); connect ( m_purchaseDialog, TQ_SIGNAL( cancelled() ), this, TQ_SLOT( albumPurchaseCancelled() ) );
} }
@ -114,7 +114,7 @@ void MagnatunePurchaseHandler::processPayment( TQString ccNumber, TQString expYe
m_resultDownloadJob = TDEIO::storedGet( KURL( purchaseURL ), false, false ); m_resultDownloadJob = TDEIO::storedGet( KURL( purchaseURL ), false, false );
Amarok::StatusBar::instance() ->newProgressOperation( m_resultDownloadJob ).setDescription( i18n( "Processing Payment" ) ); Amarok::StatusBar::instance() ->newProgressOperation( m_resultDownloadJob ).setDescription( i18n( "Processing Payment" ) );
connect( m_resultDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( xmlDownloadComplete( TDEIO::Job* ) ) ); connect( m_resultDownloadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( xmlDownloadComplete( TDEIO::Job* ) ) );
} }
@ -141,13 +141,13 @@ void MagnatunePurchaseHandler::xmlDownloadComplete( TDEIO::Job * downloadJob )
if ( m_albumDownloader == 0 ) if ( m_albumDownloader == 0 )
{ {
m_albumDownloader = new MagnatuneAlbumDownloader(); m_albumDownloader = new MagnatuneAlbumDownloader();
connect( m_albumDownloader, TQT_SIGNAL( downloadComplete( bool ) ), this, TQT_SLOT( albumDownloadComplete( bool ) ) ); connect( m_albumDownloader, TQ_SIGNAL( downloadComplete( bool ) ), this, TQ_SLOT( albumDownloadComplete( bool ) ) );
} }
if ( m_downloadDialog == 0 ) if ( m_downloadDialog == 0 )
{ {
m_downloadDialog = new MagnatuneDownloadDialog( m_parent, "downloaddialog", true, 0 ); m_downloadDialog = new MagnatuneDownloadDialog( m_parent, "downloaddialog", true, 0 );
connect( m_downloadDialog, TQT_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQT_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) ); connect( m_downloadDialog, TQ_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQ_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) );
} }

8
amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
Unescape View File

@ -58,8 +58,8 @@ void MagnatuneRedownloadHandler::showRedownloadDialog( )
if (m_redownloadDialog == 0) { if (m_redownloadDialog == 0) {
m_redownloadDialog = new MagnatuneRedownloadDialog( m_parent ); m_redownloadDialog = new MagnatuneRedownloadDialog( m_parent );
connect( m_redownloadDialog, TQT_SIGNAL( redownload( TQString) ), this, TQT_SLOT( redownload( TQString ) ) ); connect( m_redownloadDialog, TQ_SIGNAL( redownload( TQString) ), this, TQ_SLOT( redownload( TQString ) ) );
connect( m_redownloadDialog, TQT_SIGNAL(cancelled() ), this, TQT_SLOT( selectionDialogCancelled() )); connect( m_redownloadDialog, TQ_SIGNAL(cancelled() ), this, TQ_SLOT( selectionDialogCancelled() ));
} }
@ -102,13 +102,13 @@ void MagnatuneRedownloadHandler::redownload( TQString storedInfoFileName )
if ( m_albumDownloader == 0 ) if ( m_albumDownloader == 0 )
{ {
m_albumDownloader = new MagnatuneAlbumDownloader(); m_albumDownloader = new MagnatuneAlbumDownloader();
connect( m_albumDownloader, TQT_SIGNAL( downloadComplete( bool ) ), this, TQT_SLOT( albumDownloadComplete( bool ) ) ); connect( m_albumDownloader, TQ_SIGNAL( downloadComplete( bool ) ), this, TQ_SLOT( albumDownloadComplete( bool ) ) );
} }
if (m_downloadDialog == 0) { if (m_downloadDialog == 0) {
m_downloadDialog = new MagnatuneDownloadDialog(m_parent); m_downloadDialog = new MagnatuneDownloadDialog(m_parent);
connect( m_downloadDialog, TQT_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQT_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) ); connect( m_downloadDialog, TQ_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQ_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) );
} }

84
amarok/src/mediabrowser.cpp
Unescape View File

@ -259,7 +259,7 @@ MediaBrowser::MediaBrowser( const char *name )
m_toolbar->insertLineSeparator(); m_toolbar->insertLineSeparator();
// m_toolbar->setIconText( TDEToolBar::IconTextRight, true ); // m_toolbar->setIconText( TDEToolBar::IconTextRight, true );
m_toolbar->insertButton( Amarok::icon( "add_playlist" ), CUSTOM, TQT_SIGNAL( clicked() ), this, TQT_SLOT( customClicked() ), true, "custom" ); m_toolbar->insertButton( Amarok::icon( "add_playlist" ), CUSTOM, TQ_SIGNAL( clicked() ), this, TQ_SLOT( customClicked() ), true, "custom" );
TQToolTip::add( m_toolbar->getButton(TRANSFER), i18n( "Transfer tracks to media device" ) ); TQToolTip::add( m_toolbar->getButton(TRANSFER), i18n( "Transfer tracks to media device" ) );
m_toolbar->setIconText( TDEToolBar::IconOnly, false ); m_toolbar->setIconText( TDEToolBar::IconOnly, false );
@ -279,25 +279,25 @@ MediaBrowser::MediaBrowser( const char *name )
searchToolBar->setStretchableWidget( m_searchEdit ); searchToolBar->setStretchableWidget( m_searchEdit );
m_searchEdit->setFrame( TQFrame::Sunken ); m_searchEdit->setFrame( TQFrame::Sunken );
connect( button, TQT_SIGNAL( clicked() ), m_searchEdit, TQT_SLOT( clear() ) ); connect( button, TQ_SIGNAL( clicked() ), m_searchEdit, TQ_SLOT( clear() ) );
connect( filterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFilter() ) ); connect( filterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFilter() ) );
TQToolTip::add( button, i18n( "Clear filter" ) ); TQToolTip::add( button, i18n( "Clear filter" ) );
TQToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search" ) ); TQToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search" ) );
TQToolTip::add( filterButton, i18n( "Click to edit filter" ) ); TQToolTip::add( filterButton, i18n( "Click to edit filter" ) );
} //</Search LineEdit> } //</Search LineEdit>
connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSetFilter() ) ); connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSetFilter() ) );
connect( m_searchEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotSetFilterTimeout() ) ); connect( m_searchEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotSetFilterTimeout() ) );
connect( m_searchEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotSetFilter() ) ); connect( m_searchEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotSetFilter() ) );
// connect to device manager // connect to device manager
connect( MediaDeviceManager::instance(), TQT_SIGNAL( mediumAdded(const Medium *, TQString) ), connect( MediaDeviceManager::instance(), TQ_SIGNAL( mediumAdded(const Medium *, TQString) ),
TQT_SLOT( mediumAdded(const Medium *, TQString) ) ); TQ_SLOT( mediumAdded(const Medium *, TQString) ) );
connect( MediaDeviceManager::instance(), TQT_SIGNAL( mediumChanged(const Medium *, TQString) ), connect( MediaDeviceManager::instance(), TQ_SIGNAL( mediumChanged(const Medium *, TQString) ),
TQT_SLOT( mediumChanged(const Medium *, TQString) ) ); TQ_SLOT( mediumChanged(const Medium *, TQString) ) );
connect( MediaDeviceManager::instance(), TQT_SIGNAL( mediumRemoved(const Medium *, TQString) ), connect( MediaDeviceManager::instance(), TQ_SIGNAL( mediumRemoved(const Medium *, TQString) ),
TQT_SLOT( mediumRemoved(const Medium *, TQString) ) ); TQ_SLOT( mediumRemoved(const Medium *, TQString) ) );
// we always have a dummy device // we always have a dummy device
@ -363,17 +363,17 @@ MediaBrowser::MediaBrowser( const char *name )
"Go to the \"Media Devices\" pane of the configuration\n" "Go to the \"Media Devices\" pane of the configuration\n"
"dialog to choose a plugin for these devices.") ); "dialog to choose a plugin for these devices.") );
connect( m_toolbar->getButton(CONNECT), TQT_SIGNAL( clicked() ), TQT_SLOT( connectClicked() ) ); connect( m_toolbar->getButton(CONNECT), TQ_SIGNAL( clicked() ), TQ_SLOT( connectClicked() ) );
connect( m_toolbar->getButton(DISCONNECT), TQT_SIGNAL( clicked() ), TQT_SLOT( disconnectClicked() ) ); connect( m_toolbar->getButton(DISCONNECT), TQ_SIGNAL( clicked() ), TQ_SLOT( disconnectClicked() ) );
connect( m_toolbar->getButton(TRANSFER), TQT_SIGNAL( clicked() ), TQT_SLOT( transferClicked() ) ); connect( m_toolbar->getButton(TRANSFER), TQ_SIGNAL( clicked() ), TQ_SLOT( transferClicked() ) );
connect( m_toolbar->getButton(CONFIGURE), TQT_SIGNAL( clicked() ), TQT_SLOT( config() ) ); connect( m_toolbar->getButton(CONFIGURE), TQ_SIGNAL( clicked() ), TQ_SLOT( config() ) );
connect( m_deviceCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( activateDevice( int ) ) ); connect( m_deviceCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( activateDevice( int ) ) );
connect( m_cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( cancelClicked() ) ); connect( m_cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( cancelClicked() ) );
connect( pApp, TQT_SIGNAL( prepareToQuit() ), TQT_SLOT( prepareToQuit() ) ); connect( pApp, TQ_SIGNAL( prepareToQuit() ), TQ_SLOT( prepareToQuit() ) );
connect( CollectionDB::instance(), TQT_SIGNAL( tagsChanged( const MetaBundle& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( tagsChanged( const MetaBundle& ) ),
TQT_SLOT( tagsChanged( const MetaBundle& ) ) ); TQ_SLOT( tagsChanged( const MetaBundle& ) ) );
m_haveDevices = false; m_haveDevices = false;
TQMap<TQString,TQString> savedDevices = Amarok::config( "MediaBrowser" )->entryMap( "MediaBrowser" ); TQMap<TQString,TQString> savedDevices = Amarok::config( "MediaBrowser" )->entryMap( "MediaBrowser" );
@ -754,7 +754,7 @@ void
MediaBrowser::slotEditFilter() MediaBrowser::slotEditFilter()
{ {
EditFilterDialog *fd = new EditFilterDialog( this, true, m_searchEdit->text() ); EditFilterDialog *fd = new EditFilterDialog( this, true, m_searchEdit->text() );
connect( fd, TQT_SIGNAL(filterChanged(const TQString &)), TQT_SLOT(slotSetFilter(const TQString &)) ); connect( fd, TQ_SIGNAL(filterChanged(const TQString &)), TQ_SLOT(slotSetFilter(const TQString &)) );
if( fd->exec() ) if( fd->exec() )
m_searchEdit->setText( fd->filter() ); m_searchEdit->setText( fd->filter() );
delete fd; delete fd;
@ -1192,22 +1192,22 @@ MediaView::MediaView( TQWidget* parent, MediaDevice *device )
addColumn( i18n( "Remote Media" ) ); addColumn( i18n( "Remote Media" ) );
TDEActionCollection* ac = new TDEActionCollection( this ); TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "mediabrowser_select_all" ); KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "mediabrowser_select_all" );
connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) ); this, TQ_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) );
connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem* ) ), connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem* ) ),
this, TQT_SLOT( renameItem( TQListViewItem* ) ) ); this, TQ_SLOT( renameItem( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ), connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ),
this, TQT_SLOT( slotExpand( TQListViewItem* ) ) ); this, TQ_SLOT( slotExpand( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ),
this, TQT_SLOT( invokeItem( TQListViewItem* ) ) ); this, TQ_SLOT( invokeItem( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( invokeItem( TQListViewItem*, const TQPoint &, int ) ) ); this, TQ_SLOT( invokeItem( TQListViewItem*, const TQPoint &, int ) ) );
m_toolTip = new MediaItemTip( this ); m_toolTip = new MediaItemTip( this );
} }
@ -2475,8 +2475,8 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
false /* overwrite */, false /* overwrite */,
false /* resume */, false /* resume */,
false /* show progress */ ); false /* show progress */ );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( fileTransferred( TDEIO::Job * ) ) ); this, TQ_SLOT( fileTransferred( TDEIO::Job * ) ) );
bool tryToRemove = false; bool tryToRemove = false;
while ( m_wait ) while ( m_wait )
@ -2708,7 +2708,7 @@ MediaDevice::connectDevice( bool silent )
synchronizeDevice(); synchronizeDevice();
TQTimer::singleShot( 1500, m_parent->m_progressBox, TQT_SLOT(hide()) ); TQTimer::singleShot( 1500, m_parent->m_progressBox, TQ_SLOT(hide()) );
m_parent->queue()->computeSize(); m_parent->queue()->computeSize();
m_parent->updateStats(); m_parent->updateStats();
} }
@ -3329,7 +3329,7 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags )
if(!isTransferring()) if(!isTransferring())
{ {
TQTimer::singleShot( 1500, m_parent->m_progressBox, TQT_SLOT(hide()) ); TQTimer::singleShot( 1500, m_parent->m_progressBox, TQ_SLOT(hide()) );
} }
if( m_deferredDisconnect ) if( m_deferredDisconnect )
@ -3619,12 +3619,12 @@ MediaQueue::MediaQueue(MediaBrowser *parent)
itemCountChanged(); itemCountChanged();
TDEActionCollection* ac = new TDEActionCollection( this ); TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "MediaQueue" ); KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "MediaQueue" );
connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
TQT_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint&, int ) ) ); TQ_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint&, int ) ) );
connect( this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), connect( this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) ); TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) );
} }
bool bool

36
amarok/src/mediadevice/daap/daapclient.cpp
Unescape View File

@ -93,7 +93,7 @@ DEBUG_BLOCK
TQToolTip::add( customButton, i18n( "List music from a remote host" ) ); TQToolTip::add( customButton, i18n( "List music from a remote host" ) );
TQToolTip::add( m_broadcastButton, i18n( "If this button is checked, then your music will be exported to the network" ) ); TQToolTip::add( m_broadcastButton, i18n( "If this button is checked, then your music will be exported to the network" ) );
connect( m_broadcastButton, TQT_SIGNAL( toggled(int) ), TQT_SLOT( broadcastButtonToggled() ) ); connect( m_broadcastButton, TQ_SIGNAL( toggled(int) ), TQ_SLOT( broadcastButtonToggled() ) );
MediaBrowser::instance()->insertChild( this ); MediaBrowser::instance()->insertChild( this );
} }
@ -139,10 +139,10 @@ DaapClient::openDevice(bool /* silent=false */)
{ {
m_browser = new DNSSD::ServiceBrowser("_daap._tcp"); m_browser = new DNSSD::ServiceBrowser("_daap._tcp");
m_browser->setName("daapServiceBrowser"); m_browser->setName("daapServiceBrowser");
connect( m_browser, TQT_SIGNAL( serviceAdded( DNSSD::RemoteService::Ptr ) ), connect( m_browser, TQ_SIGNAL( serviceAdded( DNSSD::RemoteService::Ptr ) ),
this, TQT_SLOT( foundDaap ( DNSSD::RemoteService::Ptr ) ) ); this, TQ_SLOT( foundDaap ( DNSSD::RemoteService::Ptr ) ) );
connect( m_browser, TQT_SIGNAL( serviceRemoved( DNSSD::RemoteService::Ptr ) ), connect( m_browser, TQ_SIGNAL( serviceRemoved( DNSSD::RemoteService::Ptr ) ),
this, TQT_SLOT( serverOffline ( DNSSD::RemoteService::Ptr ) ) ); this, TQ_SLOT( serverOffline ( DNSSD::RemoteService::Ptr ) ) );
m_browser->startBrowse(); m_browser->startBrowse();
} }
#endif #endif
@ -359,7 +359,7 @@ DaapClient::foundDaap( DNSSD::RemoteService::Ptr service )
#if DNSSD_SUPPORT #if DNSSD_SUPPORT
DEBUG_BLOCK DEBUG_BLOCK
connect( service, TQT_SIGNAL( resolved( bool ) ), this, TQT_SLOT( resolvedDaap( bool ) ) ); connect( service, TQ_SIGNAL( resolved( bool ) ), this, TQ_SLOT( resolvedDaap( bool ) ) );
service->resolveAsync(); service->resolveAsync();
#endif #endif
} }
@ -544,10 +544,10 @@ DaapClient::passwordPrompt()
{ {
Daap::Reader* reader = new Daap::Reader( callback->host(), callback->port(), root, dialog.m_input->password(), this, callback->name() ); Daap::Reader* reader = new Daap::Reader( callback->host(), callback->port(), root, dialog.m_input->password(), this, callback->name() );
root->setReader( reader ); root->setReader( reader );
connect( reader, TQT_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ), connect( reader, TQ_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ),
this, TQT_SLOT( createTree( const TQString&, Daap::SongList ) ) ); this, TQ_SLOT( createTree( const TQString&, Daap::SongList ) ) );
connect( reader, TQT_SIGNAL( passwordRequired() ), this, TQT_SLOT( passwordPrompt() ) ); connect( reader, TQ_SIGNAL( passwordRequired() ), this, TQ_SLOT( passwordPrompt() ) );
connect( reader, TQT_SIGNAL( httpError( const TQString& ) ), root, TQT_SLOT( httpError( const TQString& ) ) ); connect( reader, TQ_SIGNAL( httpError( const TQString& ) ), root, TQ_SLOT( httpError( const TQString& ) ) );
reader->loginRequest(); reader->loginRequest();
} }
else else
@ -733,7 +733,7 @@ ServerItem::setOpen( bool o )
//starts loading animation //starts loading animation
m_iconCounter = 1; m_iconCounter = 1;
startAnimation(); startAnimation();
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); connect( &m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) );
setText( 0, i18n( "Loading %1").arg( text( 0 ) ) ); setText( 0, i18n( "Loading %1").arg( text( 0 ) ) );
@ -741,10 +741,10 @@ ServerItem::setOpen( bool o )
TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() ); TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() );
setReader ( reader ); setReader ( reader );
connect( reader, TQT_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ), connect( reader, TQ_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ),
m_daapClient, TQT_SLOT( createTree( const TQString&, Daap::SongList ) ) ); m_daapClient, TQ_SLOT( createTree( const TQString&, Daap::SongList ) ) );
connect( reader, TQT_SIGNAL( passwordRequired() ), m_daapClient, TQT_SLOT( passwordPrompt() ) ); connect( reader, TQ_SIGNAL( passwordRequired() ), m_daapClient, TQ_SLOT( passwordPrompt() ) );
connect( reader, TQT_SIGNAL( httpError( const TQString& ) ), this, TQT_SLOT( httpError( const TQString& ) ) ); connect( reader, TQ_SIGNAL( httpError( const TQString& ) ), this, TQ_SLOT( httpError( const TQString& ) ) );
reader->loginRequest(); reader->loginRequest();
m_loaded = true; m_loaded = true;
} }
@ -806,9 +806,9 @@ DaapDownloader::doJob()
DEBUG_BLOCK DEBUG_BLOCK
KURL::List::iterator urlIt = m_urls.begin(); KURL::List::iterator urlIt = m_urls.begin();
Daap::ContentFetcher* http = new Daap::ContentFetcher( (*urlIt).host(), (*urlIt).port(), TQString(), this ); Daap::ContentFetcher* http = new Daap::ContentFetcher( (*urlIt).host(), (*urlIt).port(), TQString(), this );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( downloadFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( downloadFinished( int, bool ) ) );
connect( http, TQT_SIGNAL( dataReadProgress( int, int ) ), this, TQT_SLOT( dataReadProgress( int, int ) ) ); connect( http, TQ_SIGNAL( dataReadProgress( int, int ) ), this, TQ_SLOT( dataReadProgress( int, int ) ) );
connect( http, TQT_SIGNAL( httpError( const TQString& ) ), this, TQT_SLOT( downloadFailed( const TQString& ) ) ); connect( http, TQ_SIGNAL( httpError( const TQString& ) ), this, TQ_SLOT( downloadFailed( const TQString& ) ) );
while( !isAborted() && !m_errorOccured && urlIt != m_urls.end() ) while( !isAborted() && !m_errorOccured && urlIt != m_urls.end() )
{ {
m_ready = false; m_ready = false;

2
amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
Unescape View File

@ -32,7 +32,7 @@ ContentFetcher::ContentFetcher( const TQString & hostname, TQ_UINT16 port, const
, m_port( port ) , m_port( port )
, m_selfDestruct( false ) , m_selfDestruct( false )
{ {
connect( this, TQT_SIGNAL( stateChanged( int ) ), this , TQT_SLOT( checkForErrors( int ) ) ); connect( this, TQ_SIGNAL( stateChanged( int ) ), this , TQ_SLOT( checkForErrors( int ) ) );
TQCString pass = password.utf8(); TQCString pass = password.utf8();
if( !password.isNull() ) if( !password.isNull() )
{ {

30
amarok/src/mediadevice/daap/daapreader/reader.cpp
Unescape View File

@ -162,8 +162,8 @@ void
Reader::logoutRequest() Reader::logoutRequest()
{ {
ContentFetcher* http = new ContentFetcher( m_host, m_port, m_password, this, "readerLogoutHttp" ); ContentFetcher* http = new ContentFetcher( m_host, m_port, m_password, this, "readerLogoutHttp" );
connect( http, TQT_SIGNAL( httpError( const TQString& ) ), this, TQT_SLOT( fetchingError( const TQString& ) ) ); connect( http, TQ_SIGNAL( httpError( const TQString& ) ), this, TQ_SLOT( fetchingError( const TQString& ) ) );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( logoutRequest( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( logoutRequest( int, bool ) ) );
http->getDaap( "/logout?" + m_loginString ); http->getDaap( "/logout?" + m_loginString );
} }
@ -179,9 +179,9 @@ Reader::loginRequest()
{ {
DEBUG_BLOCK DEBUG_BLOCK
ContentFetcher* http = new ContentFetcher( m_host, m_port, m_password, this, "readerHttp"); ContentFetcher* http = new ContentFetcher( m_host, m_port, m_password, this, "readerHttp");
connect( http, TQT_SIGNAL( httpError( const TQString& ) ), this, TQT_SLOT( fetchingError( const TQString& ) ) ); connect( http, TQ_SIGNAL( httpError( const TQString& ) ), this, TQ_SLOT( fetchingError( const TQString& ) ) );
connect( http, TQT_SIGNAL( responseHeaderReceived( const TQHttpResponseHeader & ) ) connect( http, TQ_SIGNAL( responseHeaderReceived( const TQHttpResponseHeader & ) )
, this, TQT_SLOT( loginHeaderReceived( const TQHttpResponseHeader & ) ) ); , this, TQ_SLOT( loginHeaderReceived( const TQHttpResponseHeader & ) ) );
http->getDaap( "/login" ); http->getDaap( "/login" );
} }
@ -190,15 +190,15 @@ Reader::loginHeaderReceived( const TQHttpResponseHeader & resp )
{ {
DEBUG_BLOCK DEBUG_BLOCK
ContentFetcher* http = (ContentFetcher*) sender(); ContentFetcher* http = (ContentFetcher*) sender();
disconnect( http, TQT_SIGNAL( responseHeaderReceived( const TQHttpResponseHeader & ) ) disconnect( http, TQ_SIGNAL( responseHeaderReceived( const TQHttpResponseHeader & ) )
, this, TQT_SLOT( loginHeaderReceived( const TQHttpResponseHeader & ) ) ); , this, TQ_SLOT( loginHeaderReceived( const TQHttpResponseHeader & ) ) );
if( resp.statusCode() == 401 /*authorization required*/) if( resp.statusCode() == 401 /*authorization required*/)
{ {
emit passwordRequired(); emit passwordRequired();
http->deleteLater(); http->deleteLater();
return; return;
} }
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( loginFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( loginFinished( int, bool ) ) );
} }
@ -207,7 +207,7 @@ Reader::loginFinished( int /* id */, bool error )
{ {
DEBUG_BLOCK DEBUG_BLOCK
ContentFetcher* http = (ContentFetcher*) sender(); ContentFetcher* http = (ContentFetcher*) sender();
disconnect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( loginFinished( int, bool ) ) ); disconnect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( loginFinished( int, bool ) ) );
if( error ) if( error )
{ {
http->deleteLater(); http->deleteLater();
@ -217,7 +217,7 @@ Reader::loginFinished( int /* id */, bool error )
m_sessionId = loginResults["mlog"].asList()[0].asMap()["mlid"].asList()[0].asInt(); m_sessionId = loginResults["mlog"].asList()[0].asMap()["mlid"].asList()[0].asInt();
m_loginString = "session-id=" + TQString::number( m_sessionId ); m_loginString = "session-id=" + TQString::number( m_sessionId );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( updateFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( updateFinished( int, bool ) ) );
http->getDaap( "/update?" + m_loginString ); http->getDaap( "/update?" + m_loginString );
} }
@ -226,7 +226,7 @@ Reader::updateFinished( int /*id*/, bool error )
{ {
DEBUG_BLOCK DEBUG_BLOCK
ContentFetcher* http = (ContentFetcher*) sender(); ContentFetcher* http = (ContentFetcher*) sender();
disconnect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( updateFinished( int, bool ) ) ); disconnect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( updateFinished( int, bool ) ) );
if( error ) if( error )
{ {
http->deleteLater(); http->deleteLater();
@ -238,7 +238,7 @@ Reader::updateFinished( int /*id*/, bool error )
m_loginString = m_loginString + "&revision-number=" + m_loginString = m_loginString + "&revision-number=" +
TQString::number( updateResults["mupd"].asList()[0].asMap()["musr"].asList()[0].asInt() ); TQString::number( updateResults["mupd"].asList()[0].asMap()["musr"].asList()[0].asInt() );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( databaseIdFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( databaseIdFinished( int, bool ) ) );
http->getDaap( "/databases?" + m_loginString ); http->getDaap( "/databases?" + m_loginString );
} }
@ -247,7 +247,7 @@ void
Reader::databaseIdFinished( int /*id*/, bool error ) Reader::databaseIdFinished( int /*id*/, bool error )
{ {
ContentFetcher* http = (ContentFetcher*) sender(); ContentFetcher* http = (ContentFetcher*) sender();
disconnect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( databaseIdFinished( int, bool ) ) ); disconnect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( databaseIdFinished( int, bool ) ) );
if( error ) if( error )
{ {
http->deleteLater(); http->deleteLater();
@ -256,7 +256,7 @@ Reader::databaseIdFinished( int /*id*/, bool error )
TQStringVariantMap dbIdResults = parse( http->results(), 0, true ); TQStringVariantMap dbIdResults = parse( http->results(), 0, true );
m_databaseId = TQString::number( dbIdResults["avdb"].asList()[0].asMap()["mlcl"].asList()[0].asMap()["mlit"].asList()[0].asMap()["miid"].asList()[0].asInt() ); m_databaseId = TQString::number( dbIdResults["avdb"].asList()[0].asMap()["mlcl"].asList()[0].asMap()["mlit"].asList()[0].asMap()["miid"].asList()[0].asInt() );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( songListFinished( int, bool ) ) ); connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( songListFinished( int, bool ) ) );
http->getDaap( TQString("/databases/%1/items?type=music&meta=dmap.itemid,dmap.itemname,daap.songformat,daap.songartist,daap.songalbum,daap.songtime,daap.songtracknumber,daap.songcomment,daap.songyear,daap.songgenre&%2") http->getDaap( TQString("/databases/%1/items?type=music&meta=dmap.itemid,dmap.itemname,daap.songformat,daap.songartist,daap.songalbum,daap.songtime,daap.songtracknumber,daap.songcomment,daap.songyear,daap.songgenre&%2")
.arg( m_databaseId, m_loginString ) ); .arg( m_databaseId, m_loginString ) );
@ -266,7 +266,7 @@ void
Reader::songListFinished( int /*id*/, bool error ) Reader::songListFinished( int /*id*/, bool error )
{ {
ContentFetcher* http = (ContentFetcher*) sender(); ContentFetcher* http = (ContentFetcher*) sender();
disconnect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( songListFinished( int, bool ) ) ); disconnect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( songListFinished( int, bool ) ) );
if( error ) if( error )
{ {
http->deleteLater(); http->deleteLater();

2
amarok/src/mediadevice/daap/daapserver.cpp
Unescape View File

@ -38,7 +38,7 @@ DaapServer::DaapServer(TQObject* parent, char* name)
return; return;
} }
connect( m_server, TQT_SIGNAL( readReady( KProcIO* ) ), this, TQT_SLOT( readSql() ) ); connect( m_server, TQ_SIGNAL( readReady( KProcIO* ) ), this, TQ_SLOT( readSql() ) );
} }
DaapServer::~DaapServer() DaapServer::~DaapServer()

4
amarok/src/mediadevice/daap/proxy.cpp
Unescape View File

@ -80,8 +80,8 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name)
if( line == "AMAROK_PROXY: startup" ) break; if( line == "AMAROK_PROXY: startup" ) break;
} }
debug() << "started amarok_proxy.rb --daap " << TQString::number( port ) << ' ' << realStream.url() << ' ' << AmarokConfig::soundSystem() << ' ' << hash << ' ' << revisionId << endl; debug() << "started amarok_proxy.rb --daap " << TQString::number( port ) << ' ' << realStream.url() << ' ' << AmarokConfig::soundSystem() << ' ' << hash << ' ' << revisionId << endl;
connect( m_proxy, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( playbackStopped() ) ); connect( m_proxy, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( playbackStopped() ) );
connect( m_proxy, TQT_SIGNAL( readReady( KProcIO* ) ), this, TQT_SLOT( readProxy() ) ); connect( m_proxy, TQ_SIGNAL( readReady( KProcIO* ) ), this, TQ_SLOT( readProxy() ) );
} }
Proxy::~Proxy() Proxy::~Proxy()

16
amarok/src/mediadevice/generic/genericmediadevice.cpp
Unescape View File

@ -306,11 +306,11 @@ GenericMediaDevice::GenericMediaDevice()
m_configDialog = 0; m_configDialog = 0;
connect( m_dirLister, TQT_SIGNAL( newItems(const KFileItemList &) ), this, TQT_SLOT( newItems(const KFileItemList &) ) ); connect( m_dirLister, TQ_SIGNAL( newItems(const KFileItemList &) ), this, TQ_SLOT( newItems(const KFileItemList &) ) );
connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( dirListerCompleted() ) ); connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( dirListerCompleted() ) );
connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( dirListerClear() ) ); connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( dirListerClear() ) );
connect( m_dirLister, TQT_SIGNAL( clear(const KURL &) ), this, TQT_SLOT( dirListerClear(const KURL &) ) ); connect( m_dirLister, TQ_SIGNAL( clear(const KURL &) ), this, TQ_SLOT( dirListerClear(const KURL &) ) );
connect( m_dirLister, TQT_SIGNAL( deleteItem(KFileItem *) ), this, TQT_SLOT( dirListerDeleteItem(KFileItem *) ) ); connect( m_dirLister, TQ_SIGNAL( deleteItem(KFileItem *) ), this, TQ_SLOT( dirListerDeleteItem(KFileItem *) ) );
} }
void void
@ -403,7 +403,7 @@ GenericMediaDevice::openDevice( bool /*silent*/ )
m_transferDir = newMountPoint; m_transferDir = newMountPoint;
m_initialFile = new GenericMediaFile( 0, newMountPoint, this ); m_initialFile = new GenericMediaFile( 0, newMountPoint, this );
listDir( newMountPoint ); listDir( newMountPoint );
connect( this, TQT_SIGNAL( startTransfer() ), MediaBrowser::instance(), TQT_SLOT( transferClicked() ) ); connect( this, TQ_SIGNAL( startTransfer() ), MediaBrowser::instance(), TQ_SLOT( transferClicked() ) );
return true; return true;
} }
@ -891,8 +891,8 @@ GenericMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *av
KDiskFreeSp* kdf = new KDiskFreeSp( m_parent, "generic_kdf" ); KDiskFreeSp* kdf = new KDiskFreeSp( m_parent, "generic_kdf" );
kdf->readDF( m_medium.mountPoint() ); kdf->readDF( m_medium.mountPoint() );
connect(kdf, TQT_SIGNAL(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )), connect(kdf, TQ_SIGNAL(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )),
TQT_SLOT(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long ))); TQ_SLOT(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )));
int count = 0; int count = 0;

2
amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h
Unescape View File

@ -311,7 +311,7 @@ GenericMediaDeviceConfigDialog::init()
m_addSupportedButton->setPopup( m_unsupportedMenu ); m_addSupportedButton->setPopup( m_unsupportedMenu );
connect( m_unsupportedMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( addSupportedButtonClicked( int ) ) ); connect( m_unsupportedMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( addSupportedButtonClicked( int ) ) );
} }

8
amarok/src/mediadevice/ipod/ipodmediadevice.cpp
Unescape View File

@ -283,7 +283,7 @@ IpodMediaDevice::IpodMediaDevice()
m_customAction->setEnabled( false ); m_customAction->setEnabled( false );
am->setDelayed( false ); am->setDelayed( false );
TDEPopupMenu *menu = am->popupMenu(); TDEPopupMenu *menu = am->popupMenu();
connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIpodAction(int)) ); connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotIpodAction(int)) );
menu->insertItem( i18n( "Stale and Orphaned" ), CHECK_INTEGRITY ); menu->insertItem( i18n( "Stale and Orphaned" ), CHECK_INTEGRITY );
menu->insertItem( i18n( "Update Artwork" ), UPDATE_ARTWORK ); menu->insertItem( i18n( "Update Artwork" ), UPDATE_ARTWORK );
@ -309,7 +309,7 @@ IpodMediaDevice::IpodMediaDevice()
{ {
infoFound = true; infoFound = true;
gen = new TDEPopupMenu( ipodGen ); gen = new TDEPopupMenu( ipodGen );
connect( gen, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIpodAction(int)) ); connect( gen, TQ_SIGNAL(activated(int)), TQ_SLOT(slotIpodAction(int)) );
ipodGen->insertItem( ipodGen->insertItem(
itdb_info_get_ipod_generation_string( info->ipod_generation), itdb_info_get_ipod_generation_string( info->ipod_generation),
gen ); gen );
@ -2689,8 +2689,8 @@ IpodMediaDevice::deleteFile( const KURL &url )
debug() << "deleting " << url.prettyURL() << endl; debug() << "deleting " << url.prettyURL() << endl;
m_waitForDeletion = true; m_waitForDeletion = true;
TDEIO::Job *job = TDEIO::file_delete( url, false ); TDEIO::Job *job = TDEIO::file_delete( url, false );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( fileDeleted( TDEIO::Job * ) ) ); this, TQ_SLOT( fileDeleted( TDEIO::Job * ) ) );
do do
{ {
kapp->processEvents( 100 ); kapp->processEvents( 100 );

4
amarok/src/mediadevice/mtp/mtpmediadevice.cpp
Unescape View File

@ -1112,8 +1112,8 @@ MtpMediaDevice::openDevice( bool silent )
} }
connect( connect(
m_view, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), m_view, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ),
this, TQT_SLOT( playlistRenamed( TQListViewItem*, const TQString&, int ) ) this, TQ_SLOT( playlistRenamed( TQListViewItem*, const TQString&, int ) )
); );
TQString modelname = TQString( LIBMTP_Get_Modelname( m_device ) ); TQString modelname = TQString( LIBMTP_Get_Modelname( m_device ) );

8
amarok/src/mediadevicemanager.cpp
Unescape View File

@ -36,9 +36,9 @@ MediaDeviceManager* MediaDeviceManager::instance()
MediaDeviceManager::MediaDeviceManager() MediaDeviceManager::MediaDeviceManager()
{ {
DEBUG_BLOCK DEBUG_BLOCK
connect( DeviceManager::instance(), TQT_SIGNAL( mediumAdded( const Medium*, TQString ) ), TQT_SLOT( slotMediumAdded( const Medium*, TQString ) ) ); connect( DeviceManager::instance(), TQ_SIGNAL( mediumAdded( const Medium*, TQString ) ), TQ_SLOT( slotMediumAdded( const Medium*, TQString ) ) );
connect( DeviceManager::instance(), TQT_SIGNAL( mediumChanged( const Medium*, TQString ) ), TQT_SLOT( slotMediumChanged( const Medium*, TQString ) ) ); connect( DeviceManager::instance(), TQ_SIGNAL( mediumChanged( const Medium*, TQString ) ), TQ_SLOT( slotMediumChanged( const Medium*, TQString ) ) );
connect( DeviceManager::instance(), TQT_SIGNAL( mediumRemoved( const Medium*, TQString ) ), TQT_SLOT( slotMediumRemoved( const Medium*, TQString ) ) ); connect( DeviceManager::instance(), TQ_SIGNAL( mediumRemoved( const Medium*, TQString ) ), TQ_SLOT( slotMediumRemoved( const Medium*, TQString ) ) );
Medium::List mediums = DeviceManager::instance()->getDeviceList(); Medium::List mediums = DeviceManager::instance()->getDeviceList();
foreachType( Medium::List, mediums ) foreachType( Medium::List, mediums )
{ {
@ -47,7 +47,7 @@ MediaDeviceManager::MediaDeviceManager()
if( !mediums.count() ) if( !mediums.count() )
{ {
debug() << "DeviceManager didn't return any devices, we are probably running on a non-KDE system. Trying to reinit media devices later" << endl; debug() << "DeviceManager didn't return any devices, we are probably running on a non-KDE system. Trying to reinit media devices later" << endl;
TQTimer::singleShot( 4000, this, TQT_SLOT( reinitDevices() ) ); TQTimer::singleShot( 4000, this, TQ_SLOT( reinitDevices() ) );
} }
//load manual devices //load manual devices
TQStringList manualDevices; TQStringList manualDevices;

18
amarok/src/mediumpluginmanager.cpp
Unescape View File

@ -64,11 +64,11 @@ MediumPluginManagerDialog::MediumPluginManagerDialog()
TQHBox *hbox = new TQHBox( vbox ); TQHBox *hbox = new TQHBox( vbox );
KPushButton *detectDevices = new KPushButton( i18n( "Autodetect Devices" ), hbox); KPushButton *detectDevices = new KPushButton( i18n( "Autodetect Devices" ), hbox);
detectDevices->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); detectDevices->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( detectDevices, TQT_SIGNAL( clicked() ), m_manager, TQT_SLOT( redetectDevices() ) ); connect( detectDevices, TQ_SIGNAL( clicked() ), m_manager, TQ_SLOT( redetectDevices() ) );
KPushButton *addButton = new KPushButton( i18n( "Add Device..." ), hbox ); KPushButton *addButton = new KPushButton( i18n( "Add Device..." ), hbox );
addButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); addButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( addButton, TQT_SIGNAL( clicked() ), m_manager, TQT_SLOT( newDevice() ) ); connect( addButton, TQ_SIGNAL( clicked() ), m_manager, TQ_SLOT( newDevice() ) );
} }
MediumPluginManagerDialog::~MediumPluginManagerDialog() MediumPluginManagerDialog::~MediumPluginManagerDialog()
@ -88,7 +88,7 @@ MediumPluginManager::MediumPluginManager( TQWidget *widget, const bool nographic
{ {
detectDevices( false, nographics ); detectDevices( false, nographics );
connect( this, TQT_SIGNAL( selectedPlugin( const Medium*, const TQString ) ), MediaBrowser::instance(), TQT_SLOT( pluginSelected( const Medium*, const TQString ) ) ); connect( this, TQ_SIGNAL( selectedPlugin( const Medium*, const TQString ) ), MediaBrowser::instance(), TQ_SLOT( pluginSelected( const Medium*, const TQString ) ) );
} }
MediumPluginManager::~MediumPluginManager() MediumPluginManager::~MediumPluginManager()
@ -154,7 +154,7 @@ MediumPluginManager::detectDevices( const bool redetect, const bool nographics )
MediaDeviceConfig *dev = new MediaDeviceConfig( *it, this, nographics, m_widget ); MediaDeviceConfig *dev = new MediaDeviceConfig( *it, this, nographics, m_widget );
m_deviceList.append( dev ); m_deviceList.append( dev );
connect( dev, TQT_SIGNAL(deleteMedium(Medium *)), TQT_SLOT(deleteMedium(Medium *)) ); connect( dev, TQ_SIGNAL(deleteMedium(Medium *)), TQ_SLOT(deleteMedium(Medium *)) );
foundNew = true; foundNew = true;
} }
@ -288,7 +288,7 @@ ManualDeviceAdder::ManualDeviceAdder( MediumPluginManager* mpm )
m_mdaMountPoint->setHint( i18n( "Example: /mnt/ipod" ) ); m_mdaMountPoint->setHint( i18n( "Example: /mnt/ipod" ) );
TQToolTip::add( m_mdaMountPoint, i18n( "Enter the device's mount point. Some devices (such as iRiver iFP devices) may not have a mount point and this can be ignored. All other devices (iPods, UMS/VFAT devices) should enter the mount point here." ) ); TQToolTip::add( m_mdaMountPoint, i18n( "Enter the device's mount point. Some devices (such as iRiver iFP devices) may not have a mount point and this can be ignored. All other devices (iPods, UMS/VFAT devices) should enter the mount point here." ) );
connect( m_mdaCombo, TQT_SIGNAL( activated(const TQString&) ), this, TQT_SLOT( comboChanged(const TQString&) ) ); connect( m_mdaCombo, TQ_SIGNAL( activated(const TQString&) ), this, TQ_SLOT( comboChanged(const TQString&) ) );
} }
ManualDeviceAdder::~ManualDeviceAdder() ManualDeviceAdder::~ManualDeviceAdder()
@ -433,16 +433,16 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr,
} }
m_configButton = new KPushButton( SmallIconSet( Amarok::icon( "configure" ) ), TQString(), this ); m_configButton = new KPushButton( SmallIconSet( Amarok::icon( "configure" ) ), TQString(), this );
connect( m_configButton, TQT_SIGNAL(clicked()), TQT_SLOT(configureDevice()) ); connect( m_configButton, TQ_SIGNAL(clicked()), TQ_SLOT(configureDevice()) );
m_configButton->setEnabled( !m_new && m_pluginCombo->currentText() != i18n( "Do not handle" ) ); m_configButton->setEnabled( !m_new && m_pluginCombo->currentText() != i18n( "Do not handle" ) );
TQToolTip::add( m_configButton, i18n( "Configure device settings" ) ); TQToolTip::add( m_configButton, i18n( "Configure device settings" ) );
m_removeButton = new KPushButton( i18n( "Remove" ), this ); m_removeButton = new KPushButton( i18n( "Remove" ), this );
connect( m_removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteDevice()) ); connect( m_removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(deleteDevice()) );
TQToolTip::add( m_removeButton, i18n( "Remove entries corresponding to this device from configuration file" ) ); TQToolTip::add( m_removeButton, i18n( "Remove entries corresponding to this device from configuration file" ) );
connect( m_pluginCombo, TQT_SIGNAL(activated(const TQString&)), m_manager, TQT_SLOT(slotChanged()) ); connect( m_pluginCombo, TQ_SIGNAL(activated(const TQString&)), m_manager, TQ_SLOT(slotChanged()) );
connect( this, TQT_SIGNAL(changed()), m_manager, TQT_SLOT(slotChanged()) ); connect( this, TQ_SIGNAL(changed()), m_manager, TQ_SLOT(slotChanged()) );
if( !nographics ) if( !nographics )
show(); show();

44
amarok/src/moodbar.cpp
Unescape View File

@ -39,8 +39,8 @@
// void MyClass::MyClass( void ) // void MyClass::MyClass( void )
// { // {
// // This only needs to be done once! // // This only needs to be done once!
// connect( &m_bundle.moodbar(), TQT_SIGNAL( jobEvent( int ) ), // connect( &m_bundle.moodbar(), TQ_SIGNAL( jobEvent( int ) ),
// TQT_SLOT( newMoodData( int ) ) ); // TQ_SLOT( newMoodData( int ) ) );
// } // }
// //
// void MyClass::newMetaBundle( const MetaBundle &b ) // void MyClass::newMetaBundle( const MetaBundle &b )
@ -319,20 +319,20 @@ MoodServer::MoodServer( void )
: m_moodbarBroken( false ) : m_moodbarBroken( false )
, m_currentProcess( 0 ) , m_currentProcess( 0 )
{ {
connect( App::instance(), TQT_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), connect( App::instance(), TQ_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ),
TQT_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); TQ_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) );
connect( CollectionDB::instance(), connect( CollectionDB::instance(),
TQT_SIGNAL( fileMoved( const TQString &, const TQString & ) ), TQ_SIGNAL( fileMoved( const TQString &, const TQString & ) ),
TQT_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); TQ_SLOT( slotFileMoved( const TQString &, const TQString & ) ) );
connect( CollectionDB::instance(), connect( CollectionDB::instance(),
TQT_SIGNAL( fileMoved( const TQString &, const TQString &, const TQString & ) ), TQ_SIGNAL( fileMoved( const TQString &, const TQString &, const TQString & ) ),
TQT_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); TQ_SLOT( slotFileMoved( const TQString &, const TQString & ) ) );
connect( CollectionDB::instance(), connect( CollectionDB::instance(),
TQT_SIGNAL( fileDeleted( const TQString & ) ), TQ_SIGNAL( fileDeleted( const TQString & ) ),
TQT_SLOT( slotFileDeleted( const TQString & ) ) ); TQ_SLOT( slotFileDeleted( const TQString & ) ) );
connect( CollectionDB::instance(), connect( CollectionDB::instance(),
TQT_SIGNAL( fileDeleted( const TQString &, const TQString & ) ), TQ_SIGNAL( fileDeleted( const TQString &, const TQString & ) ),
TQT_SLOT( slotFileDeleted( const TQString & ) ) ); TQ_SLOT( slotFileDeleted( const TQString & ) ) );
} }
@ -383,7 +383,7 @@ MoodServer::queueJob( MetaBundle *bundle )
m_mutex.unlock(); m_mutex.unlock();
// New jobs *must* be started from the GUI thread! // New jobs *must* be started from the GUI thread!
TQTimer::singleShot( 1000, this, TQT_SLOT( slotNewJob( void ) ) ); TQTimer::singleShot( 1000, this, TQ_SLOT( slotNewJob( void ) ) );
return false; return false;
} }
@ -476,8 +476,8 @@ MoodServer::slotNewJob( void )
<< (m_currentData.m_outfile + ".tmp") << (m_currentData.m_outfile + ".tmp")
<< m_currentData.m_infile; << m_currentData.m_infile;
connect( m_currentProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), connect( m_currentProcess, TQ_SIGNAL( processExited( TDEProcess* ) ),
TQT_SLOT( slotJobCompleted( TDEProcess* ) ) ); TQ_SLOT( slotJobCompleted( TDEProcess* ) ) );
// We have to enable TDEProcess::Stdout (even though we don't monitor // We have to enable TDEProcess::Stdout (even though we don't monitor
// it) since otherwise the child process crashes every time in // it) since otherwise the child process crashes every time in
@ -746,8 +746,8 @@ Moodbar::operator=( const Moodbar &mood )
if( JOB_PENDING( m_state ) && !JOB_PENDING( oldState ) ) if( JOB_PENDING( m_state ) && !JOB_PENDING( oldState ) )
{ {
connect( MoodServer::instance(), connect( MoodServer::instance(),
TQT_SIGNAL( jobEvent( KURL, int ) ), TQ_SIGNAL( jobEvent( KURL, int ) ),
TQT_SLOT( slotJobEvent( KURL, int ) ) ); TQ_SLOT( slotJobEvent( KURL, int ) ) );
// Increase the refcount for this job. Use mood.m_bundle // Increase the refcount for this job. Use mood.m_bundle
// since that one's already initialized. // since that one's already initialized.
MoodServer::instance()->queueJob( mood.m_bundle ); MoodServer::instance()->queueJob( mood.m_bundle );
@ -756,7 +756,7 @@ Moodbar::operator=( const Moodbar &mood )
// If we had a job pending, de-queue it // If we had a job pending, de-queue it
if( !JOB_PENDING( m_state ) && JOB_PENDING( oldState ) ) if( !JOB_PENDING( m_state ) && JOB_PENDING( oldState ) )
{ {
MoodServer::instance()->disconnect( this, TQT_SLOT( slotJobEvent( KURL, int ) ) ); MoodServer::instance()->disconnect( this, TQ_SLOT( slotJobEvent( KURL, int ) ) );
MoodServer::instance()->deQueueJob( oldURL ); MoodServer::instance()->deQueueJob( oldURL );
} }
@ -779,7 +779,7 @@ Moodbar::reset( void )
if( JOB_PENDING( m_state ) ) if( JOB_PENDING( m_state ) )
{ {
MoodServer::instance()->disconnect( this, TQT_SLOT( slotJobEvent( KURL, int ) ) ); MoodServer::instance()->disconnect( this, TQ_SLOT( slotJobEvent( KURL, int ) ) );
MoodServer::instance()->deQueueJob( m_url ); MoodServer::instance()->deQueueJob( m_url );
} }
@ -898,8 +898,8 @@ Moodbar::load( void )
// Ok no more excuses, we have to queue a job // Ok no more excuses, we have to queue a job
connect( MoodServer::instance(), connect( MoodServer::instance(),
TQT_SIGNAL( jobEvent( KURL, int ) ), TQ_SIGNAL( jobEvent( KURL, int ) ),
TQT_SLOT( slotJobEvent( KURL, int ) ) ); TQ_SLOT( slotJobEvent( KURL, int ) ) );
bool isRunning = MoodServer::instance()->queueJob( m_bundle ); bool isRunning = MoodServer::instance()->queueJob( m_bundle );
m_state = isRunning ? JobRunning : JobQueued; m_state = isRunning ? JobRunning : JobQueued;
m_url = m_bundle->url(); // Use this URL for MoodServer::deQueueJob m_url = m_bundle->url(); // Use this URL for MoodServer::deQueueJob
@ -930,7 +930,7 @@ Moodbar::slotJobEvent( KURL url, int newState )
m_mutex.lock(); m_mutex.lock();
// Disconnect the signal for efficiency's sake // Disconnect the signal for efficiency's sake
MoodServer::instance()->disconnect( this, TQT_SLOT( slotJobEvent( KURL, int ) ) ); MoodServer::instance()->disconnect( this, TQ_SLOT( slotJobEvent( KURL, int ) ) );
if( !success ) if( !success )
{ {

14
amarok/src/mountpointmanager.cpp
Unescape View File

@ -52,9 +52,9 @@ MountPointManager::MountPointManager()
//therefore it is enough to listen to DeviceManager's mediumChanged signal //therefore it is enough to listen to DeviceManager's mediumChanged signal
if (DeviceManager::instance()->isValid() ) if (DeviceManager::instance()->isValid() )
{ {
connect( DeviceManager::instance(), TQT_SIGNAL( mediumAdded( const Medium*, TQString ) ), TQT_SLOT( mediumAdded( const Medium* ) ) ); connect( DeviceManager::instance(), TQ_SIGNAL( mediumAdded( const Medium*, TQString ) ), TQ_SLOT( mediumAdded( const Medium* ) ) );
connect( DeviceManager::instance(), TQT_SIGNAL( mediumChanged( const Medium*, TQString ) ), TQT_SLOT( mediumChanged( const Medium* ) ) ); connect( DeviceManager::instance(), TQ_SIGNAL( mediumChanged( const Medium*, TQString ) ), TQ_SLOT( mediumChanged( const Medium* ) ) );
connect( DeviceManager::instance(), TQT_SIGNAL( mediumRemoved( const Medium*, TQString ) ), TQT_SLOT( mediumRemoved( const Medium* ) ) ); connect( DeviceManager::instance(), TQ_SIGNAL( mediumRemoved( const Medium*, TQString ) ), TQ_SLOT( mediumRemoved( const Medium* ) ) );
} }
else else
{ {
@ -70,10 +70,10 @@ MountPointManager::MountPointManager()
if ( collDB->adminValue( "Database Stats Version" ).toInt() >= 9 && /* make sure that deviceid actually exists*/ if ( collDB->adminValue( "Database Stats Version" ).toInt() >= 9 && /* make sure that deviceid actually exists*/
collDB->query( "SELECT COUNT(url) FROM statistics WHERE deviceid = -2;" ).first().toInt() != 0 ) collDB->query( "SELECT COUNT(url) FROM statistics WHERE deviceid = -2;" ).first().toInt() != 0 )
{ {
connect( this, TQT_SIGNAL( mediumConnected( int ) ), TQT_SLOT( migrateStatistics() ) ); connect( this, TQ_SIGNAL( mediumConnected( int ) ), TQ_SLOT( migrateStatistics() ) );
TQTimer::singleShot( 0, this, TQT_SLOT( migrateStatistics() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( migrateStatistics() ) );
} }
connect( this, TQT_SIGNAL( mediumConnected( int ) ), TQT_SLOT( updateStatisticsURLs() ) ); connect( this, TQ_SIGNAL( mediumConnected( int ) ), TQ_SLOT( updateStatisticsURLs() ) );
updateStatisticsURLs(); updateStatisticsURLs();
} }
@ -484,7 +484,7 @@ void
MountPointManager::updateStatisticsURLs( bool changed ) MountPointManager::updateStatisticsURLs( bool changed )
{ {
if ( changed ) if ( changed )
TQTimer::singleShot( 0, this, TQT_SLOT( startStatisticsUpdateJob() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( startStatisticsUpdateJob() ) );
} }
void void

12
amarok/src/multitabbar.cpp
Unescape View File

@ -526,9 +526,9 @@ MultiTabBarButton::MultiTabBarButton( const TQPixmap& pic, const TQString& text,
setFixedWidth( 24 ); setFixedWidth( 24 );
// TQToolTip::add( this, text ); // Deactivated cause it's annoying // TQToolTip::add( this, text ); // Deactivated cause it's annoying
connect( this, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); connect( this, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClicked() ) );
connect( m_animTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAnimTimer() ) ); connect( m_animTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAnimTimer() ) );
connect( m_dragSwitchTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDragSwitchTimer() ) ); connect( m_dragSwitchTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDragSwitchTimer() ) );
} }
MultiTabBarButton::MultiTabBarButton( const TQString& text, TQPopupMenu *popup, MultiTabBarButton::MultiTabBarButton( const TQString& text, TQPopupMenu *popup,
@ -549,9 +549,9 @@ MultiTabBarButton::MultiTabBarButton( const TQString& text, TQPopupMenu *popup,
m_id = id; m_id = id;
// TQToolTip::add( this, text ); // TQToolTip::add( this, text );
connect( this, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); connect( this, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClicked() ) );
connect( m_animTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAnimTimer() ) ); connect( m_animTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAnimTimer() ) );
connect( m_dragSwitchTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDragSwitchTimer() ) ); connect( m_dragSwitchTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDragSwitchTimer() ) );
} }
MultiTabBarButton::~MultiTabBarButton() MultiTabBarButton::~MultiTabBarButton()

14
amarok/src/osd.cpp
Unescape View File

@ -64,9 +64,9 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name )
setBackgroundMode( NoBackground ); setBackgroundMode( NoBackground );
unsetColors(); unsetColors();
connect( m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()) ); connect( m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide()) );
connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ),
this, TQT_SLOT( ratingChanged( const TQString&, int ) ) ); this, TQ_SLOT( ratingChanged( const TQString&, int ) ) );
//or crashes, KWin bug I think, crashes in TQWidget::icon() //or crashes, KWin bug I think, crashes in TQWidget::icon()
kapp->setTopWidget( this ); kapp->setTopWidget( this );
@ -707,10 +707,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
Amarok::OSD::OSD(): OSDWidget( 0 ) Amarok::OSD::OSD(): OSDWidget( 0 )
{ {
connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString&, const TQString& ) ),
this, TQT_SLOT( slotCoverChanged( const TQString&, const TQString& ) ) ); this, TQ_SLOT( slotCoverChanged( const TQString&, const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( imageFetched( const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( imageFetched( const TQString& ) ),
this, TQT_SLOT( slotImageChanged( const TQString& ) ) ); this, TQ_SLOT( slotImageChanged( const TQString& ) ) );
} }
void void

28
amarok/src/playerwindow.cpp
Unescape View File

@ -119,7 +119,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
//another quit shortcut because the other window has all the accels //another quit shortcut because the other window has all the accels
TQAccel *accel = new TQAccel( this ); TQAccel *accel = new TQAccel( this );
accel->insertItem( CTRL + Key_Q ); accel->insertItem( CTRL + Key_Q );
connect( accel, TQT_SIGNAL( activated( int ) ), kapp, TQT_SLOT( quit() ) ); connect( accel, TQ_SIGNAL( activated( int ) ), kapp, TQ_SLOT( quit() ) );
TQFont font; TQFont font;
font.setBold( true ); font.setBold( true );
@ -142,7 +142,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons ); KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons );
switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big! switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big!
switchView->setFocusPolicy( TQWidget::NoFocus ); switchView->setFocusPolicy( TQWidget::NoFocus );
connect( switchView, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleView() ) ); connect( switchView, TQ_SIGNAL( clicked() ), TQ_SLOT( toggleView() ) );
m_pButtonPlay->setToggleButton( true ); m_pButtonPlay->setToggleButton( true );
@ -161,10 +161,10 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
m_pVolSlider->setValue( AmarokConfig::masterVolume() ); m_pVolSlider->setValue( AmarokConfig::masterVolume() );
EngineController* const ec = EngineController::instance(); EngineController* const ec = EngineController::instance();
connect( m_pSlider, TQT_SIGNAL(sliderReleased( int )), ec, TQT_SLOT(seek( int )) ); connect( m_pSlider, TQ_SIGNAL(sliderReleased( int )), ec, TQ_SLOT(seek( int )) );
connect( m_pSlider, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(timeDisplay( int )) ); connect( m_pSlider, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(timeDisplay( int )) );
connect( m_pVolSlider, TQT_SIGNAL(sliderMoved( int )), ec, TQT_SLOT(setVolume( int )) ); connect( m_pVolSlider, TQ_SIGNAL(sliderMoved( int )), ec, TQ_SLOT(setVolume( int )) );
connect( m_pVolSlider, TQT_SIGNAL(sliderReleased( int )), ec, TQT_SLOT(setVolume( int )) ); connect( m_pVolSlider, TQ_SIGNAL(sliderReleased( int )), ec, TQ_SLOT(setVolume( int )) );
} //<Sliders> } //<Sliders>
{ //<Scroller> { //<Scroller>
@ -186,11 +186,11 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
} //<TimeLabel> } //<TimeLabel>
m_pButtonEq = new IconButton( this, "eq", this, TQT_SLOT(slotShowEqualizer( bool )) ); m_pButtonEq = new IconButton( this, "eq", this, TQ_SLOT(slotShowEqualizer( bool )) );
m_pButtonEq->setGeometry( 34,85, 28,13 ); m_pButtonEq->setGeometry( 34,85, 28,13 );
//TODO set isOn() //TODO set isOn()
m_pPlaylistButton = new IconButton( this, "pl", TQT_SIGNAL(playlistToggled( bool )) ); m_pPlaylistButton = new IconButton( this, "pl", TQ_SIGNAL(playlistToggled( bool )) );
m_pPlaylistButton->setGeometry( 5,85, 28,13 ); m_pPlaylistButton->setGeometry( 5,85, 28,13 );
m_pPlaylistButton->setOn( parent->isShown() || enablePlaylist ); m_pPlaylistButton->setOn( parent->isShown() || enablePlaylist );
@ -219,7 +219,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
//KWin::setType( winId(), NET::Override ); //KWin::setType( winId(), NET::Override );
//KWin::setOnAllDesktops( winId(), true ); //KWin::setOnAllDesktops( winId(), true );
connect( m_pAnimTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( drawScroll() ) ); connect( m_pAnimTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( drawScroll() ) );
TrackToolTip::instance()->addToWidget( m_pScrollFrame ); TrackToolTip::instance()->addToWidget( m_pScrollFrame );
} }
@ -838,7 +838,7 @@ void PlayerWidget::slotShowEqualizer( bool show ) //SLOT
KMessageBox::sorry( 0, i18n( "Equalizer is not available with this engine." ) ); KMessageBox::sorry( 0, i18n( "Equalizer is not available with this engine." ) );
else else
TQTimer::singleShot( 0, kapp, TQT_SLOT( slotConfigEqualizer() ) ); TQTimer::singleShot( 0, kapp, TQ_SLOT( slotConfigEqualizer() ) );
} }
} }
@ -899,8 +899,8 @@ NavButton::NavButton( TQWidget *parent, const TQString &icon, TDEAction *action
setFocusPolicy( TQWidget::NoFocus ); setFocusPolicy( TQWidget::NoFocus );
setEnabled( action->isEnabled() ); setEnabled( action->isEnabled() );
connect( action, TQT_SIGNAL( enabled( bool ) ), TQT_SLOT( setEnabled( bool ) ) ); connect( action, TQ_SIGNAL( enabled( bool ) ), TQ_SLOT( setEnabled( bool ) ) );
connect( this, TQT_SIGNAL( clicked() ), action, TQT_SLOT( activate() ) ); connect( this, TQ_SIGNAL( clicked() ), action, TQ_SLOT( activate() ) );
startTimer( GLOW_INTERVAL ); startTimer( GLOW_INTERVAL );
} }
@ -940,7 +940,7 @@ IconButton::IconButton( TQWidget *parent, const TQString &icon, const char *sign
, m_up( getPNG( icon + "_active2" ) ) //TODO rename files better (like the right way round for one!) , m_up( getPNG( icon + "_active2" ) ) //TODO rename files better (like the right way round for one!)
, m_down( getPNG( icon + "_inactive2" ) ) , m_down( getPNG( icon + "_inactive2" ) )
{ {
connect( this, TQT_SIGNAL(toggled( bool )), parent, signal ); connect( this, TQ_SIGNAL(toggled( bool )), parent, signal );
setToggleButton( true ); setToggleButton( true );
setFocusPolicy( TQWidget::NoFocus ); //we have no way to show focus on these widgets currently setFocusPolicy( TQWidget::NoFocus ); //we have no way to show focus on these widgets currently
@ -951,7 +951,7 @@ IconButton::IconButton( TQWidget *parent, const TQString &icon, TQObject* receiv
, m_up( getPNG( icon + "_active2" ) ) //TODO rename files better (like the right way round for one!) , m_up( getPNG( icon + "_active2" ) ) //TODO rename files better (like the right way round for one!)
, m_down( getPNG( icon + "_inactive2" ) ) , m_down( getPNG( icon + "_inactive2" ) )
{ {
connect( this, TQT_SIGNAL(toggled( bool )), receiver, slot ); connect( this, TQ_SIGNAL(toggled( bool )), receiver, slot );
setToggleButton( true ); setToggleButton( true );
setFocusPolicy( TQWidget::NoFocus ); //we have no way to show focus on these widgets currently setFocusPolicy( TQWidget::NoFocus ); //we have no way to show focus on these widgets currently

144
amarok/src/playlist.cpp
Unescape View File

@ -205,28 +205,28 @@ Playlist::Playlist( TQWidget *parent )
{ {
s_instance = this; s_instance = this;
connect( CollectionDB::instance(), TQT_SIGNAL(fileMoved(const TQString&, connect( CollectionDB::instance(), TQ_SIGNAL(fileMoved(const TQString&,
const TQString&, const TQString&)), TQT_SLOT(updateEntriesUrl(const TQString&, const TQString&, const TQString&)), TQ_SLOT(updateEntriesUrl(const TQString&,
const TQString&, const TQString&)) ); const TQString&, const TQString&)) );
connect( CollectionDB::instance(), TQT_SIGNAL(uniqueIdChanged(const TQString&, connect( CollectionDB::instance(), TQ_SIGNAL(uniqueIdChanged(const TQString&,
const TQString&, const TQString&)), TQT_SLOT(updateEntriesUniqueId(const TQString&, const TQString&, const TQString&)), TQ_SLOT(updateEntriesUniqueId(const TQString&,
const TQString&, const TQString&)) ); const TQString&, const TQString&)) );
connect( CollectionDB::instance(), TQT_SIGNAL(fileDeleted(const TQString&, connect( CollectionDB::instance(), TQ_SIGNAL(fileDeleted(const TQString&,
const TQString&)), TQT_SLOT(updateEntriesStatusDeleted(const TQString&, const TQString&)) ); const TQString&)), TQ_SLOT(updateEntriesStatusDeleted(const TQString&, const TQString&)) );
connect( CollectionDB::instance(), TQT_SIGNAL(fileAdded(const TQString&, connect( CollectionDB::instance(), TQ_SIGNAL(fileAdded(const TQString&,
const TQString&)), TQT_SLOT(updateEntriesStatusAdded(const TQString&, const TQString&)) ); const TQString&)), TQ_SLOT(updateEntriesStatusAdded(const TQString&, const TQString&)) );
connect( CollectionDB::instance(), TQT_SIGNAL(filesAdded(const TQMap<TQString,TQString>&)), connect( CollectionDB::instance(), TQ_SIGNAL(filesAdded(const TQMap<TQString,TQString>&)),
TQT_SLOT(updateEntriesStatusAdded(const TQMap<TQString,TQString>&)) ); TQ_SLOT(updateEntriesStatusAdded(const TQMap<TQString,TQString>&)) );
initStarPixmaps(); initStarPixmaps();
EngineController* const ec = EngineController::instance(); EngineController* const ec = EngineController::instance();
connect( ec, TQT_SIGNAL(orderPrevious()), TQT_SLOT(playPrevTrack()) ); connect( ec, TQ_SIGNAL(orderPrevious()), TQ_SLOT(playPrevTrack()) );
connect( ec, TQT_SIGNAL(orderNext( const bool )), TQT_SLOT(playNextTrack( const bool )) ); connect( ec, TQ_SIGNAL(orderNext( const bool )), TQ_SLOT(playNextTrack( const bool )) );
connect( ec, TQT_SIGNAL(orderCurrent()), TQT_SLOT(playCurrentTrack()) ); connect( ec, TQ_SIGNAL(orderCurrent()), TQ_SLOT(playCurrentTrack()) );
connect( this, TQT_SIGNAL( itemCountChanged( int, int, int, int, int, int ) ), ec, TQT_SLOT( playlistChanged() ) ); connect( this, TQ_SIGNAL( itemCountChanged( int, int, int, int, int, int ) ), ec, TQ_SLOT( playlistChanged() ) );
setShowSortIndicator( true ); setShowSortIndicator( true );
@ -293,48 +293,48 @@ Playlist::Playlist( TQWidget *parent )
setColumnAlignment( PlaylistItem::PlayCount, TQt::AlignCenter ); setColumnAlignment( PlaylistItem::PlayCount, TQt::AlignCenter );
connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ),
this, TQT_SLOT( doubleClicked( TQListViewItem* ) ) ); this, TQ_SLOT( doubleClicked( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ),
this, TQT_SLOT( activate( TQListViewItem* ) ) ); this, TQ_SLOT( activate( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem*, const TQPoint&, int ) ), connect( this, TQ_SIGNAL( mouseButtonPressed( int, TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( slotMouseButtonPressed( int, TQListViewItem*, const TQPoint&, int ) ) ); this, TQ_SLOT( slotMouseButtonPressed( int, TQListViewItem*, const TQPoint&, int ) ) );
connect( this, TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), connect( this, TQ_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ),
this, TQT_SLOT( slotQueueChanged( const PLItemList &, const PLItemList & ) ) ); this, TQ_SLOT( slotQueueChanged( const PLItemList &, const PLItemList & ) ) );
connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ),
this, TQT_SLOT( writeTag( TQListViewItem*, const TQString&, int ) ) ); this, TQ_SLOT( writeTag( TQListViewItem*, const TQString&, int ) ) );
connect( this, TQT_SIGNAL( aboutToClear() ), connect( this, TQ_SIGNAL( aboutToClear() ),
this, TQT_SLOT( saveUndoState() ) ); this, TQ_SLOT( saveUndoState() ) );
connect( CollectionDB::instance(), TQT_SIGNAL( scoreChanged( const TQString&, float ) ), connect( CollectionDB::instance(), TQ_SIGNAL( scoreChanged( const TQString&, float ) ),
this, TQT_SLOT( scoreChanged( const TQString&, float ) ) ); this, TQ_SLOT( scoreChanged( const TQString&, float ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ),
this, TQT_SLOT( ratingChanged( const TQString&, int ) ) ); this, TQ_SLOT( ratingChanged( const TQString&, int ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( fileMoved( const TQString&, const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( fileMoved( const TQString&, const TQString& ) ),
this, TQT_SLOT( fileMoved( const TQString&, const TQString& ) ) ); this, TQ_SLOT( fileMoved( const TQString&, const TQString& ) ) );
connect( header(), TQT_SIGNAL( indexChange( int, int, int ) ), connect( header(), TQ_SIGNAL( indexChange( int, int, int ) ),
this, TQT_SLOT( columnOrderChanged() ) ), this, TQ_SLOT( columnOrderChanged() ) ),
connect( &Glow::timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotGlowTimer()) ); connect( &Glow::timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotGlowTimer()) );
TDEActionCollection* const ac = Amarok::actionCollection(); TDEActionCollection* const ac = Amarok::actionCollection();
TDEAction *copy = KStdAction::copy( this, TQT_SLOT( copyToClipboard() ), ac, "playlist_copy" ); TDEAction *copy = KStdAction::copy( this, TQ_SLOT( copyToClipboard() ), ac, "playlist_copy" );
KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "playlist_select_all" ); KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "playlist_select_all" );
m_clearButton = new TDEAction( i18n( "clear playlist", "&Clear" ), Amarok::icon( "playlist_clear" ), 0, this, TQT_SLOT( clear() ), ac, "playlist_clear" ); m_clearButton = new TDEAction( i18n( "clear playlist", "&Clear" ), Amarok::icon( "playlist_clear" ), 0, this, TQ_SLOT( clear() ), ac, "playlist_clear" );
m_undoButton = KStdAction::undo( this, TQT_SLOT( undo() ), ac, "playlist_undo" ); m_undoButton = KStdAction::undo( this, TQ_SLOT( undo() ), ac, "playlist_undo" );
m_redoButton = KStdAction::redo( this, TQT_SLOT( redo() ), ac, "playlist_redo" ); m_redoButton = KStdAction::redo( this, TQ_SLOT( redo() ), ac, "playlist_redo" );
m_undoButton ->setIcon( Amarok::icon( "undo" ) ); m_undoButton ->setIcon( Amarok::icon( "undo" ) );
m_redoButton ->setIcon( Amarok::icon( "redo" ) ); m_redoButton ->setIcon( Amarok::icon( "redo" ) );
new TDEAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, this, TQT_SLOT( repopulate() ), ac, "repopulate" ); new TDEAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, this, TQ_SLOT( repopulate() ), ac, "repopulate" );
new TDEAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, this, TQT_SLOT( shuffle() ), ac, "playlist_shuffle" ); new TDEAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, this, TQ_SLOT( shuffle() ), ac, "playlist_shuffle" );
TDEAction *gotoCurrent = new TDEAction( i18n( "&Go To Current Track" ), Amarok::icon( "music" ), CTRL+Key_J, this, TQT_SLOT( showCurrentTrack() ), ac, "playlist_show" ); TDEAction *gotoCurrent = new TDEAction( i18n( "&Go To Current Track" ), Amarok::icon( "music" ), CTRL+Key_J, this, TQ_SLOT( showCurrentTrack() ), ac, "playlist_show" );
new TDEAction( i18n( "&Remove Duplicate && Dead Entries" ), 0, this, TQT_SLOT( removeDuplicates() ), ac, "playlist_remove_duplicates" ); new TDEAction( i18n( "&Remove Duplicate && Dead Entries" ), 0, this, TQ_SLOT( removeDuplicates() ), ac, "playlist_remove_duplicates" );
new TDEAction( i18n( "&Queue Selected Tracks" ), Amarok::icon( "queue_track" ), CTRL+Key_D, this, TQT_SLOT( queueSelected() ), ac, "queue_selected" ); new TDEAction( i18n( "&Queue Selected Tracks" ), Amarok::icon( "queue_track" ), CTRL+Key_D, this, TQ_SLOT( queueSelected() ), ac, "queue_selected" );
TDEToggleAction *stopafter = new TDEToggleAction( i18n( "&Stop Playing After Track" ), Amarok::icon( "stop" ), CTRL+ALT+Key_V, TDEToggleAction *stopafter = new TDEToggleAction( i18n( "&Stop Playing After Track" ), Amarok::icon( "stop" ), CTRL+ALT+Key_V,
this, TQT_SLOT( toggleStopAfterCurrentItem() ), ac, "stop_after" ); this, TQ_SLOT( toggleStopAfterCurrentItem() ), ac, "stop_after" );
{ // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu { // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu
TDEPopupMenu asdf; TDEPopupMenu asdf;
@ -349,10 +349,10 @@ Playlist::Playlist( TQWidget *parent )
} }
//ensure we update action enabled states when repeat Playlist is toggled //ensure we update action enabled states when repeat Playlist is toggled
connect( ac->action( "repeat" ), TQT_SIGNAL(activated( int )), TQT_SLOT(updateNextPrev()) ); connect( ac->action( "repeat" ), TQ_SIGNAL(activated( int )), TQ_SLOT(updateNextPrev()) );
connect( ac->action( "repeat" ), TQT_SIGNAL( activated( int ) ), TQT_SLOT( generateInfo() ) ); connect( ac->action( "repeat" ), TQ_SIGNAL( activated( int ) ), TQ_SLOT( generateInfo() ) );
connect( ac->action( "favor_tracks" ), TQT_SIGNAL( activated( int ) ), TQT_SLOT( generateInfo() ) ); connect( ac->action( "favor_tracks" ), TQ_SIGNAL( activated( int ) ), TQ_SLOT( generateInfo() ) );
connect( ac->action( "random_mode" ), TQT_SIGNAL( activated( int ) ), TQT_SLOT( generateInfo() ) ); connect( ac->action( "random_mode" ), TQ_SIGNAL( activated( int ) ), TQ_SLOT( generateInfo() ) );
// undostates are written in chronological order, so this is a clever way to get them back in the correct order :) // undostates are written in chronological order, so this is a clever way to get them back in the correct order :)
@ -382,14 +382,14 @@ Playlist::Playlist( TQWidget *parent )
columnResizeEvent( header()->count(), 0, 0 ); columnResizeEvent( header()->count(), 0, 0 );
//do after you resize all the columns //do after you resize all the columns
connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(columnResizeEvent( int, int, int )) ); connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), TQ_SLOT(columnResizeEvent( int, int, int )) );
connect( this, TQT_SIGNAL( contentsMoving( int, int ) ), TQT_SLOT( slotContentsMoving() ) ); connect( this, TQ_SIGNAL( contentsMoving( int, int ) ), TQ_SLOT( slotContentsMoving() ) );
connect( App::instance(), TQT_SIGNAL( useScores( bool ) ), this, TQT_SLOT( slotUseScores( bool ) ) ); connect( App::instance(), TQ_SIGNAL( useScores( bool ) ), this, TQ_SLOT( slotUseScores( bool ) ) );
connect( App::instance(), TQT_SIGNAL( useRatings( bool ) ), this, TQT_SLOT( slotUseRatings( bool ) ) ); connect( App::instance(), TQ_SIGNAL( useRatings( bool ) ), this, TQ_SLOT( slotUseRatings( bool ) ) );
connect( App::instance(), TQT_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), connect( App::instance(), TQ_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ),
this, TQT_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); this, TQ_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) );
Amarok::ToolTip::add( this, viewport() ); Amarok::ToolTip::add( this, viewport() );
@ -398,15 +398,15 @@ Playlist::Playlist( TQWidget *parent )
setTabOrderedRenaming( false ); setTabOrderedRenaming( false );
m_filtertimer = new TQTimer( this ); m_filtertimer = new TQTimer( this );
connect( m_filtertimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setDelayedFilter()) ); connect( m_filtertimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setDelayedFilter()) );
connect( MountPointManager::instance(), TQT_SIGNAL(mediumConnected( int )), connect( MountPointManager::instance(), TQ_SIGNAL(mediumConnected( int )),
TQT_SLOT(mediumChange( int )) ); TQ_SLOT(mediumChange( int )) );
connect( MountPointManager::instance(), TQT_SIGNAL(mediumRemoved( int )), connect( MountPointManager::instance(), TQ_SIGNAL(mediumRemoved( int )),
TQT_SLOT(mediumChange( int )) ); TQ_SLOT(mediumChange( int )) );
m_clicktimer = new TQTimer( this ); m_clicktimer = new TQTimer( this );
connect( m_clicktimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSingleClick()) ); connect( m_clicktimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSingleClick()) );
} }
Playlist::~Playlist() Playlist::~Playlist()
@ -1960,7 +1960,7 @@ Playlist::countChanged()
if( !m_itemCountDirty ) if( !m_itemCountDirty )
{ {
m_itemCountDirty = true; m_itemCountDirty = true;
TQTimer::singleShot( 0, this, TQT_SLOT( slotCountChanged() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( slotCountChanged() ) );
} }
} }
@ -3469,7 +3469,7 @@ Playlist::deleteSelectedFiles() //SLOT
removeSelectedItems(); removeSelectedItems();
foreachType( KURL::List, urls ) foreachType( KURL::List, urls )
CollectionDB::instance()->emitFileDeleted( (*it).path() ); CollectionDB::instance()->emitFileDeleted( (*it).path() );
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) );
} }
} }
@ -3891,7 +3891,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
popup.insertItem( SmallIconSet( Amarok::icon( "save" ) ), i18n("S&ave as Playlist..."), SAVE_PLAYLIST ); popup.insertItem( SmallIconSet( Amarok::icon( "save" ) ), i18n("S&ave as Playlist..."), SAVE_PLAYLIST );
} }
popup.insertItem( SmallIconSet( Amarok::icon( "remove_from_playlist" ) ), i18n( "Re&move From Playlist" ), this, TQT_SLOT( removeSelectedItems() ), Key_Delete, REMOVE ); popup.insertItem( SmallIconSet( Amarok::icon( "remove_from_playlist" ) ), i18n( "Re&move From Playlist" ), this, TQ_SLOT( removeSelectedItems() ), Key_Delete, REMOVE );
popup.insertSeparator(); popup.insertSeparator();
@ -3905,7 +3905,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
fileMenu.insertItem( SmallIconSet( "document-save-as" ), i18n("&Copy Track to Collection...", "&Copy %n Tracks to Collection...", itemCount), COPY_TO_COLLECTION ); fileMenu.insertItem( SmallIconSet( "document-save-as" ), i18n("&Copy Track to Collection...", "&Copy %n Tracks to Collection...", itemCount), COPY_TO_COLLECTION );
fileMenu.insertItem( SmallIconSet( "document-save-as" ), i18n("&Move Track to Collection...", "&Move %n Tracks to Collection...", itemCount), MOVE_TO_COLLECTION ); fileMenu.insertItem( SmallIconSet( "document-save-as" ), i18n("&Move Track to Collection...", "&Move %n Tracks to Collection...", itemCount), MOVE_TO_COLLECTION );
} }
fileMenu.insertItem( SmallIconSet( Amarok::icon( "remove" ) ), i18n("&Delete File...", "&Delete %n Selected Files...", itemCount ), this, TQT_SLOT( deleteSelectedFiles() ), SHIFT+Key_Delete, DELETE ); fileMenu.insertItem( SmallIconSet( Amarok::icon( "remove" ) ), i18n("&Delete File...", "&Delete %n Selected Files...", itemCount ), this, TQ_SLOT( deleteSelectedFiles() ), SHIFT+Key_Delete, DELETE );
popup.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n("Manage &Files"), &fileMenu, FILE_MENU ); popup.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n("Manage &Files"), &fileMenu, FILE_MENU );
if( itemCount == 1 ) if( itemCount == 1 )
@ -4404,7 +4404,7 @@ void Playlist::ensureItemCentered( TQListViewItem *item )
//HACK -- apparently the various metrics aren't reliable while the UI is still updating & stuff //HACK -- apparently the various metrics aren't reliable while the UI is still updating & stuff
m_itemToReallyCenter = item; m_itemToReallyCenter = item;
TQTimer::singleShot( 0, this, TQT_SLOT( reallyEnsureItemCentered() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( reallyEnsureItemCentered() ) );
} }
void void
@ -4600,7 +4600,7 @@ Playlist::slotMouseButtonPressed( int button, TQListViewItem *after, const TQPoi
void Playlist::slotContentsMoving() void Playlist::slotContentsMoving()
{ {
Amarok::ToolTip::hideTips(); Amarok::ToolTip::hideTips();
TQTimer::singleShot( 0, this, TQT_SLOT( contentsMouseMoveEvent() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( contentsMouseMoveEvent() ) );
} }
void void
@ -4822,12 +4822,12 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items )
// connects // connects
connect( connect(
child( "OkButton" ), child( "OkButton" ),
TQT_SIGNAL(clicked()), TQ_SIGNAL(clicked()),
TQT_SLOT(accept()) ); TQ_SLOT(accept()) );
connect( connect(
child( "CancelButton" ), child( "CancelButton" ),
TQT_SIGNAL(clicked()), TQ_SIGNAL(clicked()),
TQT_SLOT(reject()) ); TQ_SLOT(reject()) );
} }
TQString command() { return static_cast<KLineEdit*>(child("Command"))->text(); } TQString command() { return static_cast<KLineEdit*>(child("Command"))->text(); }

50
amarok/src/playlistbrowser.cpp
Unescape View File

@ -165,7 +165,7 @@ PlaylistBrowser::PlaylistBrowser( const char *name )
TDEPopupMenu *playlistMenu = new TDEPopupMenu( this ); TDEPopupMenu *playlistMenu = new TDEPopupMenu( this );
playlistMenu->insertItem( i18n("New..."), PLAYLIST ); playlistMenu->insertItem( i18n("New..."), PLAYLIST );
playlistMenu->insertItem( i18n("Import Existing..."), PLAYLIST_IMPORT ); playlistMenu->insertItem( i18n("Import Existing..."), PLAYLIST_IMPORT );
connect( playlistMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotAddPlaylistMenu(int) ) ); connect( playlistMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotAddPlaylistMenu(int) ) );
TDEPopupMenu *addMenu = addMenuButton->popupMenu(); TDEPopupMenu *addMenu = addMenuButton->popupMenu();
addMenu->insertItem( i18n("Playlist"), playlistMenu ); addMenu->insertItem( i18n("Playlist"), playlistMenu );
@ -173,10 +173,10 @@ PlaylistBrowser::PlaylistBrowser( const char *name )
addMenu->insertItem( i18n("Dynamic Playlist..."), ADDDYNAMIC); addMenu->insertItem( i18n("Dynamic Playlist..."), ADDDYNAMIC);
addMenu->insertItem( i18n("Radio Stream..."), STREAM ); addMenu->insertItem( i18n("Radio Stream..."), STREAM );
addMenu->insertItem( i18n("Podcast..."), PODCAST ); addMenu->insertItem( i18n("Podcast..."), PODCAST );
connect( addMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotAddMenu(int) ) ); connect( addMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotAddMenu(int) ) );
renameButton = new TDEAction( i18n("Rename"), "edit-clear", 0, this, TQT_SLOT( renameSelectedItem() ), m_ac ); renameButton = new TDEAction( i18n("Rename"), "edit-clear", 0, this, TQ_SLOT( renameSelectedItem() ), m_ac );
removeButton = new TDEAction( i18n("Delete"), Amarok::icon( "remove" ), 0, this, TQT_SLOT( removeSelectedItems() ), m_ac ); removeButton = new TDEAction( i18n("Delete"), Amarok::icon( "remove" ), 0, this, TQ_SLOT( removeSelectedItems() ), m_ac );
m_toolbar = new Browser::ToolBar( browserBox ); m_toolbar = new Browser::ToolBar( browserBox );
m_toolbar->setIconText( TDEToolBar::IconTextRight, false ); //we want the open button to have text on right m_toolbar->setIconText( TDEToolBar::IconTextRight, false ); //we want the open button to have text on right
@ -200,18 +200,18 @@ PlaylistBrowser::PlaylistBrowser( const char *name )
m_listview->setSorting( 0, sort == TQt::Ascending ? true : false ); m_listview->setSorting( 0, sort == TQt::Ascending ? true : false );
m_podcastTimerInterval = Amarok::config( "PlaylistBrowser" )->readNumEntry( "Podcast Interval", 14400000 ); m_podcastTimerInterval = Amarok::config( "PlaylistBrowser" )->readNumEntry( "Podcast Interval", 14400000 );
connect( m_podcastTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scanPodcasts()) ); connect( m_podcastTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scanPodcasts()) );
// signals and slots connections // signals and slots connections
connect( m_listview, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), connect( m_listview, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ),
this, TQT_SLOT( showContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); this, TQ_SLOT( showContextMenu( TQListViewItem *, const TQPoint &, int ) ) );
connect( m_listview, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), connect( m_listview, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ),
this, TQT_SLOT( invokeItem( TQListViewItem *, const TQPoint &, int ) ) ); this, TQ_SLOT( invokeItem( TQListViewItem *, const TQPoint &, int ) ) );
connect( m_listview, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), connect( m_listview, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ),
this, TQT_SLOT( renamePlaylist( TQListViewItem*, const TQString&, int ) ) ); this, TQ_SLOT( renamePlaylist( TQListViewItem*, const TQString&, int ) ) );
connect( m_listview, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), connect( m_listview, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
this, TQT_SLOT( currentItemChanged( TQListViewItem * ) ) ); this, TQ_SLOT( currentItemChanged( TQListViewItem * ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), TQT_SLOT( collectionScanDone() ) ); connect( CollectionDB::instance(), TQ_SIGNAL( scanDone( bool ) ), TQ_SLOT( collectionScanDone() ) );
setMinimumWidth( m_toolbar->sizeHint().width() ); setMinimumWidth( m_toolbar->sizeHint().width() );
@ -1518,7 +1518,7 @@ bool PlaylistBrowser::deleteSelectedPodcastItems( const bool removeItem, const b
delete item; delete item;
} }
else else
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), item, TQT_SLOT( isOnDisk() ) );; connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), item, TQ_SLOT( isOnDisk() ) );;
} }
return true; return true;
} }
@ -1577,8 +1577,8 @@ void PlaylistBrowser::downloadPodcastQueue() //SLOT
first->downloadMedia(); first->downloadMedia();
m_podcastDownloadQueue.removeFirst(); m_podcastDownloadQueue.removeFirst();
connect( first, TQT_SIGNAL( downloadFinished() ), this, TQT_SLOT( downloadPodcastQueue() ) ); connect( first, TQ_SIGNAL( downloadFinished() ), this, TQ_SLOT( downloadPodcastQueue() ) );
connect( first, TQT_SIGNAL( downloadAborted() ), this, TQT_SLOT( abortPodcastQueue() ) ); connect( first, TQ_SIGNAL( downloadAborted() ), this, TQ_SLOT( abortPodcastQueue() ) );
} }
void PlaylistBrowser::abortPodcastQueue() //SLOT void PlaylistBrowser::abortPodcastQueue() //SLOT
@ -2574,12 +2574,12 @@ PlaylistBrowserView::PlaylistBrowserView( TQWidget *parent, const char *name )
setTreeStepSize( 20 ); setTreeStepSize( 20 );
connect( this, TQT_SIGNAL( mouseButtonPressed ( int, TQListViewItem *, const TQPoint &, int ) ), connect( this, TQ_SIGNAL( mouseButtonPressed ( int, TQListViewItem *, const TQPoint &, int ) ),
this, TQT_SLOT( mousePressed( int, TQListViewItem *, const TQPoint &, int ) ) ); this, TQ_SLOT( mousePressed( int, TQListViewItem *, const TQPoint &, int ) ) );
//TODO moving tracks //TODO moving tracks
//connect( this, TQT_SIGNAL( moved(TQListViewItem *, TQListViewItem *, TQListViewItem * )), //connect( this, TQ_SIGNAL( moved(TQListViewItem *, TQListViewItem *, TQListViewItem * )),
// this, TQT_SLOT( itemMoved(TQListViewItem *, TQListViewItem *, TQListViewItem * ))); // this, TQ_SLOT( itemMoved(TQListViewItem *, TQListViewItem *, TQListViewItem * )));
} }
PlaylistBrowserView::~PlaylistBrowserView() { } PlaylistBrowserView::~PlaylistBrowserView() { }
@ -3099,9 +3099,9 @@ PlaylistDialog::PlaylistDialog()
edit->setFocus(); edit->setFocus();
label->setBuddy( edit ); label->setBuddy( edit );
enableButtonOK( false ); enableButtonOK( false );
connect( edit, TQT_SIGNAL( textChanged( const TQString & ) ), connect( edit, TQ_SIGNAL( textChanged( const TQString & ) ),
this, TQT_SLOT( slotTextChanged( const TQString& ) ) ); this, TQ_SLOT( slotTextChanged( const TQString& ) ) );
connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotCustomPath() ) ); connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotCustomPath() ) );
} }
void PlaylistDialog::slotOk() void PlaylistDialog::slotOk()
@ -3166,7 +3166,7 @@ InfoPane::InfoPane( TQWidget *parent )
m_pushButton = new KPushButton( KGuiItem( i18n("&Show Extended Info"), "info" ), this ); m_pushButton = new KPushButton( KGuiItem( i18n("&Show Extended Info"), "info" ), this );
m_pushButton->setToggleButton( true ); m_pushButton->setToggleButton( true );
m_pushButton->setEnabled( m_enable ); m_pushButton->setEnabled( m_enable );
connect( m_pushButton, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggle( bool )) ); connect( m_pushButton, TQ_SIGNAL(toggled( bool )), TQ_SLOT(toggle( bool )) );
//Set the height to fixed. The button shouldn't be resized. //Set the height to fixed. The button shouldn't be resized.
setFixedHeight( m_pushButton->sizeHint().height() ); setFixedHeight( m_pushButton->sizeHint().height() );

38
amarok/src/playlistbrowseritem.cpp
Unescape View File

@ -640,7 +640,7 @@ void PlaylistEntry::load()
//starts loading animation //starts loading animation
m_iconCounter = 1; m_iconCounter = 1;
startAnimation(); startAnimation();
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); connect( &m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) );
//delete all children, so that we don't duplicate things //delete all children, so that we don't duplicate things
while( firstChild() ) while( firstChild() )
@ -1791,7 +1791,7 @@ PodcastChannel::downloadChildQueue()
first->downloadMedia(); first->downloadMedia();
m_podcastDownloadQueue.removeFirst(); m_podcastDownloadQueue.removeFirst();
connect( first, TQT_SIGNAL( downloadFinished() ), this, TQT_SLOT( downloadChildQueue() ) ); connect( first, TQ_SIGNAL( downloadFinished() ), this, TQ_SLOT( downloadChildQueue() ) );
} }
void void
@ -1801,15 +1801,15 @@ PodcastChannel::fetch()
m_iconCounter = 1; m_iconCounter = 1;
startAnimation(); startAnimation();
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); connect( &m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) );
m_podcastJob = TDEIO::storedGet( m_url, false, false ); m_podcastJob = TDEIO::storedGet( m_url, false, false );
Amarok::StatusBar::instance()->newProgressOperation( m_podcastJob ) Amarok::StatusBar::instance()->newProgressOperation( m_podcastJob )
.setDescription( i18n( "Fetching Podcast" ) ) .setDescription( i18n( "Fetching Podcast" ) )
.setAbortSlot( this, TQT_SLOT( abortFetch() ) ); .setAbortSlot( this, TQ_SLOT( abortFetch() ) );
connect( m_podcastJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( fetchResult( TDEIO::Job* ) ) ); connect( m_podcastJob, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( fetchResult( TDEIO::Job* ) ) );
} }
void void
@ -2552,7 +2552,7 @@ PodcastEpisode::downloadMedia()
m_iconCounter = 1; m_iconCounter = 1;
startAnimation(); startAnimation();
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); connect( &m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) );
KURL localDir; KURL localDir;
PodcastChannel *channel = dynamic_cast<PodcastChannel*>(m_parent); PodcastChannel *channel = dynamic_cast<PodcastChannel*>(m_parent);
@ -2571,11 +2571,11 @@ PodcastEpisode::downloadMedia()
.setDescription( title().isEmpty() .setDescription( title().isEmpty()
? i18n( "Downloading Podcast Media" ) ? i18n( "Downloading Podcast Media" )
: i18n( "Downloading Podcast \"%1\"" ).arg( title() ) ) : i18n( "Downloading Podcast \"%1\"" ).arg( title() ) )
.setAbortSlot( this, TQT_SLOT( abortDownload()) ) .setAbortSlot( this, TQ_SLOT( abortDownload()) )
.setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ) ); .setProgressSignal( m_podcastEpisodeJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ) );
connect( m_podcastEpisodeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( downloadResult( TDEIO::Job * ) ) ); connect( m_podcastEpisodeJob, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( downloadResult( TDEIO::Job * ) ) );
connect( m_podcastEpisodeJob, TQT_SIGNAL( redirection( TDEIO::Job *,const KURL& ) ), TQT_SLOT( redirected( TDEIO::Job *,const KURL& ) ) ); connect( m_podcastEpisodeJob, TQ_SIGNAL( redirection( TDEIO::Job *,const KURL& ) ), TQ_SLOT( redirected( TDEIO::Job *,const KURL& ) ) );
} }
/* change the localurl if redirected, allows us to use the original filename to transfer to mediadevices*/ /* change the localurl if redirected, allows us to use the original filename to transfer to mediadevices*/
@ -3488,7 +3488,7 @@ void ShoutcastBrowser::setOpen( bool open )
if( !m_animationTimer.isActive() ) if( !m_animationTimer.isActive() )
m_animationTimer.start( ANIMATION_INTERVAL ); m_animationTimer.start( ANIMATION_INTERVAL );
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); connect( &m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) );
TQStringList tmpdirs = TDEGlobal::dirs()->resourceDirs( "tmp" ); TQStringList tmpdirs = TDEGlobal::dirs()->resourceDirs( "tmp" );
TQString tmpfile = tmpdirs[0]; TQString tmpfile = tmpdirs[0];
@ -3499,9 +3499,9 @@ void ShoutcastBrowser::setOpen( bool open )
{ {
m_downloading = true; m_downloading = true;
m_cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml", tmpfile, false ); m_cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml", tmpfile, false );
connect( m_cj, TQT_SIGNAL( copyingDone( TDEIO::Job*, const KURL&, const KURL&, bool, bool)) connect( m_cj, TQ_SIGNAL( copyingDone( TDEIO::Job*, const KURL&, const KURL&, bool, bool))
, this, TQT_SLOT(doneGenreDownload(TDEIO::Job*, const KURL&, const KURL&, bool, bool ))); , this, TQ_SLOT(doneGenreDownload(TDEIO::Job*, const KURL&, const KURL&, bool, bool )));
connect( m_cj, TQT_SIGNAL( result( TDEIO::Job* )), this, TQT_SLOT( jobFinished( TDEIO::Job* ))); connect( m_cj, TQ_SIGNAL( result( TDEIO::Job* )), this, TQ_SLOT( jobFinished( TDEIO::Job* )));
} }
TQListViewItem::setOpen( open ); TQListViewItem::setOpen( open );
@ -3646,7 +3646,7 @@ void ShoutcastGenre::setOpen( bool open )
if( !m_animationTimer.isActive() ) if( !m_animationTimer.isActive() )
m_animationTimer.start( ANIMATION_INTERVAL ); m_animationTimer.start( ANIMATION_INTERVAL );
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); connect( &m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) );
TQStringList tmpdirs = TDEGlobal::dirs()->resourceDirs( "tmp" ); TQStringList tmpdirs = TDEGlobal::dirs()->resourceDirs( "tmp" );
@ -3666,10 +3666,10 @@ void ShoutcastGenre::startGenreDownload( TQString genre, TQString tmppath )
{ {
TQString tmpfile = tmppath + "/amarok-list-" + genre + "-" + TDEApplication::randomString(10) + ".xml"; TQString tmpfile = tmppath + "/amarok-list-" + genre + "-" + TDEApplication::randomString(10) + ".xml";
TDEIO::CopyJob *cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml?genre=" + genre, tmpfile, false ); TDEIO::CopyJob *cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml?genre=" + genre, tmpfile, false );
connect( cj, TQT_SIGNAL( copyingDone ( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ), connect( cj, TQ_SIGNAL( copyingDone ( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ),
this, TQT_SLOT( doneListDownload( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ) ); this, TQ_SLOT( doneListDownload( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ) );
connect( cj, TQT_SIGNAL( result ( TDEIO::Job* ) ), connect( cj, TQ_SIGNAL( result ( TDEIO::Job* ) ),
this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) ); this, TQ_SLOT( jobFinished( TDEIO::Job* ) ) );
m_totalJobs++; m_totalJobs++;
} }

16
amarok/src/playlistloader.cpp
Unescape View File

@ -83,8 +83,8 @@ UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options
, m_xmlSource( 0 ) , m_xmlSource( 0 )
{ {
connect( this, TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), connect( this, TQ_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ),
Playlist::instance(), TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ) ); Playlist::instance(), TQ_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ) );
Playlist::instance()->lock(); // prevent user removing items as this could be bad Playlist::instance()->lock(); // prevent user removing items as this could be bad
@ -95,7 +95,7 @@ UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options
Amarok::StatusBar::instance()->newProgressOperation( this ) Amarok::StatusBar::instance()->newProgressOperation( this )
.setDescription( m_description ) .setDescription( m_description )
.setStatus( i18n("Preparing") ) .setStatus( i18n("Preparing") )
.setAbortSlot( this, TQT_SLOT(abort()) ) .setAbortSlot( this, TQ_SLOT(abort()) )
.setTotalSteps( 100 ); .setTotalSteps( 100 );
foreachType( KURL::List, urls ) { foreachType( KURL::List, urls ) {
@ -459,10 +459,10 @@ UrlLoader::loadXml( const KURL &url )
delete m_xmlSource; delete m_xmlSource;
m_xmlSource = new TQXmlInputSource( file ); m_xmlSource = new TQXmlInputSource( file );
MyXmlLoader loader; MyXmlLoader loader;
connect( &loader, TQT_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), connect( &loader, TQ_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ),
this, TQT_SLOT( slotNewBundle( const MetaBundle&, const XmlAttributeList& ) ) ); this, TQ_SLOT( slotNewBundle( const MetaBundle&, const XmlAttributeList& ) ) );
connect( &loader, TQT_SIGNAL( playlistInfo( const TQString&, const TQString&, const TQString& ) ), connect( &loader, TQ_SIGNAL( playlistInfo( const TQString&, const TQString&, const TQString& ) ),
this, TQT_SLOT( slotPlaylistInfo( const TQString&, const TQString&, const TQString& ) ) ); this, TQ_SLOT( slotPlaylistInfo( const TQString&, const TQString&, const TQString& ) ) );
loader.load( m_xmlSource ); loader.load( m_xmlSource );
if( !m_xml.isEmpty() ) if( !m_xml.isEmpty() )
{ {
@ -996,7 +996,7 @@ RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem
Amarok::StatusBar::instance()->newProgressOperation( job ) Amarok::StatusBar::instance()->newProgressOperation( job )
.setDescription( i18n("Retrieving Playlist") ); .setDescription( i18n("Retrieving Playlist") );
connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(result( TDEIO::Job* )) ); connect( job, TQ_SIGNAL(result( TDEIO::Job* )), TQ_SLOT(result( TDEIO::Job* )) );
Playlist::instance()->lock(); Playlist::instance()->lock();
} }

116
amarok/src/playlistwindow.cpp
Unescape View File

@ -123,38 +123,38 @@ PlaylistWindow::PlaylistWindow()
new K3bExporter(); new K3bExporter();
KStdAction::configureToolbars( kapp, TQT_SLOT( slotConfigToolBars() ), ac ); KStdAction::configureToolbars( kapp, TQ_SLOT( slotConfigToolBars() ), ac );
KStdAction::keyBindings( kapp, TQT_SLOT( slotConfigShortcuts() ), ac ); KStdAction::keyBindings( kapp, TQ_SLOT( slotConfigShortcuts() ), ac );
KStdAction::keyBindings( kapp, TQT_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); KStdAction::keyBindings( kapp, TQ_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" );
KStdAction::preferences( kapp, TQT_SLOT( slotConfigAmarok() ), ac ); KStdAction::preferences( kapp, TQ_SLOT( slotConfigAmarok() ), ac );
ac->action("options_configure_globals")->setIcon( Amarok::icon( "configure" ) ); ac->action("options_configure_globals")->setIcon( Amarok::icon( "configure" ) );
ac->action(KStdAction::name(KStdAction::KeyBindings))->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::ConfigureToolbars))->setIcon( Amarok::icon( "configure" ) );
ac->action(KStdAction::name(KStdAction::Preferences))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::Preferences))->setIcon( Amarok::icon( "configure" ) );
KStdAction::quit( kapp, TQT_SLOT( quit() ), ac ); KStdAction::quit( kapp, TQ_SLOT( quit() ), ac );
KStdAction::open( this, TQT_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); KStdAction::open( this, TQ_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") );
ac->action( "playlist_add" )->setIcon( Amarok::icon( "files" ) ); ac->action( "playlist_add" )->setIcon( Amarok::icon( "files" ) );
KStdAction::open( this, TQT_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") ); KStdAction::open( this, TQ_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") );
ac->action( "stream_add" )->setIcon( Amarok::icon( "files" ) ); ac->action( "stream_add" )->setIcon( Amarok::icon( "files" ) );
KStdAction::save( this, TQT_SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") ); KStdAction::save( this, TQ_SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") );
ac->action( "playlist_save" )->setIcon( Amarok::icon( "save" ) ); ac->action( "playlist_save" )->setIcon( Amarok::icon( "save" ) );
#ifndef TQ_WS_MAC #ifndef TQ_WS_MAC
KStdAction::showMenubar( this, TQT_SLOT(slotToggleMenu()), ac ); KStdAction::showMenubar( this, TQ_SLOT(slotToggleMenu()), ac );
#endif #endif
//FIXME: after string freeze rename to "Burn Current Playlist"? //FIXME: after string freeze rename to "Burn Current Playlist"?
new TDEAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, this, TQT_SLOT(slotBurnPlaylist()), ac, "playlist_burn" ); new TDEAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, this, TQ_SLOT(slotBurnPlaylist()), ac, "playlist_burn" );
actionCollection()->action("playlist_burn")->setEnabled( K3bExporter::isAvailable() ); actionCollection()->action("playlist_burn")->setEnabled( K3bExporter::isAvailable() );
new TDEAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, this, TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" ); new TDEAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, this, TQ_SLOT(slotPlayMedia()), ac, "playlist_playmedia" );
new TDEAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, this, TQT_SLOT(playAudioCD()), ac, "play_audiocd" ); new TDEAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, this, TQ_SLOT(playAudioCD()), ac, "play_audiocd" );
TDEAction *playPause = new TDEAction( i18n( "&Play/Pause" ), Amarok::icon( "play" ), Key_Space, ec, TQT_SLOT( playPause() ), ac, "play_pause" ); TDEAction *playPause = new TDEAction( i18n( "&Play/Pause" ), Amarok::icon( "play" ), Key_Space, ec, TQ_SLOT( playPause() ), ac, "play_pause" );
new TDEAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, this, TQT_SLOT(showScriptSelector()), ac, "script_manager" ); new TDEAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, this, TQ_SLOT(showScriptSelector()), ac, "script_manager" );
new TDEAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, this, TQT_SLOT(showQueueManager()), ac, "queue_manager" ); new TDEAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, this, TQ_SLOT(showQueueManager()), ac, "queue_manager" );
TDEAction *seekForward = new TDEAction( i18n( "&Seek Forward" ), Amarok::icon( "fastforward" ), Key_Right, ec, TQT_SLOT( seekForward() ), ac, "seek_forward" ); TDEAction *seekForward = new TDEAction( i18n( "&Seek Forward" ), Amarok::icon( "fastforward" ), Key_Right, ec, TQ_SLOT( seekForward() ), ac, "seek_forward" );
TDEAction *seekBackward = new TDEAction( i18n( "&Seek Backward" ), Amarok::icon( "rewind" ), Key_Left, ec, TQT_SLOT( seekBackward() ), ac, "seek_backward" ); TDEAction *seekBackward = new TDEAction( i18n( "&Seek Backward" ), Amarok::icon( "rewind" ), Key_Left, ec, TQ_SLOT( seekBackward() ), ac, "seek_backward" );
new TDEAction( i18n("Statistics"), Amarok::icon( "info" ), 0, this, TQT_SLOT(showStatistics()), ac, "statistics" ); new TDEAction( i18n("Statistics"), Amarok::icon( "info" ), 0, this, TQ_SLOT(showStatistics()), ac, "statistics" );
new TDEAction( i18n("Update Collection"), Amarok::icon( "refresh" ), 0, CollectionDB::instance(), TQT_SLOT( scanModifiedDirs() ), actionCollection(), "update_collection" ); new TDEAction( i18n("Update Collection"), Amarok::icon( "refresh" ), 0, CollectionDB::instance(), TQ_SLOT( scanModifiedDirs() ), actionCollection(), "update_collection" );
m_lastfmTags << "Alternative" << "Ambient" << "Chill Out" << "Classical" << "Dance" m_lastfmTags << "Alternative" << "Ambient" << "Chill Out" << "Classical" << "Dance"
<< "Electronica" << "Favorites" << "Heavy Metal" << "Hip Hop" << "Indie Rock" << "Electronica" << "Favorites" << "Heavy Metal" << "Hip Hop" << "Indie Rock"
@ -164,39 +164,39 @@ PlaylistWindow::PlaylistWindow()
TDEPopupMenu* playTagRadioMenu = new TDEPopupMenu( this ); TDEPopupMenu* playTagRadioMenu = new TDEPopupMenu( this );
int id = 0; int id = 0;
foreach( m_lastfmTags ) { foreach( m_lastfmTags ) {
playTagRadioMenu->insertItem( *it, this, TQT_SLOT( playLastfmGlobaltag( int ) ), 0, id ); playTagRadioMenu->insertItem( *it, this, TQ_SLOT( playLastfmGlobaltag( int ) ), 0, id );
++id; ++id;
} }
TDEPopupMenu* addTagRadioMenu = new TDEPopupMenu( this ); TDEPopupMenu* addTagRadioMenu = new TDEPopupMenu( this );
id = 0; id = 0;
foreach( m_lastfmTags ) { foreach( m_lastfmTags ) {
addTagRadioMenu->insertItem( *it, this, TQT_SLOT( addLastfmGlobaltag( int ) ), 0, id ); addTagRadioMenu->insertItem( *it, this, TQ_SLOT( addLastfmGlobaltag( int ) ), 0, id );
++id; ++id;
} }
TDEActionMenu* playLastfm = new TDEActionMenu( i18n( "Play las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_play" ); TDEActionMenu* playLastfm = new TDEActionMenu( i18n( "Play las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_play" );
TQPopupMenu* playLastfmMenu = playLastfm->popupMenu(); TQPopupMenu* playLastfmMenu = playLastfm->popupMenu();
playLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQT_SLOT( playLastfmPersonal() ) ); playLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQ_SLOT( playLastfmPersonal() ) );
playLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQT_SLOT( playLastfmNeighbor() ) ); playLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQ_SLOT( playLastfmNeighbor() ) );
playLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQT_SLOT( playLastfmCustom() ) ); playLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQ_SLOT( playLastfmCustom() ) );
playLastfmMenu->insertItem( i18n( "Global Tag Radio" ), playTagRadioMenu ); playLastfmMenu->insertItem( i18n( "Global Tag Radio" ), playTagRadioMenu );
TDEActionMenu* addLastfm = new TDEActionMenu( i18n( "Add las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_add" ); TDEActionMenu* addLastfm = new TDEActionMenu( i18n( "Add las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_add" );
TQPopupMenu* addLastfmMenu = addLastfm->popupMenu(); TQPopupMenu* addLastfmMenu = addLastfm->popupMenu();
addLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQT_SLOT( addLastfmPersonal() ) ); addLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQ_SLOT( addLastfmPersonal() ) );
addLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQT_SLOT( addLastfmNeighbor() ) ); addLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQ_SLOT( addLastfmNeighbor() ) );
addLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQT_SLOT( addLastfmCustom() ) ); addLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQ_SLOT( addLastfmCustom() ) );
addLastfmMenu->insertItem( i18n( "Global Tag Radio" ), addTagRadioMenu ); addLastfmMenu->insertItem( i18n( "Global Tag Radio" ), addTagRadioMenu );
ac->action( "options_configure_globals" )->setText( i18n( "Configure &Global Shortcuts..." ) ); ac->action( "options_configure_globals" )->setText( i18n( "Configure &Global Shortcuts..." ) );
new TDEAction( i18n( "Previous Track" ), Amarok::icon( "back" ), 0, ec, TQT_SLOT( previous() ), ac, "prev" ); new TDEAction( i18n( "Previous Track" ), Amarok::icon( "back" ), 0, ec, TQ_SLOT( previous() ), ac, "prev" );
new TDEAction( i18n( "Play" ), Amarok::icon( "play" ), 0, ec, TQT_SLOT( play() ), ac, "play" ); new TDEAction( i18n( "Play" ), Amarok::icon( "play" ), 0, ec, TQ_SLOT( play() ), ac, "play" );
new TDEAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQT_SLOT( pause() ), ac, "pause" ); new TDEAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQ_SLOT( pause() ), ac, "pause" );
new TDEAction( i18n( "Next Track" ), Amarok::icon( "next" ), 0, ec, TQT_SLOT( next() ), ac, "next" ); new TDEAction( i18n( "Next Track" ), Amarok::icon( "next" ), 0, ec, TQ_SLOT( next() ), ac, "next" );
TDEAction *toggleFocus = new TDEAction( i18n( "Toggle Focus" ), "reload", CTRL+Key_Tab, this, TQT_SLOT( slotToggleFocus() ), ac, "toggle_focus" ); TDEAction *toggleFocus = new TDEAction( i18n( "Toggle Focus" ), "reload", CTRL+Key_Tab, this, TQ_SLOT( slotToggleFocus() ), ac, "toggle_focus" );
{ // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu { // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu
@ -287,10 +287,10 @@ void PlaylistWindow::init()
m_lineEdit->setFrame( TQFrame::Sunken ); m_lineEdit->setFrame( TQFrame::Sunken );
m_lineEdit->installEventFilter( this ); //we intercept keyEvents m_lineEdit->installEventFilter( this ); //we intercept keyEvents
connect( button, TQT_SIGNAL(clicked()), m_lineEdit, TQT_SLOT(clear()) ); connect( button, TQ_SIGNAL(clicked()), m_lineEdit, TQ_SLOT(clear()) );
connect( m_lineEdit, TQT_SIGNAL(textChanged( const TQString& )), connect( m_lineEdit, TQ_SIGNAL(textChanged( const TQString& )),
playlist, TQT_SLOT(setFilterSlot( const TQString& )) ); playlist, TQ_SLOT(setFilterSlot( const TQString& )) );
connect( filterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFilter() ) ); connect( filterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFilter() ) );
TQToolTip::add( button, i18n( "Clear search field" ) ); TQToolTip::add( button, i18n( "Clear search field" ) );
TQString filtertip = i18n( "Enter space-separated terms to search in the playlist.\n\n" TQString filtertip = i18n( "Enter space-separated terms to search in the playlist.\n\n"
@ -310,7 +310,7 @@ void PlaylistWindow::init()
TQWidget *statusbar = new Amarok::StatusBar( this ); TQWidget *statusbar = new Amarok::StatusBar( this );
TDEAction* repeatAction = Amarok::actionCollection()->action( "repeat" ); TDEAction* repeatAction = Amarok::actionCollection()->action( "repeat" );
connect( repeatAction, TQT_SIGNAL( activated( int ) ), playlist, TQT_SLOT( slotRepeatTrackToggled( int ) ) ); connect( repeatAction, TQ_SIGNAL( activated( int ) ), playlist, TQ_SLOT( slotRepeatTrackToggled( int ) ) );
m_menubar = new KMenuBar( this ); m_menubar = new KMenuBar( this );
#ifndef TQ_WS_MAC #ifndef TQ_WS_MAC
@ -330,7 +330,7 @@ void PlaylistWindow::init()
actionsMenu->insertSeparator(); actionsMenu->insertSeparator();
actionCollection()->action(KStdAction::name(KStdAction::Quit))->plug( actionsMenu ); actionCollection()->action(KStdAction::name(KStdAction::Quit))->plug( actionsMenu );
connect( actionsMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( actionsMenuAboutToShow() ) ); connect( actionsMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( actionsMenuAboutToShow() ) );
//END Actions menu //END Actions menu
//BEGIN Playlist menu //BEGIN Playlist menu
@ -368,7 +368,7 @@ void PlaylistWindow::init()
m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER );
actionCollection()->action("queue_manager")->plug( m_toolsMenu ); 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( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR );
m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), kapp, TQ_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER );
actionCollection()->action("script_manager")->plug( m_toolsMenu ); actionCollection()->action("script_manager")->plug( m_toolsMenu );
actionCollection()->action("statistics")->plug( m_toolsMenu ); actionCollection()->action("statistics")->plug( m_toolsMenu );
m_toolsMenu->insertSeparator(); m_toolsMenu->insertSeparator();
@ -381,8 +381,8 @@ void PlaylistWindow::init()
m_toolsMenu->setItemEnabled( Amarok::Menu::ID_SHOW_VIS_SELECTOR, false ); m_toolsMenu->setItemEnabled( Amarok::Menu::ID_SHOW_VIS_SELECTOR, false );
#endif #endif
connect( m_toolsMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( toolsMenuAboutToShow() ) ); connect( m_toolsMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( toolsMenuAboutToShow() ) );
connect( m_toolsMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotMenuActivated(int) ) ); connect( m_toolsMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotMenuActivated(int) ) );
//END Tools menu //END Tools menu
//BEGIN Settings menu //BEGIN Settings menu
@ -405,7 +405,7 @@ void PlaylistWindow::init()
actionCollection()->action(KStdAction::name(KStdAction::ConfigureToolbars))->plug( m_settingsMenu ); actionCollection()->action(KStdAction::name(KStdAction::ConfigureToolbars))->plug( m_settingsMenu );
actionCollection()->action(KStdAction::name(KStdAction::Preferences))->plug( m_settingsMenu ); actionCollection()->action(KStdAction::name(KStdAction::Preferences))->plug( m_settingsMenu );
connect( m_settingsMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotMenuActivated(int) ) ); connect( m_settingsMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotMenuActivated(int) ) );
//END Settings menu //END Settings menu
m_menubar->insertItem( i18n( "&File" ), actionsMenu ); m_menubar->insertItem( i18n( "&File" ), actionsMenu );
@ -474,8 +474,8 @@ void PlaylistWindow::init()
{ {
addInstBrowserMacro( MediaBrowser, "MediaBrowser", i18n("Devices"), Amarok::icon( "device" ) ) addInstBrowserMacro( MediaBrowser, "MediaBrowser", i18n("Devices"), Amarok::icon( "device" ) )
//to re-enable mediabrowser hiding, uncomment this: //to re-enable mediabrowser hiding, uncomment this:
//connect( MediaBrowser::instance(), TQT_SIGNAL( availabilityChanged( bool ) ), //connect( MediaBrowser::instance(), TQ_SIGNAL( availabilityChanged( bool ) ),
// this, TQT_SLOT( mbAvailabilityChanged( bool ) ) ); // this, TQ_SLOT( mbAvailabilityChanged( bool ) ) );
m_browsers->makeDropProxy( "MediaBrowser", MediaBrowser::queue() ); m_browsers->makeDropProxy( "MediaBrowser", MediaBrowser::queue() );
} }
@ -484,17 +484,17 @@ void PlaylistWindow::init()
} }
//</Browsers> //</Browsers>
connect( Playlist::instance()->qscrollview(), TQT_SIGNAL( dynamicModeChanged( const DynamicMode* ) ), connect( Playlist::instance()->qscrollview(), TQ_SIGNAL( dynamicModeChanged( const DynamicMode* ) ),
PlaylistBrowser::instance(), TQT_SLOT( loadDynamicItems() ) ); PlaylistBrowser::instance(), TQ_SLOT( loadDynamicItems() ) );
tqApp->installEventFilter( this ); // keyboards shortcuts for the browsers tqApp->installEventFilter( this ); // keyboards shortcuts for the browsers
connect( playlist, TQT_SIGNAL( itemCountChanged( int, int, int, int, int, int ) ), connect( playlist, TQ_SIGNAL( itemCountChanged( int, int, int, int, int, int ) ),
statusbar, TQT_SLOT( slotItemCountChanged( int, int, int, int, int, int ) ) ); statusbar, TQ_SLOT( slotItemCountChanged( int, int, int, int, int, int ) ) );
connect( playlist, TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), connect( playlist, TQ_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ),
statusbar, TQT_SLOT( updateQueueLabel() ) ); statusbar, TQ_SLOT( updateQueueLabel() ) );
connect( playlist, TQT_SIGNAL( aboutToClear() ), m_lineEdit, TQT_SLOT( clear() ) ); connect( playlist, TQ_SIGNAL( aboutToClear() ), m_lineEdit, TQ_SLOT( clear() ) );
Amarok::MessageQueue::instance()->sendMessages(); Amarok::MessageQueue::instance()->sendMessages();
} }
@ -506,7 +506,7 @@ void PlaylistWindow::slotSetFilter( const TQString &filter ) //SLOT
void PlaylistWindow::slotEditFilter() //SLOT void PlaylistWindow::slotEditFilter() //SLOT
{ {
EditFilterDialog *fd = new EditFilterDialog( this, true, m_lineEdit->text() ); EditFilterDialog *fd = new EditFilterDialog( this, true, m_lineEdit->text() );
connect( fd, TQT_SIGNAL(filterChanged(const TQString &)), TQT_SLOT(slotSetFilter(const TQString &)) ); connect( fd, TQ_SIGNAL(filterChanged(const TQString &)), TQ_SLOT(slotSetFilter(const TQString &)) );
if( fd->exec() ) if( fd->exec() )
m_lineEdit->setText( fd->filter() ); m_lineEdit->setText( fd->filter() );
delete fd; delete fd;
@ -1079,7 +1079,7 @@ void PlaylistWindow::slotMenuActivated( int index ) //SLOT
case ID_SHOW_PLAYERWINDOW: case ID_SHOW_PLAYERWINDOW:
AmarokConfig::setShowPlayerWindow( !AmarokConfig::showPlayerWindow() ); AmarokConfig::setShowPlayerWindow( !AmarokConfig::showPlayerWindow() );
m_settingsMenu->changeItem( index, AmarokConfig::showPlayerWindow() ? i18n("Hide Player &Window") : i18n("Show Player &Window") ); m_settingsMenu->changeItem( index, AmarokConfig::showPlayerWindow() ? i18n("Hide Player &Window") : i18n("Show Player &Window") );
TQTimer::singleShot( 0, kapp, TQT_SLOT( applySettings() ) ); TQTimer::singleShot( 0, kapp, TQ_SLOT( applySettings() ) );
break; break;
case Amarok::Menu::ID_RESCAN_COLLECTION: case Amarok::Menu::ID_RESCAN_COLLECTION:
CollectionDB::instance()->startScan(); CollectionDB::instance()->startScan();
@ -1200,17 +1200,17 @@ DynamicBar::DynamicBar(TQWidget* parent)
// necessary because it has to be constructed before Playlist::instance(), but also connect to it // necessary because it has to be constructed before Playlist::instance(), but also connect to it
void DynamicBar::init() void DynamicBar::init()
{ {
connect(Playlist::instance()->qscrollview(), TQT_SIGNAL(dynamicModeChanged(const DynamicMode*)), connect(Playlist::instance()->qscrollview(), TQ_SIGNAL(dynamicModeChanged(const DynamicMode*)),
TQT_SLOT(slotNewDynamicMode(const DynamicMode*))); TQ_SLOT(slotNewDynamicMode(const DynamicMode*)));
KPushButton* editDynamicButton = new KPushButton( i18n("Edit"), this, "DynamicModeEdit" ); KPushButton* editDynamicButton = new KPushButton( i18n("Edit"), this, "DynamicModeEdit" );
connect( editDynamicButton, TQT_SIGNAL(clicked()), Playlist::instance()->qscrollview(), TQT_SLOT(editActiveDynamicMode()) ); connect( editDynamicButton, TQ_SIGNAL(clicked()), Playlist::instance()->qscrollview(), TQ_SLOT(editActiveDynamicMode()) );
KPushButton* repopButton = new KPushButton( i18n("Repopulate"), this, "DynamicModeRepopulate" ); KPushButton* repopButton = new KPushButton( i18n("Repopulate"), this, "DynamicModeRepopulate" );
connect( repopButton, TQT_SIGNAL(clicked()), Playlist::instance()->qscrollview(), TQT_SLOT(repopulate()) ); connect( repopButton, TQ_SIGNAL(clicked()), Playlist::instance()->qscrollview(), TQ_SLOT(repopulate()) );
KPushButton* disableButton = new KPushButton( i18n("Turn Off"), this, "DynamicModeDisable" ); KPushButton* disableButton = new KPushButton( i18n("Turn Off"), this, "DynamicModeDisable" );
connect( disableButton, TQT_SIGNAL(clicked()), Playlist::instance()->qscrollview(), TQT_SLOT(disableDynamicMode()) ); connect( disableButton, TQ_SIGNAL(clicked()), Playlist::instance()->qscrollview(), TQ_SLOT(disableDynamicMode()) );
slotNewDynamicMode( Playlist::instance()->dynamicMode() ); slotNewDynamicMode( Playlist::instance()->dynamicMode() );
} }

14
amarok/src/podcastsettings.cpp
Unescape View File

@ -102,13 +102,13 @@ PodcastSettingsDialog::init()
enableButtonOK( false ); enableButtonOK( false );
// Connects for modification check // Connects for modification check
connect( m_ps->m_purgeCountSpinBox->child( "qt_spinbox_edit" ), TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( m_ps->m_purgeCountSpinBox->child( "qt_spinbox_edit" ), TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( m_ps->m_saveLocation, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( m_ps->m_saveLocation, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( m_ps->m_autoFetchCheck, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); connect( m_ps->m_autoFetchCheck, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) );
connect( m_ps->m_streamRadio, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); connect( m_ps->m_streamRadio, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) );
connect( m_ps->m_addToMediaDeviceCheck, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); connect( m_ps->m_addToMediaDeviceCheck, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) );
connect( m_ps->m_downloadRadio, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); connect( m_ps->m_downloadRadio, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) );
connect( m_ps->m_purgeCheck, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); connect( m_ps->m_purgeCheck, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) );
} }
bool bool

22
amarok/src/queuemanager.cpp
Unescape View File

@ -317,19 +317,19 @@ QueueManager::QueueManager( TQWidget *parent, const char *name )
m_add->setEnabled( false ); m_add->setEnabled( false );
m_clear->setEnabled( false ); m_clear->setEnabled( false );
connect( m_up, TQT_SIGNAL( clicked() ), m_listview, TQT_SLOT( moveSelectedUp() ) ); connect( m_up, TQ_SIGNAL( clicked() ), m_listview, TQ_SLOT( moveSelectedUp() ) );
connect( m_down, TQT_SIGNAL( clicked() ), m_listview, TQT_SLOT( moveSelectedDown() ) ); connect( m_down, TQ_SIGNAL( clicked() ), m_listview, TQ_SLOT( moveSelectedDown() ) );
connect( m_remove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeSelected() ) ); connect( m_remove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeSelected() ) );
connect( m_add, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addItems() ) ); connect( m_add, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addItems() ) );
connect( m_clear, TQT_SIGNAL( clicked() ), m_listview, TQT_SLOT( clear() ) ); connect( m_clear, TQ_SIGNAL( clicked() ), m_listview, TQ_SLOT( clear() ) );
Playlist *pl = Playlist::instance(); Playlist *pl = Playlist::instance();
connect( pl, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateButtons() ) ); connect( pl, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( updateButtons() ) );
connect( m_listview, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateButtons() ) ); connect( m_listview, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( updateButtons() ) );
connect( pl, TQT_SIGNAL( queueChanged(const PLItemList &, const PLItemList &) ), connect( pl, TQ_SIGNAL( queueChanged(const PLItemList &, const PLItemList &) ),
TQT_SLOT( changeQueuedItems(const PLItemList &, const PLItemList &) ) ); TQ_SLOT( changeQueuedItems(const PLItemList &, const PLItemList &) ) );
connect( this, TQT_SIGNAL( applyClicked()), TQT_SLOT( applyNow() ) ); connect( this, TQ_SIGNAL( applyClicked()), TQ_SLOT( applyNow() ) );
connect( m_listview, TQT_SIGNAL( changed() ), this, TQT_SLOT ( changed() ) ); connect( m_listview, TQ_SIGNAL( changed() ), this, TQ_SLOT ( changed() ) );
s_instance->enableButtonApply(false); s_instance->enableButtonApply(false);
insertItems(); insertItems();

4
amarok/src/refreshimages.cpp
Unescape View File

@ -66,7 +66,7 @@ RefreshImages::RefreshImages()
it++; //iterate to the next set it++; //iterate to the next set
m_jobInfo[md5sum] = JobInfo( asin, locale, it == end ); m_jobInfo[md5sum] = JobInfo( asin, locale, it == end );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( finishedXmlFetch( TDEIO::Job* ) ) ); connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( finishedXmlFetch( TDEIO::Job* ) ) );
} }
} }
@ -123,7 +123,7 @@ RefreshImages::finishedXmlFetch( TDEIO::Job* xmlJob ) //SLOT
.namedItem( "Items" ) .namedItem( "Items" )
.namedItem( "Item" ) .namedItem( "Item" )
.namedItem( "DetailPageURL" ).firstChild().toText().data(); .namedItem( "DetailPageURL" ).firstChild().toText().data();
connect( imageJob, TQT_SIGNAL( result(TDEIO::Job*) ), TQT_SLOT( finishedImageFetch(TDEIO::Job*) ) ); connect( imageJob, TQ_SIGNAL( result(TDEIO::Job*) ), TQ_SLOT( finishedImageFetch(TDEIO::Job*) ) );
} }
void RefreshImages::finishedImageFetch(TDEIO::Job* imageJob) void RefreshImages::finishedImageFetch(TDEIO::Job* imageJob)

14
amarok/src/scancontroller.cpp
Unescape View File

@ -76,9 +76,9 @@ ScanController::ScanController( CollectionDB* parent, bool incremental, const TQ
m_reader->setContentHandler( this ); m_reader->setContentHandler( this );
m_reader->parse( m_source, true ); m_reader->parse( m_source, true );
connect( this, TQT_SIGNAL( scanDone( bool ) ), MountPointManager::instance(), TQT_SLOT( updateStatisticsURLs( bool ) ) ); connect( this, TQ_SIGNAL( scanDone( bool ) ), MountPointManager::instance(), TQ_SLOT( updateStatisticsURLs( bool ) ) );
connect( m_scanner, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( slotReadReady() ) ); connect( m_scanner, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( slotReadReady() ) );
*m_scanner << "amarokcollectionscanner"; *m_scanner << "amarokcollectionscanner";
*m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV *m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV
@ -173,11 +173,11 @@ ScanController::initIncremental()
DEBUG_BLOCK DEBUG_BLOCK
connect( CollectionDB::instance(), connect( CollectionDB::instance(),
TQT_SIGNAL( fileMoved( const TQString &, const TQString & ) ), TQ_SIGNAL( fileMoved( const TQString &, const TQString & ) ),
TQT_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); TQ_SLOT( slotFileMoved( const TQString &, const TQString & ) ) );
connect( CollectionDB::instance(), connect( CollectionDB::instance(),
TQT_SIGNAL( fileMoved( const TQString &, const TQString &, const TQString & ) ), TQ_SIGNAL( fileMoved( const TQString &, const TQString &, const TQString & ) ),
TQT_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); TQ_SLOT( slotFileMoved( const TQString &, const TQString & ) ) );
IdList list = MountPointManager::instance()->getMountedDeviceIds(); IdList list = MountPointManager::instance()->getMountedDeviceIds();
TQString deviceIds; TQString deviceIds;
@ -534,7 +534,7 @@ ScanController::customEvent( TQCustomEvent* e )
delete m_scanner; // Reusing doesn't work, so we have to destroy and reinstantiate delete m_scanner; // Reusing doesn't work, so we have to destroy and reinstantiate
m_scanner = new Amarok::ProcIO(); m_scanner = new Amarok::ProcIO();
connect( m_scanner, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( slotReadReady() ) ); connect( m_scanner, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( slotReadReady() ) );
*m_scanner << "amarokcollectionscanner"; *m_scanner << "amarokcollectionscanner";
*m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV *m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV

34
amarok/src/scriptmanager.cpp
Unescape View File

@ -179,17 +179,17 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name )
m_scoreCategory ->setOpen( config->readBoolEntry( "Score category State" ) ); m_scoreCategory ->setOpen( config->readBoolEntry( "Score category State" ) );
m_transcodeCategory->setOpen( config->readBoolEntry( "Transcode category open" ) ); m_transcodeCategory->setOpen( config->readBoolEntry( "Transcode category open" ) );
connect( m_gui->listView, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), TQT_SLOT( slotCurrentChanged( TQListViewItem* ) ) ); connect( m_gui->listView, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), TQ_SLOT( slotCurrentChanged( TQListViewItem* ) ) );
connect( m_gui->listView, TQT_SIGNAL( doubleClicked ( TQListViewItem*, const TQPoint&, int ) ), TQT_SLOT( slotRunScript() ) ); connect( m_gui->listView, TQ_SIGNAL( doubleClicked ( TQListViewItem*, const TQPoint&, int ) ), TQ_SLOT( slotRunScript() ) );
connect( m_gui->listView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ), TQT_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint& ) ) ); connect( m_gui->listView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ), TQ_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint& ) ) );
connect( m_gui->installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotInstallScript() ) ); connect( m_gui->installButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotInstallScript() ) );
connect( m_gui->retrieveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRetrieveScript() ) ); connect( m_gui->retrieveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRetrieveScript() ) );
connect( m_gui->uninstallButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotUninstallScript() ) ); connect( m_gui->uninstallButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotUninstallScript() ) );
connect( m_gui->runButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRunScript() ) ); connect( m_gui->runButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRunScript() ) );
connect( m_gui->stopButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStopScript() ) ); connect( m_gui->stopButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotStopScript() ) );
connect( m_gui->configureButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureScript() ) ); connect( m_gui->configureButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureScript() ) );
connect( m_gui->aboutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAboutScript() ) ); connect( m_gui->aboutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAboutScript() ) );
m_gui->installButton ->setIconSet( SmallIconSet( Amarok::icon( "files" ) ) ); m_gui->installButton ->setIconSet( SmallIconSet( Amarok::icon( "files" ) ) );
m_gui->retrieveButton ->setIconSet( SmallIconSet( Amarok::icon( "download" ) ) ); m_gui->retrieveButton ->setIconSet( SmallIconSet( Amarok::icon( "download" ) ) );
@ -203,10 +203,10 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name )
setMinimumSize( kMax( 350, sz.width() ), kMax( 250, sz.height() ) ); setMinimumSize( kMax( 350, sz.width() ), kMax( 250, sz.height() ) );
resize( sizeHint() ); resize( sizeHint() );
connect( this, TQT_SIGNAL(lyricsScriptChanged()), ContextBrowser::instance(), TQT_SLOT( lyricsScriptChanged() ) ); connect( this, TQ_SIGNAL(lyricsScriptChanged()), ContextBrowser::instance(), TQ_SLOT( lyricsScriptChanged() ) );
// Delay this call via eventloop, because it's a bit slow and would block // Delay this call via eventloop, because it's a bit slow and would block
TQTimer::singleShot( 0, this, TQT_SLOT( findScripts() ) ); TQTimer::singleShot( 0, this, TQ_SLOT( findScripts() ) );
} }
@ -500,7 +500,7 @@ ScriptManager::slotRetrieveScript()
d->setType( "amarok/script" ); d->setType( "amarok/script" );
// you have to do this by hand when providing your own Engine // you have to do this by hand when providing your own Engine
KNS::ProviderLoader *p = new KNS::ProviderLoader( this ); KNS::ProviderLoader *p = new KNS::ProviderLoader( this );
TQObject::connect( p, TQT_SIGNAL( providersLoaded(Provider::List*) ), d, TQT_SLOT( slotProviders (Provider::List *) ) ); TQObject::connect( p, TQ_SIGNAL( providersLoaded(Provider::List*) ), d, TQ_SLOT( slotProviders (Provider::List *) ) );
p->load( "amarok script", "https://www.trinitydesktop.org/ocs/providers.xml" ); p->load( "amarok script", "https://www.trinitydesktop.org/ocs/providers.xml" );
d->exec(); d->exec();
@ -593,9 +593,9 @@ ScriptManager::slotRunScript( bool silent )
*script << url.path(); *script << url.path();
script->setWorkingDirectory( Amarok::saveLocation( "scripts-data/" ) ); script->setWorkingDirectory( Amarok::saveLocation( "scripts-data/" ) );
connect( script, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotReceivedStderr( TDEProcess*, char*, int ) ) ); connect( script, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQ_SLOT( slotReceivedStderr( TDEProcess*, char*, int ) ) );
connect( script, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), TQT_SLOT( slotReceivedStdout( TDEProcess*, char*, int ) ) ); connect( script, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), TQ_SLOT( slotReceivedStdout( TDEProcess*, char*, int ) ) );
connect( script, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( scriptFinished( TDEProcess* ) ) ); connect( script, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( scriptFinished( TDEProcess* ) ) );
if( script->start( TDEProcess::NotifyOnExit ) ) if( script->start( TDEProcess::NotifyOnExit ) )
{ {

8
amarok/src/scripts/alarm/alarm.py
Unescape View File

@ -53,8 +53,8 @@ class ConfigDialog( TQDialog ):
self.cancel.setText( "Cancel" ) self.cancel.setText( "Cancel" )
self.cancel.setDefault( True ) self.cancel.setDefault( True )
self.connect( self.ok, SIGNAL( "clicked()" ), self.save ) self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.save )
self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT( "reject()" ) ) self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "reject()" ) )
self.adjustSize() self.adjustSize()
@ -88,7 +88,7 @@ class Alarm( TQApplication ):
self.t.start() self.t.start()
self.alarmTimer = TQTimer() self.alarmTimer = TQTimer()
self.connect( self.alarmTimer, SIGNAL( "timeout()" ), self.wakeup ) self.connect( self.alarmTimer, TQ_SIGNAL( "timeout()" ), self.wakeup )
self.readSettings() self.readSettings()
@ -148,7 +148,7 @@ class Alarm( TQApplication ):
self.dia = ConfigDialog() self.dia = ConfigDialog()
self.dia.show() self.dia.show()
self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings ) self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings )
############################################################################ ############################################################################

14
amarok/src/scripts/amarok_live/amarok_live.py
Unescape View File

@ -70,13 +70,13 @@ class ConfigDialog ( TQDialog ):
self.lay.addWidget( self.cancel, 2, 1 ) self.lay.addWidget( self.cancel, 2, 1 )
self.lay.addWidget( self.ok, 2, 0) self.lay.addWidget( self.ok, 2, 0)
self.connect( self.isobutton, SIGNAL( "clicked()" ), self.browseISO ) self.connect( self.isobutton, TQ_SIGNAL( "clicked()" ), self.browseISO )
self.connect( self.tmpbutton, SIGNAL( "clicked()" ), self.browsePath ) self.connect( self.tmpbutton, TQ_SIGNAL( "clicked()" ), self.browsePath )
self.connect( self.ok, SIGNAL( "clicked()" ), self.save ) self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.save )
self.connect( self.ok, SIGNAL( "clicked()" ), self.unpack ) self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.unpack )
# self.connect( self.ok, SIGNAL( "clicked()" ), self.destroy ) # self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.destroy )
self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT("reject()") ) self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT("reject()") )
self.adjustSize() self.adjustSize()
@ -259,7 +259,7 @@ class Remasterer( TQApplication ):
self.dia = ConfigDialog() self.dia = ConfigDialog()
self.dia.show() self.dia.show()
#self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings ) #self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings )
def clearCD( self ): def clearCD( self ):

10
amarok/src/scripts/databasescripts/databaseScripts.rb
Unescape View File

@ -69,12 +69,12 @@ class DatabaseScriptChooser < TQt::Dialog
@layout2.addWidget(@m_okayButton) @layout2.addWidget(@m_okayButton)
@layout3.addLayout(@layout2) @layout3.addLayout(@layout2)
connect( @m_optionCombo, SIGNAL( "activated(int)" ), self, SLOT( "optionChanged(int)" ) ); connect( @m_optionCombo, TQ_SIGNAL( "activated(int)" ), self, TQ_SLOT( "optionChanged(int)" ) );
connect( @m_okayButton, SIGNAL( "clicked()" ), self, SLOT( "accept()" ) ) connect( @m_okayButton, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "accept()" ) )
connect( @m_cancelButton, SIGNAL( "clicked()" ), self, SLOT( "cancel()" ) ) connect( @m_cancelButton, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "cancel()" ) )
connect( @m_saveDir, SIGNAL( "textChanged(const TQString &)" ), connect( @m_saveDir, TQ_SIGNAL( "textChanged(const TQString &)" ),
self, SLOT( "textChanged(const TQString &)" ) ); self, TQ_SLOT( "textChanged(const TQString &)" ) );
@Form1Layout.addLayout(@layout3, 0, 0) @Form1Layout.addLayout(@layout3, 0, 0)
languageChange() languageChange()

6
amarok/src/scripts/graphequalizer/main.cpp
Unescape View File

@ -42,9 +42,9 @@ int main(int argc, char **argv)
mainWin->show(); mainWin->show();
StdinReader* listen = new StdinReader(mainWin, "ioListener"); StdinReader* listen = new StdinReader(mainWin, "ioListener");
CallAmarok* ca = new CallAmarok(mainWin,"ca", mainWin->canvasView,mainWin->preampSlider); CallAmarok* ca = new CallAmarok(mainWin,"ca", mainWin->canvasView,mainWin->preampSlider);
mainWin->connect(listen, TQT_SIGNAL(openWindow()), mainWin, TQT_SLOT(show())); mainWin->connect(listen, TQ_SIGNAL(openWindow()), mainWin, TQ_SLOT(show()));
mainWin->connect(mainWin->canvasView,TQT_SIGNAL(eqChanged()),ca, TQT_SLOT(updateEq())); mainWin->connect(mainWin->canvasView,TQ_SIGNAL(eqChanged()),ca, TQ_SLOT(updateEq()));
mainWin->connect(mainWin->preampSlider,TQT_SIGNAL(sliderReleased()),ca, TQT_SLOT(updateEq())); mainWin->connect(mainWin->preampSlider,TQ_SIGNAL(sliderReleased()),ca, TQ_SLOT(updateEq()));
return app.exec(); return app.exec();
} }

2
amarok/src/scripts/graphequalizer/stdinreader.h
Unescape View File

@ -19,7 +19,7 @@ public:
:TQObject(parent,name) :TQObject(parent,name)
{ {
TQSocketNotifier* streamListener = new TQSocketNotifier(0, TQSocketNotifier::Read, this, "stdinWatcher"); TQSocketNotifier* streamListener = new TQSocketNotifier(0, TQSocketNotifier::Read, this, "stdinWatcher");
connect(streamListener, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dataRecieved()) ); connect(streamListener, TQ_SIGNAL(activated(int)), this, TQ_SLOT(dataRecieved()) );
} }
~StdinReader() { } ~StdinReader() { }

2
amarok/src/scripts/templates/amarok.rb
Unescape View File

@ -25,7 +25,7 @@ class QtIoListener < TQt::Object
@lineHandler = lineHandler @lineHandler = lineHandler
@iostream = iostream @iostream = iostream
streamListener = TQt::SocketNotifier.new(iostream.fileno, TQt::SocketNotifier.Read, app, 'stdinWatcher') streamListener = TQt::SocketNotifier.new(iostream.fileno, TQt::SocketNotifier.Read, app, 'stdinWatcher')
TQt::Object.connect(streamListener, SIGNAL("activated(int)"), self, SLOT("dataRecieved()") ) TQt::Object.connect(streamListener, TQ_SIGNAL("activated(int)"), self, TQ_SLOT("dataRecieved()") )
end end
def dataRecieved def dataRecieved

2
amarok/src/scripts/templates/python_qt_template.py
Unescape View File

@ -146,7 +146,7 @@ class Test( TQApplication ):
self.dia = ConfigDialog() self.dia = ConfigDialog()
self.dia.show() self.dia.show()
self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings ) self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings )
def engineStatePlay( self ): def engineStatePlay( self ):
""" Called when Engine state changes to Play """ """ Called when Engine state changes to Play """

8
amarok/src/scripts/webcontrol/WebControl.py
Unescape View File

@ -94,8 +94,8 @@ class ConfigDialog( TQDialog ):
self.cancel.setText( "Cancel" ) self.cancel.setText( "Cancel" )
self.cancel.setDefault( True ) self.cancel.setDefault( True )
self.connect( self.ok, SIGNAL( "clicked()" ), self.save ) self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.save )
self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT( "reject()" ) ) self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "reject()" ) )
self.adjustSize() self.adjustSize()
@ -147,7 +147,7 @@ class WebControl( TQApplication ):
self.zeroconfPublishing() self.zeroconfPublishing()
self.snsrv = TQSocketNotifier(self.srv.fileno(), TQSocketNotifier.Read) self.snsrv = TQSocketNotifier(self.srv.fileno(), TQSocketNotifier.Read)
self.snsrv.connect( self.snsrv, SIGNAL('activated(int)'), self.readSocket ) self.snsrv.connect( self.snsrv, TQ_SIGNAL('activated(int)'), self.readSocket )
def readSocket( self ): def readSocket( self ):
# Got a read event on the HTTP server socket. # Got a read event on the HTTP server socket.
@ -230,7 +230,7 @@ class WebControl( TQApplication ):
self.dia = ConfigDialog() self.dia = ConfigDialog()
self.dia.show() self.dia.show()
self.connect( self.dia, SIGNAL( "destroyed()" ), self.postConfigure ) self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.postConfigure )
def engineStatePlay( self ): def engineStatePlay( self ):
""" Called when Engine state changes to Play """ """ Called when Engine state changes to Play """

20
amarok/src/scrobbler.cpp
Unescape View File

@ -79,10 +79,10 @@ void Scrobbler::similarArtists( const TQString & artist )
m_similarArtistsJob = TDEIO::get( "http://ws.audioscrobbler.com/1.0/artist/" + safeArtist + "/similar.xml", false, false ); m_similarArtistsJob = TDEIO::get( "http://ws.audioscrobbler.com/1.0/artist/" + safeArtist + "/similar.xml", false, false );
connect( m_similarArtistsJob, TQT_SIGNAL( result( TDEIO::Job* ) ), connect( m_similarArtistsJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( audioScrobblerSimilarArtistsResult( TDEIO::Job* ) ) ); this, TQ_SLOT( audioScrobblerSimilarArtistsResult( TDEIO::Job* ) ) );
connect( m_similarArtistsJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), connect( m_similarArtistsJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( audioScrobblerSimilarArtistsData( TDEIO::Job*, const TQByteArray& ) ) ); this, TQ_SLOT( audioScrobblerSimilarArtistsData( TDEIO::Job*, const TQByteArray& ) ) );
} }
} }
@ -393,7 +393,7 @@ ScrobblerSubmitter::ScrobblerSubmitter()
, m_lastSubmissionFinishTime( 0 ) , m_lastSubmissionFinishTime( 0 )
, m_fakeQueueLength( 0 ) , m_fakeQueueLength( 0 )
{ {
connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scheduledTimeReached()) ); connect( &m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scheduledTimeReached()) );
readSubmitQueue(); readSubmitQueue();
} }
@ -485,7 +485,7 @@ void ScrobblerSubmitter::performHandshake()
m_inProgress = true; m_inProgress = true;
TDEIO::TransferJob* job = TDEIO::storedGet( handshakeUrl, false, false ); TDEIO::TransferJob* job = TDEIO::storedGet( handshakeUrl, false, false );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( audioScrobblerHandshakeResult( TDEIO::Job* ) ) ); connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( audioScrobblerHandshakeResult( TDEIO::Job* ) ) );
} }
@ -600,10 +600,10 @@ void ScrobblerSubmitter::performSubmit()
Amarok::StatusBar::instance()->newProgressOperation( job ) Amarok::StatusBar::instance()->newProgressOperation( job )
.setDescription( i18n( "Submitting to last.fm" ) ); .setDescription( i18n( "Submitting to last.fm" ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( audioScrobblerSubmitResult( TDEIO::Job* ) ) ); this, TQ_SLOT( audioScrobblerSubmitResult( TDEIO::Job* ) ) );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( audioScrobblerSubmitData( TDEIO::Job*, const TQByteArray& ) ) ); this, TQ_SLOT( audioScrobblerSubmitData( TDEIO::Job*, const TQByteArray& ) ) );
} }

12
amarok/src/sliderwidget.cpp
Unescape View File

@ -154,12 +154,12 @@ Amarok::PrettySlider::PrettySlider( TQt::Orientation orientation, SliderMode mod
// We only have to connect this *once*, since our MetaBundle // We only have to connect this *once*, since our MetaBundle
// doesn't get destroyed until we do. // doesn't get destroyed until we do.
connect( &m_bundle.moodbar(), TQT_SIGNAL( jobEvent( int ) ), connect( &m_bundle.moodbar(), TQ_SIGNAL( jobEvent( int ) ),
TQT_SLOT( moodbarJobEvent( int ) ) ); TQ_SLOT( moodbarJobEvent( int ) ) );
// We want to know if we should reset our moodbar data // We want to know if we should reset our moodbar data
connect( App::instance(), TQT_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), connect( App::instance(), TQ_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ),
TQT_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); TQ_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) );
} }
@ -383,7 +383,7 @@ Amarok::VolumeSlider::VolumeSlider( TQWidget *parent, uint max )
setMinimumWidth( m_pixmapInset.width() ); setMinimumWidth( m_pixmapInset.width() );
setMinimumHeight( m_pixmapInset.height() ); setMinimumHeight( m_pixmapInset.height() );
connect( m_animTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAnimTimer() ) ); connect( m_animTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAnimTimer() ) );
} }
void void
@ -442,7 +442,7 @@ Amarok::VolumeSlider::contextMenuEvent( TQContextMenuEvent *e )
{ {
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem( SmallIconSet( "equalizer" ), i18n( "&Equalizer" ), menu.insertItem( SmallIconSet( "equalizer" ), i18n( "&Equalizer" ),
kapp, TQT_SLOT( slotConfigEqualizer() ) ); kapp, TQ_SLOT( slotConfigEqualizer() ) );
} }
const int n = menu.exec( mapToGlobal( e->pos() ) ); const int n = menu.exec( mapToGlobal( e->pos() ) );

24
amarok/src/smartplaylisteditor.cpp
Unescape View File

@ -238,12 +238,12 @@ void SmartPlaylistEditor::init(TQString defaultName)
//add stretch //add stretch
static_cast<TQHBox *>(mainWidget())->setStretchFactor(new TQWidget(mainWidget()), 1); static_cast<TQHBox *>(mainWidget())->setStretchFactor(new TQWidget(mainWidget()), 1);
connect( m_matchAnyCheck, TQT_SIGNAL( toggled(bool) ), m_criteriaAnyGroupBox, TQT_SLOT( setEnabled(bool) ) ); connect( m_matchAnyCheck, TQ_SIGNAL( toggled(bool) ), m_criteriaAnyGroupBox, TQ_SLOT( setEnabled(bool) ) );
connect( m_matchAllCheck, TQT_SIGNAL( toggled(bool) ), m_criteriaAllGroupBox, TQT_SLOT( setEnabled(bool) ) ); connect( m_matchAllCheck, TQ_SIGNAL( toggled(bool) ), m_criteriaAllGroupBox, TQ_SLOT( setEnabled(bool) ) );
connect( m_orderCheck, TQT_SIGNAL( toggled(bool) ), orderBox, TQT_SLOT( setEnabled(bool) ) ); connect( m_orderCheck, TQ_SIGNAL( toggled(bool) ), orderBox, TQ_SLOT( setEnabled(bool) ) );
connect( m_limitCheck, TQT_SIGNAL( toggled(bool) ), limitBox, TQT_SLOT( setEnabled(bool) ) ); connect( m_limitCheck, TQ_SIGNAL( toggled(bool) ), limitBox, TQ_SLOT( setEnabled(bool) ) );
connect( m_expandCheck, TQT_SIGNAL( toggled(bool) ), expandBox, TQT_SLOT( setEnabled(bool) ) ); connect( m_expandCheck, TQ_SIGNAL( toggled(bool) ), expandBox, TQ_SLOT( setEnabled(bool) ) );
connect( m_orderCombo, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( updateOrderTypes(int) ) ); connect( m_orderCombo, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( updateOrderTypes(int) ) );
m_criteriaAnyGroupBox->setEnabled( false ); m_criteriaAnyGroupBox->setEnabled( false );
m_criteriaAllGroupBox->setEnabled( false ); m_criteriaAllGroupBox->setEnabled( false );
@ -426,15 +426,15 @@ CriteriaEditor::CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, i
m_removeButton->setUsesTextLabel( true ); m_removeButton->setUsesTextLabel( true );
m_removeButton->setTextLabel("-"); m_removeButton->setTextLabel("-");
connect( m_fieldCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotFieldSelected(int) ) ); connect( m_fieldCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotFieldSelected(int) ) );
connect( m_criteriaCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( loadEditWidgets() ) ); connect( m_criteriaCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( loadEditWidgets() ) );
if (criteriaType == SmartPlaylistEditor::criteriaAny) { if (criteriaType == SmartPlaylistEditor::criteriaAny) {
connect( m_addButton, TQT_SIGNAL( clicked() ), editor, TQT_SLOT( addCriteriaAny() ) ); connect( m_addButton, TQ_SIGNAL( clicked() ), editor, TQ_SLOT( addCriteriaAny() ) );
connect( m_removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveCriteriaAny() ) ); connect( m_removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveCriteriaAny() ) );
} }
else { else {
connect( m_addButton, TQT_SIGNAL( clicked() ), editor, TQT_SLOT( addCriteriaAll() ) ); connect( m_addButton, TQ_SIGNAL( clicked() ), editor, TQ_SLOT( addCriteriaAll() ) );
connect( m_removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveCriteriaAll() ) ); connect( m_removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveCriteriaAll() ) );
} }
if ( !criteria.isNull() ) { if ( !criteria.isNull() ) {

10
amarok/src/socketserver.cpp
Unescape View File

@ -103,7 +103,7 @@ Vis::SocketServer::newConnection( int sockfd )
Vis::SocketNotifier::SocketNotifier( int sockfd ) Vis::SocketNotifier::SocketNotifier( int sockfd )
: TQSocketNotifier( sockfd, TQSocketNotifier::Read, this ) : TQSocketNotifier( sockfd, TQSocketNotifier::Read, this )
{ {
connect( this, TQT_SIGNAL(activated( int )), TQT_SLOT(request( int )) ); connect( this, TQ_SIGNAL(activated( int )), TQ_SLOT(request( int )) );
} }
void void
@ -173,8 +173,8 @@ Vis::Selector::Selector( TQWidget *parent )
reinterpret_cast<TQWidget*>(header())->hide(); reinterpret_cast<TQWidget*>(header())->hide();
connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
this, TQT_SLOT(rightButton( TQListViewItem*, const TQPoint&, int )) ); this, TQ_SLOT(rightButton( TQListViewItem*, const TQPoint&, int )) );
// Can I get a pointer to the data section of a TQCString? // Can I get a pointer to the data section of a TQCString?
char str[4096]; char str[4096];
@ -286,9 +286,9 @@ Vis::Selector::Item::stateChange( bool ) //SLOT
<< Selector::instance()->m_server->path() << Selector::instance()->m_server->path()
<< text( 0 ); << text( 0 );
connect( m_proc, TQT_SIGNAL(processExited( TDEProcess* )), listView(), TQT_SLOT(processExited( TDEProcess* )) ); connect( m_proc, TQ_SIGNAL(processExited( TDEProcess* )), listView(), TQ_SLOT(processExited( TDEProcess* )) );
// Shouldn't be necessary, but make visualizations work again when running with amarok binary // Shouldn't be necessary, but make visualizations work again when running with amarok binary
connect( m_proc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int ) ), listView(), TQT_SLOT(receivedStdout (TDEProcess*, char*, int ) ) ); connect( m_proc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int ) ), listView(), TQ_SLOT(receivedStdout (TDEProcess*, char*, int ) ) );
debug() << "Starting visualization..\n"; debug() << "Starting visualization..\n";
if( m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) if( m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
break; break;

20
amarok/src/statistics.cpp
Unescape View File

@ -81,10 +81,10 @@ Statistics::Statistics( TQWidget *parent, const char *name )
m_lineEdit->setFrame( TQFrame::Sunken ); m_lineEdit->setFrame( TQFrame::Sunken );
m_lineEdit->installEventFilter( this ); //we intercept keyEvents m_lineEdit->installEventFilter( this ); //we intercept keyEvents
connect( button, TQT_SIGNAL( clicked() ) , m_lineEdit , TQT_SLOT( clear() ) ); connect( button, TQ_SIGNAL( clicked() ) , m_lineEdit , TQ_SLOT( clear() ) );
connect( m_timer, TQT_SIGNAL( timeout() ) , TQT_SLOT( slotSetFilter() ) ); connect( m_timer, TQ_SIGNAL( timeout() ) , TQ_SLOT( slotSetFilter() ) );
connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotSetFilterTimeout() ) ); connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotSetFilterTimeout() ) );
connect( m_lineEdit, TQT_SIGNAL( returnPressed() ) , TQT_SLOT( slotSetFilter() ) ); connect( m_lineEdit, TQ_SIGNAL( returnPressed() ) , TQ_SLOT( slotSetFilter() ) );
TQToolTip::add( button, i18n( "Clear search field" ) ); TQToolTip::add( button, i18n( "Clear search field" ) );
} //</Search LineEdit> } //</Search LineEdit>
@ -134,11 +134,11 @@ StatisticsList::StatisticsList( TQWidget *parent, const char *name )
setAcceptDrops( false ); setAcceptDrops( false );
setDragEnabled( true ); setDragEnabled( true );
connect( this, TQT_SIGNAL( onItem( TQListViewItem*) ), TQT_SLOT( startHover( TQListViewItem* ) ) ); connect( this, TQ_SIGNAL( onItem( TQListViewItem*) ), TQ_SLOT( startHover( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( clearHover() ) ); connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( clearHover() ) );
connect( this, TQT_SIGNAL( clicked( TQListViewItem*) ), TQT_SLOT( itemClicked( TQListViewItem* ) ) ); connect( this, TQ_SIGNAL( clicked( TQListViewItem*) ), TQ_SLOT( itemClicked( TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ),
this, TQT_SLOT( showContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); this, TQ_SLOT( showContextMenu( TQListViewItem *, const TQPoint &, int ) ) );
if( CollectionDB::instance()->isEmpty() ) if( CollectionDB::instance()->isEmpty() )
return; return;
@ -694,7 +694,7 @@ StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, TDEListVi
setText( 0, text ); setText( 0, text );
connect( m_animTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAnimTimer() ) ); connect( m_animTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAnimTimer() ) );
} }
void void

2
amarok/src/statusbar/popupMessage.cpp
Unescape View File

@ -86,7 +86,7 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con
hbox->addItem( new TQSpacerItem( 4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); hbox->addItem( new TQSpacerItem( 4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
hbox->add( new KPushButton( KStdGuiItem::close(), this, "closeButton" ) ); hbox->add( new KPushButton( KStdGuiItem::close(), this, "closeButton" ) );
connect( child( "closeButton" ), TQT_SIGNAL(clicked()), TQT_SLOT(close()) ); connect( child( "closeButton" ), TQ_SIGNAL(clicked()), TQ_SLOT(close()) );
} }
void PopupMessage::addWidget( TQWidget *widget ) void PopupMessage::addWidget( TQWidget *widget )

6
amarok/src/statusbar/progressBar.cpp
Unescape View File

@ -77,8 +77,8 @@ ProgressBar::setStatus( const TQString &text )
ProgressBar& ProgressBar&
ProgressBar::setAbortSlot( TQObject *receiver, const char *slot ) ProgressBar::setAbortSlot( TQObject *receiver, const char *slot )
{ {
connect( m_abort, TQT_SIGNAL(clicked()), receiver, slot ); connect( m_abort, TQ_SIGNAL(clicked()), receiver, slot );
connect( m_abort, TQT_SIGNAL(clicked()), this, TQT_SLOT(hide()) ); connect( m_abort, TQ_SIGNAL(clicked()), this, TQ_SLOT(hide()) );
m_abort->show(); m_abort->show();
parentWidget()->adjustSize(); parentWidget()->adjustSize();
@ -90,7 +90,7 @@ ProgressBar&
ProgressBar::setProgressSignal( TQObject *sender, const char *signal ) ProgressBar::setProgressSignal( TQObject *sender, const char *signal )
{ {
setTotalSteps( 100 ); setTotalSteps( 100 );
connect( sender, signal, Amarok::StatusBar::instance(), TQT_SLOT( setProgress ( const TQObject*, int ) ) ); connect( sender, signal, Amarok::StatusBar::instance(), TQ_SLOT( setProgress ( const TQObject*, int ) ) );
return *this; return *this;
} }

10
amarok/src/statusbar/queueLabel.cpp
Unescape View File

@ -46,11 +46,11 @@ QueueLabel::QueueLabel( TQWidget *parent, const char *name )
, m_tooltipShowing( false ) , m_tooltipShowing( false )
, m_tooltipHidden( false ) , m_tooltipHidden( false )
{ {
connect( this, TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), connect( this, TQ_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ),
Playlist::instance(), TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ) ); Playlist::instance(), TQ_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString &, const TQString & ) ), connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString &, const TQString & ) ),
this, TQT_SLOT( slotCoverChanged( const TQString &, const TQString & ) ) ); this, TQ_SLOT( slotCoverChanged( const TQString &, const TQString & ) ) );
setNum( 0 ); setNum( 0 );
} }
@ -130,7 +130,7 @@ void QueueLabel::setNum( int num )
void QueueLabel::enterEvent( TQEvent* ) void QueueLabel::enterEvent( TQEvent* )
{ {
m_tooltipHidden = false; m_tooltipHidden = false;
TQTimer::singleShot( 1000, this, TQT_SLOT(aboutToShow()) ); TQTimer::singleShot( 1000, this, TQ_SLOT(aboutToShow()) );
} }
void QueueLabel::leaveEvent( TQEvent* ) void QueueLabel::leaveEvent( TQEvent* )

8
amarok/src/statusbar/selectLabel.h
Unescape View File

@ -53,9 +53,9 @@ class SelectLabel : public TQLabel
, m_tooltipShowing( false ) , m_tooltipShowing( false )
, m_tooltipHidden( false ) , m_tooltipHidden( false )
{ {
connect( this, TQT_SIGNAL( activated( int ) ), action, TQT_SLOT( setCurrentItem( int ) ) ); connect( this, TQ_SIGNAL( activated( int ) ), action, TQ_SLOT( setCurrentItem( int ) ) );
connect( action, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setCurrentItem( int ) ) ); connect( action, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setCurrentItem( int ) ) );
connect( action, TQT_SIGNAL( enabled( bool ) ), this, TQT_SLOT( setEnabled( bool ) ) ); connect( action, TQ_SIGNAL( enabled( bool ) ), this, TQ_SLOT( setEnabled( bool ) ) );
setCurrentItem( currentItem() ); setCurrentItem( currentItem() );
} }
@ -89,7 +89,7 @@ class SelectLabel : public TQLabel
{ {
//Show the tooltip after 1/2 second //Show the tooltip after 1/2 second
m_tooltipHidden = false; m_tooltipHidden = false;
TQTimer::singleShot( 500, this, TQT_SLOT(aboutToShow()) ); TQTimer::singleShot( 500, this, TQ_SLOT(aboutToShow()) );
} }
void leaveEvent( TQEvent* ) void leaveEvent( TQEvent* )

30
amarok/src/statusbar/statusBarBase.cpp
Unescape View File

@ -64,7 +64,7 @@ namespace SingleShotPool
TQTimer *timer = static_cast<TQTimer*>( receiver->child( slot ) ); TQTimer *timer = static_cast<TQTimer*>( receiver->child( slot ) );
if( !timer ) { if( !timer ) {
timer = new TQTimer( receiver, slot ); timer = new TQTimer( receiver, slot );
receiver->connect( timer, TQT_SIGNAL(timeout()), slot ); receiver->connect( timer, TQ_SIGNAL(timeout()), slot );
} }
timer->start( timeout, true ); timer->start( timeout, true );
@ -115,15 +115,15 @@ StatusBar::StatusBar( TQWidget *parent, const char *name )
shortLongButton->setIconSet( SmallIconSet( "edit_add" ) ); shortLongButton->setIconSet( SmallIconSet( "edit_add" ) );
TQToolTip::add( shortLongButton, i18n( "Show details" ) ); TQToolTip::add( shortLongButton, i18n( "Show details" ) );
connect( shortLongButton, TQT_SIGNAL(clicked()), TQT_SLOT(showShortLongDetails()) ); connect( shortLongButton, TQ_SIGNAL(clicked()), TQ_SLOT(showShortLongDetails()) );
b1->setIconSet( SmallIconSet( "cancel" ) ); b1->setIconSet( SmallIconSet( "cancel" ) );
b2->setIconSet( SmallIconSet( "2uparrow") ); b2->setIconSet( SmallIconSet( "2uparrow") );
b2->setToggleButton( true ); b2->setToggleButton( true );
TQToolTip::add( b1, i18n( "Abort all background-operations" ) ); TQToolTip::add( b1, i18n( "Abort all background-operations" ) );
TQToolTip::add( b2, i18n( "Show progress detail" ) ); TQToolTip::add( b2, i18n( "Show progress detail" ) );
connect( b1, TQT_SIGNAL(clicked()), TQT_SLOT(abortAllProgressOperations()) ); connect( b1, TQ_SIGNAL(clicked()), TQ_SLOT(abortAllProgressOperations()) );
connect( b2, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggleProgressWindow( bool )) ); connect( b2, TQ_SIGNAL(toggled( bool )), TQ_SLOT(toggleProgressWindow( bool )) );
m_popupProgress = new OverlayWidget( this, mainProgressBarBox, "popupProgress" ); m_popupProgress = new OverlayWidget( this, mainProgressBarBox, "popupProgress" );
m_popupProgress->setMargin( 1 ); m_popupProgress->setMargin( 1 );
@ -224,7 +224,7 @@ StatusBar::shortMessage( const TQString &text, bool longShort )
m_mainTextLabel->setText( text ); m_mainTextLabel->setText( text );
m_mainTextLabel->setPalette( TQToolTip::palette() ); m_mainTextLabel->setPalette( TQToolTip::palette() );
SingleShotPool::startTimer( longShort ? 8000 : 5000, this, TQT_SLOT(resetMainText()) ); SingleShotPool::startTimer( longShort ? 8000 : 5000, this, TQ_SLOT(resetMainText()) );
writeLogFile( text ); writeLogFile( text );
} }
@ -236,7 +236,7 @@ StatusBar::resetMainText()
// debug() << sender()->name() << endl; // debug() << sender()->name() << endl;
// don't reset if we are showing a shortMessage // don't reset if we are showing a shortMessage
if( SingleShotPool::isActive( this, TQT_SLOT(resetMainText()) ) ) if( SingleShotPool::isActive( this, TQ_SLOT(resetMainText()) ) )
return; return;
m_mainTextLabel->unsetPalette(); m_mainTextLabel->unsetPalette();
@ -288,7 +288,7 @@ StatusBar::longMessage( const TQString &text, int type )
PopupMessage *message; PopupMessage *message;
message = new PopupMessage( this, m_mainTextLabel ); message = new PopupMessage( this, m_mainTextLabel );
connect( message, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(popupDeleted(TQObject *)) ); connect( message, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(popupDeleted(TQObject *)) );
message->setText( text ); message->setText( text );
TQString image; TQString image;
@ -385,11 +385,11 @@ StatusBar::newProgressOperation( TQObject *owner )
m_popupProgress->reposition(); m_popupProgress->reposition();
connect( owner, TQT_SIGNAL(destroyed( TQObject* )), TQT_SLOT(endProgressOperation( TQObject* )) ); connect( owner, TQ_SIGNAL(destroyed( TQObject* )), TQ_SLOT(endProgressOperation( TQObject* )) );
// so we can show the correct progress information // so we can show the correct progress information
// after the ProgressBar is setup // after the ProgressBar is setup
SingleShotPool::startTimer( 0, this, TQT_SLOT(updateProgressAppearance()) ); SingleShotPool::startTimer( 0, this, TQ_SLOT(updateProgressAppearance()) );
progressBox()->show(); progressBox()->show();
cancelButton()->setEnabled( true ); cancelButton()->setEnabled( true );
@ -407,9 +407,9 @@ StatusBar::newProgressOperation( TDEIO::Job *job )
if(!allDone()) if(!allDone())
toggleProgressWindowButton()->show(); toggleProgressWindowButton()->show();
connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(endProgressOperation()) ); connect( job, TQ_SIGNAL(result( TDEIO::Job* )), TQ_SLOT(endProgressOperation()) );
//TODO connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *job, const TQString& )), TQT_SLOT() ); //TODO connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job *job, const TQString& )), TQ_SLOT() );
connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )), TQT_SLOT(setProgress( TDEIO::Job*, unsigned long )) ); connect( job, TQ_SIGNAL(percent( TDEIO::Job*, unsigned long )), TQ_SLOT(setProgress( TDEIO::Job*, unsigned long )) );
return bar; return bar;
} }
@ -439,7 +439,7 @@ StatusBar::endProgressOperation( TQObject *owner )
if ( !m_progressMap.contains( owner ) ) if ( !m_progressMap.contains( owner ) )
{ {
SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) ); SingleShotPool::startTimer( 2000, this, TQ_SLOT(hideMainProgressBar()) );
return ; return ;
} }
@ -447,7 +447,7 @@ StatusBar::endProgressOperation( TQObject *owner )
if( allDone() && !m_popupProgress->isShown() ) { if( allDone() && !m_popupProgress->isShown() ) {
cancelButton()->setEnabled( false ); cancelButton()->setEnabled( false );
SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) ); SingleShotPool::startTimer( 2000, this, TQ_SLOT(hideMainProgressBar()) );
} }
updateTotalProgress(); updateTotalProgress();
@ -471,7 +471,7 @@ StatusBar::toggleProgressWindow( bool show ) //slot
m_popupProgress->setShown( show ); m_popupProgress->setShown( show );
if( !show ) if( !show )
SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) ); SingleShotPool::startTimer( 2000, this, TQ_SLOT(hideMainProgressBar()) );
} }
void void

2
amarok/src/statusbar/statusBarBase.h
Unescape View File

@ -53,7 +53,7 @@ namespace KDE
* statusbar->newProgressOperation( myObject ) * statusbar->newProgressOperation( myObject )
* .setDescription( i18n("MyProgressOperation") ) * .setDescription( i18n("MyProgressOperation") )
* .setStatus( i18n("Stage1") ) * .setStatus( i18n("Stage1") )
* .setAbortSlot( myObject, TQT_SLOT(abort()) ) * .setAbortSlot( myObject, TQ_SLOT(abort()) )
* .setTotalSteps( 100 ); * .setTotalSteps( 100 );
* *
* The newProgressOperation function returns a KDE::ProgressBar, which is * The newProgressOperation function returns a KDE::ProgressBar, which is

6
amarok/src/statusbar/statusbar.cpp
Unescape View File

@ -109,15 +109,15 @@ StatusBar::StatusBar( TQWidget *parent, const char *name )
if( !AmarokConfig::leftTimeDisplayEnabled() ) if( !AmarokConfig::leftTimeDisplayEnabled() )
m_timeLabel->hide(); m_timeLabel->hide();
connect( m_slider, TQT_SIGNAL(sliderReleased( int )), EngineController::instance(), TQT_SLOT(seek( int )) ); connect( m_slider, TQ_SIGNAL(sliderReleased( int )), EngineController::instance(), TQ_SLOT(seek( int )) );
connect( m_slider, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(drawTimeDisplay( int )) ); connect( m_slider, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(drawTimeDisplay( int )) );
// set us up the bomb // set us up the bomb
engineStateChanged( Engine::Empty ); engineStateChanged( Engine::Empty );
//slotItemCountChanged( 0 ); //slotItemCountChanged( 0 );
// for great justice! // for great justice!
connect( m_pauseTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotPauseTimer()) ); connect( m_pauseTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotPauseTimer()) );
slotItemCountChanged( 0, 0, 0, 0, 0, 0 ); slotItemCountChanged( 0, 0, 0, 0, 0, 0 );

8
amarok/src/statusbar/toggleLabel.h
Unescape View File

@ -53,9 +53,9 @@ class ToggleLabel : public TQLabel
, m_tooltipShowing( false ) , m_tooltipShowing( false )
, m_tooltipHidden( false ) , m_tooltipHidden( false )
{ {
connect( this, TQT_SIGNAL(toggled( bool )), action, TQT_SLOT(setChecked( bool )) ); connect( this, TQ_SIGNAL(toggled( bool )), action, TQ_SLOT(setChecked( bool )) );
connect( action, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(setChecked( bool )) ); connect( action, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(setChecked( bool )) );
connect( action, TQT_SIGNAL(enabled( bool )), this, TQT_SLOT(setEnabled( bool )) ); connect( action, TQ_SIGNAL(enabled( bool )), this, TQ_SLOT(setEnabled( bool )) );
setChecked( isChecked() ); setChecked( isChecked() );
} }
@ -79,7 +79,7 @@ class ToggleLabel : public TQLabel
{ {
//Show the tooltip after 1/2 second //Show the tooltip after 1/2 second
m_tooltipHidden = false; m_tooltipHidden = false;
TQTimer::singleShot( 500, this, TQT_SLOT(aboutToShow()) ); TQTimer::singleShot( 500, this, TQ_SLOT(aboutToShow()) );
} }
void leaveEvent( TQEvent* ) void leaveEvent( TQEvent* )

2
amarok/src/systray.cpp
Unescape View File

@ -53,7 +53,7 @@ Amarok::TrayIcon::TrayIcon( TQWidget *playerWidget )
//seems to be necessary //seems to be necessary
TDEAction *quit = actionCollection()->action( "file_quit" ); TDEAction *quit = actionCollection()->action( "file_quit" );
quit->disconnect(); quit->disconnect();
connect( quit, TQT_SIGNAL(activated()), kapp, TQT_SLOT(quit()) ); connect( quit, TQ_SIGNAL(activated()), kapp, TQ_SLOT(quit()) );
baseIcon = KSystemTray::loadIcon( "amarok" ); baseIcon = KSystemTray::loadIcon( "amarok" );
playOverlay = Amarok::loadOverlay( "play", baseIcon.width() ); playOverlay = Amarok::loadOverlay( "play", baseIcon.width() );

80
amarok/src/tagdialog.cpp
Unescape View File

@ -294,8 +294,8 @@ TagDialog::musicbrainzQuery() //SLOT
m_mbTrack = m_bundle.url(); m_mbTrack = m_bundle.url();
KTRMLookup* ktrm = new KTRMLookup( m_mbTrack.path(), true ); KTRMLookup* ktrm = new KTRMLookup( m_mbTrack.path(), true );
connect( ktrm, TQT_SIGNAL( sigResult( KTRMResultList, TQString ) ), TQT_SLOT( queryDone( KTRMResultList, TQString ) ) ); connect( ktrm, TQ_SIGNAL( sigResult( KTRMResultList, TQString ) ), TQ_SLOT( queryDone( KTRMResultList, TQString ) ) );
connect( pushButton_cancel, TQT_SIGNAL( clicked() ), ktrm, TQT_SLOT( deleteLater() ) ); connect( pushButton_cancel, TQ_SIGNAL( clicked() ), ktrm, TQ_SLOT( deleteLater() ) );
pushButton_musicbrainz->setEnabled( false ); pushButton_musicbrainz->setEnabled( false );
pushButton_musicbrainz->setText( i18n( "Generating audio fingerprint..." ) ); pushButton_musicbrainz->setText( i18n( "Generating audio fingerprint..." ) );
@ -316,7 +316,7 @@ TagDialog::queryDone( KTRMResultList results, TQString error ) //SLOT
{ {
TrackPickerDialog* t = new TrackPickerDialog( m_mbTrack.filename(), results, this ); TrackPickerDialog* t = new TrackPickerDialog( m_mbTrack.filename(), results, this );
t->show(); t->show();
connect( t, TQT_SIGNAL( finished() ), TQT_SLOT( resetMusicbrainz() ) ); // clear m_mbTrack connect( t, TQ_SIGNAL( finished() ), TQ_SLOT( resetMusicbrainz() ) ); // clear m_mbTrack
} }
else { else {
KMessageBox::sorry( this, i18n( "The track was not found in the MusicBrainz database." ) ); KMessageBox::sorry( this, i18n( "The track was not found in the MusicBrainz database." ) );
@ -427,8 +427,8 @@ void TagDialog::init()
const TQStringList favoriteLabels = CollectionDB::instance()->favoriteLabels(); const TQStringList favoriteLabels = CollectionDB::instance()->favoriteLabels();
TQString html = generateHTML( favoriteLabels ); TQString html = generateHTML( favoriteLabels );
m_labelCloud->set( html ); m_labelCloud->set( html );
connect( m_labelCloud->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), connect( m_labelCloud->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
this, TQT_SLOT( openURLRequest( const KURL & ) ) ); this, TQ_SLOT( openURLRequest( const KURL & ) ) );
// looks better to have a blank label than 0, we can't do this in // looks better to have a blank label than 0, we can't do this in
// the UI file due to bug in Designer // the UI file due to bug in Designer
@ -451,62 +451,62 @@ void TagDialog::init()
//HACK due to deficiency in TQt that will be addressed in version 4 //HACK due to deficiency in TQt that will be addressed in version 4
// TQSpinBox doesn't emit valueChanged if you edit the value with // TQSpinBox doesn't emit valueChanged if you edit the value with
// the lineEdit until you change the keyboard focus // the lineEdit until you change the keyboard focus
connect( kIntSpinBox_year->child( "qt_spinbox_edit" ), TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kIntSpinBox_year->child( "qt_spinbox_edit" ), TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kIntSpinBox_track->child( "qt_spinbox_edit" ), TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kIntSpinBox_track->child( "qt_spinbox_edit" ), TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kIntSpinBox_score->child( "qt_spinbox_edit" ), TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kIntSpinBox_score->child( "qt_spinbox_edit" ), TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kIntSpinBox_discNumber->child( "qt_spinbox_edit" ), TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kIntSpinBox_discNumber->child( "qt_spinbox_edit" ), TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
// Connects for modification check // Connects for modification check
connect( kLineEdit_title, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kLineEdit_title, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kComboBox_composer,TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); connect( kComboBox_composer,TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) );
connect( kComboBox_composer,TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kComboBox_composer,TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kComboBox_artist, TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); connect( kComboBox_artist, TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) );
connect( kComboBox_artist, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kComboBox_artist, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kComboBox_album, TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); connect( kComboBox_album, TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) );
connect( kComboBox_album, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kComboBox_album, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kComboBox_genre, TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); connect( kComboBox_genre, TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) );
connect( kComboBox_genre, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kComboBox_genre, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kComboBox_rating, TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); connect( kComboBox_rating, TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) );
connect( kComboBox_rating, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); connect( kComboBox_rating, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) );
connect( kIntSpinBox_track, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(checkModified()) ); connect( kIntSpinBox_track, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(checkModified()) );
connect( kIntSpinBox_year, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(checkModified()) ); connect( kIntSpinBox_year, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(checkModified()) );
connect( kIntSpinBox_score, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(checkModified()) ); connect( kIntSpinBox_score, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(checkModified()) );
connect( kTextEdit_comment, TQT_SIGNAL(textChanged()), TQT_SLOT(checkModified()) ); connect( kTextEdit_comment, TQ_SIGNAL(textChanged()), TQ_SLOT(checkModified()) );
connect( kTextEdit_lyrics, TQT_SIGNAL(textChanged()), TQT_SLOT(checkModified()) ); connect( kTextEdit_lyrics, TQ_SIGNAL(textChanged()), TQ_SLOT(checkModified()) );
connect( kTextEdit_selectedLabels, TQT_SIGNAL(textChanged()), TQT_SLOT(checkModified()) ); connect( kTextEdit_selectedLabels, TQ_SIGNAL(textChanged()), TQ_SLOT(checkModified()) );
// Remember original button text // Remember original button text
m_buttonMbText = pushButton_musicbrainz->text(); m_buttonMbText = pushButton_musicbrainz->text();
connect( pushButton_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelPressed()) ); connect( pushButton_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancelPressed()) );
connect( pushButton_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect( pushButton_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
connect( pushButton_open, TQT_SIGNAL(clicked()), TQT_SLOT(openPressed()) ); connect( pushButton_open, TQ_SIGNAL(clicked()), TQ_SLOT(openPressed()) );
connect( pushButton_previous, TQT_SIGNAL(clicked()), TQT_SLOT(previousTrack()) ); connect( pushButton_previous, TQ_SIGNAL(clicked()), TQ_SLOT(previousTrack()) );
connect( pushButton_next, TQT_SIGNAL(clicked()), TQT_SLOT(nextTrack()) ); connect( pushButton_next, TQ_SIGNAL(clicked()), TQ_SLOT(nextTrack()) );
connect( checkBox_perTrack, TQT_SIGNAL(clicked()), TQT_SLOT(perTrack()) ); connect( checkBox_perTrack, TQ_SIGNAL(clicked()), TQ_SLOT(perTrack()) );
// set an icon for the open-in-konqui button // set an icon for the open-in-konqui button
pushButton_open->setIconSet( SmallIconSet( Amarok::icon( "files" ) ) ); pushButton_open->setIconSet( SmallIconSet( Amarok::icon( "files" ) ) );
//Update lyrics on Context Browser //Update lyrics on Context Browser
connect( this, TQT_SIGNAL(lyricsChanged( const TQString& )), ContextBrowser::instance(), TQT_SLOT( lyricsChanged( const TQString& ) ) ); connect( this, TQ_SIGNAL(lyricsChanged( const TQString& )), ContextBrowser::instance(), TQ_SLOT( lyricsChanged( const TQString& ) ) );
//Update cover //Update cover
connect( CollectionDB::instance(), TQT_SIGNAL( coverFetched( const TQString&, const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( coverFetched( const TQString&, const TQString& ) ),
this, TQT_SLOT( loadCover( const TQString&, const TQString& ) ) ); this, TQ_SLOT( loadCover( const TQString&, const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ), connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString&, const TQString& ) ),
this, TQT_SLOT( loadCover( const TQString&, const TQString& ) ) ); this, TQ_SLOT( loadCover( const TQString&, const TQString& ) ) );
#if HAVE_TUNEPIMP #if HAVE_TUNEPIMP
connect( pushButton_musicbrainz, TQT_SIGNAL(clicked()), TQT_SLOT(musicbrainzQuery()) ); connect( pushButton_musicbrainz, TQ_SIGNAL(clicked()), TQ_SLOT(musicbrainzQuery()) );
#else #else
TQToolTip::add( pushButton_musicbrainz, i18n("Please install MusicBrainz to enable this functionality") ); TQToolTip::add( pushButton_musicbrainz, i18n("Please install MusicBrainz to enable this functionality") );
#endif #endif
connect( pushButton_guessTags, TQT_SIGNAL(clicked()), TQT_SLOT( guessFromFilename() ) ); connect( pushButton_guessTags, TQ_SIGNAL(clicked()), TQ_SLOT( guessFromFilename() ) );
connect( pushButton_setFilenameSchemes, TQT_SIGNAL(clicked()), TQT_SLOT( setFileNameSchemes() ) ); connect( pushButton_setFilenameSchemes, TQ_SIGNAL(clicked()), TQ_SLOT( setFileNameSchemes() ) );
if( m_urlList.count() ) { //editing multiple tracks if( m_urlList.count() ) { //editing multiple tracks
m_perTrack = false; m_perTrack = false;

22
amarok/src/tagguesserconfigdialog.ui.h
Unescape View File

@ -47,17 +47,17 @@ void TagGuesserConfigDialog::init()
item->moveItem( lvSchemes->lastItem() ); item->moveItem( lvSchemes->lastItem() );
} }
connect( lvSchemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), connect( lvSchemes, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
this, TQT_SLOT( slotCurrentChanged( TQListViewItem * ) ) ); this, TQ_SLOT( slotCurrentChanged( TQListViewItem * ) ) );
connect( lvSchemes, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), connect( lvSchemes, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ),
this, TQT_SLOT( slotRenameItem( TQListViewItem *, const TQPoint &, int ) ) ); this, TQ_SLOT( slotRenameItem( TQListViewItem *, const TQPoint &, int ) ) );
connect( bMoveUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUpClicked() ) ); connect( bMoveUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUpClicked() ) );
connect( bMoveDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDownClicked() ) ); connect( bMoveDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDownClicked() ) );
connect( bAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddClicked() ) ); connect( bAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddClicked() ) );
connect( bModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModifyClicked() ) ); connect( bModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModifyClicked() ) );
connect( bRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveClicked() ) ); connect( bRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveClicked() ) );
connect( bOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); connect( bOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) );
connect( bCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); connect( bCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
lvSchemes->setSelected( lvSchemes->firstChild(), true ); lvSchemes->setSelected( lvSchemes->firstChild(), true );
slotCurrentChanged( lvSchemes->currentItem() ); slotCurrentChanged( lvSchemes->currentItem() );

4
amarok/src/threadmanager.cpp
Unescape View File

@ -396,7 +396,7 @@ ThreadManager::Job::customEvent( TQCustomEvent *e )
case -1: case -1:
StatusBar::instance()->newProgressOperation( this ) StatusBar::instance()->newProgressOperation( this )
.setDescription( m_description ) .setDescription( m_description )
.setAbortSlot( this, TQT_SLOT(abort()) ) .setAbortSlot( this, TQ_SLOT(abort()) )
.setTotalSteps( 100 ); .setTotalSteps( 100 );
break; break;
@ -411,7 +411,7 @@ ThreadManager::DependentJob::DependentJob( TQObject *dependent, const char *name
: Job( name ) : Job( name )
, m_dependent( dependent ) , m_dependent( dependent )
{ {
connect( dependent, TQT_SIGNAL(destroyed()), TQT_SLOT(abort()) ); connect( dependent, TQ_SIGNAL(destroyed()), TQ_SLOT(abort()) );
TQApplication::postEvent( dependent, new TQCustomEvent( JobStartedEvent ) ); TQApplication::postEvent( dependent, new TQCustomEvent( JobStartedEvent ) );
} }

2
amarok/src/tooltip.cpp
Unescape View File

@ -123,7 +123,7 @@ Amarok::ToolTip::ToolTip( ToolTipClient *client, TQWidget *parent )
{ {
s_tooltips.append( this ); s_tooltips.append( this );
TQFrame::setPalette( TQToolTip::palette() ); TQFrame::setPalette( TQToolTip::palette() );
connect( &m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( hideTip() ) ); connect( &m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( hideTip() ) );
} }
Amarok::ToolTip::~ToolTip() Amarok::ToolTip::~ToolTip()

2
amarok/src/trackpickerdialog.cpp
Unescape View File

@ -78,7 +78,7 @@ TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList
m_base->trackList->setSelected(m_base->trackList->firstChild(), true); m_base->trackList->setSelected(m_base->trackList->firstChild(), true);
// m_base->trackList->triggerUpdate(); // m_base->trackList->triggerUpdate();
setMinimumWidth(kMax(300, width())); setMinimumWidth(kMax(300, width()));
connect(this, TQT_SIGNAL( sigSelectionMade( KTRMResult ) ), parent, TQT_SLOT( fillSelected( KTRMResult ) ) ); connect(this, TQ_SIGNAL( sigSelectionMade( KTRMResult ) ), parent, TQ_SLOT( fillSelected( KTRMResult ) ) );
} }

26
amarok/src/tracktooltip.cpp
Unescape View File

@ -40,21 +40,21 @@ TrackToolTip *TrackToolTip::instance()
TrackToolTip::TrackToolTip(): m_haspos( false ) TrackToolTip::TrackToolTip(): m_haspos( false )
{ {
connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString &, const TQString & ) ), connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString &, const TQString & ) ),
this, TQT_SLOT( slotCoverChanged( const TQString &, const TQString & ) ) ); this, TQ_SLOT( slotCoverChanged( const TQString &, const TQString & ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( imageFetched( const TQString & ) ), connect( CollectionDB::instance(), TQ_SIGNAL( imageFetched( const TQString & ) ),
this, TQT_SLOT( slotImageChanged( const TQString & ) ) ); this, TQ_SLOT( slotImageChanged( const TQString & ) ) );
connect( Playlist::instance(), TQT_SIGNAL( columnsChanged() ), this, TQT_SLOT( slotUpdate() ) ); connect( Playlist::instance(), TQ_SIGNAL( columnsChanged() ), this, TQ_SLOT( slotUpdate() ) );
connect( CollectionDB::instance(), TQT_SIGNAL( scoreChanged( const TQString&, float ) ), connect( CollectionDB::instance(), TQ_SIGNAL( scoreChanged( const TQString&, float ) ),
this, TQT_SLOT( slotUpdate( const TQString& ) ) ); this, TQ_SLOT( slotUpdate( const TQString& ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ),
this, TQT_SLOT( slotUpdate( const TQString& ) ) ); this, TQ_SLOT( slotUpdate( const TQString& ) ) );
// Only connect this once -- m_tags exists for the lifetime of this instance // Only connect this once -- m_tags exists for the lifetime of this instance
connect( &m_tags.moodbar(), TQT_SIGNAL( jobEvent( int ) ), connect( &m_tags.moodbar(), TQ_SIGNAL( jobEvent( int ) ),
TQT_SLOT( slotMoodbarEvent() ) ); TQ_SLOT( slotMoodbarEvent() ) );
// This is so the moodbar can be re-rendered when AlterMood is changed // This is so the moodbar can be re-rendered when AlterMood is changed
connect( App::instance(), TQT_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), connect( App::instance(), TQ_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ),
TQT_SLOT( slotMoodbarEvent() ) ); TQ_SLOT( slotMoodbarEvent() ) );
clear(); clear();
} }

6
amarok/src/transferdialog.cpp
Unescape View File

@ -89,8 +89,8 @@ TransferDialog::TransferDialog( MediaDevice *mdev )
m_label3->setDisabled( m_sort2->currentItem() == 0 ); m_label3->setDisabled( m_sort2->currentItem() == 0 );
m_sort3->setDisabled( m_sort2->currentItem() == 0 ); m_sort3->setDisabled( m_sort2->currentItem() == 0 );
connect( m_sort1, TQT_SIGNAL( activated(int) ), TQT_SLOT( sort1_activated(int)) ); connect( m_sort1, TQ_SIGNAL( activated(int) ), TQ_SLOT( sort1_activated(int)) );
connect( m_sort2, TQT_SIGNAL( activated(int) ), TQT_SLOT( sort2_activated(int)) ); connect( m_sort2, TQ_SIGNAL( activated(int) ), TQ_SLOT( sort2_activated(int)) );
TQVBox *vbox3 = new TQVBox( vbox ); TQVBox *vbox3 = new TQVBox( vbox );
TQSpacerItem *spacer2 = new TQSpacerItem( 0, 25 ); TQSpacerItem *spacer2 = new TQSpacerItem( 0, 25 );
@ -103,7 +103,7 @@ TransferDialog::TransferDialog( MediaDevice *mdev )
TQCheckBox *convertSpaces = new TQCheckBox( i18n( "Convert spaces to underscores" ), options ); TQCheckBox *convertSpaces = new TQCheckBox( i18n( "Convert spaces to underscores" ), options );
convertSpaces->setChecked( mdev->getSpacesToUnderscores() ); convertSpaces->setChecked( mdev->getSpacesToUnderscores() );
connect( convertSpaces, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( convertSpaces_toggled(bool) ) ); connect( convertSpaces, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( convertSpaces_toggled(bool) ) );
} }
void void

8
amarok/src/xmlloader_p.h
Unescape View File

@ -44,8 +44,8 @@ class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread
{ {
{ {
XmlLoader loader; XmlLoader loader;
connect( &loader, TQT_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), connect( &loader, TQ_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ),
this, TQT_SLOT( bundleLoaded( const MetaBundle&, const XmlAttributeList& ) ) ); this, TQ_SLOT( bundleLoaded( const MetaBundle&, const XmlAttributeList& ) ) );
bool success = loader.load( m_source ); bool success = loader.load( m_source );
if( !success ) if( !success )
TQApplication::postEvent( m_target, new BundleLoadedEvent( loader.m_lastError ) ); TQApplication::postEvent( m_target, new BundleLoadedEvent( loader.m_lastError ) );
@ -66,8 +66,8 @@ public:
SimpleLoader( TQXmlInputSource *source, bool *ok ) SimpleLoader( TQXmlInputSource *source, bool *ok )
{ {
XmlLoader loader; XmlLoader loader;
connect( &loader, TQT_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), connect( &loader, TQ_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ),
this, TQT_SLOT( bundleLoaded( const MetaBundle&, const XmlAttributeList& ) ) ); this, TQ_SLOT( bundleLoaded( const MetaBundle&, const XmlAttributeList& ) ) );
const bool success = loader.load( source ); const bool success = loader.load( source );
if( ok ) if( ok )
(*ok) = success; (*ok) = success;

Write Preview
Loading…
Cancel
Save