diff options
Diffstat (limited to 'amarok/src')
317 files changed, 2102 insertions, 2269 deletions
diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui index 0608eaf4..10443a4e 100644 --- a/amarok/src/Options1.ui +++ b/amarok/src/Options1.ui @@ -688,9 +688,9 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kactivelabel.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotUpdateMoodFrame()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> </functions> diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui index 281e82f3..ac342ae2 100644 --- a/amarok/src/Options2.ui +++ b/amarok/src/Options2.ui @@ -748,13 +748,13 @@ <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> </includes> -<Q_SLOTS> +<slots> <slot>installPushButton_clicked()</slot> <slot>retrievePushButton_clicked()</slot> <slot>uninstallPushButton_clicked()</slot> <slot>styleComboBox_activated( const TQString & s )</slot> <slot>updateStyleComboBox()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> </functions> diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h index 57e65deb..405dc928 100644 --- a/amarok/src/Options2.ui.h +++ b/amarok/src/Options2.ui.h @@ -117,15 +117,15 @@ void Options2::retrievePushButton_clicked() d->setType( "amarok/theme" ); // you have to do this by hand when providing your own Engine 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" ); - connect( d, TQT_SIGNAL( finished() ), d, TQT_SLOT( delayedDestruct() ) ); - connect( d, TQT_SIGNAL( finished() ), this, TQT_SLOT( updateStyleComboBox() ) ); + connect( d, TQ_SIGNAL( finished() ), d, TQ_SLOT( delayedDestruct() ) ); + connect( d, TQ_SIGNAL( finished() ), this, TQ_SLOT( updateStyleComboBox() ) ); // 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. - TQTimer::singleShot( 0, d, TQT_SLOT( exec() ) ); + TQTimer::singleShot( 0, d, TQ_SLOT( exec() ) ); } diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui index 077b8d43..b3917336 100644 --- a/amarok/src/Options5.ui +++ b/amarok/src/Options5.ui @@ -516,14 +516,14 @@ <variables> <variable access="private">OSDPreviewWidget *m_pOSDPreview;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>settingsChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected">slotPositionChanged()</slot> <slot access="protected">useCustomColorsToggled( bool on )</slot> <slot access="protected">useFakeTransparencyToggled( bool on )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> <function access="protected">hideEvent( TQHideEvent * )</function> diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h index d2abd9b1..1104a112 100644 --- a/amarok/src/Options5.ui.h +++ b/amarok/src/Options5.ui.h @@ -36,28 +36,28 @@ void Options5::init() m_pOSDPreview->setAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) ); 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(); for( int i = 0; i < numScreens; i++ ) kcfg_OsdScreen->insertItem( TQString::number( i ) ); - connect( kcfg_OsdDrawShadow, TQT_SIGNAL( toggled(bool) ), - m_pOSDPreview, TQT_SLOT( setDrawShadow(bool) ) ); - connect( kcfg_OsdTextColor, TQT_SIGNAL( changed(const TQColor&) ), - m_pOSDPreview, TQT_SLOT( setTextColor(const TQColor&) ) ); - connect( kcfg_OsdUseCustomColors, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( useCustomColorsToggled(bool) ) ); - connect( kcfg_OsdUseFakeTranslucency, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( useFakeTransparencyToggled(bool) ) ); - connect( kcfg_OsdBackgroundColor, TQT_SIGNAL( changed(const TQColor&) ), - m_pOSDPreview, TQT_SLOT( setBackgroundColor(const TQColor&) ) ); - connect( kcfg_OsdFont, TQT_SIGNAL( fontSelected(const TQFont&) ), - m_pOSDPreview, TQT_SLOT( setFont(const TQFont&) ) ); - connect( kcfg_OsdScreen, TQT_SIGNAL( activated(int) ), - m_pOSDPreview, TQT_SLOT( setScreen(int) ) ); - connect( kcfg_OsdEnabled, TQT_SIGNAL( toggled(bool) ), - m_pOSDPreview, TQT_SLOT( setShown(bool) ) ); + connect( kcfg_OsdDrawShadow, TQ_SIGNAL( toggled(bool) ), + m_pOSDPreview, TQ_SLOT( setDrawShadow(bool) ) ); + connect( kcfg_OsdTextColor, TQ_SIGNAL( changed(const TQColor&) ), + m_pOSDPreview, TQ_SLOT( setTextColor(const TQColor&) ) ); + connect( kcfg_OsdUseCustomColors, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( useCustomColorsToggled(bool) ) ); + connect( kcfg_OsdUseFakeTranslucency, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( useFakeTransparencyToggled(bool) ) ); + connect( kcfg_OsdBackgroundColor, TQ_SIGNAL( changed(const TQColor&) ), + m_pOSDPreview, TQ_SLOT( setBackgroundColor(const TQColor&) ) ); + connect( kcfg_OsdFont, TQ_SIGNAL( fontSelected(const TQFont&) ), + m_pOSDPreview, TQ_SLOT( setFont(const TQFont&) ) ); + connect( kcfg_OsdScreen, TQ_SIGNAL( activated(int) ), + m_pOSDPreview, TQ_SLOT( setScreen(int) ) ); + connect( kcfg_OsdEnabled, TQ_SIGNAL( toggled(bool) ), + m_pOSDPreview, TQ_SLOT( setShown(bool) ) ); Amarok::QStringx text = i18n( "<h3>Tags Displayed in OSD</h3>" diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui index 124f7f36..a3e9db6a 100644 --- a/amarok/src/Options8.ui +++ b/amarok/src/Options8.ui @@ -293,8 +293,8 @@ <include location="global" impldecl="in implementation">kactivelabel.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">updateServices( const TQString & s )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp index d00d6928..05f597d5 100644 --- a/amarok/src/actionclasses.cpp +++ b/amarok/src/actionclasses.cpp @@ -84,7 +84,7 @@ MenuAction::plug( TQWidget *w, int index ) const int id = TDEAction::getToolButtonID(); 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 above and aligned within window @@ -122,7 +122,7 @@ Menu::Menu() insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n( "C&over Manager" ), ID_SHOW_COVER_MANAGER ); safePlug( ac, "queue_manager", this ); insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n( "&Visualizations" ), ID_SHOW_VIS_SELECTOR ); - insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), kapp, 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, "statistics", this ); @@ -154,8 +154,8 @@ Menu::Menu() safePlug( ac, KStdAction::name(KStdAction::Quit), this ); - connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); setItemEnabled( ID_SHOW_VIS_SELECTOR, false ); #ifdef HAVE_LIBVISUAL @@ -213,7 +213,7 @@ PlayPauseAction::PlayPauseAction( TDEActionCollection *ac ) { 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 @@ -244,7 +244,7 @@ PlayPauseAction::engineStateChanged( Engine::State state, Engine::State /*oldSt //update menu texts for this special action for( int x = 0; x < containerCount(); ++x ) { TQWidget *w = container( x ); - if( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + if( w->inherits( "TQPopupMenu" ) ) static_cast<TQPopupMenu*>(w)->changeItem( itemId( x ), text ); //TODO TDEToolBar sucks so much // else if( w->inherits( "TDEToolBar" ) ) @@ -277,7 +277,7 @@ AnalyzerAction::plug( TQWidget *w, int index ) const int id = TDEAction::getToolButtonID(); addContainer( w, id ); - connect( w, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotDestroyed() ) ); TQWidget *container = new AnalyzerContainer( w ); bar->insertWidget( id, 0, container, index ); bar->setItemAutoSized( id, true ); @@ -314,7 +314,7 @@ void AnalyzerContainer::changeAnalyzer() void AnalyzerContainer::mousePressEvent( TQMouseEvent *e) { - if( e->button() == Qt::LeftButton ) { + if( e->button() == TQt::LeftButton ) { AmarokConfig::setCurrentPlaylistAnalyzer( AmarokConfig::currentPlaylistAnalyzer() + 1 ); changeAnalyzer(); } @@ -439,8 +439,8 @@ VolumeAction::plug( TQWidget *w, int index ) TQToolTip::add( m_slider, i18n( "Volume control" ) ); EngineController* const ec = EngineController::instance(); - connect( m_slider, TQT_SIGNAL(sliderMoved( int )), ec, TQT_SLOT(setVolume( int )) ); - connect( m_slider, TQT_SIGNAL(sliderReleased( int )), ec, TQT_SLOT(setVolume( int )) ); + connect( m_slider, TQ_SIGNAL(sliderMoved( int )), ec, TQ_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 ); @@ -519,7 +519,7 @@ BurnMenuAction::plug( TQWidget *w, int index ) const int id = TDEAction::getToolButtonID(); 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 ); @@ -539,8 +539,8 @@ BurnMenu::BurnMenu() insertItem( i18n("Selected Tracks"), SELECTED_TRACKS ); //TODO add "album" and "all tracks by artist" - connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); } TDEPopupMenu* @@ -574,7 +574,7 @@ BurnMenu::slotActivated( int index ) ////////////////////////////////////////////////////////////////////////////////////////// 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 @@ -587,9 +587,9 @@ StopAction::plug( TQWidget *w, int index ) const int id = TDEAction::getToolButtonID(); 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 ); TDEToolBarButton* button = bar->getButton( id ); @@ -610,8 +610,8 @@ StopMenu::StopMenu() insertItem( i18n("After Current Track"), AFTER_TRACK ); insertItem( i18n("After Queue"), AFTER_QUEUE ); - connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); } TDEPopupMenu* diff --git a/amarok/src/actionclasses.h b/amarok/src/actionclasses.h index ea4201d6..89766275 100644 --- a/amarok/src/actionclasses.h +++ b/amarok/src/actionclasses.h @@ -23,7 +23,7 @@ namespace Amarok { class Menu : public PrettyPopupMenu { - Q_OBJECT + TQ_OBJECT public: static Menu *instance(); @@ -154,7 +154,7 @@ namespace Amarok class BurnMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: @@ -183,7 +183,7 @@ namespace Amarok class StopMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h index 955f3b3a..9cad4a95 100644 --- a/amarok/src/amarok.h +++ b/amarok/src/amarok.h @@ -304,10 +304,6 @@ namespace Amarok } -#ifdef USE_QT4 -#undef foreach -#endif // USE_QT4 - /** * Use this to const-iterate over TQStringLists, if you like. * Watch out for the definition of last in the scope of your for. diff --git a/amarok/src/amarokcore/amarokdcophandler.h b/amarok/src/amarokcore/amarokdcophandler.h index a5f241ee..7a498af6 100644 --- a/amarok/src/amarokcore/amarokdcophandler.h +++ b/amarok/src/amarokcore/amarokdcophandler.h @@ -29,7 +29,7 @@ namespace Amarok class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface { - Q_OBJECT + TQ_OBJECT public: @@ -116,7 +116,7 @@ class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface class DcopPlaylistHandler : public TQObject, virtual public AmarokPlaylistInterface { - Q_OBJECT + TQ_OBJECT public: @@ -147,7 +147,7 @@ class DcopPlaylistHandler : public TQObject, virtual public AmarokPlaylistInterf class DcopPlaylistBrowserHandler : public TQObject, virtual public AmarokPlaylistBrowserInterface { - Q_OBJECT + TQ_OBJECT public: @@ -162,7 +162,7 @@ class DcopPlaylistBrowserHandler : public TQObject, virtual public AmarokPlaylis class DcopContextBrowserHandler : public TQObject, virtual public AmarokContextBrowserInterface { - Q_OBJECT + TQ_OBJECT public: @@ -178,7 +178,7 @@ class DcopContextBrowserHandler : public TQObject, virtual public AmarokContextB class DcopCollectionHandler : public TQObject, virtual public AmarokCollectionInterface { - Q_OBJECT + TQ_OBJECT public: @@ -212,7 +212,7 @@ class DcopCollectionHandler : public TQObject, virtual public AmarokCollectionIn class DcopScriptHandler : public TQObject, virtual public AmarokScriptInterface { - Q_OBJECT + TQ_OBJECT public: @@ -232,7 +232,7 @@ class DcopScriptHandler : public TQObject, virtual public AmarokScriptInterface class DcopDevicesHandler : public TQObject, virtual public AmarokDevicesInterface { - Q_OBJECT + TQ_OBJECT public: @@ -247,7 +247,7 @@ class DcopDevicesHandler : public TQObject, virtual public AmarokDevicesInterfac class DcopMediaBrowserHandler : public TQObject, virtual public AmarokMediaBrowserInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp index 5fc556eb..9f44682d 100644 --- a/amarok/src/amarokcore/crashhandler.cpp +++ b/amarok/src/amarokcore/crashhandler.cpp @@ -293,8 +293,8 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget() static_cast<TQPushButton*>(child("email"))->setDefault( true ); - connect( child( "email" ), TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( child( "close" ), TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( child( "email" ), TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( child( "close" ), TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); setCaption( i18n("Crash Handler") ); setFixedSize( sizeHint() ); diff --git a/amarok/src/analyzers/analyzerbase.cpp b/amarok/src/analyzers/analyzerbase.cpp index b4ff9ac0..2a38538e 100644 --- a/amarok/src/analyzers/analyzerbase.cpp +++ b/amarok/src/analyzers/analyzerbase.cpp @@ -193,7 +193,7 @@ Analyzer::Base2D::Base2D( TQWidget *parent, uint timeout, uint scopeSize ) { setWFlags( TQt::WNoAutoErase ); //no flicker - connect( &m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( draw() ) ); + connect( &m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( draw() ) ); } void @@ -232,7 +232,7 @@ Analyzer::Base2D::paletteChange( const TQPalette& ) Analyzer::Base3D::Base3D( TQWidget *parent, uint timeout, uint 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 diff --git a/amarok/src/analyzers/analyzerbase.h b/amarok/src/analyzers/analyzerbase.h index 5fc7a938..ed0da80e 100644 --- a/amarok/src/analyzers/analyzerbase.h +++ b/amarok/src/analyzers/analyzerbase.h @@ -75,7 +75,7 @@ protected: class Base2D : public Base<TQWidget> { -Q_OBJECT +TQ_OBJECT public: const TQPixmap *background() const { return &m_background; } @@ -107,14 +107,14 @@ private: //This mess is because moc generates an entry for this class despite the #if block -//1. the Q_OBJECT macro must be exposed +//1. the TQ_OBJECT macro must be exposed //2. we have to define the class //3. we have to declare a ctor (to satisfy the inheritance) //4. the slot must also by visible (!) //TODO find out how to stop moc generating a metaobject for this class class Base3D : public Base<TQGLWidget> { - Q_OBJECT + TQ_OBJECT #ifdef HAVE_TQGLWIDGET protected: diff --git a/amarok/src/analyzers/boomanalyzer.cpp b/amarok/src/analyzers/boomanalyzer.cpp index 3f7f8223..3d5a0901 100644 --- a/amarok/src/analyzers/boomanalyzer.cpp +++ b/amarok/src/analyzers/boomanalyzer.cpp @@ -28,17 +28,17 @@ BoomAnalyzer::BoomAnalyzer( TQWidget *parent ) v = int(K_barHeight*1000); new TQLabel( "Bar fall-rate:", box ); - o = new TQSlider( 100, 2000, 100, v, Qt::Horizontal, box ); + o = new TQSlider( 100, 2000, 100, v, TQt::Horizontal, box ); (m = new TQSpinBox( 100, 2000, 1, box ))->setValue( v ); - connect( o, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeK_barHeight( int )) ); - connect( o, TQT_SIGNAL(valueChanged(int)), m, TQT_SLOT(setValue( int )) ); + connect( o, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeK_barHeight( int )) ); + connect( o, TQ_SIGNAL(valueChanged(int)), m, TQ_SLOT(setValue( int )) ); v = int(F_peakSpeed*1000); new TQLabel( "Peak acceleration: ", box ); - o = new TQSlider( 1000, 1300, 50, v, Qt::Horizontal, box ); + o = new TQSlider( 1000, 1300, 50, v, TQt::Horizontal, box ); (m = new TQSpinBox( 1000, 1300, 1, box ))->setValue( v ); - connect( o, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeF_peakSpeed( int )) ); - connect( o, TQT_SIGNAL(valueChanged(int)), m, TQT_SLOT(setValue( int )) ); + connect( o, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeF_peakSpeed( int )) ); + connect( o, TQ_SIGNAL(valueChanged(int)), m, TQ_SLOT(setValue( int )) ); //box->show(); } diff --git a/amarok/src/analyzers/boomanalyzer.h b/amarok/src/analyzers/boomanalyzer.h index 2986e519..e5cbec48 100644 --- a/amarok/src/analyzers/boomanalyzer.h +++ b/amarok/src/analyzers/boomanalyzer.h @@ -13,7 +13,7 @@ class BoomAnalyzer : public Analyzer::Base2D { -Q_OBJECT +TQ_OBJECT public: BoomAnalyzer( TQWidget* ); diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index 2d367e38..55842b9d 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -78,6 +78,8 @@ email : markey@web.de #include <tqtimer.h> //showHyperThreadingWarning() #include <tqtooltip.h> //default tooltip for trayicon +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) + // For the HyperThreading fix #ifdef __linux__ #ifdef SCHEDAFFINITY_SUPPORT @@ -195,7 +197,7 @@ App::App() AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, appleEventProcessorUPP, (long)this, true); #endif - TQTimer::singleShot( 0, this, TQT_SLOT( continueInit() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( continueInit() ) ); } App::~App() @@ -432,48 +434,48 @@ void App::initGlobalShortcuts() EngineController* const ec = EngineController::instance(); 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, - 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, - ec, TQT_SLOT( playPause() ), true, true ); + ec, TQ_SLOT( playPause() ), true, true ); 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, - TQT_TQOBJECT(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, - ec, TQT_SLOT( next() ), true, true ); + ec, TQ_SLOT( next() ), true, true ); 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, - 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, - 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, - 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, - 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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(m_pPlaylistWindow), TQT_SLOT( showHide() ), true, true ); + m_pPlaylistWindow, TQ_SLOT( showHide() ), true, true ); #ifdef TQ_WS_X11 m_pGlobalAccel->insert( "osd", i18n( "Show OSD" ), 0, KKey("WIN+o"), 0, - TQT_TQOBJECT(Amarok::OSD::instance()), TQT_SLOT( forceToggleOSD() ), true, true ); + Amarok::OSD::instance(), TQ_SLOT( forceToggleOSD() ), true, true ); #endif 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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(this), TQT_SLOT( setRating5() ), true, true ); + this, TQ_SLOT( setRating5() ), true, true ); m_pGlobalAccel->setConfigGroup( "Shortcuts" ); m_pGlobalAccel->readSettings( kapp->config() ); @@ -538,12 +540,12 @@ void App::fixHyperThreading() #endif //SCHEDAFFINITY_3PARAMS { 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; } #else //SCHEDAFFINITY_SUPPORT 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 } else { debug() << "Workaround not enabled" << endl; } @@ -589,7 +591,7 @@ class ID3v1StringHandler : public TagLib::ID3v1::StringHandler virtual TagLib::ByteVector render( const TagLib::String &ts ) const { - const TQCString qcs = m_codec->fromUnicode( TStringToQString(ts) ); + const TQCString qcs = m_codec->fromUnicode( TStringToTQString(ts) ); return TagLib::ByteVector( qcs, qcs.length() ); } @@ -639,7 +641,7 @@ void App::applySettings( bool firstTime ) 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 //TODO get this to work! @@ -777,14 +779,14 @@ App::continueInit() CollectionDB::instance()->checkDatabase(); m_pMediaDeviceManager = MediaDeviceManager::instance(); - m_pGlobalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + m_pGlobalAccel = new TDEGlobalAccel( this ); m_pPlaylistWindow = new PlaylistWindow(); #ifdef TQ_WS_X11 m_pTray = new Amarok::TrayIcon( m_pPlaylistWindow ); #endif m_pPlaylistWindow->init(); //creates the playlist, browsers, etc. //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(); //load previous playlist in separate thread if ( restoreSession && AmarokConfig::savePlaylist() ) @@ -835,11 +837,11 @@ App::continueInit() // (e.g. deleted collection.db) if ( CollectionDB::instance()->isEmpty() ) { - //connect( collDB, TQT_SIGNAL( databaseUpdateDone() ), collDB, TQT_SLOT( startScan() ) ); + //connect( collDB, TQ_SIGNAL( databaseUpdateDone() ), collDB, TQ_SLOT( startScan() ) ); collDB->startScan(); } else if ( AmarokConfig::monitorChanges() ) - //connect( collDB, TQT_SIGNAL( databaseUpdateDone() ), collDB, TQT_SLOT( scanModifiedDirs() ) ); + //connect( collDB, TQ_SIGNAL( databaseUpdateDone() ), collDB, TQ_SLOT( scanModifiedDirs() ) ); collDB->scanModifiedDirs(); @@ -852,8 +854,8 @@ App::applyColorScheme() TQColorGroup group; using Amarok::ColorScheme::AltBase; int h, s, v; - TQWidget* const browserBar = TQT_TQWIDGET( playlistWindow()->child( "BrowserBar" ) ); - TQWidget* const contextBrowser = TQT_TQWIDGET( ContextBrowser::instance() ); + TQWidget* const browserBar = static_cast<TQWidget*>( playlistWindow()->child( "BrowserBar" ) ); + TQWidget* const contextBrowser = ContextBrowser::instance(); if( AmarokConfig::schemeKDE() ) { @@ -949,7 +951,7 @@ App::applyColorScheme() // set the TDEListView alternate colours TQObjectList* const list = playlistWindow()->queryList( "TDEListView" ); for( TQObject *o = list->first(); o; o = list->next() ) - static_cast<TDEListView*>(TQT_TQWIDGET(o))->setAlternateBackground( AltBase ); + static_cast<TDEListView*>(o)->setAlternateBackground( AltBase ); delete list; //heap allocated! } @@ -1006,7 +1008,7 @@ bool Amarok::genericEventHandler( TQWidget *recipient, TQEvent *e ) //please don't remove! case TQEvent::Wheel: { - #define e TQT_TQWHEELEVENT(e) + #define e static_cast<TQWheelEvent*>(e) //this behaviour happens for the systray and the player window //to override one, override it in that class @@ -1043,7 +1045,7 @@ bool Amarok::genericEventHandler( TQWidget *recipient, TQEvent *e ) //KDE policy states we should hide to tray and not quit() when the //close window button is pushed for the main widget - TQT_TQCLOSEEVENT(e)->accept(); //if we don't do this the info box appears on quit()! + static_cast<TQCloseEvent*>(e)->accept(); //if we don't do this the info box appears on quit()! if( AmarokConfig::showTrayIcon() && !e->spontaneous() && !kapp->sessionSaving() ) { @@ -1136,7 +1138,7 @@ void App::slotConfigAmarok( const TQCString& page ) //TDEConfigDialog didn't find an instance of this dialog, so lets create it : dialog = new AmarokConfigDialog( m_pPlaylistWindow, "settings", AmarokConfig::self() ); - connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_SLOT(applySettings()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), TQ_SLOT(applySettings()) ); } //FIXME it seems that if the dialog is on a different desktop it gets lost @@ -1185,7 +1187,7 @@ void App::firstRunWizard() setTopWidget( &wizard ); TDEConfigDialogManager* config = new TDEConfigDialogManager(&wizard, AmarokConfig::self(), "wizardconfig"); 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" ) ) ); if( wizard.exec() != TQDialog::Rejected ) @@ -1232,7 +1234,7 @@ TDEIO::Job *App::trashFiles( const KURL::List &files ) #if KDE_IS_VERSION( 3, 3, 91 ) TDEIO::Job *job = TDEIO::trash( files, true /*show progress*/ ); Amarok::StatusBar::instance()->newProgressOperation( job ).setDescription( i18n("Moving files to trash") ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotTrashResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotTrashResult( TDEIO::Job* ) ) ); return job; #else TDEIO::Job* job = TDEIO::move( files, TDEGlobalSettings::trashPath() ); @@ -1269,8 +1271,8 @@ void App::slotTrashResult( TDEIO::Job *job ) TQWidget *App::mainWindow() const { - return AmarokConfig::showPlayerWindow() ? TQT_TQWIDGET( m_pPlayerWindow ) - : TQT_TQWIDGET( m_pPlaylistWindow ); + return AmarokConfig::showPlayerWindow() ? static_cast<TQWidget*>( m_pPlayerWindow ) + : static_cast<TQWidget*>( m_pPlaylistWindow ); } void App::quit() @@ -1279,7 +1281,7 @@ void App::quit() if( MediaBrowser::instance()->blockQuit() ) { // 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; } TDEApplication::quit(); diff --git a/amarok/src/app.h b/amarok/src/app.h index 4c8ad158..1679ecea 100644 --- a/amarok/src/app.h +++ b/amarok/src/app.h @@ -41,7 +41,7 @@ class MediaDeviceManager; class LIBAMAROK_EXPORT App : public TDEApplication, public EngineObserver { - Q_OBJECT + TQ_OBJECT public: App(); diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp index ef1babf4..1bc9b7a5 100644 --- a/amarok/src/browserbar.cpp +++ b/amarok/src/browserbar.cpp @@ -44,7 +44,7 @@ namespace Amarok virtual void paintEvent( TQPaintEvent* ) { TQPainter p( this ); - parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal ); + parentWidget()->style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal ); } virtual void styleChange( TQStyle& ) @@ -54,7 +54,7 @@ namespace Amarok virtual void mouseMoveEvent( TQMouseEvent *e ) { - static_cast<BrowserBar*>(TQT_TQWIDGET(parent()))->mouseMovedOverSplitter( e ); + static_cast<BrowserBar*>(parent())->mouseMovedOverSplitter( e ); } }; } @@ -69,10 +69,10 @@ BrowserBar::BrowserBar( TQWidget *parent ) , m_browserBox( new TQVBox( this ) ) , m_currentIndex( -1 ) , m_lastIndex( -1 ) - , m_mapper( new TQSignalMapper( TQT_TQOBJECT(this) ) ) + , m_mapper( new TQSignalMapper( this ) ) { 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. TQToolTip::add (m_tabManagementButton, i18n("Manage tabs")); @@ -105,7 +105,7 @@ BrowserBar::BrowserBar( TQWidget *parent ) m_divider->hide(); 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 )) ); @@ -255,12 +255,12 @@ BrowserBar::addBrowser( const TQString &identifier, TQWidget *widget, const TQSt m_tabBar->appendTab( SmallIcon( icon ), id, title, identifier ); tab = m_tabBar->tab( id ); - tab->setFocusPolicy( TQ_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 - connect( tab, TQT_SIGNAL(clicked()), m_mapper, TQT_SLOT(map()) ); - m_mapper->setMapping( TQT_TQOBJECT(tab), id ); - connect( tab, TQT_SIGNAL(initiateDrag ( int ) ), this, TQT_SLOT( showBrowser( int )) ); + connect( tab, TQ_SIGNAL(clicked()), m_mapper, TQ_SLOT(map()) ); + m_mapper->setMapping( tab, id ); + connect( tab, TQ_SIGNAL(initiateDrag ( int ) ), this, TQ_SLOT( showBrowser( int )) ); m_browsers.push_back( widget ); } @@ -273,7 +273,7 @@ BrowserBar::removeMediaBrowser( TQWidget *widget ) m_browsers.erase( it ); TQWidget *tab; tab = m_tabBar->tab( m_browserIds["MediaBrowser"] ); - m_mapper->removeMappings( TQT_TQOBJECT(tab) ); + m_mapper->removeMappings( tab ); m_tabBar->removeTab( m_browserIds["MediaBrowser"] ); } diff --git a/amarok/src/browserbar.h b/amarok/src/browserbar.h index 474b4f69..9221d8f0 100644 --- a/amarok/src/browserbar.h +++ b/amarok/src/browserbar.h @@ -32,7 +32,7 @@ class TQVBox; class BrowserBar : public TQWidget, public EngineObserver { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/clicklineedit.h b/amarok/src/clicklineedit.h index 6aff52b6..b437b2e5 100644 --- a/amarok/src/clicklineedit.h +++ b/amarok/src/clicklineedit.h @@ -32,7 +32,7 @@ */ class ClickLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage ) public: diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index 3ca7023c..8da6556a 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -33,8 +33,6 @@ #include "threadmanager.h" #include "qstringx.h" -#include <taglib/tfile.h> //TagLib::File::isWritable - #include <unistd.h> //CollectionView ctor #include <tqapplication.h> @@ -108,8 +106,8 @@ CollectionBrowser::CollectionBrowser( const char* name ) searchToolBar->setStretchableWidget( m_searchEdit ); m_searchEdit->setFrame( TQFrame::Sunken ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClearFilter() ) ); - connect( filterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFilter() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClearFilter() ) ); + connect( filterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFilter() ) ); TQToolTip::add( button, i18n( "Clear search field" ) ); TQToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search in the collection" ) ); @@ -149,10 +147,10 @@ CollectionBrowser::CollectionBrowser( const char* name ) m_view = new CollectionView( this ); m_view->installEventFilter( this ); - m_configureAction = new TDEAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, TQT_TQOBJECT(this), TQT_SLOT( setupDirs() ), ac, "Configure" ); - m_treeViewAction = new TDERadioAction( i18n( "Tree View" ), "view_tree", 0, TQT_TQOBJECT(m_view), TQT_SLOT( setTreeMode() ), ac, "Tree View" ); - m_flatViewAction = new TDERadioAction( i18n( "Flat View" ), "view_detailed", 0, TQT_TQOBJECT(m_view), TQT_SLOT( setFlatMode() ), ac, "Flat View" ); - m_ipodViewAction = new TDERadioAction( i18n( "iPod View" ), Amarok::icon("device"), 0, TQT_TQOBJECT(m_view), TQT_SLOT( setIpodMode() ), ac, "iPod View" ); + 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, TQ_SLOT( setTreeMode() ), ac, "Tree 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, TQ_SLOT( setIpodMode() ), ac, "iPod View" ); m_treeViewAction->setExclusiveGroup("view mode"); m_flatViewAction->setExclusiveGroup("view mode"); m_ipodViewAction->setExclusiveGroup("view mode"); @@ -169,7 +167,7 @@ CollectionBrowser::CollectionBrowser( const char* name ) break; } - m_showDividerAction = new TDEToggleAction( i18n( "Show Divider" ), "format-justify-left", 0, TQT_TQOBJECT(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); @@ -178,11 +176,11 @@ CollectionBrowser::CollectionBrowser( const char* name ) // browser window; see the "For iPod-style navigation" comments below. m_ipodDecrement = new TDEAction( i18n( "Browse backward" ), TQIconSet( m_view->ipodDecrementIcon(), TQIconSet::Small ), - 0, TQT_TQOBJECT(m_view), TQT_SLOT( decrementDepth() ), ac, + 0, m_view, TQ_SLOT( decrementDepth() ), ac, "iPod Decrement" ); m_ipodIncrement = new TDEAction( i18n( "Browse forward" ), TQIconSet( m_view->ipodIncrementIcon(), TQIconSet::Small ), - 0, TQT_TQOBJECT(m_view), TQT_SLOT( incrementDepth() ), ac, + 0, m_view, TQ_SLOT( incrementDepth() ), ac, "iPod Increment" ); m_ipodDecrement->plug( m_ipodToolbar ); m_ipodIncrement->plug( m_ipodToolbar ); @@ -195,17 +193,17 @@ CollectionBrowser::CollectionBrowser( const char* name ) m_tagfilterMenuButton->setDelayed( false ); // FIXME: either both or nothing //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(); m_categoryMenu = m_tagfilterMenuButton->popupMenu(); - m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtist ); - m_categoryMenu->insertItem( i18n( "Artist / Album" ), m_view, TQT_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( "Album" ), m_view, TQT_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 / Album" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdGenreArtistAlbum ); + m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdArtist ); + 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, TQ_SLOT( presetMenu( int ) ), 0, IdArtistVisYearAlbum ); + m_categoryMenu->insertItem( i18n( "Album" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdAlbum ); + m_categoryMenu->insertItem( i18n( "Genre / Artist" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdGenreArtist ); + m_categoryMenu->insertItem( i18n( "Genre / Artist / Album" ), m_view, TQ_SLOT( presetMenu( int ) ), 0, IdGenreArtistAlbum ); m_categoryMenu->insertSeparator(); @@ -213,42 +211,42 @@ CollectionBrowser::CollectionBrowser( const char* name ) m_categoryMenu->insertItem( i18n( "&Second Level"), m_cat2Menu ); 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( "(Y&ear) - Album" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdVisYearAlbum); - m_cat1Menu ->insertItem( i18n( "A&rtist"), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdArtist ); - m_cat1Menu ->insertItem( i18n( "&Composer"), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdComposer ); - m_cat1Menu ->insertItem( i18n( "&Genre" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdGenre ); - m_cat1Menu ->insertItem( i18n( "&Year" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdYear ); - m_cat1Menu ->insertItem( i18n( "&Label" ), m_view, TQT_SLOT( cat1Menu( int ) ), 0, IdLabel ); + m_cat1Menu ->insertItem( i18n( "&Album" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdAlbum ); + m_cat1Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdVisYearAlbum); + m_cat1Menu ->insertItem( i18n( "A&rtist"), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdArtist ); + m_cat1Menu ->insertItem( i18n( "&Composer"), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdComposer ); + m_cat1Menu ->insertItem( i18n( "&Genre" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdGenre ); + m_cat1Menu ->insertItem( i18n( "&Year" ), m_view, TQ_SLOT( cat1Menu( int ) ), 0, IdYear ); + 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 ->insertItem( i18n( "&Album" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdAlbum ); - m_cat2Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdVisYearAlbum); - m_cat2Menu ->insertItem( i18n( "A&rtist" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdArtist ); - m_cat2Menu ->insertItem( i18n( "&Composer"), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdComposer ); - m_cat2Menu ->insertItem( i18n( "&Genre" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdGenre ); - m_cat2Menu ->insertItem( i18n( "&Year" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdYear ); - m_cat2Menu ->insertItem( i18n( "&Label" ), m_view, TQT_SLOT( cat2Menu( int ) ), 0, IdLabel ); - - m_cat3Menu ->insertItem( i18n( "&None" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdNone ); + m_cat2Menu ->insertItem( i18n( "&Album" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdAlbum ); + m_cat2Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdVisYearAlbum); + m_cat2Menu ->insertItem( i18n( "A&rtist" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdArtist ); + m_cat2Menu ->insertItem( i18n( "&Composer"), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdComposer ); + m_cat2Menu ->insertItem( i18n( "&Genre" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdGenre ); + m_cat2Menu ->insertItem( i18n( "&Year" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdYear ); + m_cat2Menu ->insertItem( i18n( "&Label" ), m_view, TQ_SLOT( cat2Menu( int ) ), 0, IdLabel ); + + m_cat3Menu ->insertItem( i18n( "&None" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdNone ); m_cat3Menu ->insertSeparator(); - m_cat3Menu ->insertItem( i18n( "A&lbum" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdAlbum ); - m_cat3Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdVisYearAlbum); - m_cat3Menu ->insertItem( i18n( "A&rtist" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdArtist ); - m_cat3Menu ->insertItem( i18n( "&Composer"), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdComposer ); - m_cat3Menu ->insertItem( i18n( "&Genre" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdGenre ); - m_cat3Menu ->insertItem( i18n( "&Year" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdYear ); - m_cat3Menu ->insertItem( i18n( "&Label" ), m_view, TQT_SLOT( cat3Menu( int ) ), 0, IdLabel ); + m_cat3Menu ->insertItem( i18n( "A&lbum" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdAlbum ); + m_cat3Menu ->insertItem( i18n( "(Y&ear) - Album" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdVisYearAlbum); + m_cat3Menu ->insertItem( i18n( "A&rtist" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdArtist ); + m_cat3Menu ->insertItem( i18n( "&Composer"), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdComposer ); + m_cat3Menu ->insertItem( i18n( "&Genre" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdGenre ); + m_cat3Menu ->insertItem( i18n( "&Year" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdYear ); + m_cat3Menu ->insertItem( i18n( "&Label" ), m_view, TQ_SLOT( cat3Menu( int ) ), 0, IdLabel ); m_view->cat1Menu( m_view->m_cat1, false ); m_view->cat2Menu( m_view->m_cat2, false ); m_view->cat3Menu( m_view->m_cat3, false ); m_view->setViewMode( m_view->m_viewMode ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSetFilter() ) ); - connect( m_searchEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotSetFilterTimeout() ) ); - connect( m_timeFilter, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSetFilter() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSetFilter() ) ); + connect( m_searchEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotSetFilterTimeout() ) ); + connect( m_timeFilter, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotSetFilter() ) ); setFocusProxy( m_view ); //default object to get focus } @@ -258,8 +256,8 @@ CollectionBrowser::slotClearFilter() //SLOT { m_searchEdit->clear(); kapp->processEvents(); //Let the search bar redraw fully. - TQTimer::singleShot( 0, this, TQT_SLOT( slotSetFilter() ) ); //Filter instantly - TQTimer::singleShot( 0, m_view, TQT_SLOT( slotEnsureSelectedItemVisible() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotSetFilter() ) ); //Filter instantly + TQTimer::singleShot( 0, m_view, TQ_SLOT( slotEnsureSelectedItemVisible() ) ); } void @@ -287,15 +285,15 @@ CollectionBrowser::slotSetFilter( const TQString &filter ) //SLOT { m_searchEdit->setText( filter ); kapp->processEvents(); //Let the search bar redraw fully. - TQTimer::singleShot( 0, this, TQT_SLOT( slotSetFilter() ) ); //Filter instantly - TQTimer::singleShot( 0, m_view, TQT_SLOT( slotEnsureSelectedItemVisible() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotSetFilter() ) ); //Filter instantly + TQTimer::singleShot( 0, m_view, TQ_SLOT( slotEnsureSelectedItemVisible() ) ); } void CollectionBrowser::slotEditFilter() //SLOT { 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() ) m_searchEdit->setText( cod->filter() ); delete cod; @@ -334,9 +332,9 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e ) //there are a few keypresses that we intercept - #define e TQT_TQKEYEVENT(e) + #define e static_cast<TQKeyEvent*>(e) - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_searchEdit) ) //the search lineedit + if( o == m_searchEdit ) //the search lineedit { switch( e->key() ) { @@ -359,7 +357,7 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e ) //Immediately filter and add results m_timer->stop(); m_returnPressed = true; - TQTimer::singleShot( 0, this, TQT_SLOT( slotSetFilter() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotSetFilter() ) ); } else { @@ -494,36 +492,36 @@ CollectionView::CollectionView( CollectionBrowser* parent ) //</READ CONFIG> TDEActionCollection* ac = new TDEActionCollection( this ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "collectionview_select_all" ); - - connect( CollectionDB::instance(), TQT_SIGNAL( scanStarted() ), - this, TQT_SLOT( scanStarted() ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), - this, TQT_SLOT( scanDone( bool ) ) ); - connect( BrowserBar::instance(), TQT_SIGNAL( browserActivated( int ) ), - this, TQT_SLOT( renderView() ) ); // renderView() checks if current tab is this - connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), - this, TQT_SLOT( ratingChanged( const TQString&, int ) ) ); - - connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ), - this, TQT_SLOT( slotExpand( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem* ) ), - this, TQT_SLOT( slotCollapse( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( invokeItem( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( invokeItem( TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( ipodItemClicked( TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( triggerUpdate() ) ); - - connect( MountPointManager::instance(), TQT_SIGNAL( mediumConnected( int ) ), - this, TQT_SLOT( databaseChanged() ) ); - connect( MountPointManager::instance(), TQT_SIGNAL( mediumRemoved( int ) ), - this, TQT_SLOT( databaseChanged() ) ); + KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "collectionview_select_all" ); + + connect( CollectionDB::instance(), TQ_SIGNAL( scanStarted() ), + this, TQ_SLOT( scanStarted() ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( scanDone( bool ) ), + this, TQ_SLOT( scanDone( bool ) ) ); + connect( BrowserBar::instance(), TQ_SIGNAL( browserActivated( int ) ), + this, TQ_SLOT( renderView() ) ); // renderView() checks if current tab is this + connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ), + this, TQ_SLOT( ratingChanged( const TQString&, int ) ) ); + + connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ), + this, TQ_SLOT( slotExpand( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem* ) ), + this, TQ_SLOT( slotCollapse( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( invokeItem( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( invokeItem( TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( ipodItemClicked( TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( triggerUpdate() ) ); + + connect( MountPointManager::instance(), TQ_SIGNAL( mediumConnected( int ) ), + this, TQ_SLOT( databaseChanged() ) ); + connect( MountPointManager::instance(), TQ_SIGNAL( mediumRemoved( int ) ), + this, TQ_SLOT( databaseChanged() ) ); } @@ -1186,7 +1184,7 @@ void CollectionView::ratingChanged( const TQString&, int ) { m_dirty = true; - TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); + TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) ); } void @@ -1372,7 +1370,7 @@ CollectionView::ipodItemClicked( TQListViewItem *item, const TQPoint&, int c ) return; // 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 +1467,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // 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 menu.setItemEnabled( FETCH, false ); #endif @@ -1489,7 +1487,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // menu.insertItem( SmallIconSet( Amarok::icon( "info" ) ) , 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 ) ) { @@ -1551,7 +1549,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // CollectionDB::instance()->emitFileDeleted( (*it).path() ); } m_dirty = true; - TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); + TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) ); break; } } @@ -1759,7 +1757,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, else { m_organizeURLs += Amarok::recursiveUrlExpand( urls ); - Amarok::StatusBar::instance()->incrementProgressTotalSteps( TQT_TQOBJECT(this), urls.count() ); + Amarok::StatusBar::instance()->incrementProgressTotalSteps( this, urls.count() ); return; } } @@ -1791,7 +1789,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, dialog.formatEdit->setText( AmarokConfig::customScheme() ); dialog.regexpEdit->setText( AmarokConfig::replacementRegexp() ); 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() ) { @@ -1831,9 +1829,9 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, m_organizeURLs = Amarok::recursiveUrlExpand( urls ); m_organizeCopyMode = copy; CollectionDB::instance()->createTables( true ); // create temp tables - Amarok::StatusBar::instance()->newProgressOperation( TQT_TQOBJECT(this) ) + Amarok::StatusBar::instance()->newProgressOperation( this ) .setDescription( caption ) - .setAbortSlot( TQT_TQOBJECT(this), TQT_SLOT( cancelOrganizingFiles() ) ) + .setAbortSlot( this, TQ_SLOT( cancelOrganizingFiles() ) ) .setTotalSteps( m_organizeURLs.count() ); while( !m_organizeURLs.empty() && !m_organizingFileCancelled ) @@ -1846,7 +1844,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, } m_organizeURLs.pop_front(); - Amarok::StatusBar::instance()->incrementProgress( TQT_TQOBJECT(this) ); + Amarok::StatusBar::instance()->incrementProgress( this ); if( m_organizingFileCancelled ) m_organizeURLs.clear(); } @@ -1856,7 +1854,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, CollectionDB::instance()->dropTables( true ); // and drop them // 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 ) { @@ -1886,8 +1884,8 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, } m_dirty = true; - TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); - Amarok::StatusBar::instance()->endProgressOperation( TQT_TQOBJECT(this) ); + TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) ); + Amarok::StatusBar::instance()->endProgressOperation( this ); } } @@ -3347,7 +3345,7 @@ CollectionView::setCompilation( const KURL::List &urls, bool compilation ) CollectionDB::instance()->setCompilation( urls, compilation, false ); foreachType( KURL::List, urls ) { - if ( !TagLib::File::isWritable( TQFile::encodeName( ( *it ).path() ) ) ) + if (access((*it).path().local8Bit().data(), R_OK|W_OK)) continue; MetaBundle mb( *it ); @@ -3619,9 +3617,9 @@ CollectionView::viewportResizeEvent( TQResizeEvent* e) bool CollectionView::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) + if( o == header() && e->type() == TQEvent::MouseButtonPress - && TQT_TQMOUSEEVENT( e )->button() == Qt::RightButton + && static_cast<TQMouseEvent*>( e )->button() == TQt::RightButton && m_viewMode == modeFlatView ) { TDEPopupMenu popup; @@ -3639,7 +3637,7 @@ CollectionView::eventFilter( TQObject* o, TQEvent* e ) popup.setItemVisible( Score, AmarokConfig::useScores() ); popup.setItemVisible( Rating, AmarokConfig::useRatings() ); - const int returnID = popup.exec( TQT_TQMOUSEEVENT(e)->globalPos() ); + const int returnID = popup.exec( static_cast<TQMouseEvent*>(e)->globalPos() ); if ( returnID != -1 ) { @@ -3849,7 +3847,7 @@ CollectionView::renderFlatModeView( bool /*=false*/ ) { TQDateTime time = TQDateTime(); time.setTime_t( (*it).toUInt() ); - item->setText( *it_c, time.date().toString( Qt::LocalDate ) ); + item->setText( *it_c, time.date().toString( TQt::LocalDate ) ); break; } case Playcount: diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h index 09d5a60d..7be826a6 100644 --- a/amarok/src/collectionbrowser.h +++ b/amarok/src/collectionbrowser.h @@ -58,7 +58,7 @@ namespace CollectionBrowserIds class CollectionBrowser: public TQVBox { - Q_OBJECT + TQ_OBJECT friend class CollectionView; @@ -191,7 +191,7 @@ class CollectionItem : public TDEListViewItem { class CollectionView : public TDEListView, public DropProxyTarget { - Q_OBJECT + TQ_OBJECT friend class CollectionBrowser; @@ -380,7 +380,7 @@ class CollectionView : public TDEListView, public DropProxyTarget // why is signal detailsClicked() missing from KDialogBase? class OrganizeCollectionDialogBase : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: OrganizeCollectionDialogBase( TQWidget *parent=0, const char *name=0, bool modal=true, diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index 024779e4..3f4ec328 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -184,7 +184,7 @@ INotify::doJob() 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 ) { // 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 @@ -255,21 +255,21 @@ CollectionDB::CollectionDB() cacheCoverDir().remove( *it ); - connect( this, TQT_SIGNAL(fileMoved(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(aftMigratePermanentTablesUrl(const TQString&, const TQString&, const TQString&)) ); - connect( this, TQT_SIGNAL(uniqueIdChanged(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(aftMigratePermanentTablesUniqueId(const TQString&, const TQString&, const TQString&)) ); + connect( this, TQ_SIGNAL(fileMoved(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(aftMigratePermanentTablesUrl(const TQString&, const TQString&, const TQString&)) ); + connect( this, TQ_SIGNAL(uniqueIdChanged(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& ) ), - TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ) ); - connect( Scrobbler::instance(), TQT_SIGNAL( similarArtistsFetched( const TQString&, const TQStringList& ) ), - this, TQT_SLOT( similarArtistsFetched( const TQString&, const TQStringList& ) ) ); + connect( this, TQ_SIGNAL( coverRemoved( const TQString&, const TQString& ) ), + TQ_SIGNAL( coverChanged( const TQString&, const TQString& ) ) ); + connect( Scrobbler::instance(), TQ_SIGNAL( 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 // 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(); m_aftEnabledPersistentTables << "lyrics" << "statistics" << "tags_labels"; } @@ -1782,7 +1782,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) coverPm[i] = coverPm[i-1]; TQImage im( locate( "data","amarok/images/more_albums.png" ) ); - coverPm[0].convertFromImage( im.smoothScale( coverW, coverH, TQ_ScaleMin ) ); + coverPm[0].convertFromImage( im.smoothScale( coverW, coverH, TQImage::ScaleMin ) ); } pixmapH = coverPm[0].height(); @@ -1816,8 +1816,8 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) TQPainter p; p.begin( &pmtext ); p.fillRect( 0, 0, pixmapW, fontH, TQBrush( TQt::black ) ); // border - p.fillRect( 1, 1, pixmapW-margin, fontH-margin, palette.brush( TQPalette::Normal, TQColorGroup::Background ) ); - p.setBrush( palette.color( TQPalette::Normal, TQColorGroup::Text ) ); + p.fillRect( 1, 1, pixmapW-margin, fontH-margin, palette.brush( TQPalette::Active, TQColorGroup::Background ) ); + p.setBrush( palette.color( TQPalette::Active, TQColorGroup::Text ) ); p.setFont( font ); p.drawText( margin, fm.ascent() + 1, text ); p.end(); @@ -1834,7 +1834,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) // compose image p.begin( &pmdrag ); - p.setBackgroundMode( Qt::TransparentMode ); + p.setBackgroundMode( TQt::TransparentMode ); for ( int i = 0; i < covers; i++ ) bitBlt( &pmdrag, i * coverSpacing, i * coverSpacing, &coverPm[i], 0, TQt::CopyROP ); @@ -1945,7 +1945,7 @@ CollectionDB::podcastImage( const TQString &remoteURL, const bool withShadow, ui { TDEIO::Job *job = TDEIO::storedGet( url, false, false ); 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* ) ) ); } } @@ -2131,7 +2131,7 @@ CollectionDB::findAmazonImage( const TQString &artist, const TQString &album, ui if ( width > 1 ) { TQImage img( imageDir.filePath( key ) ); - img.smoothScale( width, width, TQ_ScaleMin ).save( cacheCoverDir().filePath( widthKey + key ), "PNG" ); + img.smoothScale( width, width, TQImage::ScaleMin ).save( cacheCoverDir().filePath( widthKey + key ), "PNG" ); return cacheCoverDir().filePath( widthKey + key ); } @@ -2207,7 +2207,7 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, if ( !TQFile::exists( path ) ) { TQImage img( image ); - img.smoothScale( width, width, TQ_ScaleMin ).save( path, "PNG" ); + img.smoothScale( width, width, TQImage::ScaleMin ).save( path, "PNG" ); } return path; } @@ -2373,7 +2373,7 @@ CollectionDB::notAvailCover( const bool withShadow, int width ) s = cacheCoverDir().filePath( widthKey + "nocover.png" ); else { - m_noCover.smoothScale( width, width, TQ_ScaleMin ).save( cacheCoverDir().filePath( widthKey + "nocover.png" ), "PNG" ); + m_noCover.smoothScale( width, width, TQImage::ScaleMin ).save( cacheCoverDir().filePath( widthKey + "nocover.png" ), "PNG" ); s = cacheCoverDir().filePath( widthKey + "nocover.png" ); } @@ -4018,13 +4018,13 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b { 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; while( m_waitForFileOperation ) { 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() ); 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 ); } - 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; while( m_waitForFileOperation ) { 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() ); job->kill(); @@ -4429,7 +4429,7 @@ CollectionDB::setCompilation( const KURL::List &urls, bool enabled, bool updateV // Update the Collection-Browser view, // using TQTimer to make sure we don't manipulate the GUI from a thread 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, // using TQTimer to make sure we don't manipulate the GUI from a thread if ( updateView ) - TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( databaseChanged() ) ); + TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( databaseChanged() ) ); if( art || alb ) emit tagsChanged( values[12], values[14] ); @@ -4934,7 +4934,7 @@ CollectionDB::fetchCover( TQWidget* parent, const TQString& artist, const TQStri itemCoverMap->insert( item, fetcher ); 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->startFetch(); #endif @@ -5362,7 +5362,7 @@ CollectionDB::checkDatabase() TQLabel *label = new TQLabel( i18n( "Updating database" ), dialog ); dialog->setMainWidget( label ); 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 kapp->processEvents(); 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 // rescan again, now. if ( m_rescanRequired ) - TQTimer::singleShot( 0, CollectionDB::instance(), TQT_SLOT( scanMonitor() ) ); + TQTimer::singleShot( 0, CollectionDB::instance(), TQ_SLOT( scanMonitor() ) ); } else { @@ -5856,7 +5856,7 @@ CollectionDB::loadHashFile( const TQCString& hash, uint width ) } else if ( TQFileInfo( full ).isReadable() ) { //debug() << "loadHashFile: scaling: " << full << endl; TQImage image( full ); - if ( image.smoothScale( width, width, TQ_ScaleMin ).save( path, "PNG" ) ) { + if ( image.smoothScale( width, width, TQImage::ScaleMin ).save( path, "PNG" ) ) { //debug() << "loadHashFile: scaled: " << path << endl; return path; } diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h index edc39f75..42071e0c 100644 --- a/amarok/src/collectiondb.h +++ b/amarok/src/collectiondb.h @@ -194,7 +194,7 @@ class PostgresqlConnection : public DbConnection class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver { - Q_OBJECT + TQ_OBJECT friend class SimilarArtistsInsertionJob; @@ -657,7 +657,7 @@ class INotify : public JobBase class INotify : public ThreadManager::DependentJob #endif // Q_MOC_RUN { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/collectionscanner/collectionscanner.cpp b/amarok/src/collectionscanner/collectionscanner.cpp index 7dace13a..ce3dee14 100644 --- a/amarok/src/collectionscanner/collectionscanner.cpp +++ b/amarok/src/collectionscanner/collectionscanner.cpp @@ -60,13 +60,13 @@ CollectionScanner::CollectionScanner( const TQStringList& folders, , m_pause( false ) { DcopCollectionScannerHandler* dcsh = new DcopCollectionScannerHandler(); - connect( dcsh, TQT_SIGNAL(pauseRequest()), this, TQT_SLOT(pause()) ); - connect( dcsh, TQT_SIGNAL(unpauseRequest()), this, TQT_SLOT(resume()) ); + connect( dcsh, TQ_SIGNAL(pauseRequest()), this, TQ_SLOT(pause()) ); + connect( dcsh, TQ_SIGNAL(unpauseRequest()), this, TQ_SLOT(resume()) ); kapp->setName( TQString( "amarokcollectionscanner" ).ascii() ); if( !restart ) TQFile::remove( m_logfile ); - TQTimer::singleShot( 0, this, TQT_SLOT( doJob() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doJob() ) ); } @@ -108,7 +108,7 @@ CollectionScanner::doJob() //SLOT << endl; else { TQTextStream logStream; - logStream.setDevice(TQT_TQIODEVICE(&logFile)); + logStream.setDevice(&logFile); logStream.setEncoding(TQTextStream::UnicodeUTF8); lastFile = logStream.read(); logFile.close(); @@ -120,7 +120,7 @@ CollectionScanner::doJob() //SLOT << " read-only" << endl; else { TQTextStream folderStream; - folderStream.setDevice(TQT_TQIODEVICE(&folderFile)); + folderStream.setDevice(&folderFile); folderStream.setEncoding(TQTextStream::UnicodeUTF8); entries = TQStringList::split( "\n", folderStream.read() ); } diff --git a/amarok/src/collectionscanner/collectionscanner.h b/amarok/src/collectionscanner/collectionscanner.h index cd38b241..77c11f1e 100644 --- a/amarok/src/collectionscanner/collectionscanner.h +++ b/amarok/src/collectionscanner/collectionscanner.h @@ -41,7 +41,7 @@ typedef TQMap<TQString, TQString> AttributeMap; class CollectionScanner : public TDEApplication { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/collectionscanner/collectionscannerdcophandler.h b/amarok/src/collectionscanner/collectionscannerdcophandler.h index 57638447..1a4eb6b2 100644 --- a/amarok/src/collectionscanner/collectionscannerdcophandler.h +++ b/amarok/src/collectionscanner/collectionscannerdcophandler.h @@ -26,7 +26,7 @@ class DcopCollectionScannerHandler : public TQObject, virtual public CollectionScannerInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/columnlist.cpp b/amarok/src/columnlist.cpp index ffb6d35e..ce3c46d2 100644 --- a/amarok/src/columnlist.cpp +++ b/amarok/src/columnlist.cpp @@ -65,11 +65,11 @@ ColumnList::ColumnList( TQWidget *parent, const char *name ) m_up = new KPushButton( KGuiItem( TQString(), "go-up" ), buttonbox ); 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 ); 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->addColumn(""); @@ -81,9 +81,9 @@ ColumnList::ColumnList( TQWidget *parent, const char *name ) m_list->setDragEnabled( true ); m_list->setDropVisualizer( true ); m_list->setDropVisualizerWidth( 3 ); - connect( m_list, TQT_SIGNAL( moved() ), this, TQT_SLOT( updateUI() ) ); - connect( m_list, TQT_SIGNAL( moved() ), this, TQT_SLOT( setChanged() ) ); - connect( m_list, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), this, TQT_SLOT( updateUI() ) ); + connect( m_list, TQ_SIGNAL( moved() ), this, TQ_SLOT( updateUI() ) ); + connect( m_list, TQ_SIGNAL( moved() ), this, TQ_SLOT( setChanged() ) ); + connect( m_list, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), this, TQ_SLOT( updateUI() ) ); TQHeader* const h = Playlist::instance()->header(); for( int i = h->count() - 1; i >= 0; --i ) @@ -176,7 +176,7 @@ ColumnsDialog::ColumnsDialog() { setMainWidget( m_list ); enableButtonApply( false ); - connect( m_list, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( m_list, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); } ColumnsDialog::~ColumnsDialog() diff --git a/amarok/src/columnlist.h b/amarok/src/columnlist.h index 10604065..142a7688 100644 --- a/amarok/src/columnlist.h +++ b/amarok/src/columnlist.h @@ -29,7 +29,7 @@ template<class T> class TQValueList; class ColumnList: public TQHBox { - Q_OBJECT + TQ_OBJECT public: ColumnList( TQWidget *parent = 0, const char *name = 0 ); @@ -56,7 +56,7 @@ private: class ColumnsDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: static void display(); diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp index 8007fc74..50344251 100644 --- a/amarok/src/configdialog.cpp +++ b/amarok/src/configdialog.cpp @@ -108,8 +108,8 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC opt6->setName( "Engine" ); opt6->setSpacing( KDialog::spacingHint() ); TQWidget *groupBox, *aboutEngineButton; - groupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Sound System"), opt6 ); - m_engineConfigFrame = new TQGroupBox( 1, Qt::Horizontal, opt6 ); + groupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Sound System"), opt6 ); + m_engineConfigFrame = new TQGroupBox( 1, TQt::Horizontal, opt6 ); m_soundSystem = new TQComboBox( false, groupBox ); aboutEngineButton = new TQPushButton( i18n("About"), groupBox ); @@ -152,7 +152,7 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC opt9->setSpacing( KDialog::spacingHint() ); TQVBox *topbox = new TQVBox( opt9 ); topbox->setSpacing( KDialog::spacingHint() ); - TQGroupBox *mediaBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Media Devices"), topbox ); + TQGroupBox *mediaBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Media Devices"), topbox ); mediaBox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQVBox *vbox = new TQVBox( mediaBox ); vbox->setSpacing( KDialog::spacingHint() ); @@ -163,10 +163,10 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC hbox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); KPushButton *autodetect = new KPushButton( i18n( "Autodetect Devices" ), hbox ); 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 ); 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 ); frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); @@ -184,28 +184,28 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC addPage( opt9, i18n( "Media Devices" ), Amarok::icon( "device" ), i18n( "Configure Portable Player Support" ) ); // Show information labels (must be done after insertions) - TQObjectList *list = queryList( TQLABEL_OBJECT_NAME_STRING, "infoPixmap" ); + TQObjectList *list = queryList( "TQLabel", "infoPixmap" ); TQPixmap const info = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -TDEIcon::SizeHuge ); for( TQObject *label = list->first(); label; label = list->next() ) - static_cast<TQLabel*>(TQT_TQWIDGET(label))->setPixmap( info ); + static_cast<TQLabel*>(label)->setPixmap( info ); delete list; //stop TDEFont Requesters getting stupidly large - list = queryList( TQLABEL_OBJECT_NAME_STRING, "m_sampleLabel" ); + list = queryList( "TQLabel", "m_sampleLabel" ); for( TQObject *label = list->first(); label; label = list->next() ) - static_cast<TQLabel*>(TQT_TQWIDGET(label))->setMaximumWidth( 250 ); + static_cast<TQLabel*>(label)->setMaximumWidth( 250 ); delete list; - connect( m_deviceManager, TQT_SIGNAL(changed()), TQT_SLOT(updateButtons()) ); - connect( m_soundSystem, TQT_SIGNAL(activated( int )), TQT_SLOT(updateButtons()) ); - connect( aboutEngineButton, TQT_SIGNAL(clicked()), TQT_SLOT(aboutEngine()) ); + connect( m_deviceManager, TQ_SIGNAL(changed()), TQ_SLOT(updateButtons()) ); + connect( m_soundSystem, TQ_SIGNAL(activated( int )), TQ_SLOT(updateButtons()) ); + connect( aboutEngineButton, TQ_SIGNAL(clicked()), TQ_SLOT(aboutEngine()) ); #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 - connect( m_opt2->styleComboBox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateButtons() ) ); - connect( m_opt7->dbSetupFrame->databaseEngine, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateButtons() ) ); - connect( m_opt1->kComboBox_browser, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateButtons() ) ); - connect( m_opt1->kLineEdit_customBrowser, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( updateButtons() ) ); + connect( m_opt2->styleComboBox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateButtons() ) ); + connect( m_opt7->dbSetupFrame->databaseEngine, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateButtons() ) ); + connect( m_opt1->kComboBox_browser, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateButtons() ) ); + connect( m_opt1->kLineEdit_customBrowser, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( updateButtons() ) ); } AmarokConfigDialog::~AmarokConfigDialog() @@ -263,13 +263,13 @@ void AmarokConfigDialog::updateButtons() void AmarokConfigDialog::updateSettings() { #ifdef TQ_WS_X11 - OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) ); + OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( child( "osdpreview" ) ); AmarokConfig::setOsdAlignment( osd->alignment() ); AmarokConfig::setOsdYOffset( osd->y() ); Amarok::OSD::instance()->applySettings(); #endif - static_cast<CollectionSetup*>(TQT_TQWIDGET(child("CollectionSetup")))->writeConfig(); + static_cast<CollectionSetup*>(child("CollectionSetup"))->writeConfig(); if ( m_engineConfig ) m_engineConfig->save(); @@ -300,8 +300,8 @@ void AmarokConfigDialog::updateSettings() { PlaylistWindow::self()->addBrowser( "MediaBrowser", MediaBrowser::instance(), i18n( "Media Device" ), Amarok::icon( "device" ) ); //to re-enable mediabrowser hiding, uncomment this: - //connect( MediaBrowser::instance(), TQT_SIGNAL( availabilityChanged( bool ) ), - // PlaylistWindow::self(), TQT_SLOT( mbAvailabilityChanged( bool ) ) ); + //connect( MediaBrowser::instance(), TQ_SIGNAL( availabilityChanged( bool ) ), + // PlaylistWindow::self(), TQ_SLOT( mbAvailabilityChanged( bool ) ) ); } @@ -352,7 +352,7 @@ void AmarokConfigDialog::updateWidgetsDefault() bool AmarokConfigDialog::hasChanged() { #ifdef TQ_WS_X11 - OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) ); + OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( child( "osdpreview" ) ); #endif return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] || @@ -410,7 +410,7 @@ void AmarokConfigDialog::soundSystemChanged() m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).arg( m_soundSystem->currentText() ) ); m_engineConfigFrame->show(); - connect( m_engineConfig, TQT_SIGNAL(viewChanged()), TQT_SLOT(updateButtons()) ); + connect( m_engineConfig, TQ_SIGNAL(viewChanged()), TQ_SLOT(updateButtons()) ); } else { m_engineConfig = 0; diff --git a/amarok/src/configdialog.h b/amarok/src/configdialog.h index 779f9aff..5f25248a 100644 --- a/amarok/src/configdialog.h +++ b/amarok/src/configdialog.h @@ -33,7 +33,7 @@ class MediumPluginManager; class AmarokConfigDialog : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp index fedd216e..da9a071c 100644 --- a/amarok/src/contextbrowser.cpp +++ b/amarok/src/contextbrowser.cpp @@ -248,18 +248,18 @@ ContextBrowser::ContextBrowser( const char *name ) m_lyricsSearchText->setFrame( TQFrame::Sunken ); 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" ) ); TQString filtertip = i18n( "Enter text to search for. Press enter to advance to the next match." ); TQToolTip::add( m_lyricsSearchText, filtertip ); - connect ( button, TQT_SIGNAL(clicked()), m_lyricsSearchText, TQT_SLOT(clear()) ); - connect ( m_lyricsSearchText, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(lyricsSearchText(const TQString & )) ); - connect ( m_lyricsSearchText, TQT_SIGNAL(returnPressed()), this, (TQT_SLOT(lyricsSearchTextNext())) ); + connect ( button, TQ_SIGNAL(clicked()), m_lyricsSearchText, TQ_SLOT(clear()) ); + connect ( m_lyricsSearchText, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(lyricsSearchText(const TQString & )) ); + connect ( m_lyricsSearchText, TQ_SIGNAL(returnPressed()), this, (TQ_SLOT(lyricsSearchTextNext())) ); Amarok::actionCollection()->setAutoConnectShortcuts ( true ); - new TDEAction( i18n("Search text in lyrics"), TDEShortcut("/"), TQT_TQOBJECT(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 ); } @@ -289,10 +289,10 @@ ContextBrowser::ContextBrowser( const char *name ) m_wikiPage = new HTMLView( m_wikiTab, "wiki_page", true /* DNDEnabled */, false /* JScriptEnabled */ ); m_cuefile = CueFile::instance(); - connect( m_cuefile, TQT_SIGNAL(metaData( const MetaBundle& )), - EngineController::instance(), TQT_SLOT(currentTrackMetaDataChanged( const MetaBundle& )) ); - connect( m_cuefile, TQT_SIGNAL(newCuePoint( long, long, long )), - Scrobbler::instance(), TQT_SLOT(subTrack( long, long, long )) ); + connect( m_cuefile, TQ_SIGNAL(metaData( const MetaBundle& )), + EngineController::instance(), TQ_SLOT(currentTrackMetaDataChanged( const MetaBundle& )) ); + connect( m_cuefile, TQ_SIGNAL(newCuePoint( long, long, long )), + Scrobbler::instance(), TQ_SLOT(subTrack( long, long, long )) ); addTab( m_contextTab, SmallIconSet( Amarok::icon( "music" ) ), i18n( "Music" ) ); 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 TDEIO::del( KURL::fromPathOrURL( Amarok::saveLocation( "covershadow-cache/" ) ), false, false ); - connect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), TQT_SLOT( tabChanged( TQWidget* ) ) ); - - connect( m_currentTrackPage->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( openURLRequest( const KURL & ) ) ); - connect( m_lyricsPage->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( openURLRequest( const KURL & ) ) ); - connect( m_wikiPage->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( openURLRequest( const KURL & ) ) ); - - connect( m_currentTrackPage, TQT_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); - connect( m_lyricsPage, TQT_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); - connect( m_wikiPage, TQT_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); - - connect( m_lyricsToolBar->getButton( LYRICS_ADD ), TQT_SIGNAL(clicked( int )), TQT_SLOT(lyricsAdd()) ); - connect( m_lyricsToolBar->getButton( LYRICS_EDIT ), TQT_SIGNAL(toggled( int )), TQT_SLOT(lyricsEditToggle()) ); - connect( m_lyricsToolBar->getButton( LYRICS_SEARCH ), TQT_SIGNAL(clicked( int )), TQT_SLOT(lyricsSearch()) ); - connect( m_lyricsToolBar->getButton( LYRICS_REFRESH ), TQT_SIGNAL(clicked( int )), TQT_SLOT(lyricsRefresh()) ); - connect( m_lyricsToolBar->getButton( LYRICS_BROWSER ), TQT_SIGNAL(clicked( int )), TQT_SLOT(lyricsExternalPage()) ); - - connect( m_wikiToolBar->getButton( WIKI_BACK ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiHistoryBack()) ); - connect( m_wikiToolBar->getButton( WIKI_FORWARD ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiHistoryForward()) ); - connect( m_wikiToolBar->getButton( WIKI_ARTIST ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiArtistPage()) ); - connect( m_wikiToolBar->getButton( WIKI_ALBUM ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiAlbumPage()) ); - connect( m_wikiToolBar->getButton( WIKI_TITLE ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiTitlePage()) ); - connect( m_wikiToolBar->getButton( WIKI_BROWSER ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiExternalPage()) ); - connect( m_wikiToolBar->getButton( WIKI_CONFIG ), TQT_SIGNAL(clicked( int )), TQT_SLOT(wikiConfig()) ); - - connect( m_wikiBackPopup, TQT_SIGNAL(activated( int )), TQT_SLOT(wikiBackPopupActivated( int )) ); - connect( m_wikiForwardPopup, TQT_SIGNAL(activated( int )), TQT_SLOT(wikiForwardPopupActivated( int )) ); - - connect( CollectionDB::instance(), TQT_SIGNAL( scanStarted() ), TQT_SLOT( collectionScanStarted() ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), TQT_SLOT( collectionScanDone( bool ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( databaseEngineChanged() ), TQT_SLOT( renderView() ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( coverFetched( const TQString&, const TQString& ) ), - this, TQT_SLOT( coverFetched( const TQString&, const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ), - this, TQT_SLOT( coverRemoved( const TQString&, const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( similarArtistsFetched( const TQString& ) ), - this, TQT_SLOT( similarArtistsFetched( const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( tagsChanged( const MetaBundle& ) ), - this, TQT_SLOT( tagsChanged( const MetaBundle& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( tagsChanged( const TQString&, const TQString& ) ), - this, TQT_SLOT( tagsChanged( const TQString&, const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), - this, TQT_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); - connect( StarManager::instance(), TQT_SIGNAL( ratingsColorsChanged( const TQString& ) ), - this, TQT_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( scoreChanged( const TQString&, float ) ), - this, TQT_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( labelsChanged( const TQString& ) ), - this, TQT_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( imageFetched( const TQString& ) ), - this, TQT_SLOT( imageFetched( const TQString& ) ) ); - - connect( App::instance(), TQT_SIGNAL( useScores( bool ) ), - this, TQT_SLOT( refreshCurrentTrackPage() ) ); - connect( App::instance(), TQT_SIGNAL( useRatings( bool ) ), - this, TQT_SLOT( refreshCurrentTrackPage() ) ); - - connect( MountPointManager::instance(), TQT_SIGNAL( mediumConnected( int ) ), - this, TQT_SLOT( renderView() ) ); - connect( MountPointManager::instance(), TQT_SIGNAL( mediumRemoved( int ) ), - this, TQT_SLOT( renderView() ) ); + connect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), TQ_SLOT( tabChanged( TQWidget* ) ) ); + + connect( m_currentTrackPage->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( openURLRequest( const KURL & ) ) ); + connect( m_lyricsPage->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( openURLRequest( const KURL & ) ) ); + connect( m_wikiPage->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( openURLRequest( const KURL & ) ) ); + + connect( m_currentTrackPage, TQ_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); + connect( m_lyricsPage, TQ_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); + connect( m_wikiPage, TQ_SIGNAL( popupMenu( const TQString&, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( const TQString&, const TQPoint& ) ) ); + + connect( m_lyricsToolBar->getButton( LYRICS_ADD ), TQ_SIGNAL(clicked( int )), TQ_SLOT(lyricsAdd()) ); + connect( m_lyricsToolBar->getButton( LYRICS_EDIT ), TQ_SIGNAL(toggled( int )), TQ_SLOT(lyricsEditToggle()) ); + connect( m_lyricsToolBar->getButton( LYRICS_SEARCH ), TQ_SIGNAL(clicked( int )), TQ_SLOT(lyricsSearch()) ); + connect( m_lyricsToolBar->getButton( LYRICS_REFRESH ), TQ_SIGNAL(clicked( int )), TQ_SLOT(lyricsRefresh()) ); + connect( m_lyricsToolBar->getButton( LYRICS_BROWSER ), TQ_SIGNAL(clicked( int )), TQ_SLOT(lyricsExternalPage()) ); + + connect( m_wikiToolBar->getButton( WIKI_BACK ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiHistoryBack()) ); + connect( m_wikiToolBar->getButton( WIKI_FORWARD ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiHistoryForward()) ); + connect( m_wikiToolBar->getButton( WIKI_ARTIST ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiArtistPage()) ); + connect( m_wikiToolBar->getButton( WIKI_ALBUM ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiAlbumPage()) ); + connect( m_wikiToolBar->getButton( WIKI_TITLE ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiTitlePage()) ); + connect( m_wikiToolBar->getButton( WIKI_BROWSER ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiExternalPage()) ); + connect( m_wikiToolBar->getButton( WIKI_CONFIG ), TQ_SIGNAL(clicked( int )), TQ_SLOT(wikiConfig()) ); + + connect( m_wikiBackPopup, TQ_SIGNAL(activated( int )), TQ_SLOT(wikiBackPopupActivated( int )) ); + connect( m_wikiForwardPopup, TQ_SIGNAL(activated( int )), TQ_SLOT(wikiForwardPopupActivated( int )) ); + + connect( CollectionDB::instance(), TQ_SIGNAL( scanStarted() ), TQ_SLOT( collectionScanStarted() ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( scanDone( bool ) ), TQ_SLOT( collectionScanDone( bool ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( databaseEngineChanged() ), TQ_SLOT( renderView() ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( coverFetched( const TQString&, const TQString& ) ), + this, TQ_SLOT( coverFetched( const TQString&, const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString&, const TQString& ) ), + this, TQ_SLOT( coverRemoved( const TQString&, const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( similarArtistsFetched( const TQString& ) ), + this, TQ_SLOT( similarArtistsFetched( const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( tagsChanged( const MetaBundle& ) ), + this, TQ_SLOT( tagsChanged( const MetaBundle& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( tagsChanged( const TQString&, const TQString& ) ), + this, TQ_SLOT( tagsChanged( const TQString&, const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ), + this, TQ_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); + connect( StarManager::instance(), TQ_SIGNAL( ratingsColorsChanged( const TQString& ) ), + this, TQ_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( scoreChanged( const TQString&, float ) ), + this, TQ_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( labelsChanged( const TQString& ) ), + this, TQ_SLOT( ratingOrScoreOrLabelsChanged( const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( imageFetched( const TQString& ) ), + this, TQ_SLOT( imageFetched( const TQString& ) ) ); + + connect( App::instance(), TQ_SIGNAL( useScores( bool ) ), + this, TQ_SLOT( refreshCurrentTrackPage() ) ); + connect( App::instance(), TQ_SIGNAL( useRatings( bool ) ), + this, TQ_SLOT( refreshCurrentTrackPage() ) ); + + connect( MountPointManager::instance(), TQ_SIGNAL( mediumConnected( int ) ), + this, TQ_SLOT( renderView() ) ); + connect( MountPointManager::instance(), TQ_SIGNAL( mediumRemoved( int ) ), + this, TQ_SLOT( renderView() ) ); showContext( KURL( "current://track" ) ); @@ -1103,7 +1103,7 @@ class CurrentTrackJob : public ThreadManager::DependentJob { public: CurrentTrackJob( ContextBrowser *parent ) - : ThreadManager::DependentJob( TQT_TQOBJECT(parent), "CurrentTrackJob" ) + : ThreadManager::DependentJob( parent, "CurrentTrackJob" ) , b( parent ) , m_currentTrack( TQDeepCopy<MetaBundle>( EngineController::instance()->bundle() ) ) , m_isStream( EngineController::engine()->isStream() ) @@ -2995,7 +2995,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st fullStarIO.setFormat( "PNG" ); TQBuffer fullStarBuf; fullStarBuf.open( IO_WriteOnly ); - fullStarIO.setIODevice( TQT_TQIODEVICE(&fullStarBuf) ); + fullStarIO.setIODevice( &fullStarBuf ); fullStarIO.write(); fullStarBuf.close(); TQCString fullStar = KCodecs::base64Encode( fullStarBuf.buffer(), true ); @@ -3010,7 +3010,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st halfStarIO.setFormat( "PNG" ); TQBuffer halfStarBuf; halfStarBuf.open( IO_WriteOnly ); - halfStarIO.setIODevice( TQT_TQIODEVICE(&halfStarBuf) ); + halfStarIO.setIODevice( &halfStarBuf ); halfStarIO.write(); halfStarBuf.close(); TQCString halfStar = KCodecs::base64Encode( halfStarBuf.buffer(), true ); @@ -3703,8 +3703,8 @@ ContextBrowser::wikiConfig() // SLOT otherLabel->setBuddy( m_wikiLocaleEdit ); 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_wikiConfigDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( wikiConfigApply() ) ); + connect( m_wikiLocaleCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( wikiConfigChanged(int) ) ); + connect( m_wikiConfigDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( wikiConfigApply() ) ); m_wikiLocaleEdit->setText( wikiLocale() ); m_wikiLocaleCombo->setCurrentItem( index ); @@ -3826,9 +3826,9 @@ ContextBrowser::eventFilter( TQObject *o, TQEvent *e ) switch( e->type() ) { case 6/*TQEvent::KeyPress*/: - #define e TQT_TQKEYEVENT(e) + #define e static_cast<TQKeyEvent*>(e) - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_addLabelEdit) ) //the add label lineedit + if( o == m_addLabelEdit ) //the add label lineedit { switch( e->key() ) { @@ -3846,7 +3846,7 @@ ContextBrowser::eventFilter( TQObject *o, TQEvent *e ) } } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lyricsSearchText)) + if (o == m_lyricsSearchText) { switch ( e->key() ) { @@ -3864,7 +3864,7 @@ ContextBrowser::eventFilter( TQObject *o, TQEvent *e ) break; } - return KTabWidget::eventFilter( TQT_TQOBJECT(o), TQT_TQEVENT(e) ); + return KTabWidget::eventFilter( o, e ); } void ContextBrowser::showWikipedia( const TQString &url, bool fromHistory, bool replaceHistory ) @@ -3994,7 +3994,7 @@ void ContextBrowser::showWikipedia( const TQString &url, bool fromHistory, bool Amarok::StatusBar::instance()->newProgressOperation( m_wikiJob ) .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* ) ) ); } diff --git a/amarok/src/contextbrowser.h b/amarok/src/contextbrowser.h index 2f046c5c..bcbfc922 100644 --- a/amarok/src/contextbrowser.h +++ b/amarok/src/contextbrowser.h @@ -38,7 +38,7 @@ namespace TDEIO { class Job; class TransferJob; } class ContextBrowser : public KTabWidget, public EngineObserver { - Q_OBJECT + TQ_OBJECT friend class CurrentTrackJob; diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp index 1bdaed54..bf41f59d 100644 --- a/amarok/src/coverfetcher.cpp +++ b/amarok/src/coverfetcher.cpp @@ -119,7 +119,7 @@ CoverLabel::CoverLabel ( TQWidget * parent, const char * name, WFlags f ) void CoverLabel::mouseReleaseEvent(TQMouseEvent *pEvent) { - if (pEvent->button() == Qt::LeftButton || pEvent->button() == Qt::RightButton) + if (pEvent->button() == TQt::LeftButton || pEvent->button() == TQt::RightButton) { Amarok::coverContextMenu( this, pEvent->globalPos(), m_artist, m_album, false ); } @@ -235,7 +235,7 @@ CoverFetcher::startFetch() debug() << url << endl; 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 ); } @@ -411,7 +411,7 @@ CoverFetcher::attemptAnotherFetch() // try a different query 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 ); @@ -473,11 +473,11 @@ CoverFetcher::attemptAnotherFetch() amazonLocale->insertItem( i18n("Japan"), CoverFetcher::Japan); amazonLocale->insertItem( i18n("United Kingdom"), CoverFetcher::UK ); if( CoverManager::instance() ) - connect( amazonLocale, TQT_SIGNAL( activated(int) ), - CoverManager::instance(), TQT_SLOT( changeLocale(int) ) ); + connect( amazonLocale, TQ_SIGNAL( activated(int) ), + CoverManager::instance(), TQ_SLOT( changeLocale(int) ) ); else - connect( amazonLocale, TQT_SIGNAL( activated(int) ), - fetcher, TQT_SLOT( changeLocale(int) ) ); + connect( amazonLocale, TQ_SIGNAL( activated(int) ), + fetcher, TQ_SLOT( changeLocale(int) ) ); TQHBoxLayout *hbox1 = new TQHBoxLayout( 8 ); hbox1->addWidget( new TQLabel( i18n( "Amazon Locale: " ), this ) ); hbox1->addWidget( amazonLocale ); @@ -504,11 +504,11 @@ CoverFetcher::attemptAnotherFetch() adjustSize(); setFixedHeight( height() ); - connect( searchButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( searchButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } - TQString query() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child( "Query" )))->text(); } + TQString query() { return static_cast<KLineEdit*>(child( "Query" ))->text(); } }; TQString @@ -561,7 +561,7 @@ CoverFetcher::getUserQuery( TQString explanation ) explanation = i18n("Ask Amazon for covers using this query:"); EditSearchDialog dialog( - TQT_TQWIDGET( parent() ), + static_cast<TQWidget*>( parent() ), explanation, m_userQuery, this ); @@ -608,17 +608,17 @@ CoverFetcher::getUserQuery( TQString explanation ) this->setFixedSize( sizeHint() ); this->setCaption( i18n("Cover Found") ); - connect( save, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( newsearch, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( nextcover, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( save, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( newsearch, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( nextcover, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } virtual void accept() { - if( tqstrcmp( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "NewSearch" ) == 0 ) + if( qstrcmp( sender()->name(), "NewSearch" ) == 0 ) done( 1000 ); - else if( tqstrcmp( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "NextCover" ) == 0 ) + else if( qstrcmp( sender()->name(), "NextCover" ) == 0 ) done( 1001 ); else KDialog::accept(); @@ -629,7 +629,7 @@ CoverFetcher::getUserQuery( TQString explanation ) void CoverFetcher::showCover() { - CoverFoundDialog dialog( TQT_TQWIDGET( parent() ), m_image, m_currentCoverName ); + CoverFoundDialog dialog( static_cast<TQWidget*>( parent() ), m_image, m_currentCoverName ); switch( dialog.exec() ) { diff --git a/amarok/src/coverfetcher.h b/amarok/src/coverfetcher.h index a16c9c24..23a185df 100644 --- a/amarok/src/coverfetcher.h +++ b/amarok/src/coverfetcher.h @@ -40,7 +40,7 @@ namespace TDEIO { class Job; } class CoverFetcher : public TQObject { friend class EditSearchDialog; - Q_OBJECT + TQ_OBJECT static const uint MAX_COVERS_CHOICE = 10; diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp index e591ab1c..691f66e3 100644 --- a/amarok/src/covermanager.cpp +++ b/amarok/src/covermanager.cpp @@ -147,7 +147,7 @@ CoverManager::CoverManager() m_searchEdit->setFrame( TQFrame::Sunken ); 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( 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 Without Cover"), AlbumsWithoutCover ); 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 // amazon locale menu @@ -172,7 +172,7 @@ CoverManager::CoverManager() m_amazonLocaleMenu->insertItem( i18n("Germany"), CoverFetcher::Germany ); m_amazonLocaleMenu->insertItem( i18n("Japan"), CoverFetcher::Japan); 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 TDEToolBar* toolBar = new TDEToolBar( hbox ); @@ -188,7 +188,7 @@ CoverManager::CoverManager() //fetch missing covers button 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 //cover view @@ -200,7 +200,7 @@ CoverManager::CoverManager() m_statusLabel->setIndent( 3 ); m_statusBar->addWidget( m_progressBox = new TQHBox( m_statusBar ), 1, true ); 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->setCenterIndicator( true ); @@ -211,24 +211,24 @@ CoverManager::CoverManager() // signals and slots connections - connect( m_artistView, TQT_SIGNAL(selectionChanged( TQListViewItem* ) ), - TQT_SLOT(slotArtistSelected( TQListViewItem* )) ); - connect( m_coverView, TQT_SIGNAL(contextMenuRequested( TQIconViewItem*, const TQPoint& )), - TQT_SLOT(showCoverMenu( TQIconViewItem*, const TQPoint& )) ); - connect( m_coverView, TQT_SIGNAL(executed( TQIconViewItem* )), - TQT_SLOT(coverItemExecuted( TQIconViewItem* )) ); - connect( m_timer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotSetFilter()) ); - connect( m_searchEdit, TQT_SIGNAL(textChanged( const TQString& )), - TQT_SLOT(slotSetFilterTimeout()) ); + connect( m_artistView, TQ_SIGNAL(selectionChanged( TQListViewItem* ) ), + TQ_SLOT(slotArtistSelected( TQListViewItem* )) ); + connect( m_coverView, TQ_SIGNAL(contextMenuRequested( TQIconViewItem*, const TQPoint& )), + TQ_SLOT(showCoverMenu( TQIconViewItem*, const TQPoint& )) ); + connect( m_coverView, TQ_SIGNAL(executed( TQIconViewItem* )), + TQ_SLOT(coverItemExecuted( TQIconViewItem* )) ); + connect( m_timer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotSetFilter()) ); + connect( m_searchEdit, TQ_SIGNAL(textChanged( const TQString& )), + TQ_SLOT(slotSetFilterTimeout()) ); #ifdef AMAZON_SUPPORT - connect( CollectionDB::instance(), TQT_SIGNAL(coverFetched( const TQString&, const TQString& )), - TQT_SLOT(coverFetched( const TQString&, const TQString& )) ); - connect( CollectionDB::instance(), TQT_SIGNAL(coverRemoved( const TQString&, const TQString& )), - TQT_SLOT(coverRemoved( const TQString&, const TQString& )) ); - connect( CollectionDB::instance(), TQT_SIGNAL(coverFetcherError( const TQString& )), - TQT_SLOT(coverFetcherError()) ); + connect( CollectionDB::instance(), TQ_SIGNAL(coverFetched( const TQString&, const TQString& )), + TQ_SLOT(coverFetched( const TQString&, const TQString& )) ); + connect( CollectionDB::instance(), TQ_SIGNAL(coverRemoved( const TQString&, const TQString& )), + TQ_SLOT(coverRemoved( const TQString&, const TQString& )) ); + connect( CollectionDB::instance(), TQ_SIGNAL(coverFetcherError( const TQString& )), + TQ_SLOT(coverFetcherError()) ); #endif m_currentView = AllAlbums; @@ -238,7 +238,7 @@ CoverManager::CoverManager() 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++; // 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 { m_fetchCovers.clear(); @@ -809,7 +809,7 @@ void CoverManager::updateStatusBar() m_fetchingCovers = 0; m_coversFetched = 0; m_coverErrors = 0; - TQTimer::singleShot( 2000, this, TQT_SLOT( updateStatusBar() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( updateStatusBar() ) ); } 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 setShowToolTips( false ); - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), TQT_SLOT( setStatusText( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), CoverManager::instance(), TQT_SLOT( updateStatusBar() ) ); + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), TQ_SLOT( setStatusText( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), CoverManager::instance(), TQ_SLOT( updateStatusBar() ) ); } diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h index 413b48e5..6ae998f7 100644 --- a/amarok/src/covermanager.h +++ b/amarok/src/covermanager.h @@ -27,7 +27,7 @@ class PixmapViewer; class CoverManager : public TQSplitter { - Q_OBJECT + TQ_OBJECT static CoverManager *s_instance; @@ -110,7 +110,7 @@ class CoverManager : public TQSplitter class CoverView : public TDEIconView { - Q_OBJECT + TQ_OBJECT public: @@ -153,7 +153,7 @@ class CoverViewItem : public TDEIconViewItem class CoverViewDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/cuefile.h b/amarok/src/cuefile.h index 3b9ca605..98bcd84e 100644 --- a/amarok/src/cuefile.h +++ b/amarok/src/cuefile.h @@ -51,7 +51,7 @@ class CueFileItem { // <<Singleton>> class CueFile : public TQObject, public TQMap<long, CueFileItem>, public EngineObserver { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp index 64a299e5..96c7fac6 100644 --- a/amarok/src/database_refactor/collectiondb.cpp +++ b/amarok/src/database_refactor/collectiondb.cpp @@ -95,8 +95,8 @@ CollectionDB::CollectionDB() startTimer( MONITOR_INTERVAL * 1000 ); - connect( Scrobbler::instance(), TQT_SIGNAL( similarArtistsFetched( const TQString&, const TQStringList& ) ), - this, TQT_SLOT( similarArtistsFetched( const TQString&, const TQStringList& ) ) ); + connect( Scrobbler::instance(), TQ_SIGNAL( 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, // using TQTimer to make sure we don't manipulate the GUI from a thread 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, // using TQTimer to make sure we don't manipulate the GUI from a thread 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; 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->startFetch(); #endif diff --git a/amarok/src/database_refactor/collectiondb.h b/amarok/src/database_refactor/collectiondb.h index c6bcba98..b23ebd23 100644 --- a/amarok/src/database_refactor/collectiondb.h +++ b/amarok/src/database_refactor/collectiondb.h @@ -43,7 +43,7 @@ class DbConnectionPool : TQPtrQueue<DbConnection> class CollectionDB : public TQObject, public EngineObserver { - Q_OBJECT + TQ_OBJECT friend class SimilarArtistsInsertionJob; diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui index 2339a086..30ba2ab1 100644 --- a/amarok/src/dbsetup.ui +++ b/amarok/src/dbsetup.ui @@ -452,9 +452,9 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> </includes> -<Q_SLOTS> +<slots> <slot>databaseEngine_activated( int )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private">init()</function> </functions> diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp index 44cd37ca..71af81a8 100644 --- a/amarok/src/deletedialog.cpp +++ b/amarok/src/deletedialog.cpp @@ -98,7 +98,7 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) : adjustSize(); 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))); } diff --git a/amarok/src/deletedialog.h b/amarok/src/deletedialog.h index 4636f374..3c5479f6 100644 --- a/amarok/src/deletedialog.h +++ b/amarok/src/deletedialog.h @@ -30,7 +30,7 @@ class TQWidgetStack; class DeleteWidget : public DeleteDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -44,7 +44,7 @@ protected slots: class DeleteDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui index f3706f97..eef1b80b 100644 --- a/amarok/src/deletedialogbase.ui +++ b/amarok/src/deletedialogbase.ui @@ -125,9 +125,9 @@ <slot>slotShouldDelete(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotShouldDelete(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistbox.h</include> diff --git a/amarok/src/deviceconfiguredialog.cpp b/amarok/src/deviceconfiguredialog.cpp index fc8276a0..cf036fee 100644 --- a/amarok/src/deviceconfiguredialog.cpp +++ b/amarok/src/deviceconfiguredialog.cpp @@ -90,8 +90,8 @@ DeviceConfigureDialog::DeviceConfigureDialog( const Medium &medium ) m_transcodeWhenNecessary = new TQRadioButton( transcodeGroup ); m_transcodeWhenNecessary->setText( i18n( "When necessary" ) ); m_transcodeWhenNecessary->setChecked( !device->m_transcodeAlways ); - connect( m_transcodeCheck, TQT_SIGNAL(toggled( bool )), - transcodeGroup, TQT_SLOT(setEnabled( bool )) ); + connect( m_transcodeCheck, TQ_SIGNAL(toggled( bool )), + transcodeGroup, TQ_SLOT(setEnabled( bool )) ); transcodeGroup->insert( m_transcodeAlways ); transcodeGroup->insert( m_transcodeWhenNecessary ); m_transcodeRemove = new TQCheckBox( transcodeGroup ); @@ -99,8 +99,8 @@ DeviceConfigureDialog::DeviceConfigureDialog( const Medium &medium ) m_transcodeRemove->setChecked( device->m_transcodeRemove ); const ScriptManager *sm = ScriptManager::instance(); - m_transcodeCheck->setEnabled( sm->transcodeScriptRunning() != TQString::null ); - transcodeGroup->setEnabled( sm->transcodeScriptRunning() != TQString::null && device->m_transcode ); + m_transcodeCheck->setEnabled( !sm->transcodeScriptRunning().isEmpty() ); + transcodeGroup->setEnabled( !sm->transcodeScriptRunning().isEmpty() && device->m_transcode ); if( sm->transcodeScriptRunning().isNull() ) { TQToolTip::add( m_transcodeCheck, i18n( "For this feature, a script of type \"Transcode\" has to be running" ) ); diff --git a/amarok/src/deviceconfiguredialog.h b/amarok/src/deviceconfiguredialog.h index 9d02a360..16cde2be 100644 --- a/amarok/src/deviceconfiguredialog.h +++ b/amarok/src/deviceconfiguredialog.h @@ -28,7 +28,7 @@ class Medium; */ class DeviceConfigureDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: DeviceConfigureDialog( const Medium &medium ); diff --git a/amarok/src/devicemanager.h b/amarok/src/devicemanager.h index 10ac9f5a..a5f50546 100644 --- a/amarok/src/devicemanager.h +++ b/amarok/src/devicemanager.h @@ -32,7 +32,7 @@ typedef TQMap<TQString, Medium*> MediumMap; class DeviceManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: DeviceManager(); diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp index 9b8c4660..c2190a15 100644 --- a/amarok/src/directorylist.cpp +++ b/amarok/src/directorylist.cpp @@ -123,7 +123,7 @@ Item::Item( TQListView *parent ) if ( CollectionSetup::instance()->m_dirs.contains( "/" ) ) static_cast<TQCheckListItem*>( this )->setOn(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 ); setVisible( true ); } @@ -138,9 +138,9 @@ Item::Item( TQListViewItem *parent, const KURL &url , bool full_disable /* defau { m_lister.setDirOnlyMode( true ); setExpandable( true ); - connect( &m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(newItems( const KFileItemList& )) ); - connect( &m_lister, TQT_SIGNAL(completed()), TQT_SLOT(completed()) ); - connect( &m_lister, TQT_SIGNAL(canceled()), TQT_SLOT(completed()) ); + connect( &m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(newItems( const KFileItemList& )) ); + connect( &m_lister, TQ_SIGNAL(completed()), TQ_SLOT(completed()) ); + connect( &m_lister, TQ_SIGNAL(canceled()), TQ_SLOT(completed()) ); } diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h index a2aec52a..1ef077c9 100644 --- a/amarok/src/directorylist.h +++ b/amarok/src/directorylist.h @@ -70,7 +70,7 @@ namespace Collection { //just to keep it out of the global namespace class Item : public TQObject, public TQCheckListItem { -Q_OBJECT +TQ_OBJECT public: Item( TQListView *parent ); diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp index aab91888..4788e5d7 100644 --- a/amarok/src/editfilterdialog.cpp +++ b/amarok/src/editfilterdialog.cpp @@ -178,7 +178,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c keywordLayout->addWidget( m_editKeyword ); m_mainLay->addLayout( keywordLayout ); 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 m_groupBox = new TQGroupBox( plainPage(), "groupBox" ); @@ -207,7 +207,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c paramLayout->addWidget( m_spinMin2 ); 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"); paramLayout->addWidget( m_andLabel ); @@ -220,7 +220,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c m_spinMax2 = new TQSpinBox( m_groupBox, "maximum2" ); 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 ); filesizeLayout->setAlignment( AlignLeft ); @@ -240,7 +240,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c // check the "One Value Choosing" by default 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() ); otherOptionsLayout->setAlignment( AlignHCenter ); @@ -282,10 +282,10 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c m_actionCheck << m_checkExactly; m_actionCheck << m_checkExclude; - connect( m_checkALL, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckAll()) ); - connect( m_checkAtLeastOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckAtLeastOne()) ); - connect( m_checkExactly, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckExactly()) ); - connect( m_checkExclude, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckExclude()) ); + connect( m_checkALL, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckAll()) ); + connect( m_checkAtLeastOne, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckAtLeastOne()) ); + connect( m_checkExactly, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckExactly()) ); + connect( m_checkExclude, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckExclude()) ); // check "select all words" as default slotCheckAll(); @@ -325,7 +325,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c verticalCondLay->addWidget( m_prefixNOT ); 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 ) ); @@ -334,8 +334,8 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c if (m_filterText.isEmpty()) m_groupBox3->setEnabled( false ); - connect( m_checkAND, TQT_SIGNAL(clicked()), TQT_SLOT(slotCheckAND()) ); - connect( m_checkOR, TQT_SIGNAL(clicked()), TQT_SLOT(slotCheckOR()) ); + connect( m_checkAND, TQ_SIGNAL(clicked()), TQ_SLOT(slotCheckAND()) ); + connect( m_checkOR, TQ_SIGNAL(clicked()), TQ_SLOT(slotCheckOR()) ); // check "AND" condition as default slotCheckAND(); diff --git a/amarok/src/editfilterdialog.h b/amarok/src/editfilterdialog.h index 6e536e75..7e949296 100644 --- a/amarok/src/editfilterdialog.h +++ b/amarok/src/editfilterdialog.h @@ -22,7 +22,7 @@ class KComboBox; class EditFilterDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, const TQString &text = "" ); diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp index 3fcaf997..02299797 100644 --- a/amarok/src/engine/helix/helix-configdialog.cpp +++ b/amarok/src/engine/helix/helix-configdialog.cpp @@ -56,8 +56,8 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, TQGridLayout *grid = (TQGridLayout*)parent->layout(); 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, TQT_SIGNAL(textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); + connect( (TQWidget *) m_w, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotStringChanged( const TQString& )) ); + connect( (TQWidget *) m_w, TQ_SIGNAL(textChanged( const TQString& )), pluginConfig, TQ_SIGNAL(viewChanged()) ); TQToolTip::add( (TQWidget *) m_w, "<qt>" + tooltip ); @@ -84,8 +84,8 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, m_key = str; m_w = new KLineEdit( str, parent ); - connect( m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); - connect( m_w, TQT_SIGNAL(textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); + connect( m_w, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotStringChanged( const TQString& )) ); + connect( m_w, TQ_SIGNAL(textChanged( const TQString& )), pluginConfig, TQ_SIGNAL(viewChanged()) ); TQToolTip::add( m_w, "<qt>" + tooltip ); @@ -122,8 +122,8 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent, op->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); grid->addWidget( op, row, 0 ); grid->addWidget( deviceComboBox, row, 1); - connect( (TQWidget *)deviceComboBox, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( slotNewDevice( const TQString& )) ); - connect( (TQWidget *)deviceComboBox, TQT_SIGNAL( activated( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); + connect( (TQWidget *)deviceComboBox, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( slotNewDevice( const TQString& )) ); + connect( (TQWidget *)deviceComboBox, TQ_SIGNAL( activated( const TQString& )), pluginConfig, TQ_SIGNAL(viewChanged()) ); ++row; @@ -133,12 +133,12 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent, checkBox_outputDevice->setText( i18n( "Device:" ) ); 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, TQT_SIGNAL( textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); - connect( checkBox_outputDevice, TQT_SIGNAL( toggled(bool) ), lineEdit_outputDevice, TQT_SLOT( setEnabled(bool) ) ); - connect( checkBox_outputDevice, TQT_SIGNAL( toggled(bool) ), pluginConfig, TQT_SIGNAL(viewChanged()) ); + connect( (TQWidget *) lineEdit_outputDevice, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotStringChanged( const TQString& )) ); + connect( (TQWidget *) lineEdit_outputDevice, TQ_SIGNAL( textChanged( const TQString& )), pluginConfig, TQ_SIGNAL(viewChanged()) ); + connect( checkBox_outputDevice, TQ_SIGNAL( toggled(bool) ), lineEdit_outputDevice, TQ_SLOT( setEnabled(bool) ) ); + 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 ); if (HelixConfig::deviceenabled()) diff --git a/amarok/src/engine/helix/helix-configdialog.h b/amarok/src/engine/helix/helix-configdialog.h index 9ad4ef7e..ad0ce27e 100644 --- a/amarok/src/engine/helix/helix-configdialog.h +++ b/amarok/src/engine/helix/helix-configdialog.h @@ -27,7 +27,7 @@ class HelixEngine; // the Helix core class HelixConfigEntry : public TQObject { -Q_OBJECT +TQ_OBJECT public: HelixConfigEntry( TQWidget *parent, Amarok::PluginConfig*, @@ -54,7 +54,7 @@ private: class HelixSoundDevice : public TQObject { -Q_OBJECT +TQ_OBJECT public: HelixSoundDevice( TQWidget *parent, Amarok::PluginConfig *config, int &row, HelixEngine *engine ); diff --git a/amarok/src/engine/helix/helix-engine.h b/amarok/src/engine/helix/helix-engine.h index b0a00af2..8a1eab4c 100644 --- a/amarok/src/engine/helix/helix-engine.h +++ b/amarok/src/engine/helix/helix-engine.h @@ -21,7 +21,7 @@ struct timeval; class HelixEngine : public Engine::Base, public PlayerControl { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h index 0dadcf19..fea8c8d8 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h @@ -116,11 +116,6 @@ void HXUnixDebugBreak(); #include <stdlib.h> #endif -#ifdef _SYMBIAN -# include <unistd.h> -# define _MAX_PATH MAXPATHLEN -#endif - #ifdef _OPENWAVE #ifndef _MAX_PATH #define _MAX_PATH 256 @@ -136,8 +131,6 @@ void HXUnixDebugBreak(); # define MAX_TRACE_OUTPUT 255 # elif _WIN16 # define MAX_TRACE_OUTPUT 255 -# elif _SYMBIAN -# define MAX_TRACE_OUTPUT 255 # else # define MAX_TRACE_OUTPUT (_MAX_PATH*2 + 20) # endif @@ -254,12 +247,6 @@ HXBOOL STDMETHODCALLTYPE HXIsValidString(const char* lpsz, int nLength); #else void HXDebugBreak(); #endif -#elif defined(_SYMBIAN) -#if defined(__WINS__) -#define HXDebugBreak() _asm { int 3 } -#else -void HXDebugBreak(); -#endif //_SYMBIAN #elif defined(_UNIX) void HXDebugBreak(); #elif defined(_VXWORKS) @@ -300,8 +287,6 @@ do { \ # define HXAbort() abort() #elif defined(WIN32_PLATFORM_PSPC) # define HXAbort() exit(1) -#elif defined(_SYMBIAN) -# define HXAbort() exit(1) #elif defined(_OPENWAVE) // XXXSAB is this right?? # define HXAbort() exit(1) diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h index 800f4a21..4f55daa8 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h @@ -1225,95 +1225,6 @@ extern HXAtomic g_AtomicOps; //in common/util/atomicops.cpp /*********************************************************************** - * SYMBIAN - * - * Implementation Notes: - * - * Note: This is an imcompletely-defined platform, be aware that - * not all standard HXAtomic operators are defined! - * - */ -#elif defined(_SYMBIAN) - -/* Increment by 1 and return new value */ -inline INT32 -HXAtomicIncRetINT32(INT32* pNum) -{ - return User::LockedInc(*((TInt*)pNum)) + 1; -} - -/* Decrement by 1 and return new value */ -inline INT32 -HXAtomicDecRetINT32(INT32* pNum) -{ - return User::LockedDec(*((TInt*)pNum)) - 1; -} - -/* Increment by 1 and return new value */ -inline UINT32 -HXAtomicIncRetUINT32(UINT32* pNum) -{ - return ((UINT32)User::LockedInc(*((TInt*)pNum))) + 1; -} - -/* Decrement by 1 and return new value */ -inline UINT32 -HXAtomicDecRetUINT32(UINT32* pNum) -{ - return ((UINT32)User::LockedDec(*((TInt*)pNum))) - 1; -} - -#define HXAtomicIncINT32(p) HXAtomicIncRetINT32((p)) -#define HXAtomicDecINT32(p) HXAtomicDecRetINT32((p)) -#define HXAtomicIncUINT32(p) HXAtomicIncRetUINT32((p)) -#define HXAtomicDecUINT32(p) HXAtomicDecRetUINT32((p)) - -#if 0 - -/* - * Add and subtract operations are not implemented - * at this time because there isn't an easy way to - * do it using the facilities provided by Symbian. - * Assembly will likely be needed. - */ - -/* Add n and return new value */ -inline INT32 -HXAtomicAddRetINT32(INT32* pNum, INT32 n) -{ - -} - -/* Subtract n and return new value */ -inline INT32 -HXAtomicSubRetINT32(INT32* pNum, INT32 n) -{ - -} - -/* Add n and return new value */ -inline UINT32 -HXAtomicAddRetUINT32(UINT32* pNum, UINT32 n) -{ - -} - -/* Subtract n and return new value */ -inline UINT32 -HXAtomicSubRetUINT32(UINT32* pNum, UINT32 n) -{ - -} - -#define HXAtomicAddINT32(p,n) HXAtomicAddRetINT32((p),(n)) -#define HXAtomicSubINT32(p,n) HXAtomicSubRetINT32((p),(n)) - -#define HXAtomicAddUINT32(p,n) HXAtomicAddRetUINT32((p),(n)) -#define HXAtomicSubUINT32(p,n) HXAtomicSubRetUINT32((p),(n)) - -#endif - -/*********************************************************************** * Linux / ARM (gcc) * * Implementation Notes: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h index b3921e04..67d4782a 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h @@ -321,10 +321,6 @@ DEFINE_GUID_ENUM(IID_IHXPreCacheGroupMgr, 0x00000E00, 0xb4c8, 0x11d0, 0x99, 0 DEFINE_GUID_ENUM(IID_IHXDataFileFactory, 0x00000F00, 0xb4c8, 0x11d0, 0x99, 0x95, 0x0, 0xa0, 0x24, 0x8d, 0xa5, 0xf0) DEFINE_GUID_ENUM(IID_IHXDataFile, 0x00000F01, 0xb4c8, 0x11d0, 0x99, 0x95, 0x0, 0xa0, 0x24, 0x8d, 0xa5, 0xf0) DEFINE_GUID_ENUM(IID_IHXAsyncDataFile, 0x972bacc0, 0xaff, 0x11d7, 0xac, 0x45, 0x0, 0x1, 0x2, 0x51, 0xb3, 0x40) -#ifdef _SYMBIAN -DEFINE_GUID_ENUM(IID_IHXSymbFileSessionManager, 0x8a5c6080, 0xb16, 0x11d7, 0xac, 0x45, 0x0, 0x1, 0x2, 0x51, 0xb3, 0x40) -#endif // _SYMBIAN - /* * File: * memfsys.h diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h index 6aa13398..d7446aa1 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h @@ -11,12 +11,6 @@ * */ -#if defined(_SYMBIAN) -# include <e32def.h> -# include <e32std.h> -# include <platform/symbian/symbiantypes.h> /* For our TInt64 impl */ -#endif - #ifdef _VXWORKS #include "types/vxTypesOld.h" #include "vxWorks.h" @@ -38,7 +32,7 @@ #define _HXTYPES_H_ // this is essential to make sure that new is not #define'd before the C++ version is included. -#if (defined(_MSC_VER) && defined(_DEBUG) && defined(__cplusplus) && !defined(WIN32_PLATFORM_PSPC) && !defined(_SYMBIAN) && !defined(_OPENWAVE)) +#if (defined(_MSC_VER) && defined(_DEBUG) && defined(__cplusplus) && !defined(WIN32_PLATFORM_PSPC) && !defined(_OPENWAVE)) #include <memory> #endif @@ -51,16 +45,6 @@ #error For VC++ 6.0 or higher you must include hxtypes.h before other windows header files. #endif -#if defined(_SYMBIAN) -typedef TInt8 INT8; -typedef TUint8 UINT8; -typedef TInt16 INT16; -typedef TUint16 UINT16; -typedef TInt32 INT32; -typedef TUint32 UINT32; -typedef TUint32 UINT; /* Its unclear, but UINT is suppose to be 32 bits. */ -typedef TBool BOOL; -#else # ifndef _VXWORKS typedef char INT8; /* signed 8 bit value */ @@ -91,8 +75,6 @@ typedef TBool BOOL; #endif /* _VXWORKS */ -#endif /* _SYMBIAN */ - #if defined(HELIX_CONFIG_AVOID_BOOL) typedef int HXBOOL; @@ -125,9 +107,6 @@ typedef unsigned long int UINT64; #elif defined(_WINDOWS) || defined(_OPENWAVE_SIMULATOR) typedef __int64 INT64; typedef unsigned __int64 UINT64; -#elif defined(_SYMBIAN) && !defined (_SYMBIAN_81_) -typedef SymInt64 INT64; -typedef SymInt64 UINT64; #else typedef long long INT64; typedef unsigned long long UINT64; @@ -146,21 +125,12 @@ typedef ULONG32 HX_MOFTAG; * so, we provide these casting macros that have to be used * to cast 64-bit ints to smaller datatypes */ -#if defined(_SYMBIAN) && !defined (_SYMBIAN_81_) -#define INT64_TO_ULONG32(a) ((ULONG32)((a).Low())) -#define INT64_TO_UINT32(a) ((UINT32)((a).Low())) -#define INT64_TO_INT32(a) ((INT32)((a).Low())) -#define INT64_TO_DOUBLE(a) ((a).GetTReal()) -#define INT64_TO_FLOAT(a) ((a).GetTReal()) -#define UINT32_TO_DOUBLE(a) (SymbianUINT32toDouble(a)) -#else #define INT64_TO_ULONG32(a) ((ULONG32)(a)) #define INT64_TO_UINT32(a) ((UINT32) (a)) #define INT64_TO_INT32(a) ((INT32) (a)) #define INT64_TO_DOUBLE(a) ((double) (a)) #define INT64_TO_FLOAT(a) ((float) (a)) #define UINT32_TO_DOUBLE(a) ((double) (a)) -#endif #ifdef _MACINTOSH @@ -171,10 +141,6 @@ typedef ULONG32 HX_MOFTAG; #endif #endif -#if defined(_SYMBIAN) -#define PATH_MAX KMaxPath -#endif - #ifdef __cplusplus extern "C" { /* Assume C declarations for C++ */ #endif /* __cplusplus */ @@ -650,7 +616,7 @@ typedef ULONG32 HXXIMAGE; * in place of the standard header file basetsd.h, since this standard * header file conflicts with our definitions. */ -#if defined(_MSC_VER) && (_MSC_VER > 1100) && !defined(_SYMBIAN) +#if defined(_MSC_VER) && (_MSC_VER > 1100) #include "hxbastsd.h" #ifdef WIN32_PLATFORM_PSPC #define _TYPES_H_ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h index 4316cc2f..98334788 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h @@ -20,11 +20,6 @@ #define BI_BITFIELDS 3L #endif -#ifdef _SYMBIAN -#include <coemain.h> -#include <w32std.h> -#endif - /**************************************************************************** * * Structure: @@ -182,9 +177,6 @@ typedef struct HXEXPORT_CLASS _HXxWindow #ifdef _UNIX void * display; #endif -#ifdef _SYMBIAN - CDirectScreenAccess* iDSA; -#endif } HXxWindow; typedef void* HXxWindowID; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/util/hxstrutl.h b/amarok/src/engine/helix/helix-sp/helix-include/common/util/hxstrutl.h index d9df49cc..aa04dead 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/util/hxstrutl.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/util/hxstrutl.h @@ -110,14 +110,6 @@ size_t StrNCSpn(const char *str1, const char *str2, size_t depth1, size_t depth2 char* StrToUpper(char *pString); -#if defined( _SYMBIAN) -#define NEW_FAST_TEMP_STR(NAME, EstimatedBiggestSize, LenNeeded) \ - char* NAME = new char[(LenNeeded)]; - -#define DELETE_FAST_TEMP_STR(NAME) \ - delete[] NAME; - -#else /* XXXSMP We can use alloca() on platforms that support it for more speed! */ #define NEW_FAST_TEMP_STR(NAME, EstimatedBiggestSize, LenNeeded) \ char __##NAME##__StaticVersion[EstimatedBiggestSize]; \ @@ -138,6 +130,5 @@ char* StrToUpper(char *pString); { \ delete[] NAME; \ } -#endif /* defined(_SYMBIAN) */ #endif /* _HXSTRUTL_H_ */ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/memory.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/memory.h index 2cc9d506..03ad99f6 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/memory.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/memory.h @@ -14,9 +14,7 @@ #ifndef HLXSYS_MEMORY_H #define HLXSYS_MEMORY_H -#if defined(_SYMBIAN) -#include <string.h> -#elif defined(_OPENWAVE) +#if defined(_OPENWAVE) #include "platform/openwave/hx_op_stdc.h" #elif !defined(__TCS__) && !defined(_VXWORKS) #include <memory.h> diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdio.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdio.h index 117f9ec5..4e8ed044 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdio.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdio.h @@ -105,7 +105,7 @@ int __helix_vfprintf(FILE* f, const char *format, va_list ap); #define snprintf _snprintf #define vsnprintf _vsnprintf -#elif defined(_SYMBIAN) || defined(_WINCE) || defined(_IRIX) +#elif defined(_WINCE) || defined(_IRIX) #define snprintf __helix_snprintf #define vsnprintf __helix_vsnprintf #endif diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h index b055336e..3ddf3206 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h @@ -110,15 +110,6 @@ atoi64(const char* str) #endif /* _UNIX */ -#if defined(_SYMBIAN) - -#define itoa __helix_itoa -#define i64toa __helix_i64toa -#define atoi64 __helix_atoi64 -#define putenv __helix_putenv - -#endif - #if defined(_OPENWAVE) #define itoa(v,s,r) __helix_itoa((v),(s),(r)) diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h index f369e2c0..b6091413 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h @@ -20,11 +20,6 @@ #include <string.h> #endif /* !_OPENWAVE */ -#ifdef _SYMBIAN -//on symbian we have stuff scattered all about. -# include <stdlib.h> -# include <ctype.h> -#endif #if !defined(_VXWORKS) #ifdef _UNIX #include <strings.h> @@ -88,17 +83,6 @@ strncasecmp(const char* str1, const char* str2, int len) #endif /* _WINDOWS */ -#if defined(_SYMBIAN) -unsigned long __helix_strtoul(const char*s, char**end, int base); -#define strtoul __helix_strtoul -#define strrev __helix_strrev -#define stricmp strcasecmp -#define strnicmp strncasecmp -#define strlwr __helix_strlwr -#define strupr __helix_strupr - -#endif /* _SYMBIAN */ - #if defined(_OPENWAVE) #define strcmpi stricmp #define strrev __helix_strrev @@ -220,7 +204,7 @@ new_path_string(const char* str) { if (*psrc == '/' || *psrc == '\\') { -#if defined _WIN32 || defined(_SYMBIAN) +#if defined _WIN32 *pdst = '\\'; #elif defined _UNIX || defined _OPENWAVE *pdst = '/'; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/time.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/time.h index f0009d0a..c9db8f46 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/time.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/time.h @@ -14,10 +14,6 @@ #ifndef HLXSYS_TIME_H #define HLXSYS_TIME_H -#if defined(_SYMBIAN) -# include <sys/time.h> -#endif - #if defined(WIN32_PLATFORM_PSPC) # include "hxtypes.h" # include "hlxclib/windows.h" diff --git a/amarok/src/engine/kdemm/kdemmengine.cpp b/amarok/src/engine/kdemm/kdemmengine.cpp index 67b7e9e1..3e215e92 100644 --- a/amarok/src/engine/kdemm/kdemmengine.cpp +++ b/amarok/src/engine/kdemm/kdemmengine.cpp @@ -85,7 +85,7 @@ bool KDEMMEngine::init() 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; return true; diff --git a/amarok/src/engine/kdemm/kdemmengine.h b/amarok/src/engine/kdemm/kdemmengine.h index edda617c..e19ca3a0 100644 --- a/amarok/src/engine/kdemm/kdemmengine.h +++ b/amarok/src/engine/kdemm/kdemmengine.h @@ -36,7 +36,7 @@ namespace KDE { namespace Multimedia { class SimplePlayer; } } class KDEMMEngine : public Engine::Base { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp index ac9edc57..90360beb 100644 --- a/amarok/src/engine/mas/masengine.cpp +++ b/amarok/src/engine/mas/masengine.cpp @@ -97,7 +97,7 @@ bool MasEngine::init() } 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 :-)"); return true; diff --git a/amarok/src/engine/mas/masengine.h b/amarok/src/engine/mas/masengine.h index c94806ac..509342ce 100644 --- a/amarok/src/engine/mas/masengine.h +++ b/amarok/src/engine/mas/masengine.h @@ -38,7 +38,7 @@ class KURL; class MasEngine : public Engine::Base { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/engine/nmm/HostList.h b/amarok/src/engine/nmm/HostList.h index f18add88..3d75d4d7 100644 --- a/amarok/src/engine/nmm/HostList.h +++ b/amarok/src/engine/nmm/HostList.h @@ -31,7 +31,7 @@ class HostListItem; class HostList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/engine/nmm/ServerregistryPing.cpp b/amarok/src/engine/nmm/ServerregistryPing.cpp index 8f025833..5cbf3d9b 100644 --- a/amarok/src/engine/nmm/ServerregistryPing.cpp +++ b/amarok/src/engine/nmm/ServerregistryPing.cpp @@ -29,12 +29,12 @@ ServerregistryPing::ServerregistryPing(const TQString &host, TQ_UINT16 port) : TQSocket() { - connect( this, TQT_SIGNAL(connected()), - TQT_SLOT(socketConnected()) ); - connect( this, TQT_SIGNAL(connectionClosed()), - TQT_SLOT(socketConnectionClosed()) ); - connect( this, TQT_SIGNAL(error(int)), - TQT_SLOT(socketError(int)) ); + connect( this, TQ_SIGNAL(connected()), + TQ_SLOT(socketConnected()) ); + connect( this, TQ_SIGNAL(connectionClosed()), + TQ_SLOT(socketConnectionClosed()) ); + connect( this, TQ_SIGNAL(error(int)), + TQ_SLOT(socketError(int)) ); connectToHost(host, port); } diff --git a/amarok/src/engine/nmm/ServerregistryPing.h b/amarok/src/engine/nmm/ServerregistryPing.h index 312929c0..ea60f059 100644 --- a/amarok/src/engine/nmm/ServerregistryPing.h +++ b/amarok/src/engine/nmm/ServerregistryPing.h @@ -35,7 +35,7 @@ class ServerregistryPing : public TQSocket { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/engine/nmm/nmm_configdialog.cpp b/amarok/src/engine/nmm/nmm_configdialog.cpp index 712e98ea..e3748c66 100644 --- a/amarok/src/engine/nmm/nmm_configdialog.cpp +++ b/amarok/src/engine/nmm/nmm_configdialog.cpp @@ -57,7 +57,7 @@ NmmConfigDialog::NmmConfigDialog() m_user_list = new HostList( m_view->audioGroup, "TheUserList" ); 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_user_list ); @@ -74,17 +74,17 @@ NmmConfigDialog::NmmConfigDialog() createHostLists(); /* connect 'Add...' and 'Remove' buttons */ - connect( m_view->addLocationButton, TQT_SIGNAL( released() ), TQT_SLOT( addHost() ) ); - connect( m_view->removeHostButton, TQT_SIGNAL( released() ), TQT_SLOT( removeHost() ) ); - connect( m_user_list, TQT_SIGNAL( selectionChanged() ) , this, TQT_SLOT( enableRemoveButton() ) ); + connect( m_view->addLocationButton, TQ_SIGNAL( released() ), TQ_SLOT( addHost() ) ); + connect( m_view->removeHostButton, TQ_SIGNAL( released() ), TQ_SLOT( removeHost() ) ); + connect( m_user_list, TQ_SIGNAL( selectionChanged() ) , this, TQ_SLOT( enableRemoveButton() ) ); /* 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->audioGroup, TQT_SIGNAL( released( int ) ), TQT_SIGNAL( viewChanged() ) ); + PluginConfig::connect( m_view->audioPlaybackNode, TQ_SIGNAL( activated( int ) ), TQ_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() diff --git a/amarok/src/engine/nmm/nmm_configdialog.h b/amarok/src/engine/nmm/nmm_configdialog.h index 292046de..09267c41 100644 --- a/amarok/src/engine/nmm/nmm_configdialog.h +++ b/amarok/src/engine/nmm/nmm_configdialog.h @@ -37,7 +37,7 @@ class NmmLocation; class NmmConfigDialog : public Amarok::PluginConfig { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp index 1edeae23..7f148628 100644 --- a/amarok/src/engine/nmm/nmm_engine.cpp +++ b/amarok/src/engine/nmm/nmm_engine.cpp @@ -98,7 +98,7 @@ bool NmmEngine::init() createEnvironmentHostList(); 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; } @@ -177,7 +177,7 @@ Engine::State NmmEngine::state() const Amarok::PluginConfig* NmmEngine::configure() const { 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; } @@ -191,7 +191,7 @@ bool NmmEngine::load(const KURL& url, bool stream) // check security options static bool already_checked = false; if( !already_checked) { - TQTimer::singleShot(100, this, TQT_SLOT( checkSecurity() ) ); + TQTimer::singleShot(100, this, TQ_SLOT( checkSecurity() ) ); already_checked = true; } @@ -690,7 +690,7 @@ Result NmmEngine::endTrack() __position = 0; // cleanup after this method returned - TQTimer::singleShot( 0, instance(), TQT_SLOT( endOfStreamReached() ) ); + TQTimer::singleShot( 0, instance(), TQ_SLOT( endOfStreamReached() ) ); return SUCCESS; } diff --git a/amarok/src/engine/nmm/nmm_engine.h b/amarok/src/engine/nmm/nmm_engine.h index 43630cb4..061f802c 100644 --- a/amarok/src/engine/nmm/nmm_engine.h +++ b/amarok/src/engine/nmm/nmm_engine.h @@ -44,7 +44,7 @@ using namespace NMM; */ class NmmEngine : public Engine::Base { -Q_OBJECT +TQ_OBJECT public: NmmEngine(); diff --git a/amarok/src/engine/xine/xine-config.cpp b/amarok/src/engine/xine/xine-config.cpp index 2f72a55d..937970dd 100644 --- a/amarok/src/engine/xine/xine-config.cpp +++ b/amarok/src/engine/xine/xine-config.cpp @@ -30,7 +30,7 @@ XineGeneralEntry::XineGeneralEntry(const TQString& key, xine_t *xine, XineConfig , m_xine(xine) { 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); 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); 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 ); 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]); } - 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_view->deviceComboBox->setCurrentItem( (XineCfg::outputPlugin() == "auto" ) ? "Autodetect" : XineCfg::outputPlugin() ); init(); diff --git a/amarok/src/engine/xine/xine-config.h b/amarok/src/engine/xine/xine-config.h index 4f4c392d..cc64b8eb 100644 --- a/amarok/src/engine/xine/xine-config.h +++ b/amarok/src/engine/xine/xine-config.h @@ -23,7 +23,7 @@ class KLineEdit; class XineGeneralEntry : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -63,7 +63,7 @@ void saveXineEntry(Functor& storeEntry, T val, const TQString& key, xine_t *xine class XineStrEntry : public XineGeneralEntry { - Q_OBJECT + TQ_OBJECT public: @@ -80,7 +80,7 @@ class XineStrEntry : public XineGeneralEntry class XineIntEntry : public XineGeneralEntry { - Q_OBJECT + TQ_OBJECT public: @@ -98,7 +98,7 @@ class XineIntEntry : public XineGeneralEntry class XineEnumEntry : public XineIntEntry { - Q_OBJECT + TQ_OBJECT public: XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *xine, XineConfigDialog* xcf); @@ -107,7 +107,7 @@ public: class XineConfigDialog : public Amarok::PluginConfig { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp index 7b9230ed..c6c61dbc 100644 --- a/amarok/src/engine/xine/xine-engine.cpp +++ b/amarok/src/engine/xine/xine-engine.cpp @@ -68,6 +68,7 @@ static inline TQCString configPath() { return TQFile::encodeName(locate( "data", static Fader *s_fader = 0; static OutFader *s_outfader = 0; +bool XineEngine::s_logarithmicVolume = false; XineEngine::XineEngine() : EngineBase() @@ -89,6 +90,12 @@ XineEngine::XineEngine() addPluginProperty("HasCDDA", "true"); // new property debug() << "hello" << endl; + // Detect xine version, this is used for volume adjustment. + // Xine versions prior to 1.2.13 use linear volume, so the engine uses logarithmic volume. + // Xine versions starting from 1.2.13 use logarithmic volume, so the engine uses linear volume. + int xinemajor = 0, xineminor = 0, xinemaint = 0; + xine_get_version(&xinemajor, &xineminor, &xinemaint); + s_logarithmicVolume = (xinemajor * 1000000 + xineminor * 1000 + xinemaint < 1002013); } XineEngine::~XineEngine() @@ -569,6 +576,15 @@ XineEngine::seek( uint ms ) } void +XineEngine::setVolume( uint value ) +{ + m_volume = value; + + setVolumeSW( adjustVolume( value ) ); +} + + +void XineEngine::setVolumeSW( uint vol ) { if ( !m_stream ) @@ -577,6 +593,19 @@ XineEngine::setVolumeSW( uint vol ) xine_set_param( m_stream, XINE_PARAM_AUDIO_AMP_LEVEL, static_cast<uint>( vol * m_preamp ) ); } +// Xine versions prior to 1.2.13 use linear volume, so the engine uses logarithmic volume. +// Xine versions starting from 1.2.13 use logarithmic volume, so the engine uses linear volume. +uint +XineEngine::adjustVolume( uint volume ) +{ + if (s_logarithmicVolume) + { + return XineEngine::makeVolumeLogarithmic(volume); + } + + return volume; +} + void XineEngine::fadeOut( uint fadeLength, bool* terminate, bool exiting ) { @@ -585,7 +614,7 @@ XineEngine::fadeOut( uint fadeLength, bool* terminate, bool exiting ) m_fadeOutRunning = !m_fadeOutRunning; const bool isPlaying = m_stream && ( xine_get_status( m_stream ) == XINE_STATUS_PLAY ); - const float originalVol = Engine::Base::makeVolumeLogarithmic( m_volume ) * m_preamp; + const float originalVol = adjustVolume( m_volume ) * m_preamp; // On shutdown, limit fadeout to 3 secs max, so that we don't risk getting killed const int length = exiting ? TQMIN( fadeLength, 3000 ) : fadeLength; @@ -605,7 +634,7 @@ XineEngine::fadeOut( uint fadeLength, bool* terminate, bool exiting ) if( *terminate ) break; ::usleep( stepSizeUs ); - float vol = Engine::Base::makeVolumeLogarithmic( m_volume ) * m_preamp; + float vol = adjustVolume( m_volume ) * m_preamp; float mix = (float)t.elapsed() / (float)length; if ( mix > 1.0 ) { @@ -830,8 +859,8 @@ Amarok::PluginConfig* XineEngine::configure() const { XineConfigDialog* xcf = new XineConfigDialog( m_xine ); - connect(xcf, TQT_SIGNAL( settingsSaved() ), this, TQT_SLOT( configChanged() )); - connect(this, TQT_SIGNAL( resetConfig(xine_t*) ), xcf, TQT_SLOT( reset(xine_t*) )); + connect(xcf, TQ_SIGNAL( settingsSaved() ), this, TQ_SLOT( configChanged() )); + connect(this, TQ_SIGNAL( resetConfig(xine_t*) ), xcf, TQ_SLOT( reset(xine_t*) )); return xcf; } @@ -1294,7 +1323,7 @@ Fader::run() elapsedUs += stepSizeUs; // get volume (amarok main * equalizer preamp) - float vol = XineEngine::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp; + float vol = XineEngine::adjustVolume( m_engine->m_volume ) * m_engine->m_preamp; // compute the mix factor as the percentage of time spent since fade begun float mix = (elapsedUs / 1000.0) / (float)m_fadeLength; diff --git a/amarok/src/engine/xine/xine-engine.h b/amarok/src/engine/xine/xine-engine.h index 8b581237..6a707039 100644 --- a/amarok/src/engine/xine/xine-engine.h +++ b/amarok/src/engine/xine/xine-engine.h @@ -24,7 +24,7 @@ class XineConfigDialog; class XineEngine : public Engine::Base { - Q_OBJECT + TQ_OBJECT friend class Fader; @@ -53,7 +53,10 @@ class XineEngine : public Engine::Base virtual Amarok::PluginConfig *configure() const; virtual void setEqualizerEnabled( bool ); virtual void setEqualizerParameters( int preamp, const TQValueList<int>& ); + virtual void setVolume( uint value ); virtual void setVolumeSW( uint ); + static uint adjustVolume( uint volume ); + virtual void fadeOut( uint fadeLength, bool* terminate, bool exiting = false ); static void XineEventListener( void*, const xine_event_t* ); @@ -80,6 +83,7 @@ class XineEngine : public Engine::Base int64_t m_currentVpts; float m_preamp; + static bool s_logarithmicVolume; bool m_stopFader; bool m_fadeOutRunning; diff --git a/amarok/src/engine/yauap/yauap-engine.cpp b/amarok/src/engine/yauap/yauap-engine.cpp index 46c671b0..1549a55d 100644 --- a/amarok/src/engine/yauap/yauap-engine.cpp +++ b/amarok/src/engine/yauap/yauap-engine.cpp @@ -47,7 +47,7 @@ signal_handler( DBusConnection * /*con*/, DBusMessage *msg, void *data ) const char *interface = dbus_message_get_interface(msg); 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")) TQApplication::postEvent(engine, new TQCustomEvent(3004)); @@ -473,7 +473,7 @@ yauapEngine::init() m_state = Engine::Idle; - connect(&helper, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(yauapProcessExited())); + connect(&helper, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(yauapProcessExited())); if (initDbusConnection()) return true; diff --git a/amarok/src/engine/yauap/yauap-engine.h b/amarok/src/engine/yauap/yauap-engine.h index daf08a6e..1202058f 100644 --- a/amarok/src/engine/yauap/yauap-engine.h +++ b/amarok/src/engine/yauap/yauap-engine.h @@ -59,7 +59,7 @@ static DBusHandlerResult signal_handler( DBusConnection *, DBusMessage *, void * class yauapEngine : public Engine::Base { - Q_OBJECT + TQ_OBJECT friend class DBusConnection; diff --git a/amarok/src/enginebase.h b/amarok/src/enginebase.h index 88d4c872..eabfa53e 100644 --- a/amarok/src/enginebase.h +++ b/amarok/src/enginebase.h @@ -60,7 +60,7 @@ namespace Engine class LIBAMAROK_EXPORT Base : public TQObject, public Amarok::Plugin { - Q_OBJECT + TQ_OBJECT signals: @@ -179,7 +179,7 @@ namespace Engine * Set new volume value. * @param value Volume in range 0 to 100. */ - void setVolume( uint value ); + virtual void setVolume( uint value ); /** Set new crossfade length (msec) */ void setXfadeLength( int value ) { m_xfadeLength = value; } diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp index 0cd7e664..b74ba733 100644 --- a/amarok/src/enginecontroller.cpp +++ b/amarok/src/enginecontroller.cpp @@ -67,7 +67,7 @@ EngineController::EngineController() { 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() @@ -161,24 +161,24 @@ EngineController::loadEngine( const TQString &engineName ) Amarok::Plugin *plugin = PluginManager::createFromService( *it ); if( plugin ) { - TQObject *bar = TQT_TQOBJECT(Amarok::StatusBar::instance()); + TQObject *bar = Amarok::StatusBar::instance(); EngineBase *engine = static_cast<EngineBase*>( plugin ); - connect( engine, TQT_SIGNAL(stateChanged( Engine::State )), - this, TQT_SLOT(slotStateChanged( Engine::State )) ); - connect( engine, TQT_SIGNAL(trackEnded()), - this, TQT_SLOT(slotTrackEnded()) ); + connect( engine, TQ_SIGNAL(stateChanged( Engine::State )), + this, TQ_SLOT(slotStateChanged( Engine::State )) ); + connect( engine, TQ_SIGNAL(trackEnded()), + this, TQ_SLOT(slotTrackEnded()) ); if( bar ) { - connect( engine, TQT_SIGNAL(statusText( const TQString& )), - bar, TQT_SLOT(shortMessage( const TQString& )) ); - connect( engine, TQT_SIGNAL(infoMessage( const TQString& )), - bar, TQT_SLOT(longMessage( const TQString& )) ); + connect( engine, TQ_SIGNAL(statusText( const TQString& )), + bar, TQ_SLOT(shortMessage( const TQString& )) ); + connect( engine, TQ_SIGNAL(infoMessage( const TQString& )), + bar, TQ_SLOT(longMessage( const TQString& )) ); } - connect( engine, TQT_SIGNAL(metaData( const Engine::SimpleMetaBundle& )), - this, TQT_SLOT(slotEngineMetaData( const Engine::SimpleMetaBundle& )) ); - connect( engine, TQT_SIGNAL(showConfigDialog( const TQCString& )), - kapp, TQT_SLOT(slotConfigAmarok( const TQCString& )) ); + connect( engine, TQ_SIGNAL(metaData( const Engine::SimpleMetaBundle& )), + this, TQ_SLOT(slotEngineMetaData( const Engine::SimpleMetaBundle& )) ); + connect( engine, TQ_SIGNAL(showConfigDialog( const TQCString& )), + kapp, TQ_SLOT(slotConfigAmarok( const TQCString& )) ); if( engine->init() ) return engine; @@ -406,10 +406,10 @@ void EngineController::play( const MetaBundle &bundle, uint offset ) if (LastFm::Controller::instance()->changeStation( url.url() ) == -1) // Request was canceled, return immediately. return; - connect( m_engine, TQT_SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService() - , TQT_SLOT( requestMetaData() ) ); - connect( LastFm::Controller::instance()->getService(), TQT_SIGNAL( metaDataResult( const MetaBundle& ) ), - this, TQT_SLOT( slotStreamMetaData( const MetaBundle& ) ) ); + connect( m_engine, TQ_SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService() + , TQ_SLOT( requestMetaData() ) ); + connect( LastFm::Controller::instance()->getService(), TQ_SIGNAL( metaDataResult( const MetaBundle& ) ), + this, TQ_SLOT( slotStreamMetaData( const MetaBundle& ) ) ); return; } else @@ -422,10 +422,10 @@ void EngineController::play( const MetaBundle &bundle, uint offset ) return; m_lastFm = true; - connect( m_engine, TQT_SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService() - , TQT_SLOT( requestMetaData() ) ); - connect( LastFm::Controller::instance()->getService(), TQT_SIGNAL( metaDataResult( const MetaBundle& ) ), - this, TQT_SLOT( slotStreamMetaData( const MetaBundle& ) ) ); + connect( m_engine, TQ_SIGNAL( lastFmTrackChange() ), LastFm::Controller::instance()->getService() + , TQ_SLOT( requestMetaData() ) ); + connect( LastFm::Controller::instance()->getService(), TQ_SIGNAL( metaDataResult( const MetaBundle& ) ), + this, TQ_SLOT( slotStreamMetaData( const MetaBundle& ) ) ); } 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 next( false ); - TQTimer::singleShot( 0, this, TQT_SLOT(play()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(play()) ); } else { @@ -747,7 +747,7 @@ void EngineController::slotTrackEnded() //SLOT //FIXME not perfect if ( !m_isTiming ) { - TQTimer::singleShot( AmarokConfig::trackDelayLength(), this, TQT_SLOT(trackFinished()) ); + TQTimer::singleShot( AmarokConfig::trackDelayLength(), this, TQ_SLOT(trackFinished()) ); m_isTiming = true; } diff --git a/amarok/src/enginecontroller.h b/amarok/src/enginecontroller.h index cd41112e..3349482d 100644 --- a/amarok/src/enginecontroller.h +++ b/amarok/src/enginecontroller.h @@ -34,7 +34,7 @@ namespace TDEIO { class Job; } class EngineController : public TQObject, public EngineSubject { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp index b72a819f..a3aa903f 100644 --- a/amarok/src/equalizerpresetmanager.cpp +++ b/amarok/src/equalizerpresetmanager.cpp @@ -42,8 +42,8 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na m_presetsView = new TDEListView( mainWidget, "presetListView" ); m_presetsView->addColumn( i18n( "Presets" ) ); m_presetsView->setFullWidth( true ); - connect(m_presetsView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateButtonState() )); - connect(m_presetsView, TQT_SIGNAL( doubleClicked ( TQListViewItem*, const TQPoint&, int ) ), TQT_SLOT( slotRename() )); + connect(m_presetsView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( updateButtonState() )); + connect(m_presetsView, TQ_SIGNAL( doubleClicked ( TQListViewItem*, const TQPoint&, int ) ), TQ_SLOT( slotRename() )); mainLayout->addWidget( m_presetsView ); TQVBoxLayout* buttonsLayout = new TQVBoxLayout( mainLayout ); @@ -54,9 +54,9 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na buttonsLayout->addWidget( m_renameBtn ); buttonsLayout->addWidget( m_deleteBtn ); - connect(m_renameBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRename() )); - connect(m_deleteBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDelete() )); - connect(this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( slotDefault() )); + connect(m_renameBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRename() )); + connect(m_deleteBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDelete() )); + connect(this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( slotDefault() )); TQSpacerItem* spacer = new TQSpacerItem( 20, 40, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); buttonsLayout->addItem( spacer ); diff --git a/amarok/src/equalizerpresetmanager.h b/amarok/src/equalizerpresetmanager.h index ebc3ef46..f4202b91 100644 --- a/amarok/src/equalizerpresetmanager.h +++ b/amarok/src/equalizerpresetmanager.h @@ -30,7 +30,7 @@ class TDEListView; class EqualizerPresetManager : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp index a5455ec2..b6d463da 100644 --- a/amarok/src/equalizersetup.cpp +++ b/amarok/src/equalizersetup.cpp @@ -78,23 +78,23 @@ EqualizerSetup::EqualizerSetup() TQPushButton* presetAdd = new TQPushButton( presetBox ); presetAdd->setIconSet( SmallIconSet( Amarok::icon( "add_playlist" ) ) ); 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 ); presetConf->setIconSet( SmallIconSet( Amarok::icon( "configure" ) ) ); TQToolTip::add( presetConf, i18n("Manage presets") ); - connect( presetConf, TQT_SIGNAL( clicked() ), TQT_SLOT( editPresets() ) ); + connect( presetConf, TQ_SIGNAL( clicked() ), TQ_SLOT( editPresets() ) ); 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 // BEGIN GroupBox - m_groupBoxSliders = new TQGroupBox( 1, Qt::Vertical, i18n("Enable Equalizer"), vbox ); + m_groupBoxSliders = new TQGroupBox( 1, TQt::Vertical, i18n("Enable Equalizer"), vbox ); m_groupBoxSliders->setCheckable( true ); m_groupBoxSliders->setChecked( AmarokConfig::equalizerEnabled() ); 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 TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders ); @@ -103,11 +103,11 @@ EqualizerSetup::EqualizerSetup() // END GroupBox // BEGIN Preamp slider - m_slider_preamp = new Slider( Qt::Vertical, slidersLayoutWidget, 100 ); + m_slider_preamp = new Slider( TQt::Vertical, slidersLayoutWidget, 100 ); m_slider_preamp->setMinValue( -100 ); m_slider_preamp->setTickmarks( TQSlider::Right ); 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 ); TQLabel* preampLabel = new TQLabel( i18n("Pre-amp"), slidersLayoutWidget ); @@ -126,7 +126,7 @@ EqualizerSetup::EqualizerSetup() } for ( int i = 0; i < 10; i++ ) { - Slider *slider = new Slider( Qt::Vertical, slidersLayoutWidget ); + Slider *slider = new Slider( TQt::Vertical, slidersLayoutWidget ); TQLabel *label = new TQLabel( bandLabels[i], slidersLayoutWidget ); slider->setMinValue( -100 ); @@ -136,13 +136,13 @@ EqualizerSetup::EqualizerSetup() slidersGridLayout->addMultiCellWidget(label, 1, 1, 2 * i + 2, 2 * i + 3, TQt::AlignHCenter ); m_bandSliders.append( slider ); - connect( slider, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( setEqualizerParameters() ) ); - connect( slider, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( sliderChanged() ) ); + connect( slider, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( setEqualizerParameters() ) ); + connect( slider, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( sliderChanged() ) ); } // END // BEGIN Equalizer Graph Widget - TQGroupBox* graphGBox = new TQGroupBox( 2, Qt::Horizontal, 0, vbox ); + TQGroupBox* graphGBox = new TQGroupBox( 2, TQt::Horizontal, 0, vbox ); graphGBox->setInsideMargin( KDialog::marginHint() ); TQVBox* graphVBox = new TQVBox( graphGBox ); diff --git a/amarok/src/equalizersetup.h b/amarok/src/equalizersetup.h index 03ed492e..775ea1b4 100644 --- a/amarok/src/equalizersetup.h +++ b/amarok/src/equalizersetup.h @@ -32,7 +32,7 @@ namespace Amarok { class Slider; } class EqualizerSetup : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp index bc7c2191..c79d8fda 100644 --- a/amarok/src/filebrowser.cpp +++ b/amarok/src/filebrowser.cpp @@ -93,7 +93,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) } TDEActionCollection* ac = new TDEActionCollection( this ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "filebrowser_select_all" ); + KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "filebrowser_select_all" ); TDEToolBar *toolbar = new Browser::ToolBar( this ); @@ -104,7 +104,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) 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( 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() ); - connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(prepareContextMenu()) ); - connect( menu, TQT_SIGNAL(activated( int )), TQT_SLOT(contextMenuActivated( int )) ); + connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(prepareContextMenu()) ); + 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, - TQT_TQOBJECT(this), TQT_SLOT( gotoCurrentFolder() ), actionCollection ); + this, TQ_SLOT( gotoCurrentFolder() ), actionCollection ); gotoCurrent->plug( toolbar ); - disconnect( actionCollection->action( "up" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( cdUp() ) ); - connect( actionCollection->action( "up" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( myCdUp() ) ); - disconnect( actionCollection->action( "home" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( home() ) ); - connect( actionCollection->action( "home" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( myHome() ) ); + disconnect( actionCollection->action( "up" ), TQ_SIGNAL( activated() ), m_dir, TQ_SLOT( cdUp() ) ); + connect( actionCollection->action( "up" ), TQ_SIGNAL( activated() ), m_dir, TQ_SLOT( myCdUp() ) ); + disconnect( actionCollection->action( "home" ), TQ_SIGNAL( activated() ), m_dir, TQ_SLOT( home() ) ); + 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_combo, TQT_SIGNAL(urlActivated( const KURL& )), TQT_SLOT(setUrl( const KURL& )) ); - connect( m_combo, TQT_SIGNAL(returnPressed( const TQString& )), TQT_SLOT(setUrl( const TQString& )) ); - connect( m_dir, TQT_SIGNAL(viewChanged( KFileView* )), TQT_SLOT(slotViewChanged( KFileView* )) ); - connect( m_dir, TQT_SIGNAL(fileSelected( const KFileItem* )), TQT_SLOT(activate( const KFileItem* )) ); - connect( m_dir, TQT_SIGNAL(urlEntered( const KURL& )), TQT_SLOT(urlChanged( const KURL& )) ); - connect( m_dir, TQT_SIGNAL(urlEntered( const KURL& )), searchPane, TQT_SLOT(urlChanged( const KURL& )) ); - connect( m_dir, TQT_SIGNAL(dropped( const KFileItem*, TQDropEvent*, const KURL::List& )), - TQT_SLOT(dropped( const KFileItem*, TQDropEvent*, const KURL::List& )) ); + connect( m_filter, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(setFilter( const TQString& )) ); + connect( m_combo, TQ_SIGNAL(urlActivated( const KURL& )), TQ_SLOT(setUrl( const KURL& )) ); + connect( m_combo, TQ_SIGNAL(returnPressed( const TQString& )), TQ_SLOT(setUrl( const TQString& )) ); + connect( m_dir, TQ_SIGNAL(viewChanged( KFileView* )), TQ_SLOT(slotViewChanged( KFileView* )) ); + connect( m_dir, TQ_SIGNAL(fileSelected( const KFileItem* )), TQ_SLOT(activate( const KFileItem* )) ); + connect( m_dir, TQ_SIGNAL(urlEntered( const KURL& )), TQ_SLOT(urlChanged( const KURL& )) ); + connect( m_dir, TQ_SIGNAL(urlEntered( const KURL& )), searchPane, TQ_SLOT(urlChanged( const KURL& )) ); + connect( m_dir, TQ_SIGNAL(dropped( const KFileItem*, TQDropEvent*, const KURL::List& )), + TQ_SLOT(dropped( const KFileItem*, TQDropEvent*, const KURL::List& )) ); setSpacing( 4 ); 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 ); 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 ); @@ -619,17 +619,17 @@ SearchPane::SearchPane( FileBrowser *parent ) container->setBackgroundMode( TQt::PaletteBase ); 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 ); 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*/ ); insertChild( m_lister ); - connect( m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(searchMatches( const KFileItemList& )) ); - connect( m_lister, TQT_SIGNAL(completed()), TQT_SLOT(searchComplete()) ); + connect( m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(searchMatches( const KFileItemList& )) ); + connect( m_lister, TQ_SIGNAL(completed()), TQ_SLOT(searchComplete()) ); } void @@ -638,7 +638,7 @@ SearchPane::toggle( bool toggled ) if ( toggled ) m_lineEdit->setFocus(); - TQT_TQWIDGET(child("container"))->setShown( toggled ); + static_cast<TQWidget*>(child("container"))->setShown( toggled ); } void @@ -686,7 +686,7 @@ SearchPane::searchComplete() //connected to KDirLister::complete() //TODO fix crappy KDElibs - TQTimer::singleShot( 0, this, TQT_SLOT(_searchComplete()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(_searchComplete()) ); } void diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h index fb3eea0b..4faffb30 100644 --- a/amarok/src/filebrowser.h +++ b/amarok/src/filebrowser.h @@ -50,7 +50,7 @@ class Medium; class FileBrowser : public TQVBox { - Q_OBJECT + TQ_OBJECT enum MenuId { MakePlaylist, SavePlaylist, MediaDevice, AppendToPlaylist, QueueTrack, QueueTracks, SelectAllFiles, BurnCd, MoveToCollection, CopyToCollection, OrganizeFiles, EditTags }; @@ -101,7 +101,7 @@ class TQListViewItem; class SearchPane : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui index c6613fa6..12ba2c6f 100644 --- a/amarok/src/firstrunwizard.ui +++ b/amarok/src/firstrunwizard.ui @@ -280,10 +280,10 @@ <variable access="public">enum Interface { XMMS, Compact };</variable> <variable access="private">CollectionSetup* m_folderSetup;</variable> </variables> -<Q_SLOTS> +<slots> <slot access="private" specifier="non virtual">invokeHandbook()</slot> <slot>openLink( const TQString & s )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> <function access="protected">showPage( TQWidget * w )</function> diff --git a/amarok/src/firstrunwizard.ui.h b/amarok/src/firstrunwizard.ui.h index cc5480e7..c37c560c 100644 --- a/amarok/src/firstrunwizard.ui.h +++ b/amarok/src/firstrunwizard.ui.h @@ -40,10 +40,10 @@ FirstRunWizard::init() WizardPageLayout_2->addWidget( m_folderSetup = new CollectionSetup( WizardPage_2 ) ); - text4->disconnect( TQT_SIGNAL(linkClicked( const TQString& )) ); - connect( text4, TQT_SIGNAL(linkClicked( const TQString& )), TQT_SLOT(invokeHandbook()) ); - dbActiveLabel->disconnect( TQT_SIGNAL(linkClicked( const TQString& )) ); - connect( dbActiveLabel, TQT_SIGNAL(linkClicked( const TQString& )), TQT_SLOT(openLink( const TQString &)) ); + text4->disconnect( TQ_SIGNAL(linkClicked( const TQString& )) ); + connect( text4, TQ_SIGNAL(linkClicked( const TQString& )), TQ_SLOT(invokeHandbook()) ); + dbActiveLabel->disconnect( TQ_SIGNAL(linkClicked( const TQString& )) ); + connect( dbActiveLabel, TQ_SIGNAL(linkClicked( const TQString& )), TQ_SLOT(openLink( const TQString &)) ); setFinishEnabled ( WizardPage_4, true ); #if !defined(USE_MYSQL) && !defined(USE_POSTGRESQL) removePage(WizardPage_3); diff --git a/amarok/src/hintlineedit.cpp b/amarok/src/hintlineedit.cpp index a934218c..b6777cde 100644 --- a/amarok/src/hintlineedit.cpp +++ b/amarok/src/hintlineedit.cpp @@ -31,7 +31,7 @@ HintLineEdit::init() reparent( m_vbox, 0, TQPoint(0,0), true ); m_hint = new TQLabel( m_vbox ); //m_hint->setBuddy( this ); - m_hint->setFocusPolicy( TQ_NoFocus ); + m_hint->setFocusPolicy( TQWidget::NoFocus ); TQFont font; font.setPointSize( font.pointSize() - 2); m_hint->setFont( font ); diff --git a/amarok/src/hintlineedit.h b/amarok/src/hintlineedit.h index 5e32bd9c..c4b571d2 100644 --- a/amarok/src/hintlineedit.h +++ b/amarok/src/hintlineedit.h @@ -9,7 +9,7 @@ class TQWidget; class HintLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp index c7c4c97e..3223fb98 100644 --- a/amarok/src/htmlview.cpp +++ b/amarok/src/htmlview.cpp @@ -39,8 +39,8 @@ HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool D TDEActionCollection* ac = actionCollection(); ac->setAutoConnectShortcuts( true ); - m_copy = KStdAction::copy( this, TQT_SLOT( copyText() ), ac, "htmlview_copy" ); - m_selectAll = KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "htmlview_select_all" ); + m_copy = KStdAction::copy( this, TQ_SLOT( copyText() ), ac, "htmlview_copy" ); + m_selectAll = KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "htmlview_select_all" ); { TDEPopupMenu m; m_copy->plug( &m ); @@ -50,7 +50,7 @@ HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool D m_selectAll->unplug( &m ); } - connect( this, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( enableCopyAction() ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( enableCopyAction() ) ); enableCopyAction(); } diff --git a/amarok/src/htmlview.h b/amarok/src/htmlview.h index 38a51e81..37b85e8b 100644 --- a/amarok/src/htmlview.h +++ b/amarok/src/htmlview.h @@ -15,7 +15,7 @@ class KTempFile; class HTMLView : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/kbookmarkhandler.cpp b/amarok/src/kbookmarkhandler.cpp index b57bd829..2d5ed67e 100644 --- a/amarok/src/kbookmarkhandler.cpp +++ b/amarok/src/kbookmarkhandler.cpp @@ -42,11 +42,11 @@ KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, TDEPopupMenu* rootmenu TQString KBookmarkHandler::currentURL() const { - return static_cast<KDirOperator*>(TQT_TQWIDGET(parent()))->url().url(); + return static_cast<KDirOperator*>(parent())->url().url(); } void KBookmarkHandler::openBookmarkURL( const TQString &url ) { - static_cast<KDirOperator*>(TQT_TQWIDGET(parent()))->setURL( KURL(url), true ); + static_cast<KDirOperator*>(parent())->setURL( KURL(url), true ); } diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp index cdc3dafa..87be7df0 100644 --- a/amarok/src/konquisidebar/universalamarok.cpp +++ b/amarok/src/konquisidebar/universalamarok.cpp @@ -84,9 +84,9 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi // widgetParent->resize(580,300); TDEToolBar *topBar = new TDEToolBar( widget, "Topbar" ); topBar->setIconSize(16); - topBar->insertButton( "today", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( currentTrack() ) ); - topBar->insertButton( "text-x-generic", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( lyrics() ) ); - topBar->insertButton( "preferences-desktop-personal", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( wiki() ) ); + topBar->insertButton( "today", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( currentTrack() ) ); + topBar->insertButton( "text-x-generic", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( lyrics() ) ); + topBar->insertButton( "preferences-desktop-personal", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( wiki() ) ); browser = new TDEHTMLPart(widget, "widget-browser"); //browser=new TDEHTMLPart(widget); @@ -105,32 +105,32 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi TDEToolBar* toolBar=new TDEToolBar(widget, "PlayerControls"); toolBar->setIconSize(16); - toolBar->insertButton( "media-skip-backward",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPrev() ) ); - toolBar->insertButton( "media-playback-start", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPlay() ) ); - toolBar->insertButton( "media-playback-pause",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPause() ) ); - toolBar->insertButton( "media-playback-stop", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendStop() ) ); - toolBar->insertButton( "media-skip-forward", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendNext() ) ); + toolBar->insertButton( "media-skip-backward",0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendPrev() ) ); + toolBar->insertButton( "media-playback-start", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendPlay() ) ); + toolBar->insertButton( "media-playback-pause",0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendPause() ) ); + toolBar->insertButton( "media-playback-stop", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendStop() ) ); + toolBar->insertButton( "media-skip-forward", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendNext() ) ); 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,Qt::Horizontal, toolBar,"volume"); + vol_slider = new TQSlider(0,100,1,0,TQt::Horizontal, toolBar,"volume"); 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); fileInfo = new TQFileInfo(HTML_FILE); 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 ); kdDebug() << "Connecting widget signal" << endl; - connect( widget, TQT_SIGNAL( emitURL( const KURL &)), - this, TQT_SLOT( openURLRequest( const KURL &) ) ); - connect( browser->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( openURLRequest( const KURL & ) ) ); + connect( widget, TQ_SIGNAL( emitURL( const KURL &)), + this, TQ_SLOT( openURLRequest( const KURL &) ) ); + connect( browser->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( openURLRequest( const KURL & ) ) ); widget->show(); } diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h index 7db2770b..3f1097fa 100644 --- a/amarok/src/konquisidebar/universalamarok.h +++ b/amarok/src/konquisidebar/universalamarok.h @@ -40,7 +40,7 @@ class TQDateTime; class amarokWidget : public TQVBox { -Q_OBJECT +TQ_OBJECT public: amarokWidget( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); @@ -57,7 +57,7 @@ signals: class UniversalAmarok : public KonqSidebarPlugin { -Q_OBJECT +TQ_OBJECT public: UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp index 9d0c05cb..85865b15 100644 --- a/amarok/src/ktrm.cpp +++ b/amarok/src/ktrm.cpp @@ -736,7 +736,7 @@ void KTRMLookup::puidGenerated() Amarok::StatusBar::instance()->newProgressOperation( job ) .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 } diff --git a/amarok/src/ktrm.h b/amarok/src/ktrm.h index 4cb39d8d..b552d711 100644 --- a/amarok/src/ktrm.h +++ b/amarok/src/ktrm.h @@ -121,7 +121,7 @@ typedef TQValueList<KTRMResult> KTRMResultList; */ class KTRMLookup : public TQObject { -Q_OBJECT +TQ_OBJECT signals: diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp index 3e03b7a8..a9ab8d41 100644 --- a/amarok/src/lastfm.cpp +++ b/amarok/src/lastfm.cpp @@ -69,10 +69,10 @@ AmarokHttp::get ( const TQString & path ) m_error = TQHttp::NoError; m_state = TQHttp::Connecting; TDEIO::TransferJob *job = TDEIO::get(uri, true, false); - connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); return 0; } @@ -138,13 +138,13 @@ Controller::Controller() { TDEActionCollection* ac = Amarok::actionCollection(); 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" ), - 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" ), - 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 ); } @@ -505,8 +505,8 @@ WebService::handshake( const TQString& username, const TQString& password ) if (this->wasCanceled()) return false; - connect( m_server, TQT_SIGNAL( readReady( KProcIO* ) ), this, TQT_SLOT( readProxy() ) ); - connect( m_server, TQT_SIGNAL( processExited( TDEProcess* ) ), Controller::instance(), TQT_SLOT( playbackStopped() ) ); + connect( m_server, TQ_SIGNAL( readReady( KProcIO* ) ), this, TQ_SLOT( readProxy() ) ); + connect( m_server, TQ_SIGNAL( processExited( TDEProcess* ) ), Controller::instance(), TQ_SLOT( playbackStopped() ) ); } else m_proxyUrl = m_streamUrl.toString(); @@ -565,7 +565,7 @@ void WebService::requestMetaData() //SLOT { 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" ) .arg( m_session ) @@ -621,7 +621,7 @@ WebService::metaDataFinished( int /*id*/, bool error ) //SLOT } 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; 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" ) .arg( m_session ) @@ -676,7 +676,7 @@ void WebService::love() //SLOT { 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" ) .arg( m_session ) @@ -689,7 +689,7 @@ void WebService::skip() //SLOT { 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" ) .arg( m_session ) @@ -702,7 +702,7 @@ void WebService::ban() //SLOT { 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" ) .arg( m_session ) @@ -760,7 +760,7 @@ WebService::friends( TQString username ) username = m_username; 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" ) .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); @@ -802,7 +802,7 @@ WebService::neighbours( TQString username ) username = m_username; 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" ) .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); @@ -844,7 +844,7 @@ WebService::userTags( TQString username ) username = m_username; 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" ) .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); @@ -886,7 +886,7 @@ WebService::recentTracks( TQString username ) username = m_username; 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" ) .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); @@ -948,9 +948,9 @@ WebService::recommend( int type, TQString username, TQString artist, TQString to } 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( Qt::UTC ).toTime_t(); + uint currentTime = TQDateTime::currentDateTime( TQt::UTC ).toTime_t(); TQString challenge = TQString::number( currentTime ); TQCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest(); @@ -1096,10 +1096,10 @@ void Bundle::detach() { LoginDialog::LoginDialog( TQWidget *parent ) : KDialogBase( parent, "LastfmLogin", true, TQString(), Ok|Cancel) { - makeGridMainWidget( 1, Qt::Horizontal ); + makeGridMainWidget( 1, TQt::Horizontal ); new TQLabel( i18n( "To use last.fm with Amarok, you need a last.fm profile." ), mainWidget() ); - makeGridMainWidget( 2, Qt::Horizontal ); + makeGridMainWidget( 2, TQt::Horizontal ); TQLabel *nameLabel = new TQLabel( i18n("&Username:"), mainWidget() ); m_userLineEdit = new KLineEdit( mainWidget() ); nameLabel->setBuddy( m_userLineEdit ); diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h index 8cd351e4..f3980c3b 100644 --- a/amarok/src/lastfm.h +++ b/amarok/src/lastfm.h @@ -40,7 +40,7 @@ namespace TDEIO { class Job; } DO NOT use this class for anything else, use TDEIO directly instead. */ class AmarokHttp : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -74,7 +74,7 @@ namespace LastFm class Controller : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -110,7 +110,7 @@ namespace LastFm class WebService : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -272,7 +272,7 @@ namespace LastFm class LoginDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -289,7 +289,7 @@ namespace LastFm class CustomStationDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/loader/loader.cpp b/amarok/src/loader/loader.cpp index 0410b2af..e570d9c1 100644 --- a/amarok/src/loader/loader.cpp +++ b/amarok/src/loader/loader.cpp @@ -170,7 +170,7 @@ Loader::Loader( TQStringList args ) args.prepend( "amarokapp" ); - m_proc = new TQProcess( args, TQT_TQOBJECT(this) ); + m_proc = new TQProcess( args, this ); m_proc->setCommunication( TQProcess::Stdout ); std::cout << "Amarok: [Loader] Starting amarokapp..\n"; diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp b/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp index 559c628e..b39f2a0c 100644 --- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp +++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp @@ -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 ); - 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 ) .setDescription( i18n( "Downloading album" ) ) - .setAbortSlot( this, TQT_SLOT( albumDownloadAborted() ) ); + .setAbortSlot( this, TQ_SLOT( albumDownloadAborted() ) ); } 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 ); - 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 ) .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 ); - 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 ) .setDescription( i18n( "Adding album cover to collection" ) ) - .setAbortSlot( this, TQT_SLOT( coverAddAborted() ) ); + .setAbortSlot( this, TQ_SLOT( coverAddAborted() ) ); } else { diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h index c160cd30..a509d0bf 100644 --- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h +++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h @@ -35,7 +35,7 @@ This class encapsulates the downloading of an album once all required informatio */ class MagnatuneAlbumDownloader: public TQObject { -Q_OBJECT +TQ_OBJECT public: MagnatuneAlbumDownloader(); diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp index 3e833123..da03da18 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp @@ -44,7 +44,7 @@ MagnatuneArtistInfoBox::displayArtistInfo( KURL url ) m_infoDownloadJob = TDEIO::storedGet( url, false, false ); 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; diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h index 490aea08..9184bf08 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h @@ -35,7 +35,7 @@ A specialized TDEHTMLPart for displaying html info about a Magnatune artist or a */ class MagnatuneArtistInfoBox : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.cpp b/amarok/src/magnatunebrowser/magnatunebrowser.cpp index 26b04d27..bbf4cc09 100644 --- a/amarok/src/magnatunebrowser/magnatunebrowser.cpp +++ b/amarok/src/magnatunebrowser/magnatunebrowser.cpp @@ -41,7 +41,7 @@ MagnatuneBrowser::MagnatuneBrowser( const char *name ) DEBUG_BLOCK initTopPanel( ); - TQSplitter *spliter = new TQSplitter( Qt::Vertical, this ); + TQSplitter *spliter = new TQSplitter( TQt::Vertical, this ); debug() << "Magnatune browser starting..." << endl; m_listView = new MagnatuneListView( spliter ); @@ -52,15 +52,15 @@ MagnatuneBrowser::MagnatuneBrowser( const char *name ) initBottomPanel(); - //connect (m_listView, TQT_SIGNAL(executed(TDEListViewItem *)), this, TQT_SLOT(itemExecuted(TDEListViewItem *))); - connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( itemExecuted( TQListViewItem * ) ) ); - connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( selectionChanged( TQListViewItem * ) ) ); - connect( m_listView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( showPopupMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( m_popupMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( menuAboutToShow() ) ); + //connect (m_listView, TQ_SIGNAL(executed(TDEListViewItem *)), this, TQ_SLOT(itemExecuted(TDEListViewItem *))); + connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemExecuted( TQListViewItem * ) ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( selectionChanged( TQListViewItem * ) ) ); + connect( m_listView, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( showPopupMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_popupMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( menuAboutToShow() ) ); m_currentInfoUrl = ""; @@ -225,15 +225,15 @@ void MagnatuneBrowser::menuAboutToShow( ) switch ( selectedItem->depth() ) { 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; case 1: - m_popupMenu->insertItem( i18n( "Add album to playlist" ), this, TQT_SLOT( addSelectionToPlaylist() ) ); - m_popupMenu->insertItem( i18n( "Purchase album" ), this, TQT_SLOT( purchaseSelectedAlbum() ) ); + m_popupMenu->insertItem( i18n( "Add album to playlist" ), this, TQ_SLOT( addSelectionToPlaylist() ) ); + m_popupMenu->insertItem( i18n( "Purchase album" ), this, TQ_SLOT( purchaseSelectedAlbum() ) ); break; case 2: - m_popupMenu->insertItem( i18n( "Add track to playlist" ), this, TQT_SLOT( addSelectionToPlaylist() ) ); - m_popupMenu->insertItem( i18n( "Purchase album" ), this, TQT_SLOT( purchaseAlbumContainingSelectedTrack() ) ); + m_popupMenu->insertItem( i18n( "Add track to playlist" ), this, TQ_SLOT( addSelectionToPlaylist() ) ); + m_popupMenu->insertItem( i18n( "Purchase album" ), this, TQ_SLOT( purchaseAlbumContainingSelectedTrack() ) ); } } @@ -258,7 +258,7 @@ void MagnatuneBrowser::purchaseSelectedAlbum( ) { m_purchaseHandler = new MagnatunePurchaseHandler(); 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() ); @@ -273,7 +273,7 @@ void MagnatuneBrowser::purchaseAlbumContainingSelectedTrack( ) { m_purchaseHandler = new MagnatunePurchaseHandler(); 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() ); @@ -300,9 +300,9 @@ void MagnatuneBrowser::initTopPanel( ) updateGenreBox(); 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() @@ -331,9 +331,9 @@ void MagnatuneBrowser::initBottomPanel() m_isInfoShown = true; - connect( m_showInfoToggleButton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( showInfo( bool ) ) ); - connect( m_updateListButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updateButtonClicked() ) ); - connect( m_purchaseAlbumButton, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( purchaseButtonClicked() ) ); + connect( m_showInfoToggleButton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( showInfo( bool ) ) ); + connect( m_updateListButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updateButtonClicked() ) ); + connect( m_purchaseAlbumButton, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( purchaseButtonClicked() ) ); } void MagnatuneBrowser::updateButtonClicked() @@ -349,9 +349,9 @@ bool MagnatuneBrowser::updateMagnatuneList() m_listDownloadJob = TDEIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false ); Amarok::StatusBar::instance() ->newProgressOperation( m_listDownloadJob ) .setDescription( i18n( "Downloading Magnatune.com Database" ) ) - .setAbortSlot( TQT_TQOBJECT(this), TQT_SLOT( listDownloadCancelled() ) ); + .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; } @@ -387,7 +387,7 @@ void MagnatuneBrowser::listDownloadComplete( TDEIO::Job * downLoadJob ) 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 ); } diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.h b/amarok/src/magnatunebrowser/magnatunebrowser.h index 91c4f0d1..b5b6a90c 100644 --- a/amarok/src/magnatunebrowser/magnatunebrowser.h +++ b/amarok/src/magnatunebrowser/magnatunebrowser.h @@ -50,7 +50,7 @@ Implemented as a singleton */ class MagnatuneBrowser : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h index 5c201f6b..f72829ac 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h @@ -33,7 +33,7 @@ */ class MagnatuneDownloadDialog : public MagnatuneDownloadDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui index 6d7499f8..a5992619 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui @@ -108,9 +108,9 @@ <slot>downloadButtonClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">downloadButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h index b372b66a..36f974d8 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h @@ -25,7 +25,7 @@ class MagnatunePurchaseDialog : public magnatunePurchaseDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui index 801226f3..bdfeafea 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui @@ -698,9 +698,9 @@ <tabstop>purchaseButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>purchase()</slot> <slot>cancel()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp index cdbfe48a..9ad173e9 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp +++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp @@ -60,7 +60,7 @@ void MagnatunePurchaseHandler::purchaseAlbum( const MagnatuneAlbum &album ) if ( m_albumDownloader == 0 ) { 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"; @@ -83,8 +83,8 @@ void MagnatunePurchaseHandler::showPurchaseDialog( TQString coverTempLocation ) { 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, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( albumPurchaseCancelled() ) ); + 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, 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 ); 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 ) { 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 ) { 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 * ) ) ); } diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h index c1bd858e..24031753 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h +++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h @@ -37,7 +37,7 @@ The main class responcible for handelig of purchases from Magnatune.com */ class MagnatunePurchaseHandler : public TQObject { -Q_OBJECT +TQ_OBJECT public: MagnatunePurchaseHandler(); diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h index 613ab96f..364706b4 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h +++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h @@ -27,7 +27,7 @@ class MagnatuneRedownloadDialog : public magnatuneReDownloadDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui index 26a2062d..e1135d36 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui @@ -98,10 +98,10 @@ <slot>selectionChanged()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">redownload()</slot> <slot access="protected">selectionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp index 47e778f0..1f68c882 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp +++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp @@ -58,8 +58,8 @@ void MagnatuneRedownloadHandler::showRedownloadDialog( ) if (m_redownloadDialog == 0) { m_redownloadDialog = new MagnatuneRedownloadDialog( m_parent ); - connect( m_redownloadDialog, TQT_SIGNAL( redownload( TQString) ), this, TQT_SLOT( redownload( TQString ) ) ); - connect( m_redownloadDialog, TQT_SIGNAL(cancelled() ), this, TQT_SLOT( selectionDialogCancelled() )); + connect( m_redownloadDialog, TQ_SIGNAL( redownload( TQString) ), this, TQ_SLOT( redownload( TQString ) ) ); + connect( m_redownloadDialog, TQ_SIGNAL(cancelled() ), this, TQ_SLOT( selectionDialogCancelled() )); } @@ -102,13 +102,13 @@ void MagnatuneRedownloadHandler::redownload( TQString storedInfoFileName ) if ( m_albumDownloader == 0 ) { 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) { 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 * ) ) ); } diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h index 926f9fed..2e42c6b2 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h +++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h @@ -34,7 +34,7 @@ This class handles the redownloading of previously purchased albums */ class MagnatuneRedownloadHandler : public TQObject { -Q_OBJECT +TQ_OBJECT public: MagnatuneRedownloadHandler(TQWidget * parent); diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp index ea17966c..28a9dec0 100644 --- a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp +++ b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp @@ -149,7 +149,7 @@ MagnatuneXmlParser::parseAlbum( TQDomElement e ) else if ( sElementName == "launchdate" ) { TQString dateString = childElement.text(); - TQDate date = TQDate::fromString( dateString, Qt::ISODate ); + TQDate date = TQDate::fromString( dateString, TQt::ISODate ); m_pCurrentAlbum->setLaunchDate( date ); } diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.h b/amarok/src/magnatunebrowser/magnatunexmlparser.h index a04f905d..07cf455f 100644 --- a/amarok/src/magnatunebrowser/magnatunexmlparser.h +++ b/amarok/src/magnatunebrowser/magnatunexmlparser.h @@ -42,7 +42,7 @@ class MagnatuneXmlParser : public JobBase class MagnatuneXmlParser : public ThreadManager::Job #endif { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index 7a8c21b9..7fc25a8d 100644 --- a/amarok/src/mediabrowser.cpp +++ b/amarok/src/mediabrowser.cpp @@ -259,7 +259,7 @@ MediaBrowser::MediaBrowser( const char *name ) m_toolbar->insertLineSeparator(); // m_toolbar->setIconText( TDEToolBar::IconTextRight, true ); - m_toolbar->insertButton( Amarok::icon( "add_playlist" ), CUSTOM, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(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" ) ); m_toolbar->setIconText( TDEToolBar::IconOnly, false ); @@ -279,25 +279,25 @@ MediaBrowser::MediaBrowser( const char *name ) searchToolBar->setStretchableWidget( m_searchEdit ); m_searchEdit->setFrame( TQFrame::Sunken ); - connect( button, TQT_SIGNAL( clicked() ), m_searchEdit, TQT_SLOT( clear() ) ); - connect( filterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFilter() ) ); + connect( button, TQ_SIGNAL( clicked() ), m_searchEdit, TQ_SLOT( clear() ) ); + connect( filterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFilter() ) ); TQToolTip::add( button, i18n( "Clear filter" ) ); TQToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search" ) ); TQToolTip::add( filterButton, i18n( "Click to edit filter" ) ); } //</Search LineEdit> - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSetFilter() ) ); - connect( m_searchEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotSetFilterTimeout() ) ); - connect( m_searchEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotSetFilter() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSetFilter() ) ); + connect( m_searchEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotSetFilterTimeout() ) ); + connect( m_searchEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotSetFilter() ) ); // connect to device manager - connect( MediaDeviceManager::instance(), TQT_SIGNAL( mediumAdded(const Medium *, TQString) ), - TQT_SLOT( mediumAdded(const Medium *, TQString) ) ); - connect( MediaDeviceManager::instance(), TQT_SIGNAL( mediumChanged(const Medium *, TQString) ), - TQT_SLOT( mediumChanged(const Medium *, TQString) ) ); - connect( MediaDeviceManager::instance(), TQT_SIGNAL( mediumRemoved(const Medium *, TQString) ), - TQT_SLOT( mediumRemoved(const Medium *, TQString) ) ); + connect( MediaDeviceManager::instance(), TQ_SIGNAL( mediumAdded(const Medium *, TQString) ), + TQ_SLOT( mediumAdded(const Medium *, TQString) ) ); + connect( MediaDeviceManager::instance(), TQ_SIGNAL( mediumChanged(const Medium *, TQString) ), + TQ_SLOT( mediumChanged(const Medium *, TQString) ) ); + connect( MediaDeviceManager::instance(), TQ_SIGNAL( mediumRemoved(const Medium *, TQString) ), + TQ_SLOT( mediumRemoved(const Medium *, TQString) ) ); // 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" "dialog to choose a plugin for these devices.") ); - connect( m_toolbar->getButton(CONNECT), TQT_SIGNAL( clicked() ), TQT_SLOT( connectClicked() ) ); - connect( m_toolbar->getButton(DISCONNECT), TQT_SIGNAL( clicked() ), TQT_SLOT( disconnectClicked() ) ); - connect( m_toolbar->getButton(TRANSFER), TQT_SIGNAL( clicked() ), TQT_SLOT( transferClicked() ) ); - connect( m_toolbar->getButton(CONFIGURE), TQT_SIGNAL( clicked() ), TQT_SLOT( config() ) ); + connect( m_toolbar->getButton(CONNECT), TQ_SIGNAL( clicked() ), TQ_SLOT( connectClicked() ) ); + connect( m_toolbar->getButton(DISCONNECT), TQ_SIGNAL( clicked() ), TQ_SLOT( disconnectClicked() ) ); + connect( m_toolbar->getButton(TRANSFER), TQ_SIGNAL( clicked() ), TQ_SLOT( transferClicked() ) ); + 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( pApp, TQT_SIGNAL( prepareToQuit() ), TQT_SLOT( prepareToQuit() ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( tagsChanged( const MetaBundle& ) ), - TQT_SLOT( tagsChanged( const MetaBundle& ) ) ); + connect( m_cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( cancelClicked() ) ); + connect( pApp, TQ_SIGNAL( prepareToQuit() ), TQ_SLOT( prepareToQuit() ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( tagsChanged( const MetaBundle& ) ), + TQ_SLOT( tagsChanged( const MetaBundle& ) ) ); m_haveDevices = false; TQMap<TQString,TQString> savedDevices = Amarok::config( "MediaBrowser" )->entryMap( "MediaBrowser" ); @@ -754,7 +754,7 @@ void MediaBrowser::slotEditFilter() { 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() ) m_searchEdit->setText( fd->filter() ); delete fd; @@ -1192,22 +1192,22 @@ MediaView::MediaView( TQWidget* parent, MediaDevice *device ) addColumn( i18n( "Remote Media" ) ); TDEActionCollection* ac = new TDEActionCollection( this ); - KStdAction::selectAll( TQT_TQOBJECT(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 ) ), - this, TQT_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem* ) ), - this, TQT_SLOT( renameItem( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem* ) ), + this, TQ_SLOT( renameItem( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ), - this, TQT_SLOT( slotExpand( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ), + this, TQ_SLOT( slotExpand( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( invokeItem( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( invokeItem( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( invokeItem( TQListViewItem*, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( invokeItem( TQListViewItem*, const TQPoint &, int ) ) ); m_toolTip = new MediaItemTip( this ); } @@ -2475,8 +2475,8 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) false /* overwrite */, false /* resume */, false /* show progress */ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( fileTransferred( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( fileTransferred( TDEIO::Job * ) ) ); bool tryToRemove = false; while ( m_wait ) @@ -2708,7 +2708,7 @@ MediaDevice::connectDevice( bool silent ) 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->updateStats(); } @@ -3329,7 +3329,7 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags ) 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 ) @@ -3619,12 +3619,12 @@ MediaQueue::MediaQueue(MediaBrowser *parent) itemCountChanged(); TDEActionCollection* ac = new TDEActionCollection( this ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "MediaQueue" ); + KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "MediaQueue" ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - TQT_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), - TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), + TQ_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), + TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) ); } bool diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h index 2b8a9c38..0b83e492 100644 --- a/amarok/src/mediabrowser.h +++ b/amarok/src/mediabrowser.h @@ -124,7 +124,7 @@ class LIBAMAROK_EXPORT MediaItem : public TDEListViewItem class MediaQueue : public TDEListView, public DropProxyTarget { - Q_OBJECT + TQ_OBJECT public: @@ -171,7 +171,7 @@ class MediaQueue : public TDEListView, public DropProxyTarget class LIBAMAROK_EXPORT MediaBrowser : public TQVBox { - Q_OBJECT + TQ_OBJECT friend class DeviceConfigureDialog; friend class MediaDevice; @@ -279,7 +279,7 @@ class LIBAMAROK_EXPORT MediaBrowser : public TQVBox class MediaView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class MediaBrowser; friend class MediaDevice; @@ -327,7 +327,7 @@ class MediaView : public TDEListView class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin { - Q_OBJECT + TQ_OBJECT friend class DeviceConfigureDialog; friend class TransferDialog; diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp index 1f5e9360..f6d8d78d 100644 --- a/amarok/src/mediadevice/daap/daapclient.cpp +++ b/amarok/src/mediadevice/daap/daapclient.cpp @@ -93,7 +93,7 @@ DEBUG_BLOCK 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" ) ); - connect( m_broadcastButton, TQT_SIGNAL( toggled(int) ), TQT_SLOT( broadcastButtonToggled() ) ); + connect( m_broadcastButton, TQ_SIGNAL( toggled(int) ), TQ_SLOT( broadcastButtonToggled() ) ); MediaBrowser::instance()->insertChild( this ); } @@ -139,10 +139,10 @@ DaapClient::openDevice(bool /* silent=false */) { m_browser = new DNSSD::ServiceBrowser("_daap._tcp"); m_browser->setName("daapServiceBrowser"); - connect( m_browser, TQT_SIGNAL( serviceAdded( DNSSD::RemoteService::Ptr ) ), - this, TQT_SLOT( foundDaap ( DNSSD::RemoteService::Ptr ) ) ); - connect( m_browser, TQT_SIGNAL( serviceRemoved( DNSSD::RemoteService::Ptr ) ), - this, TQT_SLOT( serverOffline ( DNSSD::RemoteService::Ptr ) ) ); + connect( m_browser, TQ_SIGNAL( serviceAdded( DNSSD::RemoteService::Ptr ) ), + this, TQ_SLOT( foundDaap ( DNSSD::RemoteService::Ptr ) ) ); + connect( m_browser, TQ_SIGNAL( serviceRemoved( DNSSD::RemoteService::Ptr ) ), + this, TQ_SLOT( serverOffline ( DNSSD::RemoteService::Ptr ) ) ); m_browser->startBrowse(); } #endif @@ -359,7 +359,7 @@ DaapClient::foundDaap( DNSSD::RemoteService::Ptr service ) #if DNSSD_SUPPORT 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(); #endif } @@ -532,7 +532,7 @@ DaapClient::passwordPrompt() KPasswordEdit* m_input; }; - Daap::Reader* callback = dynamic_cast<Daap::Reader*>( const_cast<TQT_BASE_OBJECT_NAME*>( sender() ) ); + Daap::Reader* callback = dynamic_cast<Daap::Reader*>( const_cast<TQObject*>( sender() ) ); if (!callback) { debug() << "No callback!" << endl; return; @@ -544,10 +544,10 @@ DaapClient::passwordPrompt() { Daap::Reader* reader = new Daap::Reader( callback->host(), callback->port(), root, dialog.m_input->password(), this, callback->name() ); root->setReader( reader ); - connect( reader, TQT_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ), - this, TQT_SLOT( createTree( const TQString&, Daap::SongList ) ) ); - connect( reader, TQT_SIGNAL( passwordRequired() ), this, TQT_SLOT( passwordPrompt() ) ); - connect( reader, TQT_SIGNAL( httpError( const TQString& ) ), root, TQT_SLOT( httpError( const TQString& ) ) ); + connect( reader, TQ_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ), + this, TQ_SLOT( createTree( const TQString&, Daap::SongList ) ) ); + connect( reader, TQ_SIGNAL( passwordRequired() ), this, TQ_SLOT( passwordPrompt() ) ); + connect( reader, TQ_SIGNAL( httpError( const TQString& ) ), root, TQ_SLOT( httpError( const TQString& ) ) ); reader->loginRequest(); } else @@ -733,7 +733,7 @@ ServerItem::setOpen( bool o ) //starts loading animation m_iconCounter = 1; 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 ) ) ); @@ -741,10 +741,10 @@ ServerItem::setOpen( bool o ) TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() ); setReader ( reader ); - connect( reader, TQT_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ), - m_daapClient, TQT_SLOT( createTree( const TQString&, Daap::SongList ) ) ); - connect( reader, TQT_SIGNAL( passwordRequired() ), m_daapClient, TQT_SLOT( passwordPrompt() ) ); - connect( reader, TQT_SIGNAL( httpError( const TQString& ) ), this, TQT_SLOT( httpError( const TQString& ) ) ); + connect( reader, TQ_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ), + m_daapClient, TQ_SLOT( createTree( const TQString&, Daap::SongList ) ) ); + connect( reader, TQ_SIGNAL( passwordRequired() ), m_daapClient, TQ_SLOT( passwordPrompt() ) ); + connect( reader, TQ_SIGNAL( httpError( const TQString& ) ), this, TQ_SLOT( httpError( const TQString& ) ) ); reader->loginRequest(); m_loaded = true; } @@ -806,9 +806,9 @@ DaapDownloader::doJob() DEBUG_BLOCK KURL::List::iterator urlIt = m_urls.begin(); 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, TQT_SIGNAL( dataReadProgress( int, int ) ), this, TQT_SLOT( dataReadProgress( int, int ) ) ); - connect( http, TQT_SIGNAL( httpError( const TQString& ) ), this, TQT_SLOT( downloadFailed( const TQString& ) ) ); + connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( downloadFinished( int, bool ) ) ); + connect( http, TQ_SIGNAL( dataReadProgress( int, int ) ), this, TQ_SLOT( dataReadProgress( int, int ) ) ); + connect( http, TQ_SIGNAL( httpError( const TQString& ) ), this, TQ_SLOT( downloadFailed( const TQString& ) ) ); while( !isAborted() && !m_errorOccured && urlIt != m_urls.end() ) { m_ready = false; @@ -817,7 +817,7 @@ DaapDownloader::doJob() KTempFile* tempNewFile = new KTempFile( TQString(), '.' + TQFileInfo( (*urlIt).path() ).extension() ); tempNewFile->setAutoDelete( true ); m_tempFileList.append( tempNewFile ); - http->getDaap( (*urlIt).path() + (*urlIt).query(), TQT_TQIODEVICE(tempNewFile->file()) ); + http->getDaap( (*urlIt).path() + (*urlIt).query(), tempNewFile->file() ); while( !m_ready && !isAborted() ) { msleep( 100 ); //Sleep 100 msec diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h index e6128edb..e58cf2df 100644 --- a/amarok/src/mediadevice/daap/daapclient.h +++ b/amarok/src/mediadevice/daap/daapclient.h @@ -51,7 +51,7 @@ class TQTimer; class DaapClient : public MediaDevice { - Q_OBJECT + TQ_OBJECT public: struct ServerInfo @@ -128,7 +128,7 @@ class DaapClient : public MediaDevice class ServerItem : public TQObject, public MediaItem { - Q_OBJECT + TQ_OBJECT public: @@ -175,7 +175,7 @@ class DaapDownloader : public JobBase class DaapDownloader : public ThreadManager::Job #endif { -Q_OBJECT +TQ_OBJECT public: DaapDownloader( KURL::List urls ); diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp index e27f27eb..7c0a24d2 100644 --- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp +++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp @@ -32,7 +32,7 @@ ContentFetcher::ContentFetcher( const TQString & hostname, TQ_UINT16 port, const , m_port( port ) , 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(); if( !password.isNull() ) { @@ -47,7 +47,7 @@ TQDataStream& ContentFetcher::results() { TQBuffer* bytes = new TQBuffer( readAll() ); - TQIODevice* stream = KFilterDev::device( TQT_TQIODEVICE(bytes), "application/x-gzip", false ); + TQIODevice* stream = KFilterDev::device( bytes, "application/x-gzip", false ); stream->open( IO_ReadOnly ); TQDataStream* ds = new TQDataStream( stream ); return *ds; diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h index 60e2e3b1..486409e5 100644 --- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h +++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h @@ -27,7 +27,7 @@ namespace Daap { */ class ContentFetcher : public TQHttp { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp index 2fb911c8..4348c814 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.cpp +++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp @@ -162,15 +162,15 @@ void Reader::logoutRequest() { 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, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( logoutRequest( int, bool ) ) ); + connect( http, TQ_SIGNAL( httpError( const TQString& ) ), this, TQ_SLOT( fetchingError( const TQString& ) ) ); + connect( http, TQ_SIGNAL( requestFinished( int, bool ) ), this, TQ_SLOT( logoutRequest( int, bool ) ) ); http->getDaap( "/logout?" + m_loginString ); } void Reader::logoutRequest( int, bool ) { - const_cast<TQT_BASE_OBJECT_NAME*>(sender())->deleteLater(); + const_cast<TQObject*>(sender())->deleteLater(); deleteLater(); } @@ -179,9 +179,9 @@ Reader::loginRequest() { DEBUG_BLOCK 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, TQT_SIGNAL( responseHeaderReceived( const TQHttpResponseHeader & ) ) - , this, TQT_SLOT( loginHeaderReceived( const TQHttpResponseHeader & ) ) ); + connect( http, TQ_SIGNAL( httpError( const TQString& ) ), this, TQ_SLOT( fetchingError( const TQString& ) ) ); + connect( http, TQ_SIGNAL( responseHeaderReceived( const TQHttpResponseHeader & ) ) + , this, TQ_SLOT( loginHeaderReceived( const TQHttpResponseHeader & ) ) ); http->getDaap( "/login" ); } @@ -190,15 +190,15 @@ Reader::loginHeaderReceived( const TQHttpResponseHeader & resp ) { DEBUG_BLOCK ContentFetcher* http = (ContentFetcher*) sender(); - disconnect( http, TQT_SIGNAL( responseHeaderReceived( const TQHttpResponseHeader & ) ) - , this, TQT_SLOT( loginHeaderReceived( const TQHttpResponseHeader & ) ) ); + disconnect( http, TQ_SIGNAL( responseHeaderReceived( const TQHttpResponseHeader & ) ) + , this, TQ_SLOT( loginHeaderReceived( const TQHttpResponseHeader & ) ) ); if( resp.statusCode() == 401 /*authorization required*/) { emit passwordRequired(); http->deleteLater(); 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 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 ) { http->deleteLater(); @@ -217,7 +217,7 @@ Reader::loginFinished( int /* id */, bool error ) m_sessionId = loginResults["mlog"].asList()[0].asMap()["mlid"].asList()[0].asInt(); 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 ); } @@ -226,7 +226,7 @@ Reader::updateFinished( int /*id*/, bool error ) { DEBUG_BLOCK 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 ) { http->deleteLater(); @@ -238,7 +238,7 @@ Reader::updateFinished( int /*id*/, bool error ) m_loginString = m_loginString + "&revision-number=" + 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 ); } @@ -247,7 +247,7 @@ void Reader::databaseIdFinished( int /*id*/, bool error ) { 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 ) { http->deleteLater(); @@ -256,7 +256,7 @@ Reader::databaseIdFinished( int /*id*/, bool error ) 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() ); - 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") .arg( m_databaseId, m_loginString ) ); @@ -266,7 +266,7 @@ void Reader::songListFinished( int /*id*/, bool error ) { 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 ) { http->deleteLater(); @@ -418,7 +418,7 @@ Reader::addElement( TQStringVariantMap &parentMap, char* tag, TQVariant element void Reader::fetchingError( const TQString& error ) { - const_cast<TQT_BASE_OBJECT_NAME*>( sender() )->deleteLater(); + const_cast<TQObject*>(sender())->deleteLater(); emit httpError( error ); } #include "reader.moc" diff --git a/amarok/src/mediadevice/daap/daapreader/reader.h b/amarok/src/mediadevice/daap/daapreader/reader.h index b674d6e7..4f22500f 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.h +++ b/amarok/src/mediadevice/daap/daapreader/reader.h @@ -52,7 +52,7 @@ namespace Daap */ class Reader : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevice/daap/daapserver.cpp b/amarok/src/mediadevice/daap/daapserver.cpp index 63953fcb..7cbd2803 100644 --- a/amarok/src/mediadevice/daap/daapserver.cpp +++ b/amarok/src/mediadevice/daap/daapserver.cpp @@ -38,7 +38,7 @@ DaapServer::DaapServer(TQObject* parent, char* name) 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() diff --git a/amarok/src/mediadevice/daap/daapserver.h b/amarok/src/mediadevice/daap/daapserver.h index dd20e4ec..ad25cba9 100644 --- a/amarok/src/mediadevice/daap/daapserver.h +++ b/amarok/src/mediadevice/daap/daapserver.h @@ -21,7 +21,7 @@ namespace DNSSD { class DaapServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb b/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb index 1d86abf4..27d9f28a 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb @@ -27,7 +27,7 @@ require 'rubygems' # people to be able to grab this plugin if they want and use it, because it's snazzy. # # First thing you do is create a gem of your project and make sure that it depends -# on "mongrel" AND "gem_plugin". This Q_SIGNALS to the GemPlugin system that this is +# on "mongrel" AND "gem_plugin". This signals to the GemPlugin system that this is # a plugin for mongrel. # # Next you put this code into a file like lib/init.rb (can be anything really): diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb index 3a9b0581..6c348fbc 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb @@ -267,7 +267,7 @@ module Mongrel # any errors means we should delete the file, including if the file is dumped @socket.close rescue Object @body.delete if @body.class == Tempfile - @body = nil # Q_SIGNALS that there was a problem + @body = nil # signals that there was a problem end end @@ -608,7 +608,7 @@ module Mongrel request = HttpRequest.new(params, client, notifiers) # in the case of large file uploads the user could close the socket, so skip those requests - break if request.body == nil # nil Q_SIGNALS from HttpRequest::initialize that the request was aborted + break if request.body == nil # nil signals from HttpRequest::initialize that the request was aborted # request is good so far, continue processing the response response = HttpResponse.new(client) diff --git a/amarok/src/mediadevice/daap/proxy.cpp b/amarok/src/mediadevice/daap/proxy.cpp index 63a9bc7c..7f09a8aa 100644 --- a/amarok/src/mediadevice/daap/proxy.cpp +++ b/amarok/src/mediadevice/daap/proxy.cpp @@ -80,8 +80,8 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name) if( line == "AMAROK_PROXY: startup" ) break; } 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, TQT_SIGNAL( readReady( KProcIO* ) ), this, TQT_SLOT( readProxy() ) ); + connect( m_proxy, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( playbackStopped() ) ); + connect( m_proxy, TQ_SIGNAL( readReady( KProcIO* ) ), this, TQ_SLOT( readProxy() ) ); } Proxy::~Proxy() diff --git a/amarok/src/mediadevice/daap/proxy.h b/amarok/src/mediadevice/daap/proxy.h index 63a81133..bb4f552b 100644 --- a/amarok/src/mediadevice/daap/proxy.h +++ b/amarok/src/mediadevice/daap/proxy.h @@ -21,7 +21,7 @@ namespace Daap { class Proxy : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index e64baceb..2c05db7a 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -306,11 +306,11 @@ GenericMediaDevice::GenericMediaDevice() m_configDialog = 0; - connect( m_dirLister, TQT_SIGNAL( newItems(const KFileItemList &) ), this, TQT_SLOT( newItems(const KFileItemList &) ) ); - connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( dirListerCompleted() ) ); - connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( dirListerClear() ) ); - connect( m_dirLister, TQT_SIGNAL( clear(const KURL &) ), this, TQT_SLOT( dirListerClear(const KURL &) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem(KFileItem *) ), this, TQT_SLOT( dirListerDeleteItem(KFileItem *) ) ); + connect( m_dirLister, TQ_SIGNAL( newItems(const KFileItemList &) ), this, TQ_SLOT( newItems(const KFileItemList &) ) ); + connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( dirListerCompleted() ) ); + connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( dirListerClear() ) ); + connect( m_dirLister, TQ_SIGNAL( clear(const KURL &) ), this, TQ_SLOT( dirListerClear(const KURL &) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem(KFileItem *) ), this, TQ_SLOT( dirListerDeleteItem(KFileItem *) ) ); } void @@ -403,7 +403,7 @@ GenericMediaDevice::openDevice( bool /*silent*/ ) m_transferDir = newMountPoint; m_initialFile = new GenericMediaFile( 0, newMountPoint, this ); listDir( newMountPoint ); - connect( this, TQT_SIGNAL( startTransfer() ), MediaBrowser::instance(), TQT_SLOT( transferClicked() ) ); + connect( this, TQ_SIGNAL( startTransfer() ), MediaBrowser::instance(), TQ_SLOT( transferClicked() ) ); return true; } @@ -889,10 +889,10 @@ GenericMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *av { if( !m_connected || !KURL::fromPathOrURL( m_medium.mountPoint() ).isLocalFile() ) return false; - KDiskFreeSp* kdf = new KDiskFreeSp( TQT_TQOBJECT(m_parent), "generic_kdf" ); + KDiskFreeSp* kdf = new KDiskFreeSp( m_parent, "generic_kdf" ); kdf->readDF( m_medium.mountPoint() ); - connect(kdf, TQT_SIGNAL(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )), - TQT_SLOT(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long ))); + connect(kdf, TQ_SIGNAL(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )), + TQ_SLOT(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long ))); int count = 0; diff --git a/amarok/src/mediadevice/generic/genericmediadevice.h b/amarok/src/mediadevice/generic/genericmediadevice.h index 1891626b..c7ed1305 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.h +++ b/amarok/src/mediadevice/generic/genericmediadevice.h @@ -40,7 +40,7 @@ typedef TQMap<GenericMediaItem*, GenericMediaFile*> MediaItemMap; class GenericMediaDevice : public MediaDevice { - Q_OBJECT + TQ_OBJECT friend class GenericMediaDeviceConfigDialog; diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui index f0bddeac..b9b0dcf9 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui @@ -250,9 +250,6 @@ <property name="text"> <string>Convert spaces</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="0" column="0"> <property name="name"> @@ -441,13 +438,13 @@ <variable access="private">MetaBundle *m_previewBundle;</variable> <variable access="private">GenericMediaDevice *m_device;</variable> </variables> -<Q_SLOTS> +<slots> <slot>addSupportedButtonClicked( int id )</slot> <slot specifier="non virtual">removeSupportedButtonClicked()</slot> <slot specifier="non virtual">supportedListBoxDoubleClicked( TQListBoxItem * item )</slot> <slot>updatePreviewLabel()</slot> <slot>updatePreviewLabel( const TQString & format )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">updateConfigDialogLists( const TQStringList & supportedFileTypes )</function> <function access="private" specifier="non virtual" returnType="TQString">buildDestination( const TQString & format, const MetaBundle & mb )</function> diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h index 64d1d0fe..17a96e8f 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h @@ -311,7 +311,7 @@ GenericMediaDeviceConfigDialog::init() 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 ) ) ); } diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.h b/amarok/src/mediadevice/ifp/ifpmediadevice.h index b1c7a29c..a20fe8d6 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.h +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h @@ -33,7 +33,7 @@ class TransferDialog; class IfpMediaDevice : public MediaDevice { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index 1e947dc8..6797ae60 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -159,7 +159,7 @@ class IpodMediaItem : public MediaItem if( !rss.isEmpty() || !url.isEmpty() ) { PodcastEpisodeBundle peb( KURL::fromPathOrURL(url), KURL::fromPathOrURL(rss), - track->title, track->artist, desc, date.toString(Qt::ISODate), TQString() /*type*/, + track->title, track->artist, desc, date.toString(TQt::ISODate), TQString() /*type*/, bundle->length(), TQString() /*guid*/, track->playcount<=0 ); bundle->setPodcastBundle( peb ); } @@ -283,7 +283,7 @@ IpodMediaDevice::IpodMediaDevice() m_customAction->setEnabled( false ); am->setDelayed( false ); 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( "Update Artwork" ), UPDATE_ARTWORK ); @@ -309,7 +309,7 @@ IpodMediaDevice::IpodMediaDevice() { infoFound = true; 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( itdb_info_get_ipod_generation_string( info->ipod_generation), gen ); @@ -2689,8 +2689,8 @@ IpodMediaDevice::deleteFile( const KURL &url ) debug() << "deleting " << url.prettyURL() << endl; m_waitForDeletion = true; TDEIO::Job *job = TDEIO::file_delete( url, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( fileDeleted( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( fileDeleted( TDEIO::Job * ) ) ); do { kapp->processEvents( 100 ); diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h index 82d6b85f..0b10b607 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.h +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h @@ -48,7 +48,7 @@ class PodcastInfo; class IpodMediaDevice : public MediaDevice { friend class IpodMediaItem; - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp index 7231749b..6adbe56b 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -1112,8 +1112,8 @@ MtpMediaDevice::openDevice( bool silent ) } connect( - m_view, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), - this, TQT_SLOT( playlistRenamed( TQListViewItem*, const TQString&, int ) ) + m_view, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + this, TQ_SLOT( playlistRenamed( TQListViewItem*, const TQString&, int ) ) ); TQString modelname = TQString( LIBMTP_Get_Modelname( m_device ) ); diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.h b/amarok/src/mediadevice/mtp/mtpmediadevice.h index cb7cb8ff..72e94ab1 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.h +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.h @@ -124,7 +124,7 @@ class MtpMediaItem : public MediaItem class MtpMediaDevice : public MediaDevice { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp index 2d30b2fa..badd2e55 100644 --- a/amarok/src/mediadevice/njb/njbmediadevice.cpp +++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp @@ -380,7 +380,7 @@ NjbMediaDevice::downloadToCollection() TQPtrList<MediaItem> items; m_view->getSelectedLeaves( 0, &items ); - KTempDir tempdir( TQString::null ); // Default prefix is fine with us + KTempDir tempdir; // Default prefix is fine with us tempdir.setAutoDelete( true ); // We don't need it once the work is done. TQString path = tempdir.name(), filepath; KURL::List urls; diff --git a/amarok/src/mediadevice/njb/njbmediadevice.h b/amarok/src/mediadevice/njb/njbmediadevice.h index ff14d8dc..0b219986 100644 --- a/amarok/src/mediadevice/njb/njbmediadevice.h +++ b/amarok/src/mediadevice/njb/njbmediadevice.h @@ -84,7 +84,7 @@ class NjbMediaItem : public MediaItem class NjbMediaDevice : public MediaDevice { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h index 9bbed0c2..785dbf0c 100644 --- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h +++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h @@ -72,7 +72,7 @@ class RioKarmaMediaItem : public MediaItem class RioKarmaMediaDevice : public MediaDevice { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mediadevicemanager.cpp b/amarok/src/mediadevicemanager.cpp index c39829bf..225a7618 100644 --- a/amarok/src/mediadevicemanager.cpp +++ b/amarok/src/mediadevicemanager.cpp @@ -36,9 +36,9 @@ MediaDeviceManager* MediaDeviceManager::instance() MediaDeviceManager::MediaDeviceManager() { DEBUG_BLOCK - connect( DeviceManager::instance(), TQT_SIGNAL( mediumAdded( const Medium*, TQString ) ), TQT_SLOT( slotMediumAdded( const Medium*, TQString ) ) ); - connect( DeviceManager::instance(), TQT_SIGNAL( mediumChanged( const Medium*, TQString ) ), TQT_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( mediumAdded( const Medium*, TQString ) ), TQ_SLOT( slotMediumAdded( const Medium*, TQString ) ) ); + connect( DeviceManager::instance(), TQ_SIGNAL( mediumChanged( const Medium*, TQString ) ), TQ_SLOT( slotMediumChanged( const Medium*, TQString ) ) ); + connect( DeviceManager::instance(), TQ_SIGNAL( mediumRemoved( const Medium*, TQString ) ), TQ_SLOT( slotMediumRemoved( const Medium*, TQString ) ) ); Medium::List mediums = DeviceManager::instance()->getDeviceList(); foreachType( Medium::List, mediums ) { @@ -47,7 +47,7 @@ MediaDeviceManager::MediaDeviceManager() 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; - TQTimer::singleShot( 4000, this, TQT_SLOT( reinitDevices() ) ); + TQTimer::singleShot( 4000, this, TQ_SLOT( reinitDevices() ) ); } //load manual devices TQStringList manualDevices; diff --git a/amarok/src/mediadevicemanager.h b/amarok/src/mediadevicemanager.h index c568b5fb..d27eceab 100644 --- a/amarok/src/mediadevicemanager.h +++ b/amarok/src/mediadevicemanager.h @@ -30,7 +30,7 @@ class MediaDeviceManager : public TQObject //static const uint APPLE = 1; //static const uint IFP = 2; - Q_OBJECT + TQ_OBJECT public: MediaDeviceManager(); diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp index e358b75c..2e364cae 100644 --- a/amarok/src/mediumpluginmanager.cpp +++ b/amarok/src/mediumpluginmanager.cpp @@ -54,7 +54,7 @@ MediumPluginManagerDialog::MediumPluginManagerDialog() vbox->setSpacing( KDialog::spacingHint() ); vbox->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - m_location = new TQGroupBox( 1, Qt::Vertical, i18n( "Devices" ), vbox ); + m_location = new TQGroupBox( 1, TQt::Vertical, i18n( "Devices" ), vbox ); m_location->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); m_devicesBox = new TQVBox( m_location ); m_devicesBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); @@ -64,11 +64,11 @@ MediumPluginManagerDialog::MediumPluginManagerDialog() TQHBox *hbox = new TQHBox( vbox ); KPushButton *detectDevices = new KPushButton( i18n( "Autodetect Devices" ), hbox); 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 ); 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() @@ -88,7 +88,7 @@ MediumPluginManager::MediumPluginManager( TQWidget *widget, const bool nographic { 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() @@ -154,7 +154,7 @@ MediumPluginManager::detectDevices( const bool redetect, const bool nographics ) MediaDeviceConfig *dev = new MediaDeviceConfig( *it, this, nographics, m_widget ); 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; } @@ -288,7 +288,7 @@ ManualDeviceAdder::ManualDeviceAdder( MediumPluginManager* mpm ) 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." ) ); - 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() @@ -433,16 +433,16 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, } 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" ) ); TQToolTip::add( m_configButton, i18n( "Configure device settings" ) ); 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" ) ); - connect( m_pluginCombo, TQT_SIGNAL(activated(const TQString&)), m_manager, TQT_SLOT(slotChanged()) ); - connect( this, TQT_SIGNAL(changed()), m_manager, TQT_SLOT(slotChanged()) ); + connect( m_pluginCombo, TQ_SIGNAL(activated(const TQString&)), m_manager, TQ_SLOT(slotChanged()) ); + connect( this, TQ_SIGNAL(changed()), m_manager, TQ_SLOT(slotChanged()) ); if( !nographics ) show(); diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h index a367596f..1ca7d826 100644 --- a/amarok/src/mediumpluginmanager.h +++ b/amarok/src/mediumpluginmanager.h @@ -43,7 +43,7 @@ typedef TQMap<TQString, Medium*> DeletedMap; class MediaDeviceConfig : public TQHBox { - Q_OBJECT + TQ_OBJECT public: @@ -80,7 +80,7 @@ typedef TQValueList<MediaDeviceConfig *> DeviceList; class MediumPluginManager : public TQObject { - Q_OBJECT + TQ_OBJECT friend class DeviceManager; @@ -114,7 +114,7 @@ class MediumPluginManager : public TQObject class MediumPluginManagerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -133,7 +133,7 @@ class MediumPluginManagerDialog : public KDialogBase class ManualDeviceAdder : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp index 7787c503..aa27b4d2 100644 --- a/amarok/src/metabundle.cpp +++ b/amarok/src/metabundle.cpp @@ -63,6 +63,7 @@ #include "metabundle.h" #include "podcastbundle.h" +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) namespace Amarok { KURL detachedKURL( const KURL &url ) { @@ -75,7 +76,7 @@ namespace Amarok { MetaBundle::EmbeddedImage::EmbeddedImage( const TagLib::ByteVector& data, const TagLib::String& description ) - : m_description( TStringToQString( description ) ) + : m_description( TStringToTQString( description ) ) { m_data.duplicate( data.data(), data.size() ); } @@ -419,7 +420,7 @@ MetaBundle::init( TagLib::AudioProperties *ap ) if ( ap ) { m_bitrate = ap->bitrate(); - m_length = ap->length(); + m_length = ap->lengthInSeconds(); m_sampleRate = ap->sampleRate(); } else @@ -511,7 +512,7 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag tag = fileref.tag(); if ( tag ) { - #define strip( x ) TQString(TStringToQString( x )).stripWhiteSpace() + #define strip( x ) TStringToTQString( x ).stripWhiteSpace() setTitle( strip( tag->title() ) ); setArtist( strip( tag->artist() ) ); setAlbum( strip( tag->album() ) ); @@ -536,19 +537,19 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag if ( file->ID3v2Tag() ) { if ( !file->ID3v2Tag()->frameListMap()["TPOS"].isEmpty() ) - disc = TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TPOS"].front()->toString() )).stripWhiteSpace(); + disc = TStringToTQString( file->ID3v2Tag()->frameListMap()["TPOS"].front()->toString() ).stripWhiteSpace(); if ( !file->ID3v2Tag()->frameListMap()["TBPM"].isEmpty() ) - setBpm( TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TBPM"].front()->toString() )).stripWhiteSpace().toFloat() ); + setBpm( TStringToTQString( file->ID3v2Tag()->frameListMap()["TBPM"].front()->toString() ).stripWhiteSpace().toFloat() ); if ( !file->ID3v2Tag()->frameListMap()["TCOM"].isEmpty() ) - setComposer( TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TCOM"].front()->toString() )).stripWhiteSpace() ); + setComposer( TStringToTQString( file->ID3v2Tag()->frameListMap()["TCOM"].front()->toString() ).stripWhiteSpace() ); if ( !file->ID3v2Tag()->frameListMap()["TPE2"].isEmpty() ) // non-standard: Apple, Microsoft - setAlbumArtist( TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TPE2"].front()->toString() )).stripWhiteSpace() ); + setAlbumArtist( TStringToTQString( file->ID3v2Tag()->frameListMap()["TPE2"].front()->toString() ).stripWhiteSpace() ); if ( !file->ID3v2Tag()->frameListMap()["TCMP"].isEmpty() ) - compilation = TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TCMP"].front()->toString() )).stripWhiteSpace(); + compilation = TStringToTQString( file->ID3v2Tag()->frameListMap()["TCMP"].front()->toString() ).stripWhiteSpace(); if(images) { loadImagesFromTag( *file->ID3v2Tag(), *images ); @@ -561,16 +562,16 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag if ( file->tag() ) { if ( !file->tag()->fieldListMap()[ "COMPOSER" ].isEmpty() ) - setComposer( TQString(TStringToQString( file->tag()->fieldListMap()["COMPOSER"].front() )).stripWhiteSpace() ); + setComposer( TStringToTQString( file->tag()->fieldListMap()["COMPOSER"].front() ).stripWhiteSpace() ); if ( !file->tag()->fieldListMap()[ "BPM" ].isEmpty() ) - setBpm( TQString(TStringToQString( file->tag()->fieldListMap()["BPM"].front() )).stripWhiteSpace().toFloat() ); + setBpm( TStringToTQString( file->tag()->fieldListMap()["BPM"].front() ).stripWhiteSpace().toFloat() ); if ( !file->tag()->fieldListMap()[ "DISCNUMBER" ].isEmpty() ) - disc = TQString(TStringToQString( file->tag()->fieldListMap()["DISCNUMBER"].front() )).stripWhiteSpace(); + disc = TStringToTQString( file->tag()->fieldListMap()["DISCNUMBER"].front() ).stripWhiteSpace(); if ( !file->tag()->fieldListMap()[ "COMPILATION" ].isEmpty() ) - compilation = TQString(TStringToQString( file->tag()->fieldListMap()["COMPILATION"].front() )).stripWhiteSpace(); + compilation = TStringToTQString( file->tag()->fieldListMap()["COMPILATION"].front() ).stripWhiteSpace(); } } else if ( TagLib::FLAC::File *file = dynamic_cast<TagLib::FLAC::File *>( fileref.file() ) ) @@ -579,16 +580,16 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag if ( file->xiphComment() ) { if ( !file->xiphComment()->fieldListMap()[ "COMPOSER" ].isEmpty() ) - setComposer( TQString(TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() )).stripWhiteSpace() ); + setComposer( TStringToTQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).stripWhiteSpace() ); if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() ) - setBpm( TQString(TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() )).stripWhiteSpace().toFloat() ); + setBpm( TStringToTQString( file->xiphComment()->fieldListMap()["BPM"].front() ).stripWhiteSpace().toFloat() ); if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() ) - disc = TQString(TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() )).stripWhiteSpace(); + disc = TStringToTQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).stripWhiteSpace(); if ( !file->xiphComment()->fieldListMap()[ "COMPILATION" ].isEmpty() ) - compilation = TQString(TStringToQString( file->xiphComment()->fieldListMap()["COMPILATION"].front() )).stripWhiteSpace(); + compilation = TStringToTQString( file->xiphComment()->fieldListMap()["COMPILATION"].front() ).stripWhiteSpace(); } if ( images && file->ID3v2Tag() ) { @@ -601,7 +602,7 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag TagLib::MP4::Tag *mp4tag = dynamic_cast<TagLib::MP4::Tag *>( file->tag() ); if( mp4tag ) { - setComposer( TQString(TStringToQString( mp4tag->composer() )) ); + setComposer( TStringToTQString( mp4tag->composer() ) ); setBpm( TQString::number( mp4tag->bpm() ).toFloat() ); disc = TQString::number( mp4tag->disk() ); compilation = TQString::number( mp4tag->compilation() ); @@ -1282,7 +1283,7 @@ MetaBundle::genreList() //static TagLib::StringList genres = TagLib::ID3v1::genreList(); for( TagLib::StringList::ConstIterator it = genres.begin(), end = genres.end(); it != end; ++it ) - list += TStringToQString( (*it) ); + list += TStringToTQString( (*it) ); list.sort(); @@ -1337,7 +1338,7 @@ MetaBundle::setExtendedTag( TagLib::File *file, int tag, const TQString value ) if ( oggFile && oggFile->tag() ) { value.isEmpty() ? - oggFile->tag()->removeField( id ): + oggFile->tag()->removeFields( id ): oggFile->tag()->addField( id, QStringToTString( value ), true ); } } @@ -1355,7 +1356,7 @@ MetaBundle::setExtendedTag( TagLib::File *file, int tag, const TQString value ) if ( flacFile && flacFile->xiphComment() ) { value.isEmpty() ? - flacFile->xiphComment()->removeField( id ): + flacFile->xiphComment()->removeFields( id ): flacFile->xiphComment()->addField( id, QStringToTString( value ), true ); } } diff --git a/amarok/src/metabundlesaver.h b/amarok/src/metabundlesaver.h index 5ef3d320..aa62fb99 100644 --- a/amarok/src/metabundlesaver.h +++ b/amarok/src/metabundlesaver.h @@ -26,7 +26,7 @@ namespace TagLib { class LIBAMAROK_EXPORT MetaBundleSaver : public TQObject { - Q_OBJECT + TQ_OBJECT public: MetaBundleSaver( MetaBundle *bundle ); diff --git a/amarok/src/metadata/asf/asfattribute.cpp b/amarok/src/metadata/asf/asfattribute.cpp index 5c832431..b73bd486 100644 --- a/amarok/src/metadata/asf/asfattribute.cpp +++ b/amarok/src/metadata/asf/asfattribute.cpp @@ -23,9 +23,11 @@ #include "asfattribute.h" #include "asffile.h" +#include "tqshared.h" + using namespace TagLib; -class ASF::Attribute::AttributePrivate : public RefCounter +class ASF::Attribute::AttributePrivate : public TQShared { public: AttributePrivate() diff --git a/amarok/src/metadata/asf/asffile.cpp b/amarok/src/metadata/asf/asffile.cpp index bbe5ee5f..3000007e 100644 --- a/amarok/src/metadata/asf/asffile.cpp +++ b/amarok/src/metadata/asf/asffile.cpp @@ -252,7 +252,7 @@ ASF::File::ExtendedContentDescriptionObject::render(ASF::File *file) { data.clear(); data.append(ByteVector::fromShort(attributeData.size(), false)); - data.append(attributeData.toByteVector(ByteVector::null)); + data.append(attributeData.toByteVector(ByteVector())); return BaseObject::render(file); } @@ -279,7 +279,7 @@ ASF::File::MetadataObject::render(ASF::File *file) { data.clear(); data.append(ByteVector::fromShort(attributeData.size(), false)); - data.append(attributeData.toByteVector(ByteVector::null)); + data.append(attributeData.toByteVector(ByteVector())); return BaseObject::render(file); } @@ -306,7 +306,7 @@ ASF::File::MetadataLibraryObject::render(ASF::File *file) { data.clear(); data.append(ByteVector::fromShort(attributeData.size(), false)); - data.append(attributeData.toByteVector(ByteVector::null)); + data.append(attributeData.toByteVector(ByteVector())); return BaseObject::render(file); } diff --git a/amarok/src/metadata/asf/asftag.cpp b/amarok/src/metadata/asf/asftag.cpp index 300887e6..9056ee7e 100644 --- a/amarok/src/metadata/asf/asftag.cpp +++ b/amarok/src/metadata/asf/asftag.cpp @@ -63,7 +63,7 @@ ASF::Tag::album() const { if(d->attributeListMap.contains("WM/AlbumTitle")) return d->attributeListMap["WM/AlbumTitle"][0].toString(); - return String::null; + return String(); } String @@ -107,7 +107,7 @@ ASF::Tag::genre() const { if(d->attributeListMap.contains("WM/Genre")) return d->attributeListMap["WM/Genre"][0].toString(); - return String::null; + return String(); } void diff --git a/amarok/src/metadata/asf/asftag.h b/amarok/src/metadata/asf/asftag.h index f282dee9..f33bd09a 100644 --- a/amarok/src/metadata/asf/asftag.h +++ b/amarok/src/metadata/asf/asftag.h @@ -56,7 +56,7 @@ namespace TagLib { /*! * Returns the album name; if no album name is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String album() const; @@ -66,7 +66,7 @@ namespace TagLib { virtual String comment() const; /*! - * Returns the genre name; if no genre is present in the tag String::null + * Returns the genre name; if no genre is present in the tag a null String * will be returned. */ virtual String genre() const; @@ -77,7 +77,7 @@ namespace TagLib { virtual String rating() const; /*! - * Returns the genre name; if no genre is present in the tag String::null + * Returns the genre name; if no genre is present in the tag a null String * will be returned. */ virtual String copyright() const; @@ -104,7 +104,7 @@ namespace TagLib { virtual void setArtist(const String &s); /*! - * Sets the album to \a s. If \a s is String::null then this value will be + * Sets the album to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setAlbum(const String &s); diff --git a/amarok/src/metadata/audible/audibletag.cpp b/amarok/src/metadata/audible/audibletag.cpp index f62f2155..6a02508a 100644 --- a/amarok/src/metadata/audible/audibletag.cpp +++ b/amarok/src/metadata/audible/audibletag.cpp @@ -35,11 +35,11 @@ using namespace TagLib; Audible::Tag::Tag() : TagLib::Tag::Tag() { - m_title = String::null; - m_artist = String::null; - m_album = String::null; - m_comment = String::null; - m_genre = String::null; + m_title = String(); + m_artist = String(); + m_album = String(); + m_comment = String(); + m_genre = String(); m_year = 0; m_track = 0; m_userID = 0; @@ -50,11 +50,11 @@ Audible::Tag::~Tag() { } bool Audible::Tag::isEmpty() const { - return m_title == String::null && - m_artist == String::null && - m_album == String::null && - m_comment == String::null && - m_genre == String::null && + return m_title.isEmpty() && + m_artist.isEmpty() && + m_album.isEmpty() && + m_comment.isEmpty() && + m_genre.isEmpty() && m_year == 0 && m_track == 0 && m_userID == 0; @@ -105,7 +105,7 @@ void Audible::Tag::readTags( FILE *fp ) } else if(!strcmp(name, "description")) { - if( m_comment.isNull() ) + if( m_comment.isEmpty() ) m_comment = String(value, String::Latin1); } else if(!strcmp(name, "pubdate")) diff --git a/amarok/src/metadata/audible/audibletag.h b/amarok/src/metadata/audible/audibletag.h index f03966fa..5dc16d53 100644 --- a/amarok/src/metadata/audible/audibletag.h +++ b/amarok/src/metadata/audible/audibletag.h @@ -54,30 +54,30 @@ namespace TagLib { /*! * Returns the track name; if no track name is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String title() const { return m_title; } /*! * Returns the artist name; if no artist name is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String artist() const { return m_artist; } /*! * Returns the album name; if no album name is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String album() const { return m_album; } /*! * Returns the track comment; if no comment is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String comment() const { return m_comment; } /*! - * Returns the genre name; if no genre is present in the tag String::null + * Returns the genre name; if no genre is present in the tag a null String * will be returned. */ virtual String genre() const { return m_genre; } @@ -99,31 +99,31 @@ namespace TagLib { virtual uint userID() const { return m_userID; } /*! - * Sets the title to \a s. If \a s is String::null then this value will be + * Sets the title to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setTitle(const String &s) { m_title = s; } /*! - * Sets the artist to \a s. If \a s is String::null then this value will be + * Sets the artist to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setArtist(const String &s) { m_artist = s; } /*! - * Sets the album to \a s. If \a s is String::null then this value will be + * Sets the album to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setAlbum(const String &s) { m_album = s; } /*! - * Sets the album to \a s. If \a s is String::null then this value will be + * Sets the album to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setComment(const String &s) { m_comment = s; } /*! - * Sets the genre to \a s. If \a s is String::null then this value will be + * Sets the genre to \a s. If \a s is a null String then this value will be * cleared. For tag formats that use a fixed set of genres, the appropriate * value will be selected based on a string comparison. A list of available * genres for those formats should be available in that type's diff --git a/amarok/src/metadata/m4a/itunesalbbox.cpp b/amarok/src/metadata/m4a/itunesalbbox.cpp index 5832fa0b..c3412e57 100644 --- a/amarok/src/metadata/m4a/itunesalbbox.cpp +++ b/amarok/src/metadata/m4a/itunesalbbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesAlbBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunesartbox.cpp b/amarok/src/metadata/m4a/itunesartbox.cpp index 19e717d1..8944c950 100644 --- a/amarok/src/metadata/m4a/itunesartbox.cpp +++ b/amarok/src/metadata/m4a/itunesartbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesArtBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunescmtbox.cpp b/amarok/src/metadata/m4a/itunescmtbox.cpp index c79f0f7e..4b2c9063 100644 --- a/amarok/src/metadata/m4a/itunescmtbox.cpp +++ b/amarok/src/metadata/m4a/itunescmtbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesCmtBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunescvrbox.cpp b/amarok/src/metadata/m4a/itunescvrbox.cpp index 4a7b3dbb..0fa7ab89 100644 --- a/amarok/src/metadata/m4a/itunescvrbox.cpp +++ b/amarok/src/metadata/m4a/itunescvrbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesCvrBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunesdaybox.cpp b/amarok/src/metadata/m4a/itunesdaybox.cpp index 16568d74..4cd9c330 100644 --- a/amarok/src/metadata/m4a/itunesdaybox.cpp +++ b/amarok/src/metadata/m4a/itunesdaybox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesDayBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunesdiskbox.cpp b/amarok/src/metadata/m4a/itunesdiskbox.cpp index 93c47f2b..7cd1ad82 100644 --- a/amarok/src/metadata/m4a/itunesdiskbox.cpp +++ b/amarok/src/metadata/m4a/itunesdiskbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesDiskBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunesgenbox.cpp b/amarok/src/metadata/m4a/itunesgenbox.cpp index 08708bc4..af344aa3 100644 --- a/amarok/src/metadata/m4a/itunesgenbox.cpp +++ b/amarok/src/metadata/m4a/itunesgenbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesGenBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunesgrpbox.cpp b/amarok/src/metadata/m4a/itunesgrpbox.cpp index 061b6bda..ca512a1f 100644 --- a/amarok/src/metadata/m4a/itunesgrpbox.cpp +++ b/amarok/src/metadata/m4a/itunesgrpbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesGrpBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunesnambox.cpp b/amarok/src/metadata/m4a/itunesnambox.cpp index 6cc954bb..569258bd 100644 --- a/amarok/src/metadata/m4a/itunesnambox.cpp +++ b/amarok/src/metadata/m4a/itunesnambox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesNamBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunestmpobox.cpp b/amarok/src/metadata/m4a/itunestmpobox.cpp index 3d0ad2da..0abdfa43 100644 --- a/amarok/src/metadata/m4a/itunestmpobox.cpp +++ b/amarok/src/metadata/m4a/itunestmpobox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesTmpoBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/itunestrknbox.cpp b/amarok/src/metadata/m4a/itunestrknbox.cpp index f8d36cb1..162a954a 100644 --- a/amarok/src/metadata/m4a/itunestrknbox.cpp +++ b/amarok/src/metadata/m4a/itunestrknbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesTrknBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/ituneswrtbox.cpp b/amarok/src/metadata/m4a/ituneswrtbox.cpp index ecf3c43e..ec8d2b45 100644 --- a/amarok/src/metadata/m4a/ituneswrtbox.cpp +++ b/amarok/src/metadata/m4a/ituneswrtbox.cpp @@ -55,7 +55,7 @@ void MP4::ITunesWrtBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); // parse data box - TagLib::uint size; + uint size; MP4::Fourcc fourcc; if(mp4file->readSizeAndType( size, fourcc ) == true) diff --git a/amarok/src/metadata/m4a/mp4audiosampleentry.cpp b/amarok/src/metadata/m4a/mp4audiosampleentry.cpp index fb87547e..3c129c55 100644 --- a/amarok/src/metadata/m4a/mp4audiosampleentry.cpp +++ b/amarok/src/metadata/m4a/mp4audiosampleentry.cpp @@ -30,9 +30,9 @@ using namespace TagLib; class MP4::Mp4AudioSampleEntry::Mp4AudioSampleEntryPrivate { public: - TagLib::uint channelcount; - TagLib::uint samplerate; - TagLib::uint bitrate; + uint channelcount; + uint samplerate; + uint bitrate; }; MP4::Mp4AudioSampleEntry::Mp4AudioSampleEntry( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) @@ -46,17 +46,17 @@ MP4::Mp4AudioSampleEntry::~Mp4AudioSampleEntry() delete d; } -TagLib::uint MP4::Mp4AudioSampleEntry::channels() const +uint MP4::Mp4AudioSampleEntry::channels() const { return d->channelcount; } -TagLib::uint MP4::Mp4AudioSampleEntry::samplerate() const +uint MP4::Mp4AudioSampleEntry::samplerate() const { return d->samplerate; } -TagLib::uint MP4::Mp4AudioSampleEntry::bitrate() const +uint MP4::Mp4AudioSampleEntry::bitrate() const { return d->bitrate; } @@ -88,7 +88,7 @@ void MP4::Mp4AudioSampleEntry::parseEntry() (fourcc() == MP4::Fourcc("drms")) ) { TagLib::MP4::Fourcc fourcc; - TagLib::uint esds_size; + uint esds_size; if (!mp4file->readSizeAndType( esds_size, fourcc )) return; @@ -104,8 +104,8 @@ void MP4::Mp4AudioSampleEntry::parseEntry() // upcoming byte must be ESDescrTag (0x03) if( EsDescrTag[0] == 0x03 ) { - TagLib::uint descr_len = mp4file->readSystemsLen(); - TagLib::uint EsId; + uint descr_len = mp4file->readSystemsLen(); + uint EsId; if( !mp4file->readShort( EsId ) ) return; ByteVector priority = mp4file->readBlock(1); @@ -114,7 +114,7 @@ void MP4::Mp4AudioSampleEntry::parseEntry() } else { - TagLib::uint EsId; + uint EsId; if( !mp4file->readShort( EsId ) ) return; } @@ -123,7 +123,7 @@ void MP4::Mp4AudioSampleEntry::parseEntry() if( DecCfgTag[0] != 0x04 ) return; // read decoder configuration length - // TagLib::uint deccfg_len = mp4file->readSystemsLen(); + // uint deccfg_len = mp4file->readSystemsLen(); // read object type Id ByteVector objId = mp4file->readBlock(1); // read stream type id @@ -131,7 +131,7 @@ void MP4::Mp4AudioSampleEntry::parseEntry() // read buffer Size DB ByteVector bufferSizeDB = mp4file->readBlock(3); // read max bitrate - TagLib::uint max_bitrate; + uint max_bitrate; if( !mp4file->readInt( max_bitrate ) ) return; // read average bitrate diff --git a/amarok/src/metadata/m4a/mp4audiosampleentry.h b/amarok/src/metadata/m4a/mp4audiosampleentry.h index c39c5e30..d0b5479c 100644 --- a/amarok/src/metadata/m4a/mp4audiosampleentry.h +++ b/amarok/src/metadata/m4a/mp4audiosampleentry.h @@ -36,11 +36,11 @@ namespace TagLib ~Mp4AudioSampleEntry(); //! function to get the number of channels - TagLib::uint channels() const; + uint channels() const; //! function to get the sample rate - TagLib::uint samplerate() const; + uint samplerate() const; //! function to get the average bitrate of the audio stream - TagLib::uint bitrate() const; + uint bitrate() const; private: //! parse the content of the box diff --git a/amarok/src/metadata/m4a/mp4file.cpp b/amarok/src/metadata/m4a/mp4file.cpp index 7d37d597..b210f1ec 100644 --- a/amarok/src/metadata/m4a/mp4file.cpp +++ b/amarok/src/metadata/m4a/mp4file.cpp @@ -63,7 +63,7 @@ MP4::File::File(const char *file, bool , AudioProperties::ReadStyle ) d->isValid = false; - TagLib::uint size; + uint size; MP4::Fourcc fourcc; while( readSizeAndType( size, fourcc ) == true ) @@ -126,10 +126,10 @@ void MP4::File::remove() { } -TagLib::uint MP4::File::readSystemsLen() +uint MP4::File::readSystemsLen() { - TagLib::uint length = 0; - TagLib::uint nbytes = 0; + uint length = 0; + uint nbytes = 0; ByteVector input; TagLib::uchar tmp_input; @@ -144,7 +144,7 @@ TagLib::uint MP4::File::readSystemsLen() return length; } -bool MP4::File::readSizeAndType( TagLib::uint& size, MP4::Fourcc& fourcc ) +bool MP4::File::readSizeAndType( uint& size, MP4::Fourcc& fourcc ) { // read the two blocks from file ByteVector readsize = readBlock(4); @@ -169,7 +169,7 @@ bool MP4::File::readSizeAndType( TagLib::uint& size, MP4::Fourcc& fourcc ) return true; } -bool MP4::File::readInt( TagLib::uint& toRead ) +bool MP4::File::readInt( uint& toRead ) { ByteVector readbuffer = readBlock(4); if( readbuffer.size() != 4 ) @@ -182,7 +182,7 @@ bool MP4::File::readInt( TagLib::uint& toRead ) return true; } -bool MP4::File::readShort( TagLib::uint& toRead ) +bool MP4::File::readShort( uint& toRead ) { ByteVector readbuffer = readBlock(2); if( readbuffer.size() != 2 ) @@ -295,7 +295,7 @@ void fillTagFromProxy( MP4::Mp4TagsProxy& proxy, MP4::Tag& mp4tag ) TagLib::ByteVector datavec = databox->data(); if( datavec.size() >= 4 ) { - TagLib::uint trackno = static_cast<TagLib::uint>( static_cast<unsigned char>(datavec[0]) << 24 | + uint trackno = static_cast<uint>( static_cast<unsigned char>(datavec[0]) << 24 | static_cast<unsigned char>(datavec[1]) << 16 | static_cast<unsigned char>(datavec[2]) << 8 | static_cast<unsigned char>(datavec[3]) ); @@ -342,7 +342,7 @@ void fillTagFromProxy( MP4::Mp4TagsProxy& proxy, MP4::Tag& mp4tag ) TagLib::ByteVector datavec = databox->data(); if( datavec.size() >= 4 ) { - TagLib::uint discno = static_cast<TagLib::uint>( static_cast<unsigned char>(datavec[0]) << 24 | + uint discno = static_cast<uint>( static_cast<unsigned char>(datavec[0]) << 24 | static_cast<unsigned char>(datavec[1]) << 16 | static_cast<unsigned char>(datavec[2]) << 8 | static_cast<unsigned char>(datavec[3]) ); @@ -360,7 +360,7 @@ void fillTagFromProxy( MP4::Mp4TagsProxy& proxy, MP4::Tag& mp4tag ) if( datavec.size() >= 2 ) { - TagLib::uint bpm = static_cast<TagLib::uint>( static_cast<unsigned char>(datavec[0]) << 8 | + uint bpm = static_cast<uint>( static_cast<unsigned char>(datavec[0]) << 8 | static_cast<unsigned char>(datavec[1]) ); mp4tag.setBpm( bpm ); } diff --git a/amarok/src/metadata/m4a/mp4file.h b/amarok/src/metadata/m4a/mp4file.h index 9e40dbc9..abe42e91 100644 --- a/amarok/src/metadata/m4a/mp4file.h +++ b/amarok/src/metadata/m4a/mp4file.h @@ -114,22 +114,22 @@ namespace TagLib { * Helper function for parsing the MP4 file - reads the size and type of the next box. * Returns true if read succeeded - not at EOF */ - bool readSizeAndType( TagLib::uint& size, MP4::Fourcc& fourcc ); + bool readSizeAndType( uint& size, MP4::Fourcc& fourcc ); /*! * Helper function to read the length of an descriptor in systems manner */ - TagLib::uint readSystemsLen(); + uint readSystemsLen(); /*! * Helper function for reading an unsigned int out of the file (big endian method) */ - bool readInt( TagLib::uint& toRead ); + bool readInt( uint& toRead ); /*! * Helper function for reading an unsigned short out of the file (big endian method) */ - bool readShort( TagLib::uint& toRead ); + bool readShort( uint& toRead ); /*! * Helper function for reading an unsigned long long (64bit) out of the file (big endian method) diff --git a/amarok/src/metadata/m4a/mp4hdlrbox.cpp b/amarok/src/metadata/m4a/mp4hdlrbox.cpp index a3ec5f72..99bbe5f8 100644 --- a/amarok/src/metadata/m4a/mp4hdlrbox.cpp +++ b/amarok/src/metadata/m4a/mp4hdlrbox.cpp @@ -30,12 +30,12 @@ using namespace TagLib; class MP4::Mp4HdlrBox::Mp4HdlrBoxPrivate { public: - TagLib::uint pre_defined; + uint pre_defined; MP4::Fourcc handler_type; TagLib::String hdlr_string; }; // class Mp4HdlrBoxPrivate -MP4::Mp4HdlrBox::Mp4HdlrBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4HdlrBox::Mp4HdlrBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoFullBox( file, fourcc, size, offset ) { d = new MP4::Mp4HdlrBox::Mp4HdlrBoxPrivate(); @@ -58,7 +58,7 @@ TagLib::String MP4::Mp4HdlrBox::hdlr_string() const void MP4::Mp4HdlrBox::parse() { - TagLib::uint totalread = 12+20; + uint totalread = 12+20; TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); if( mp4file->readInt( d->pre_defined ) == false ) diff --git a/amarok/src/metadata/m4a/mp4hdlrbox.h b/amarok/src/metadata/m4a/mp4hdlrbox.h index 0a6bf542..d993bc09 100644 --- a/amarok/src/metadata/m4a/mp4hdlrbox.h +++ b/amarok/src/metadata/m4a/mp4hdlrbox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4HdlrBox: public Mp4IsoFullBox { public: - Mp4HdlrBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4HdlrBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4HdlrBox(); //! parse hdlr contents diff --git a/amarok/src/metadata/m4a/mp4ilstbox.cpp b/amarok/src/metadata/m4a/mp4ilstbox.cpp index 1d5ae9a3..81b6e7a9 100644 --- a/amarok/src/metadata/m4a/mp4ilstbox.cpp +++ b/amarok/src/metadata/m4a/mp4ilstbox.cpp @@ -36,7 +36,7 @@ public: MP4::BoxFactory boxfactory; }; // class Mp4IlstBoxPrivate -MP4::Mp4IlstBox::Mp4IlstBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4IlstBox::Mp4IlstBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoBox( file, fourcc, size, offset ) { d = new MP4::Mp4IlstBox::Mp4IlstBoxPrivate(); @@ -62,9 +62,9 @@ void MP4::Mp4IlstBox::parse() TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); - TagLib::uint totalsize = 8; + uint totalsize = 8; // parse all contained boxes - TagLib::uint size; + uint size; MP4::Fourcc fourcc; #if 0 diff --git a/amarok/src/metadata/m4a/mp4ilstbox.h b/amarok/src/metadata/m4a/mp4ilstbox.h index 9e7ad1c4..43df7e5d 100644 --- a/amarok/src/metadata/m4a/mp4ilstbox.h +++ b/amarok/src/metadata/m4a/mp4ilstbox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4IlstBox: public Mp4IsoBox { public: - Mp4IlstBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4IlstBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4IlstBox(); //! parse ilst contents diff --git a/amarok/src/metadata/m4a/mp4isobox.cpp b/amarok/src/metadata/m4a/mp4isobox.cpp index 7f089241..6a559b89 100644 --- a/amarok/src/metadata/m4a/mp4isobox.cpp +++ b/amarok/src/metadata/m4a/mp4isobox.cpp @@ -28,12 +28,12 @@ class MP4::Mp4IsoBox::Mp4IsoBoxPrivate { public: MP4::Fourcc fourcc; - TagLib::uint size; + uint size; long offset; TagLib::File* file; }; -MP4::Mp4IsoBox::Mp4IsoBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4IsoBox::Mp4IsoBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) { d = new MP4::Mp4IsoBox::Mp4IsoBoxPrivate(); d->file = file; @@ -60,7 +60,7 @@ MP4::Fourcc MP4::Mp4IsoBox::fourcc() const return d->fourcc; } -TagLib::uint MP4::Mp4IsoBox::size() const +uint MP4::Mp4IsoBox::size() const { return d->size; } diff --git a/amarok/src/metadata/m4a/mp4isofullbox.cpp b/amarok/src/metadata/m4a/mp4isofullbox.cpp index f938ad44..c8963ba2 100644 --- a/amarok/src/metadata/m4a/mp4isofullbox.cpp +++ b/amarok/src/metadata/m4a/mp4isofullbox.cpp @@ -60,7 +60,7 @@ TagLib::uchar MP4::Mp4IsoFullBox::version() return d->version; } -TagLib::uint MP4::Mp4IsoFullBox::flags() +uint MP4::Mp4IsoFullBox::flags() { return d->flags; } diff --git a/amarok/src/metadata/m4a/mp4itunestag.cpp b/amarok/src/metadata/m4a/mp4itunestag.cpp index aabd6449..c3ec182d 100644 --- a/amarok/src/metadata/m4a/mp4itunestag.cpp +++ b/amarok/src/metadata/m4a/mp4itunestag.cpp @@ -31,13 +31,13 @@ public: TagLib::String artist; TagLib::String album; TagLib::String genre; - TagLib::uint year; - TagLib::uint track; + uint year; + uint track; TagLib::String comment; TagLib::String grouping; TagLib::String composer; - TagLib::uint disk; - TagLib::uint bpm; + uint disk; + uint bpm; bool isEmpty; TagLib::ByteVector cover; }; @@ -83,12 +83,12 @@ String MP4::Tag::genre() const return d->genre; } -TagLib::uint MP4::Tag::year() const +uint MP4::Tag::year() const { return d->year; } -TagLib::uint MP4::Tag::track() const +uint MP4::Tag::track() const { return d->track; } @@ -103,12 +103,12 @@ String MP4::Tag::composer() const return d->composer; } -TagLib::uint MP4::Tag::disk() const +uint MP4::Tag::disk() const { return d->disk; } -TagLib::uint MP4::Tag::bpm() const +uint MP4::Tag::bpm() const { return d->bpm; } @@ -148,13 +148,13 @@ void MP4::Tag::setGenre(const String &s) d->isEmpty = false; } -void MP4::Tag::setYear(const TagLib::uint i) +void MP4::Tag::setYear(const uint i) { d->year = i; d->isEmpty = false; } -void MP4::Tag::setTrack(const TagLib::uint i) +void MP4::Tag::setTrack(const uint i) { d->track = i; d->isEmpty = false; @@ -172,13 +172,13 @@ void MP4::Tag::setComposer(const String &s) d->isEmpty = false; } -void MP4::Tag::setDisk(const TagLib::uint i) +void MP4::Tag::setDisk(const uint i) { d->disk = i; d->isEmpty = false; } -void MP4::Tag::setBpm(const TagLib::uint i) +void MP4::Tag::setBpm(const uint i) { d->bpm = i; d->isEmpty = false; diff --git a/amarok/src/metadata/m4a/mp4mdiabox.cpp b/amarok/src/metadata/m4a/mp4mdiabox.cpp index c3b30ad3..f4e76191 100644 --- a/amarok/src/metadata/m4a/mp4mdiabox.cpp +++ b/amarok/src/metadata/m4a/mp4mdiabox.cpp @@ -38,7 +38,7 @@ public: MP4::BoxFactory boxfactory; }; // class Mp4MdiaBoxPrivate -MP4::Mp4MdiaBox::Mp4MdiaBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4MdiaBox::Mp4MdiaBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoBox( file, fourcc, size, offset ) { d = new MP4::Mp4MdiaBox::Mp4MdiaBoxPrivate(); @@ -60,9 +60,9 @@ void MP4::Mp4MdiaBox::parse() { TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); - TagLib::uint totalsize = 8; + uint totalsize = 8; // parse all contained boxes - TagLib::uint size; + uint size; MP4::Fourcc fourcc; // stores the current handler type @@ -81,7 +81,7 @@ void MP4::Mp4MdiaBox::parse() // create the appropriate subclass and parse it MP4::Mp4IsoBox* curbox = d->boxfactory.createInstance( mp4file, fourcc, size, mp4file->tell() ); - if( static_cast<TagLib::uint>( fourcc ) == 0x6d696e66 /*"minf"*/ ) + if( static_cast<uint>( fourcc ) == 0x6d696e66 /*"minf"*/ ) { // cast to minf Mp4MinfBox* minfbox = dynamic_cast<Mp4MinfBox*>( curbox ); @@ -94,7 +94,7 @@ void MP4::Mp4MdiaBox::parse() curbox->parsebox(); d->mdiaBoxes.append( curbox ); - if(static_cast<TagLib::uint>( fourcc ) == 0x68646c72 /*"hdlr"*/ ) + if(static_cast<uint>( fourcc ) == 0x68646c72 /*"hdlr"*/ ) { // cast to hdlr box Mp4HdlrBox* hdlrbox = dynamic_cast<Mp4HdlrBox*>( curbox ); diff --git a/amarok/src/metadata/m4a/mp4mdiabox.h b/amarok/src/metadata/m4a/mp4mdiabox.h index 16503bdb..da631052 100644 --- a/amarok/src/metadata/m4a/mp4mdiabox.h +++ b/amarok/src/metadata/m4a/mp4mdiabox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4MdiaBox: public Mp4IsoBox { public: - Mp4MdiaBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4MdiaBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4MdiaBox(); //! parse mdia contents diff --git a/amarok/src/metadata/m4a/mp4metabox.cpp b/amarok/src/metadata/m4a/mp4metabox.cpp index 30eebf2b..2bebe2ec 100644 --- a/amarok/src/metadata/m4a/mp4metabox.cpp +++ b/amarok/src/metadata/m4a/mp4metabox.cpp @@ -36,7 +36,7 @@ public: MP4::BoxFactory boxfactory; }; // class Mp4MetaBoxPrivate -MP4::Mp4MetaBox::Mp4MetaBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4MetaBox::Mp4MetaBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoFullBox( file, fourcc, size, offset ) { d = new MP4::Mp4MetaBox::Mp4MetaBoxPrivate(); @@ -58,9 +58,9 @@ void MP4::Mp4MetaBox::parse() { TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); - TagLib::uint totalsize = 12; // initial size of box + uint totalsize = 12; // initial size of box // parse all contained boxes - TagLib::uint size; + uint size; MP4::Fourcc fourcc; while( (mp4file->readSizeAndType( size, fourcc ) == true) ) diff --git a/amarok/src/metadata/m4a/mp4metabox.h b/amarok/src/metadata/m4a/mp4metabox.h index 58d96670..3f8847f8 100644 --- a/amarok/src/metadata/m4a/mp4metabox.h +++ b/amarok/src/metadata/m4a/mp4metabox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4MetaBox: public Mp4IsoFullBox { public: - Mp4MetaBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4MetaBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4MetaBox(); //! parse meta contents diff --git a/amarok/src/metadata/m4a/mp4minfbox.cpp b/amarok/src/metadata/m4a/mp4minfbox.cpp index 0081dda7..027f36f3 100644 --- a/amarok/src/metadata/m4a/mp4minfbox.cpp +++ b/amarok/src/metadata/m4a/mp4minfbox.cpp @@ -39,7 +39,7 @@ public: MP4::Fourcc handler_type; }; // class Mp4MinfBoxPrivate -MP4::Mp4MinfBox::Mp4MinfBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4MinfBox::Mp4MinfBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoBox( file, fourcc, size, offset ) { d = new MP4::Mp4MinfBox::Mp4MinfBoxPrivate(); @@ -66,9 +66,9 @@ void MP4::Mp4MinfBox::parse() { TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); - TagLib::uint totalsize = 8; + uint totalsize = 8; // parse all contained boxes - TagLib::uint size; + uint size; MP4::Fourcc fourcc; while( (mp4file->readSizeAndType( size, fourcc ) == true) ) @@ -84,7 +84,7 @@ void MP4::Mp4MinfBox::parse() // create the appropriate subclass and parse it MP4::Mp4IsoBox* curbox = d->boxfactory.createInstance( mp4file, fourcc, size, mp4file->tell() ); - if(static_cast<TagLib::uint>( fourcc ) == 0x7374626c /*stbl*/ ) + if(static_cast<uint>( fourcc ) == 0x7374626c /*stbl*/ ) { // cast to hdlr box Mp4StblBox* stblbox = dynamic_cast<Mp4StblBox*>( curbox ); diff --git a/amarok/src/metadata/m4a/mp4minfbox.h b/amarok/src/metadata/m4a/mp4minfbox.h index 9195d307..bd438676 100644 --- a/amarok/src/metadata/m4a/mp4minfbox.h +++ b/amarok/src/metadata/m4a/mp4minfbox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4MinfBox: public Mp4IsoBox { public: - Mp4MinfBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4MinfBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4MinfBox(); //! parse minf contents diff --git a/amarok/src/metadata/m4a/mp4moovbox.cpp b/amarok/src/metadata/m4a/mp4moovbox.cpp index 24826ec2..2a98cacc 100644 --- a/amarok/src/metadata/m4a/mp4moovbox.cpp +++ b/amarok/src/metadata/m4a/mp4moovbox.cpp @@ -36,7 +36,7 @@ public: MP4::BoxFactory boxfactory; }; // class Mp4MoovBoxPrivate -MP4::Mp4MoovBox::Mp4MoovBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4MoovBox::Mp4MoovBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoBox( file, fourcc, size, offset ) { d = new MP4::Mp4MoovBox::Mp4MoovBoxPrivate(); @@ -58,9 +58,9 @@ void MP4::Mp4MoovBox::parse() { TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); - TagLib::uint totalsize = 8; + uint totalsize = 8; // parse all contained boxes - TagLib::uint size; + uint size; MP4::Fourcc fourcc; while( (mp4file->readSizeAndType( size, fourcc ) == true) ) diff --git a/amarok/src/metadata/m4a/mp4moovbox.h b/amarok/src/metadata/m4a/mp4moovbox.h index 390953f7..87a8c1df 100644 --- a/amarok/src/metadata/m4a/mp4moovbox.h +++ b/amarok/src/metadata/m4a/mp4moovbox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4MoovBox: public Mp4IsoBox { public: - Mp4MoovBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4MoovBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4MoovBox(); //! parse moov contents diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.cpp b/amarok/src/metadata/m4a/mp4mvhdbox.cpp index 36053e4b..3dbd31a5 100644 --- a/amarok/src/metadata/m4a/mp4mvhdbox.cpp +++ b/amarok/src/metadata/m4a/mp4mvhdbox.cpp @@ -36,18 +36,18 @@ public: //! modification time of the file - since midnight, Jan. 1, 1904, UTC-time TagLib::ulonglong modificationTime; //! timescale for the file - referred by all time specifications in this box - TagLib::uint timescale; + uint timescale; //! duration of presentation TagLib::ulonglong duration; //! playout speed - TagLib::uint rate; + uint rate; //! volume for entire presentation - TagLib::uint volume; + uint volume; //! track ID for an additional track (next new track) - TagLib::uint nextTrackID; + uint nextTrackID; }; // class Mp4MvhdBoxPrivate -MP4::Mp4MvhdBox::Mp4MvhdBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4MvhdBox::Mp4MvhdBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoFullBox( file, fourcc, size, offset ) { d = new MP4::Mp4MvhdBox::Mp4MvhdBoxPrivate(); @@ -68,7 +68,7 @@ TagLib::ulonglong MP4::Mp4MvhdBox::modificationTime() const return d->modificationTime; } -TagLib::uint MP4::Mp4MvhdBox::timescale() const +uint MP4::Mp4MvhdBox::timescale() const { return d->timescale; } @@ -78,17 +78,17 @@ TagLib::ulonglong MP4::Mp4MvhdBox::duration() const return d->duration; } -TagLib::uint MP4::Mp4MvhdBox::rate() const +uint MP4::Mp4MvhdBox::rate() const { return d->rate; } -TagLib::uint MP4::Mp4MvhdBox::volume() const +uint MP4::Mp4MvhdBox::volume() const { return d->volume; } -TagLib::uint MP4::Mp4MvhdBox::nextTrackID() const +uint MP4::Mp4MvhdBox::nextTrackID() const { return d->nextTrackID; } @@ -111,7 +111,7 @@ void MP4::Mp4MvhdBox::parse() } else { - TagLib::uint creationTime_tmp, modificationTime_tmp, duration_tmp; + uint creationTime_tmp, modificationTime_tmp, duration_tmp; if( !mp4file->readInt( creationTime_tmp ) ) return; diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.h b/amarok/src/metadata/m4a/mp4mvhdbox.h index b133485e..ba15e4e2 100644 --- a/amarok/src/metadata/m4a/mp4mvhdbox.h +++ b/amarok/src/metadata/m4a/mp4mvhdbox.h @@ -33,7 +33,7 @@ namespace TagLib class Mp4MvhdBox: public Mp4IsoFullBox { public: - Mp4MvhdBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4MvhdBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4MvhdBox(); //! function to get the creation time of the mp4 file diff --git a/amarok/src/metadata/m4a/mp4propsproxy.cpp b/amarok/src/metadata/m4a/mp4propsproxy.cpp index ebee9c29..70f38491 100644 --- a/amarok/src/metadata/m4a/mp4propsproxy.cpp +++ b/amarok/src/metadata/m4a/mp4propsproxy.cpp @@ -45,15 +45,15 @@ MP4::Mp4PropsProxy::~Mp4PropsProxy() delete d; } -TagLib::uint MP4::Mp4PropsProxy::seconds() const +uint MP4::Mp4PropsProxy::seconds() const { if( d->mvhdbox ) - return static_cast<TagLib::uint>( d->mvhdbox->duration() / d->mvhdbox->timescale() ); + return static_cast<uint>( d->mvhdbox->duration() / d->mvhdbox->timescale() ); else return 0; } -TagLib::uint MP4::Mp4PropsProxy::channels() const +uint MP4::Mp4PropsProxy::channels() const { if( d->audiosampleentry ) return d->audiosampleentry->channels(); @@ -61,7 +61,7 @@ TagLib::uint MP4::Mp4PropsProxy::channels() const return 0; } -TagLib::uint MP4::Mp4PropsProxy::sampleRate() const +uint MP4::Mp4PropsProxy::sampleRate() const { if( d->audiosampleentry ) return (d->audiosampleentry->samplerate()>>16); @@ -69,7 +69,7 @@ TagLib::uint MP4::Mp4PropsProxy::sampleRate() const return 0; } -TagLib::uint MP4::Mp4PropsProxy::bitRate() const +uint MP4::Mp4PropsProxy::bitRate() const { if( d->audiosampleentry ) return (d->audiosampleentry->bitrate()); diff --git a/amarok/src/metadata/m4a/mp4propsproxy.h b/amarok/src/metadata/m4a/mp4propsproxy.h index 0ea29e2b..f6132c90 100644 --- a/amarok/src/metadata/m4a/mp4propsproxy.h +++ b/amarok/src/metadata/m4a/mp4propsproxy.h @@ -41,13 +41,13 @@ namespace TagLib ~Mp4PropsProxy(); //! function to get length of media in seconds - TagLib::uint seconds() const; + uint seconds() const; //! function to get the nunmber of channels - TagLib::uint channels() const; + uint channels() const; //! function to get the sample rate - TagLib::uint sampleRate() const; + uint sampleRate() const; //! function to get the bitrate rate - TagLib::uint bitRate() const; + uint bitRate() const; //! function to register the movie header box - mvhd void registerMvhd( MP4::Mp4MvhdBox* mvhdbox ); diff --git a/amarok/src/metadata/m4a/mp4sampleentry.cpp b/amarok/src/metadata/m4a/mp4sampleentry.cpp index e5619eaa..d74a22f4 100644 --- a/amarok/src/metadata/m4a/mp4sampleentry.cpp +++ b/amarok/src/metadata/m4a/mp4sampleentry.cpp @@ -28,7 +28,7 @@ using namespace TagLib; class MP4::Mp4SampleEntry::Mp4SampleEntryPrivate { public: - TagLib::uint data_reference_index; + uint data_reference_index; }; MP4::Mp4SampleEntry::Mp4SampleEntry( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) diff --git a/amarok/src/metadata/m4a/mp4stblbox.cpp b/amarok/src/metadata/m4a/mp4stblbox.cpp index f67de597..cfd1978d 100644 --- a/amarok/src/metadata/m4a/mp4stblbox.cpp +++ b/amarok/src/metadata/m4a/mp4stblbox.cpp @@ -39,7 +39,7 @@ public: MP4::Fourcc handler_type; }; // class Mp4StblBoxPrivate -MP4::Mp4StblBox::Mp4StblBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4StblBox::Mp4StblBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoBox( file, fourcc, size, offset ) { d = new MP4::Mp4StblBox::Mp4StblBoxPrivate(); @@ -66,9 +66,9 @@ void MP4::Mp4StblBox::parse() { TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); - TagLib::uint totalsize = 8; + uint totalsize = 8; // parse all contained boxes - TagLib::uint size; + uint size; MP4::Fourcc fourcc; while( (mp4file->readSizeAndType( size, fourcc ) == true) ) @@ -86,7 +86,7 @@ void MP4::Mp4StblBox::parse() MP4::Mp4IsoBox* curbox = d->boxfactory.createInstance( mp4file, fourcc, size, mp4file->tell() ); // check for stsd - if( static_cast<TagLib::uint>(fourcc) == 0x73747364 /*'stsd'*/ ) + if( static_cast<uint>(fourcc) == 0x73747364 /*'stsd'*/ ) { // cast to stsd box MP4::Mp4StsdBox* stsdbox = dynamic_cast<MP4::Mp4StsdBox*>(curbox); diff --git a/amarok/src/metadata/m4a/mp4stblbox.h b/amarok/src/metadata/m4a/mp4stblbox.h index 39619a6e..3eed245a 100644 --- a/amarok/src/metadata/m4a/mp4stblbox.h +++ b/amarok/src/metadata/m4a/mp4stblbox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4StblBox: public Mp4IsoBox { public: - Mp4StblBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4StblBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4StblBox(); //! parse stbl contents diff --git a/amarok/src/metadata/m4a/mp4stsdbox.cpp b/amarok/src/metadata/m4a/mp4stsdbox.cpp index 6bb8cbe6..bd9e8f4a 100644 --- a/amarok/src/metadata/m4a/mp4stsdbox.cpp +++ b/amarok/src/metadata/m4a/mp4stsdbox.cpp @@ -36,7 +36,7 @@ public: MP4::Mp4AudioSampleEntry* audioSampleEntry; }; // class Mp4StsdBoxPrivate -MP4::Mp4StsdBox::Mp4StsdBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4StsdBox::Mp4StsdBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoFullBox( file, fourcc, size, offset ) { d = new MP4::Mp4StsdBox::Mp4StsdBoxPrivate(); @@ -58,19 +58,19 @@ void MP4::Mp4StsdBox::parse() if(!mp4file) return; - TagLib::uint totalsize = 12; // initial size of box + uint totalsize = 12; // initial size of box // check for handler type - only parse if 'soun': - if( static_cast<TagLib::uint>(d->handler_type) == 0x736f756e ) + if( static_cast<uint>(d->handler_type) == 0x736f756e ) { // read entry count - TagLib::uint entry_count; + uint entry_count; if(!mp4file->readInt( entry_count )) return; // simply read first entry and skip all following // read size and type - TagLib::uint cursize; + uint cursize; MP4::Fourcc fourcc; if( !mp4file->readSizeAndType( cursize, fourcc )) return; diff --git a/amarok/src/metadata/m4a/mp4stsdbox.h b/amarok/src/metadata/m4a/mp4stsdbox.h index 90bc0147..54318759 100644 --- a/amarok/src/metadata/m4a/mp4stsdbox.h +++ b/amarok/src/metadata/m4a/mp4stsdbox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4StsdBox: public Mp4IsoFullBox { public: - Mp4StsdBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4StsdBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4StsdBox(); //! parse stsd contents diff --git a/amarok/src/metadata/m4a/mp4trakbox.cpp b/amarok/src/metadata/m4a/mp4trakbox.cpp index c573ec7a..4fe373ff 100644 --- a/amarok/src/metadata/m4a/mp4trakbox.cpp +++ b/amarok/src/metadata/m4a/mp4trakbox.cpp @@ -36,7 +36,7 @@ public: MP4::BoxFactory boxfactory; }; // class Mp4TrakBoxPrivate -MP4::Mp4TrakBox::Mp4TrakBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4TrakBox::Mp4TrakBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoBox( file, fourcc, size, offset ) { d = new MP4::Mp4TrakBox::Mp4TrakBoxPrivate(); @@ -58,9 +58,9 @@ void MP4::Mp4TrakBox::parse() { TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); - TagLib::uint totalsize = 8; + uint totalsize = 8; // parse all contained boxes - TagLib::uint size; + uint size; MP4::Fourcc fourcc; while( (mp4file->readSizeAndType( size, fourcc ) == true) ) diff --git a/amarok/src/metadata/m4a/mp4trakbox.h b/amarok/src/metadata/m4a/mp4trakbox.h index b362fa32..b0f05cb3 100644 --- a/amarok/src/metadata/m4a/mp4trakbox.h +++ b/amarok/src/metadata/m4a/mp4trakbox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4TrakBox: public Mp4IsoBox { public: - Mp4TrakBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4TrakBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4TrakBox(); //! parse trak contents diff --git a/amarok/src/metadata/m4a/mp4udtabox.cpp b/amarok/src/metadata/m4a/mp4udtabox.cpp index 268d1c1b..58a171ba 100644 --- a/amarok/src/metadata/m4a/mp4udtabox.cpp +++ b/amarok/src/metadata/m4a/mp4udtabox.cpp @@ -36,7 +36,7 @@ public: MP4::BoxFactory boxfactory; }; // class Mp4UdtaBoxPrivate -MP4::Mp4UdtaBox::Mp4UdtaBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ) +MP4::Mp4UdtaBox::Mp4UdtaBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ) : Mp4IsoBox( file, fourcc, size, offset ) { d = new MP4::Mp4UdtaBox::Mp4UdtaBoxPrivate(); @@ -61,9 +61,9 @@ void MP4::Mp4UdtaBox::parse() #endif TagLib::MP4::File* mp4file = static_cast<MP4::File*>( file() ); - TagLib::uint totalsize = 8; + uint totalsize = 8; // parse all contained boxes - TagLib::uint size; + uint size; MP4::Fourcc fourcc; #if 0 diff --git a/amarok/src/metadata/m4a/mp4udtabox.h b/amarok/src/metadata/m4a/mp4udtabox.h index 4873e321..eb982023 100644 --- a/amarok/src/metadata/m4a/mp4udtabox.h +++ b/amarok/src/metadata/m4a/mp4udtabox.h @@ -32,7 +32,7 @@ namespace TagLib class Mp4UdtaBox: public Mp4IsoBox { public: - Mp4UdtaBox( TagLib::File* file, MP4::Fourcc fourcc, TagLib::uint size, long offset ); + Mp4UdtaBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset ); ~Mp4UdtaBox(); //! parse moov contents diff --git a/amarok/src/metadata/mp4/mp4file.cpp b/amarok/src/metadata/mp4/mp4file.cpp index 536955c3..e78d6ae9 100644 --- a/amarok/src/metadata/mp4/mp4file.cpp +++ b/amarok/src/metadata/mp4/mp4file.cpp @@ -129,15 +129,15 @@ bool MP4::File::save() #ifdef USE_ITMF_TAGS - MP4TagsSetName(filetags, mp4tag->title().isNull() ? "" : mp4tag->title().toCString(true)); - MP4TagsSetArtist(filetags, mp4tag->artist().isNull() ? "" : mp4tag->artist().toCString(true)); - MP4TagsSetAlbum(filetags, mp4tag->album().isNull() ? "" : mp4tag->album().toCString(true)); - MP4TagsSetComments(filetags, mp4tag->comment().isNull() ? "" : mp4tag->comment().toCString(true)); - MP4TagsSetGenre(filetags, mp4tag->genre().isNull() ? "" : mp4tag->genre().toCString(true)); - MP4TagsSetComposer(filetags, mp4tag->composer().isNull() ? "" : mp4tag->composer().toCString(true)); + MP4TagsSetName(filetags, mp4tag->title().isEmpty() ? "" : mp4tag->title().toCString(true)); + MP4TagsSetArtist(filetags, mp4tag->artist().isEmpty() ? "" : mp4tag->artist().toCString(true)); + MP4TagsSetAlbum(filetags, mp4tag->album().isEmpty() ? "" : mp4tag->album().toCString(true)); + MP4TagsSetComments(filetags, mp4tag->comment().isEmpty() ? "" : mp4tag->comment().toCString(true)); + MP4TagsSetGenre(filetags, mp4tag->genre().isEmpty() ? "" : mp4tag->genre().toCString(true)); + MP4TagsSetComposer(filetags, mp4tag->composer().isEmpty() ? "" : mp4tag->composer().toCString(true)); #else #define setmeta(val, tag) \ - if(mp4tag->val().isNull()) { \ + if(mp4tag->val().isEmpty()) { \ /*MP4DeleteMetadata##tag(handle);*/ \ MP4SetMetadata##tag(handle, ""); \ } else { \ diff --git a/amarok/src/metadata/mp4/mp4tag.cpp b/amarok/src/metadata/mp4/mp4tag.cpp index 642df2b1..24537ae5 100644 --- a/amarok/src/metadata/mp4/mp4tag.cpp +++ b/amarok/src/metadata/mp4/mp4tag.cpp @@ -38,12 +38,12 @@ email : andrew.leadbetter@gmail.com using namespace TagLib; MP4::Tag::Tag() : TagLib::Tag::Tag() { - m_title = String::null; - m_artist = String::null; - m_album = String::null; - m_comment = String::null; - m_genre = String::null; - m_composer = String::null; + m_title = String(); + m_artist = String(); + m_album = String(); + m_comment = String(); + m_genre = String(); + m_composer = String(); m_year = 0; m_track = 0; m_disk = 0; @@ -55,12 +55,12 @@ MP4::Tag::~Tag() { } bool MP4::Tag::isEmpty() const { - return m_title == String::null && - m_artist == String::null && - m_album == String::null && - m_comment == String::null && - m_genre == String::null && - m_composer == String::null && + return m_title.isEmpty() && + m_artist.isEmpty() && + m_album.isEmpty() && + m_comment.isEmpty() && + m_genre.isEmpty() && + m_composer.isEmpty() && m_year == 0 && m_track == 0 && m_disk == 0 && diff --git a/amarok/src/metadata/mp4/mp4tag.h b/amarok/src/metadata/mp4/mp4tag.h index 34f95054..f791c078 100644 --- a/amarok/src/metadata/mp4/mp4tag.h +++ b/amarok/src/metadata/mp4/mp4tag.h @@ -57,36 +57,36 @@ namespace TagLib { /*! * Returns the track name; if no track name is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String title() const { return m_title; } /*! * Returns the artist name; if no artist name is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String artist() const { return m_artist; } /*! * Returns the album name; if no album name is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String album() const { return m_album; } /*! * Returns the track comment; if no comment is present in the tag - * String::null will be returned. + * a null String will be returned. */ virtual String comment() const { return m_comment; } /*! - * Returns the genre name; if no genre is present in the tag String::null + * Returns the genre name; if no genre is present in the tag a null String * will be returned. */ virtual String genre() const { return m_genre; } /*! - * Returns the composer name; if no composer is present in the tag String::null + * Returns the composer name; if no composer is present in the tag a null String * will be returned. */ virtual String composer() const { return m_composer; } @@ -126,31 +126,31 @@ namespace TagLib { virtual int compilation() const { return m_compilation; } /*! - * Sets the title to \a s. If \a s is String::null then this value will be + * Sets the title to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setTitle(const String &s) { m_title = s; } /*! - * Sets the artist to \a s. If \a s is String::null then this value will be + * Sets the artist to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setArtist(const String &s) { m_artist = s; } /*! - * Sets the album to \a s. If \a s is String::null then this value will be + * Sets the album to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setAlbum(const String &s) { m_album = s; } /*! - * Sets the album to \a s. If \a s is String::null then this value will be + * Sets the album to \a s. If \a s is a null String then this value will be * cleared. */ virtual void setComment(const String &s) { m_comment = s; } /*! - * Sets the genre to \a s. If \a s is String::null then this value will be + * Sets the genre to \a s. If \a s is a null String then this value will be * cleared. For tag formats that use a fixed set of genres, the appropriate * value will be selected based on a string comparison. A list of available * genres for those formats should be available in that type's @@ -184,7 +184,7 @@ namespace TagLib { virtual void setCompilation(bool compilation) { m_compilation = compilation ? 1 : 0; } /*! - * Sets the composer to \a s. If \a s is String::null then this value will + * Sets the composer to \a s. If \a s is a null String then this value will * be cleared. */ virtual void setComposer(const String &s) { m_composer = s; } diff --git a/amarok/src/metadata/rmff/rmff.cpp b/amarok/src/metadata/rmff/rmff.cpp index da0edd55..943e24dd 100644 --- a/amarok/src/metadata/rmff/rmff.cpp +++ b/amarok/src/metadata/rmff/rmff.cpp @@ -51,7 +51,10 @@ using namespace TagLib::RealMedia; RMFFile::RMFFile(const char *filename) : File(filename), m_id3tag(0) { if (isOpen()) - m_id3tag = new ID3v1::Tag(this, length() - 128); + { + auto tagOffset = length() - 128; + m_id3tag = new ID3v1::Tag(this, tagOffset); + } } RMFFile::~RMFFile() @@ -91,12 +94,12 @@ String RealMediaFF::genre() const return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : ""; } -TagLib::uint RealMediaFF::year() const +uint RealMediaFF::year() const { return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0; } -TagLib::uint RealMediaFF::track() const +uint RealMediaFF::track() const { return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0; } diff --git a/amarok/src/metadata/rmff/rmff.h b/amarok/src/metadata/rmff/rmff.h index abc8ea23..095d8f9c 100644 --- a/amarok/src/metadata/rmff/rmff.h +++ b/amarok/src/metadata/rmff/rmff.h @@ -297,8 +297,8 @@ namespace TagLib TagLib::String album () const; TagLib::String comment () const; TagLib::String genre () const; - TagLib::uint year () const; - TagLib::uint track () const; + uint year () const; + uint track () const; // TODO write support //void setTitle (const String &s); //void setArtist (const String &s); diff --git a/amarok/src/metadata/rmff/taglib_realmediafile.cpp b/amarok/src/metadata/rmff/taglib_realmediafile.cpp index b28c8467..ec1c1439 100644 --- a/amarok/src/metadata/rmff/taglib_realmediafile.cpp +++ b/amarok/src/metadata/rmff/taglib_realmediafile.cpp @@ -78,12 +78,12 @@ String RealMedia::Tag::genre () const return m_rmff->genre(); } -TagLib::uint RealMedia::Tag::year () const +uint RealMedia::Tag::year () const { return m_rmff->year(); } -TagLib::uint RealMedia::Tag::track () const +uint RealMedia::Tag::track () const { return m_rmff->track(); } diff --git a/amarok/src/metadata/trueaudio/combinedtag.h b/amarok/src/metadata/trueaudio/combinedtag.h index 7d530d29..16d2d66c 100644 --- a/amarok/src/metadata/trueaudio/combinedtag.h +++ b/amarok/src/metadata/trueaudio/combinedtag.h @@ -49,7 +49,7 @@ namespace TagLib { if(tag2) return tag2->title(); - return String::null; + return String(); } virtual String artist() const { @@ -59,7 +59,7 @@ namespace TagLib { if(tag2) return tag2->artist(); - return String::null; + return String(); } virtual String album() const { @@ -69,7 +69,7 @@ namespace TagLib { if(tag2) return tag2->album(); - return String::null; + return String(); } virtual String comment() const { @@ -79,7 +79,7 @@ namespace TagLib { if(tag2) return tag2->comment(); - return String::null; + return String(); } virtual String genre() const { @@ -89,7 +89,7 @@ namespace TagLib { if(tag2) return tag2->genre(); - return String::null; + return String(); } virtual uint year() const { diff --git a/amarok/src/metadata/wavpack/combinedtag.h b/amarok/src/metadata/wavpack/combinedtag.h index 7d530d29..16d2d66c 100644 --- a/amarok/src/metadata/wavpack/combinedtag.h +++ b/amarok/src/metadata/wavpack/combinedtag.h @@ -49,7 +49,7 @@ namespace TagLib { if(tag2) return tag2->title(); - return String::null; + return String(); } virtual String artist() const { @@ -59,7 +59,7 @@ namespace TagLib { if(tag2) return tag2->artist(); - return String::null; + return String(); } virtual String album() const { @@ -69,7 +69,7 @@ namespace TagLib { if(tag2) return tag2->album(); - return String::null; + return String(); } virtual String comment() const { @@ -79,7 +79,7 @@ namespace TagLib { if(tag2) return tag2->comment(); - return String::null; + return String(); } virtual String genre() const { @@ -89,7 +89,7 @@ namespace TagLib { if(tag2) return tag2->genre(); - return String::null; + return String(); } virtual uint year() const { diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp index 57a8eeee..840f42cb 100644 --- a/amarok/src/moodbar.cpp +++ b/amarok/src/moodbar.cpp @@ -39,8 +39,8 @@ // void MyClass::MyClass( void ) // { // // This only needs to be done once! -// connect( &m_bundle.moodbar(), TQT_SIGNAL( jobEvent( int ) ), -// TQT_SLOT( newMoodData( int ) ) ); +// connect( &m_bundle.moodbar(), TQ_SIGNAL( jobEvent( int ) ), +// TQ_SLOT( newMoodData( int ) ) ); // } // // void MyClass::newMetaBundle( const MetaBundle &b ) @@ -319,20 +319,20 @@ MoodServer::MoodServer( void ) : m_moodbarBroken( false ) , m_currentProcess( 0 ) { - connect( App::instance(), TQT_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), - TQT_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); + connect( App::instance(), TQ_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), + TQ_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); connect( CollectionDB::instance(), - TQT_SIGNAL( fileMoved( const TQString &, const TQString & ) ), - TQT_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); + TQ_SIGNAL( fileMoved( const TQString &, const TQString & ) ), + TQ_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); connect( CollectionDB::instance(), - TQT_SIGNAL( fileMoved( const TQString &, const TQString &, const TQString & ) ), - TQT_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); + TQ_SIGNAL( fileMoved( const TQString &, const TQString &, const TQString & ) ), + TQ_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); connect( CollectionDB::instance(), - TQT_SIGNAL( fileDeleted( const TQString & ) ), - TQT_SLOT( slotFileDeleted( const TQString & ) ) ); + TQ_SIGNAL( fileDeleted( const TQString & ) ), + TQ_SLOT( slotFileDeleted( const TQString & ) ) ); connect( CollectionDB::instance(), - TQT_SIGNAL( fileDeleted( const TQString &, const TQString & ) ), - TQT_SLOT( slotFileDeleted( const TQString & ) ) ); + TQ_SIGNAL( fileDeleted( const TQString &, const TQString & ) ), + TQ_SLOT( slotFileDeleted( const TQString & ) ) ); } @@ -383,7 +383,7 @@ MoodServer::queueJob( MetaBundle *bundle ) m_mutex.unlock(); // 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; } @@ -476,8 +476,8 @@ MoodServer::slotNewJob( void ) << (m_currentData.m_outfile + ".tmp") << m_currentData.m_infile; - connect( m_currentProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), - TQT_SLOT( slotJobCompleted( TDEProcess* ) ) ); + connect( m_currentProcess, TQ_SIGNAL( processExited( TDEProcess* ) ), + TQ_SLOT( slotJobCompleted( TDEProcess* ) ) ); // We have to enable TDEProcess::Stdout (even though we don't monitor // 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 ) ) { connect( MoodServer::instance(), - TQT_SIGNAL( jobEvent( KURL, int ) ), - TQT_SLOT( slotJobEvent( KURL, int ) ) ); + TQ_SIGNAL( jobEvent( KURL, int ) ), + TQ_SLOT( slotJobEvent( KURL, int ) ) ); // Increase the refcount for this job. Use mood.m_bundle // since that one's already initialized. 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( !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 ); } @@ -779,7 +779,7 @@ Moodbar::reset( void ) 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 ); } @@ -898,8 +898,8 @@ Moodbar::load( void ) // Ok no more excuses, we have to queue a job connect( MoodServer::instance(), - TQT_SIGNAL( jobEvent( KURL, int ) ), - TQT_SLOT( slotJobEvent( KURL, int ) ) ); + TQ_SIGNAL( jobEvent( KURL, int ) ), + TQ_SLOT( slotJobEvent( KURL, int ) ) ); bool isRunning = MoodServer::instance()->queueJob( m_bundle ); m_state = isRunning ? JobRunning : JobQueued; m_url = m_bundle->url(); // Use this URL for MoodServer::deQueueJob @@ -930,7 +930,7 @@ Moodbar::slotJobEvent( KURL url, int newState ) m_mutex.lock(); // 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 ) { diff --git a/amarok/src/moodbar.h b/amarok/src/moodbar.h index 8b3d2ef5..6401b03f 100644 --- a/amarok/src/moodbar.h +++ b/amarok/src/moodbar.h @@ -38,7 +38,7 @@ class MetaBundle; class Moodbar : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -116,7 +116,7 @@ class TDEProcess; // For internal use only (well, mostly) class MoodServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/mountpointmanager.cpp b/amarok/src/mountpointmanager.cpp index bba625c9..3fd08fff 100644 --- a/amarok/src/mountpointmanager.cpp +++ b/amarok/src/mountpointmanager.cpp @@ -52,9 +52,9 @@ MountPointManager::MountPointManager() //therefore it is enough to listen to DeviceManager's mediumChanged signal if (DeviceManager::instance()->isValid() ) { - connect( DeviceManager::instance(), TQT_SIGNAL( mediumAdded( const Medium*, TQString ) ), TQT_SLOT( mediumAdded( const Medium* ) ) ); - connect( DeviceManager::instance(), TQT_SIGNAL( mediumChanged( const Medium*, TQString ) ), TQT_SLOT( mediumChanged( const Medium* ) ) ); - connect( DeviceManager::instance(), TQT_SIGNAL( mediumRemoved( const Medium*, TQString ) ), TQT_SLOT( mediumRemoved( const Medium* ) ) ); + connect( DeviceManager::instance(), TQ_SIGNAL( mediumAdded( const Medium*, TQString ) ), TQ_SLOT( mediumAdded( const Medium* ) ) ); + connect( DeviceManager::instance(), TQ_SIGNAL( mediumChanged( const Medium*, TQString ) ), TQ_SLOT( mediumChanged( const Medium* ) ) ); + connect( DeviceManager::instance(), TQ_SIGNAL( mediumRemoved( const Medium*, TQString ) ), TQ_SLOT( mediumRemoved( const Medium* ) ) ); } else { @@ -70,10 +70,10 @@ MountPointManager::MountPointManager() 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 ) { - connect( this, TQT_SIGNAL( mediumConnected( int ) ), TQT_SLOT( migrateStatistics() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( migrateStatistics() ) ); + connect( this, TQ_SIGNAL( mediumConnected( int ) ), TQ_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(); } @@ -484,7 +484,7 @@ void MountPointManager::updateStatisticsURLs( bool changed ) { if ( changed ) - TQTimer::singleShot( 0, this, TQT_SLOT( startStatisticsUpdateJob() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( startStatisticsUpdateJob() ) ); } void diff --git a/amarok/src/mountpointmanager.h b/amarok/src/mountpointmanager.h index c4d90ccd..835a9872 100644 --- a/amarok/src/mountpointmanager.h +++ b/amarok/src/mountpointmanager.h @@ -145,7 +145,7 @@ public: * @author Maximilian Kossick <maximilian.kossick@googlemail.com> */ class MountPointManager : public TQObject { -Q_OBJECT +TQ_OBJECT signals: diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index 86ddd6f9..3468246d 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -189,7 +189,7 @@ void MultiTabBarInternal::showTabSelectionMenu(TQPoint pos) void MultiTabBarInternal::mousePressEvent( TQMouseEvent *ev ) { - if ( ev->button() != Qt::RightButton ){ + if ( ev->button() != TQt::RightButton ){ ev->ignore(); return; } @@ -375,7 +375,7 @@ bool MultiTabBarInternal::eventFilter( TQObject *, TQEvent *e ) //PATCH by markey: Allow switching of tabs with mouse wheel if ( e->type() == TQEvent::Wheel ) { - TQWheelEvent* event = TQT_TQWHEELEVENT( e ); + TQWheelEvent* event = static_cast<TQWheelEvent*>( e ); const int delta = event->delta() / 120; // Determine which tab is currently active @@ -526,9 +526,9 @@ MultiTabBarButton::MultiTabBarButton( const TQPixmap& pic, const TQString& text, setFixedWidth( 24 ); // TQToolTip::add( this, text ); // Deactivated cause it's annoying - connect( this, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); - connect( m_animTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAnimTimer() ) ); - connect( m_dragSwitchTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDragSwitchTimer() ) ); + connect( this, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClicked() ) ); + connect( m_animTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAnimTimer() ) ); + connect( m_dragSwitchTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDragSwitchTimer() ) ); } MultiTabBarButton::MultiTabBarButton( const TQString& text, TQPopupMenu *popup, @@ -549,9 +549,9 @@ MultiTabBarButton::MultiTabBarButton( const TQString& text, TQPopupMenu *popup, m_id = id; // TQToolTip::add( this, text ); - connect( this, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); - connect( m_animTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAnimTimer() ) ); - connect( m_dragSwitchTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDragSwitchTimer() ) ); + connect( this, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClicked() ) ); + connect( m_animTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAnimTimer() ) ); + connect( m_dragSwitchTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDragSwitchTimer() ) ); } MultiTabBarButton::~MultiTabBarButton() @@ -714,7 +714,7 @@ TQSize MultiTabBarButton::sizeHint() const // h = ( parentWidget()->width() - 3 ) / NUM_TABS; // } - return ( style().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). + return ( style().sizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). expandedTo( TQApplication::globalStrut() ) ); } diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h index 82f2926c..43ae07d0 100644 --- a/amarok/src/multitabbar.h +++ b/amarok/src/multitabbar.h @@ -59,7 +59,7 @@ class DropProxyTarget */ class MultiTabBar: public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum MultiTabBarMode{Horizontal, Vertical}; @@ -173,7 +173,7 @@ class MultiTabBar: public TQWidget */ class MultiTabBarButton: public TQPushButton { - Q_OBJECT + TQ_OBJECT public: MultiTabBarButton( const TQPixmap& pic, const TQString&, TQPopupMenu *popup, @@ -250,7 +250,7 @@ class MultiTabBarButton: public TQPushButton */ class MultiTabBarTab: public MultiTabBarButton { - Q_OBJECT + TQ_OBJECT public: MultiTabBarTab( const TQPixmap& pic, const TQString&, int id, TQWidget *parent, diff --git a/amarok/src/multitabbar_p.h b/amarok/src/multitabbar_p.h index f12308ff..3bb9a2b7 100644 --- a/amarok/src/multitabbar_p.h +++ b/amarok/src/multitabbar_p.h @@ -29,7 +29,7 @@ class MultiTabBarInternal: public TQScrollView { - Q_OBJECT + TQ_OBJECT public: MultiTabBarInternal(TQWidget *parent,MultiTabBar::MultiTabBarMode bm); diff --git a/amarok/src/mydiroperator.h b/amarok/src/mydiroperator.h index 691b8d03..fc399e70 100644 --- a/amarok/src/mydiroperator.h +++ b/amarok/src/mydiroperator.h @@ -11,7 +11,7 @@ class Medium; class MyDirOperator : public KDirOperator { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui index 2f5740a6..a2e45c54 100644 --- a/amarok/src/organizecollectiondialog.ui +++ b/amarok/src/organizecollectiondialog.ui @@ -571,15 +571,15 @@ <variable>MetaBundle previewBundle;</variable> <variable>bool detailed;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>updatePreview( const TQString & )</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>preview( const TQString & format )</slot> <slot>update( int dummy )</slot> <slot>update( const TQString & dummy )</slot> <slot>slotDetails()</slot> -</Q_SLOTS> +</slots> <functions> <function returnType="TQString">buildDestination( const TQString & format, const MetaBundle & mb )</function> <function returnType="TQString">buildFormatTip()</function> diff --git a/amarok/src/organizecollectiondialog.ui.h b/amarok/src/organizecollectiondialog.ui.h index a86a217b..b93d4089 100644 --- a/amarok/src/organizecollectiondialog.ui.h +++ b/amarok/src/organizecollectiondialog.ui.h @@ -202,8 +202,8 @@ void OrganizeCollectionDialog::slotDetails() } if( dynamic_cast<TQWidget *>(parent()) ) { - TQT_TQWIDGET(parent())->adjustSize(); - TQT_TQWIDGET(parent())->updateGeometry(); + static_cast<TQWidget *>(parent())->adjustSize(); + static_cast<TQWidget *>(parent())->updateGeometry(); } } diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index 02a6aa58..74bfa51e 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -60,13 +60,13 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name ) , m_rating( 0 ) , m_volume( false ) { - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundMode( NoBackground ); unsetColors(); - connect( m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()) ); - connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), - this, TQT_SLOT( ratingChanged( const TQString&, int ) ) ); + connect( m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide()) ); + connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ), + this, TQ_SLOT( ratingChanged( const TQString&, int ) ) ); //or crashes, KWin bug I think, crashes in TQWidget::icon() kapp->setTopWidget( this ); @@ -225,7 +225,7 @@ OSDWidget::determineMetrics( const uint M ) m_scaledCover = m_cover.smoothScale( TQMIN( availableWidth, m_cover.width() ), TQMIN( rect.height(), m_cover.height() ), - TQ_ScaleMin ); //this will force us to be with our bounds + TQImage::ScaleMin ); //this will force us to be with our bounds int shadowWidth = 0; if( m_drawShadow && !m_scaledCover.hasAlpha() && @@ -624,7 +624,7 @@ void OSDPreviewWidget::mousePressEvent( TQMouseEvent *event ) { m_dragOffset = event->pos(); - if( event->button() == Qt::LeftButton && !m_dragging ) { + if( event->button() == TQt::LeftButton && !m_dragging ) { grabMouse( KCursor::sizeAllCursor() ); m_dragging = true; } @@ -707,10 +707,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) Amarok::OSD::OSD(): OSDWidget( 0 ) { - connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotCoverChanged( const TQString&, const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( imageFetched( const TQString& ) ), - this, TQT_SLOT( slotImageChanged( const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotCoverChanged( const TQString&, const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( imageFetched( const TQString& ) ), + this, TQ_SLOT( slotImageChanged( const TQString& ) ) ); } void diff --git a/amarok/src/osd.h b/amarok/src/osd.h index 61273488..7b93d02a 100644 --- a/amarok/src/osd.h +++ b/amarok/src/osd.h @@ -25,7 +25,7 @@ class OSDWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -109,7 +109,7 @@ class OSDWidget : public TQWidget class OSDPreviewWidget : public OSDWidget { - Q_OBJECT + TQ_OBJECT public: @@ -157,7 +157,7 @@ namespace Amarok { class OSD : public OSDWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/pixmapviewer.cpp b/amarok/src/pixmapviewer.cpp index 4e133a4c..abd360fb 100644 --- a/amarok/src/pixmapviewer.cpp +++ b/amarok/src/pixmapviewer.cpp @@ -37,14 +37,14 @@ void PixmapViewer::drawContents( TQPainter * p, int clipx, int clipy, int clipw, } void PixmapViewer::contentsMousePressEvent(TQMouseEvent *event) { - if(Qt::LeftButton == event->button()) { + if(TQt::LeftButton == event->button()) { m_currentPos = event->globalPos(); m_isDragging = true; } } void PixmapViewer::contentsMouseReleaseEvent(TQMouseEvent *event) { - if(Qt::LeftButton == event->button()) { + if(TQt::LeftButton == event->button()) { m_currentPos = event->globalPos(); m_isDragging = false; } diff --git a/amarok/src/pixmapviewer.h b/amarok/src/pixmapviewer.h index f8a99037..5ca1aee1 100644 --- a/amarok/src/pixmapviewer.h +++ b/amarok/src/pixmapviewer.h @@ -22,7 +22,7 @@ #include <tqscrollview.h> class PixmapViewer : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 043877fc..2178a011 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -119,7 +119,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl //another quit shortcut because the other window has all the accels TQAccel *accel = new TQAccel( this ); accel->insertItem( CTRL + Key_Q ); - connect( accel, TQT_SIGNAL( activated( int ) ), kapp, TQT_SLOT( quit() ) ); + connect( accel, TQ_SIGNAL( activated( int ) ), kapp, TQ_SLOT( quit() ) ); TQFont font; font.setBold( true ); @@ -141,8 +141,8 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons ); switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big! - switchView->setFocusPolicy( TQ_NoFocus ); - connect( switchView, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleView() ) ); + switchView->setFocusPolicy( TQWidget::NoFocus ); + connect( switchView, TQ_SIGNAL( clicked() ), TQ_SLOT( toggleView() ) ); m_pButtonPlay->setToggleButton( true ); @@ -150,9 +150,9 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl } //</NavButtons> { //<Sliders> - m_pSlider = new Amarok::PrettySlider( Qt::Horizontal, + m_pSlider = new Amarok::PrettySlider( TQt::Horizontal, Amarok::PrettySlider::Pretty, this ); - m_pVolSlider = new Amarok::PrettySlider( Qt::Vertical, + m_pVolSlider = new Amarok::PrettySlider( TQt::Vertical, Amarok::PrettySlider::Pretty, this, Amarok::VOLUME_MAX ); @@ -161,10 +161,10 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl m_pVolSlider->setValue( AmarokConfig::masterVolume() ); EngineController* const ec = EngineController::instance(); - connect( m_pSlider, TQT_SIGNAL(sliderReleased( int )), ec, TQT_SLOT(seek( int )) ); - connect( m_pSlider, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(timeDisplay( int )) ); - connect( m_pVolSlider, TQT_SIGNAL(sliderMoved( int )), ec, TQT_SLOT(setVolume( int )) ); - connect( m_pVolSlider, TQT_SIGNAL(sliderReleased( int )), ec, TQT_SLOT(setVolume( int )) ); + connect( m_pSlider, TQ_SIGNAL(sliderReleased( int )), ec, TQ_SLOT(seek( int )) ); + connect( m_pSlider, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(timeDisplay( int )) ); + connect( m_pVolSlider, TQ_SIGNAL(sliderMoved( int )), ec, TQ_SLOT(setVolume( int )) ); + connect( m_pVolSlider, TQ_SIGNAL(sliderReleased( int )), ec, TQ_SLOT(setVolume( int )) ); } //<Sliders> { //<Scroller> @@ -186,11 +186,11 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl } //<TimeLabel> - m_pButtonEq = new IconButton( TQT_TQWIDGET(this), "eq", TQT_TQOBJECT(this), TQT_SLOT(slotShowEqualizer( bool )) ); + m_pButtonEq = new IconButton( this, "eq", this, TQ_SLOT(slotShowEqualizer( bool )) ); m_pButtonEq->setGeometry( 34,85, 28,13 ); //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->setOn( parent->isShown() || enablePlaylist ); @@ -219,7 +219,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl //KWin::setType( winId(), NET::Override ); //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 ); } @@ -557,7 +557,7 @@ bool PlayerWidget::event( TQEvent *e ) return true; case 6/*TQEvent::KeyPress*/: - if (TQT_TQKEYEVENT(e)->key() == TQt::Key_D/* && (m_pAnalyzer->inherits(TQGLWIDGET_OBJECT_NAME_STRING)*/) + if (static_cast<TQKeyEvent*>(e)->key() == TQt::Key_D/* && (m_pAnalyzer->inherits("TQGLWidget")*/) { if( m_pAnalyzer->parent() ) { @@ -688,7 +688,7 @@ PlayerWidget::eventFilter( TQObject *o, TQEvent *e ) { //NOTE we only monitor for parent() - which is the PlaylistWindow - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pAnalyzer) ) + if( o == m_pAnalyzer ) { //delete analyzer, create same one back in Player Window if( e->type() == TQEvent::Close ) @@ -703,7 +703,7 @@ PlayerWidget::eventFilter( TQObject *o, TQEvent *e ) { case TQEvent::Close: - TQT_TQCLOSEEVENT(e)->accept(); //close the window! + static_cast<TQCloseEvent*>(e)->accept(); //close the window! return true; //don't let PlaylistWindow have the event - see PlaylistWindow::closeEvent() case TQEvent::Hide: @@ -770,7 +770,7 @@ void PlayerWidget::contextMenuEvent( TQMouseEvent *e ) void PlayerWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::RightButton ) + if ( e->button() == TQt::RightButton ) { //Amarok::Menu::instance()->exec( e->globalPos() ); } @@ -796,7 +796,7 @@ void PlayerWidget::mousePressEvent( TQMouseEvent *e ) void PlayerWidget::mouseMoveEvent( TQMouseEvent *e ) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) { const int distance = (e->pos() - m_startDragPos).manhattanLength(); @@ -838,7 +838,7 @@ void PlayerWidget::slotShowEqualizer( bool show ) //SLOT KMessageBox::sorry( 0, i18n( "Equalizer is not available with this engine." ) ); else - TQTimer::singleShot( 0, kapp, TQT_SLOT( slotConfigEqualizer() ) ); + TQTimer::singleShot( 0, kapp, TQ_SLOT( slotConfigEqualizer() ) ); } } @@ -896,11 +896,11 @@ NavButton::NavButton( TQWidget *parent, const TQString &icon, TDEAction *action iconSet.setPixmap( pixmap, TQIconSet::Automatic, TQIconSet::Disabled, TQIconSet::Off ); setIconSet( iconSet ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setEnabled( action->isEnabled() ); - connect( action, TQT_SIGNAL( enabled( bool ) ), TQT_SLOT( setEnabled( bool ) ) ); - connect( this, TQT_SIGNAL( clicked() ), action, TQT_SLOT( activate() ) ); + connect( action, TQ_SIGNAL( enabled( bool ) ), TQ_SLOT( setEnabled( bool ) ) ); + connect( this, TQ_SIGNAL( clicked() ), action, TQ_SLOT( activate() ) ); startTimer( GLOW_INTERVAL ); } @@ -940,10 +940,10 @@ 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_down( getPNG( icon + "_inactive2" ) ) { - connect( this, TQT_SIGNAL(toggled( bool )), parent, signal ); + connect( this, TQ_SIGNAL(toggled( bool )), parent, signal ); setToggleButton( true ); - setFocusPolicy( TQ_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 } IconButton::IconButton( TQWidget *parent, const TQString &icon, TQObject* receiver, const char *slot ) @@ -951,10 +951,10 @@ 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_down( getPNG( icon + "_inactive2" ) ) { - connect( this, TQT_SIGNAL(toggled( bool )), receiver, slot ); + connect( this, TQ_SIGNAL(toggled( bool )), receiver, slot ); setToggleButton( true ); - setFocusPolicy( TQ_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 } void IconButton::drawButton( TQPainter *p ) diff --git a/amarok/src/playerwindow.h b/amarok/src/playerwindow.h index cc16274c..b4e8af36 100644 --- a/amarok/src/playerwindow.h +++ b/amarok/src/playerwindow.h @@ -60,7 +60,7 @@ protected: class IconButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: @@ -81,7 +81,7 @@ private: class PlayerWidget : public TQWidget, public EngineObserver { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index 3bd33d32..c1374263 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -57,7 +57,6 @@ #include <tqpainter.h> #include <tqpen.h> //slotGlowTimer() #include <tqsimplerichtext.h> //toolTipText() -#include <tqsortedlist.h> #include <tqtimer.h> #include <tqtooltip.h> #include <tqvaluelist.h> //addHybridTracks() @@ -206,28 +205,28 @@ Playlist::Playlist( TQWidget *parent ) { s_instance = this; - connect( CollectionDB::instance(), TQT_SIGNAL(fileMoved(const TQString&, - const TQString&, const TQString&)), TQT_SLOT(updateEntriesUrl(const TQString&, + connect( CollectionDB::instance(), TQ_SIGNAL(fileMoved(const TQString&, + const TQString&, const TQString&)), TQ_SLOT(updateEntriesUrl(const TQString&, const TQString&, const TQString&)) ); - connect( CollectionDB::instance(), TQT_SIGNAL(uniqueIdChanged(const TQString&, - const TQString&, const TQString&)), TQT_SLOT(updateEntriesUniqueId(const TQString&, + connect( CollectionDB::instance(), TQ_SIGNAL(uniqueIdChanged(const TQString&, + const TQString&, const TQString&)), TQ_SLOT(updateEntriesUniqueId(const TQString&, const TQString&, const TQString&)) ); - connect( CollectionDB::instance(), TQT_SIGNAL(fileDeleted(const TQString&, - const TQString&)), TQT_SLOT(updateEntriesStatusDeleted(const TQString&, const TQString&)) ); - connect( CollectionDB::instance(), TQT_SIGNAL(fileAdded(const TQString&, - const TQString&)), TQT_SLOT(updateEntriesStatusAdded(const TQString&, const TQString&)) ); - connect( CollectionDB::instance(), TQT_SIGNAL(filesAdded(const TQMap<TQString,TQString>&)), - TQT_SLOT(updateEntriesStatusAdded(const TQMap<TQString,TQString>&)) ); + connect( CollectionDB::instance(), TQ_SIGNAL(fileDeleted(const TQString&, + const TQString&)), TQ_SLOT(updateEntriesStatusDeleted(const TQString&, const TQString&)) ); + connect( CollectionDB::instance(), TQ_SIGNAL(fileAdded(const TQString&, + const TQString&)), TQ_SLOT(updateEntriesStatusAdded(const TQString&, const TQString&)) ); + connect( CollectionDB::instance(), TQ_SIGNAL(filesAdded(const TQMap<TQString,TQString>&)), + TQ_SLOT(updateEntriesStatusAdded(const TQMap<TQString,TQString>&)) ); initStarPixmaps(); EngineController* const ec = EngineController::instance(); - connect( ec, TQT_SIGNAL(orderPrevious()), TQT_SLOT(playPrevTrack()) ); - connect( ec, TQT_SIGNAL(orderNext( const bool )), TQT_SLOT(playNextTrack( const bool )) ); - connect( ec, TQT_SIGNAL(orderCurrent()), TQT_SLOT(playCurrentTrack()) ); + connect( ec, TQ_SIGNAL(orderPrevious()), TQ_SLOT(playPrevTrack()) ); + connect( ec, TQ_SIGNAL(orderNext( const bool )), TQ_SLOT(playNextTrack( const bool )) ); + 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 ); @@ -294,48 +293,48 @@ Playlist::Playlist( TQWidget *parent ) setColumnAlignment( PlaylistItem::PlayCount, TQt::AlignCenter ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( doubleClicked( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( activate( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotMouseButtonPressed( int, TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), - this, TQT_SLOT( slotQueueChanged( const PLItemList &, const PLItemList & ) ) ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), - this, TQT_SLOT( writeTag( TQListViewItem*, const TQString&, int ) ) ); - connect( this, TQT_SIGNAL( aboutToClear() ), - this, TQT_SLOT( saveUndoState() ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( scoreChanged( const TQString&, float ) ), - this, TQT_SLOT( scoreChanged( const TQString&, float ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), - this, TQT_SLOT( ratingChanged( const TQString&, int ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( fileMoved( const TQString&, const TQString& ) ), - this, TQT_SLOT( fileMoved( const TQString&, const TQString& ) ) ); - connect( header(), TQT_SIGNAL( indexChange( int, int, int ) ), - this, TQT_SLOT( columnOrderChanged() ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( doubleClicked( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( activate( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed( int, TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotMouseButtonPressed( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), + this, TQ_SLOT( slotQueueChanged( const PLItemList &, const PLItemList & ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + this, TQ_SLOT( writeTag( TQListViewItem*, const TQString&, int ) ) ); + connect( this, TQ_SIGNAL( aboutToClear() ), + this, TQ_SLOT( saveUndoState() ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( scoreChanged( const TQString&, float ) ), + this, TQ_SLOT( scoreChanged( const TQString&, float ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ), + this, TQ_SLOT( ratingChanged( const TQString&, int ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( fileMoved( const TQString&, const TQString& ) ), + this, TQ_SLOT( fileMoved( const TQString&, const TQString& ) ) ); + connect( header(), TQ_SIGNAL( indexChange( int, int, int ) ), + 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(); - TDEAction *copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copyToClipboard() ), ac, "playlist_copy" ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "playlist_select_all" ); + TDEAction *copy = KStdAction::copy( this, TQ_SLOT( copyToClipboard() ), ac, "playlist_copy" ); + KStdAction::selectAll( this, TQ_SLOT( selectAll() ), ac, "playlist_select_all" ); - m_clearButton = new TDEAction( i18n( "clear playlist", "&Clear" ), Amarok::icon( "playlist_clear" ), 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), ac, "playlist_clear" ); - m_undoButton = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), ac, "playlist_undo" ); - m_redoButton = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), ac, "playlist_redo" ); + 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, TQ_SLOT( undo() ), ac, "playlist_undo" ); + m_redoButton = KStdAction::redo( this, TQ_SLOT( redo() ), ac, "playlist_redo" ); m_undoButton ->setIcon( Amarok::icon( "undo" ) ); m_redoButton ->setIcon( Amarok::icon( "redo" ) ); - new TDEAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, TQT_TQOBJECT(this), TQT_SLOT( repopulate() ), ac, "repopulate" ); - new TDEAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, TQT_TQOBJECT(this), TQT_SLOT( shuffle() ), ac, "playlist_shuffle" ); - TDEAction *gotoCurrent = new TDEAction( i18n( "&Go To Current Track" ), Amarok::icon( "music" ), CTRL+Key_J, TQT_TQOBJECT(this), TQT_SLOT( showCurrentTrack() ), ac, "playlist_show" ); - new TDEAction( i18n( "&Remove Duplicate && Dead Entries" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeDuplicates() ), ac, "playlist_remove_duplicates" ); - new TDEAction( i18n( "&Queue Selected Tracks" ), Amarok::icon( "queue_track" ), CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( queueSelected() ), ac, "queue_selected" ); + 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, TQ_SLOT( shuffle() ), ac, "playlist_shuffle" ); + 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, TQ_SLOT( removeDuplicates() ), ac, "playlist_remove_duplicates" ); + 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, - TQT_TQOBJECT(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 TDEPopupMenu asdf; @@ -350,10 +349,10 @@ Playlist::Playlist( TQWidget *parent ) } //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" ), TQT_SIGNAL( activated( int ) ), TQT_SLOT( generateInfo() ) ); - connect( ac->action( "favor_tracks" ), TQT_SIGNAL( activated( int ) ), TQT_SLOT( generateInfo() ) ); - connect( ac->action( "random_mode" ), TQT_SIGNAL( activated( int ) ), TQT_SLOT( generateInfo() ) ); + connect( ac->action( "repeat" ), TQ_SIGNAL(activated( int )), TQ_SLOT(updateNextPrev()) ); + connect( ac->action( "repeat" ), TQ_SIGNAL( activated( int ) ), TQ_SLOT( generateInfo() ) ); + connect( ac->action( "favor_tracks" ), TQ_SIGNAL( activated( int ) ), TQ_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 :) @@ -383,14 +382,14 @@ Playlist::Playlist( TQWidget *parent ) columnResizeEvent( header()->count(), 0, 0 ); //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(), TQT_SIGNAL( useRatings( bool ) ), this, TQT_SLOT( slotUseRatings( bool ) ) ); - connect( App::instance(), TQT_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), - this, TQT_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); + connect( App::instance(), TQ_SIGNAL( useScores( bool ) ), this, TQ_SLOT( slotUseScores( bool ) ) ); + connect( App::instance(), TQ_SIGNAL( useRatings( bool ) ), this, TQ_SLOT( slotUseRatings( bool ) ) ); + connect( App::instance(), TQ_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), + this, TQ_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); Amarok::ToolTip::add( this, viewport() ); @@ -399,15 +398,15 @@ Playlist::Playlist( TQWidget *parent ) setTabOrderedRenaming( false ); 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 )), - TQT_SLOT(mediumChange( int )) ); - connect( MountPointManager::instance(), TQT_SIGNAL(mediumRemoved( int )), - TQT_SLOT(mediumChange( int )) ); + connect( MountPointManager::instance(), TQ_SIGNAL(mediumConnected( int )), + TQ_SLOT(mediumChange( int )) ); + connect( MountPointManager::instance(), TQ_SIGNAL(mediumRemoved( int )), + TQ_SLOT(mediumChange( int )) ); 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() @@ -1961,7 +1960,7 @@ Playlist::countChanged() if( !m_itemCountDirty ) { m_itemCountDirty = true; - TQTimer::singleShot( 0, this, TQT_SLOT( slotCountChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotCountChanged() ) ); } } @@ -2726,10 +2725,10 @@ Playlist::columnResizeEvent( int col, int oldw, int neww ) bool Playlist::eventFilter( TQObject *o, TQEvent *e ) { - #define me TQT_TQMOUSEEVENT(e) - #define ke TQT_TQKEYEVENT(e) + #define me static_cast<TQMouseEvent*>(e) + #define ke static_cast<TQKeyEvent*>(e) - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::RightButton ) + if( o == header() && e->type() == TQEvent::MouseButtonPress && me->button() == TQt::RightButton ) { enum { HIDE = 1000, SELECT, CUSTOM, SMARTRESIZING }; @@ -2754,7 +2753,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) popup.insertItem( i18n("&Fit to Width"), SMARTRESIZING ); popup.setItemChecked( SMARTRESIZING, m_smartResizing ); - int col = popup.exec( TQT_TQMOUSEEVENT(e)->globalPos() ); + int col = popup.exec( static_cast<TQMouseEvent*>(e)->globalPos() ); switch( col ) { case HIDE: @@ -2795,7 +2794,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } // not in slotMouseButtonPressed because we need to disable normal usage. - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->state() == TQt::ControlButton && me->button() == Qt::RightButton ) + if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->state() == TQt::ControlButton && me->button() == TQt::RightButton ) { PlaylistItem *item = static_cast<PlaylistItem*>( itemAt( me->pos() ) ); @@ -2810,7 +2809,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } // trigger in-place tag editing - else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::LeftButton ) + else if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->button() == TQt::LeftButton ) { m_clicktimer->stop(); m_itemToRename = 0; @@ -2821,7 +2820,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) bool edit = item && item->isSelected() && selectedItems().count()==1 - && (me->state() & ~Qt::LeftButton) == 0 + && (me->state() & ~TQt::LeftButton) == 0 && item->url().isLocalFile(); if( edit ) { @@ -2833,7 +2832,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } } - else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonRelease && me->button() == Qt::LeftButton ) + else if( o == viewport() && e->type() == TQEvent::MouseButtonRelease && me->button() == TQt::LeftButton ) { int col = header()->sectionAt( viewportToContents( me->pos() ).x() ); if( col != PlaylistItem::Rating ) @@ -2852,14 +2851,14 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } // avoid in-place tag editing upon double-clicks - else if( e->type() == TQEvent::MouseButtonDblClick && me->button() == Qt::LeftButton ) + else if( e->type() == TQEvent::MouseButtonDblClick && me->button() == TQt::LeftButton ) { m_itemToRename = 0; m_clicktimer->stop(); } // Toggle play/pause if user middle-clicks on current track - else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::MidButton ) + else if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->button() == TQt::MidButton ) { PlaylistItem *item = static_cast<PlaylistItem*>( itemAt( me->pos() ) ); @@ -2870,7 +2869,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } } - else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(renameLineEdit()) && e->type() == 6 /*TQEvent::KeyPress*/ && m_renameItem ) + else if( o == renameLineEdit() && e->type() == 6 /*TQEvent::KeyPress*/ && m_renameItem ) { const int visibleCols = numVisibleColumns(); int physicalColumn = visibleCols - 1; @@ -2961,7 +2960,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } } - else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(renameLineEdit()) && ( e->type() == TQEvent::Hide || e->type() == TQEvent::Close ) ) + else if( o == renameLineEdit() && ( e->type() == TQEvent::Hide || e->type() == TQEvent::Close ) ) { m_renameItem = 0; } @@ -3470,41 +3469,42 @@ Playlist::deleteSelectedFiles() //SLOT removeSelectedItems(); foreachType( KURL::List, urls ) CollectionDB::instance()->emitFileDeleted( (*it).path() ); - TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); + TQTimer::singleShot( 0, CollectionView::instance(), TQ_SLOT( renderView() ) ); } } void Playlist::removeDuplicates() //SLOT { - // Remove dead entries: - - for( TQListViewItemIterator it( this ); it.current(); ) { - PlaylistItem* item = static_cast<PlaylistItem*>( *it ); + // Remove dead entries + for (TQListViewItemIterator it(this); it.current(); ) + { + PlaylistItem *item = static_cast<PlaylistItem*>(*it); const KURL url = item->url(); - if ( url.isLocalFile() && !TQFile::exists( url.path() ) ) { - removeItem( item ); + if (url.isLocalFile() && !TQFile::exists(url.path())) + { + removeItem(item); ++it; delete item; } else ++it; } - // Remove dupes: - - TQSortedList<PlaylistItem> list; - for( TQListViewItemIterator it( this ); it.current(); ++it ) - list.prepend( static_cast<PlaylistItem*>( it.current() ) ); - - list.sort(); - - TQPtrListIterator<PlaylistItem> it( list ); - PlaylistItem *item; - while( (item = it.current()) ) { - const KURL &compare = item->url(); - ++it; - if ( *it && compare == it.current()->url() ) { - removeItem( item ); + // Remove duplicates + TQMap<KURL, bool> existingItems; + for (TQListViewItemIterator it(this); it.current(); ) + { + PlaylistItem *item = static_cast<PlaylistItem*>(*it); + const KURL &itemUrl = item->url(); + if (!existingItems.contains(itemUrl)) + { + existingItems[itemUrl] = true; + ++it; + } + else + { + removeItem(item); + ++it; delete item; } } @@ -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( "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(); @@ -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("&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 ); if( itemCount == 1 ) @@ -4194,7 +4194,7 @@ void Playlist::contentsMousePressEvent( TQMouseEvent *e ) /// Conditions on setting the rating of an item if( item && !( e->state() & TQt::ControlButton || e->state() & TQt::ShiftButton ) && // skip if ctrl or shift held - ( e->button() & Qt::LeftButton ) && // only on a left click + ( e->button() & TQt::LeftButton ) && // only on a left click ( e->pos().x() > beginRatingSection && e->pos().x() < endRatingSection ) ) // mouse over rating column { int rating = item->ratingAtPoint( e->pos().x() ); @@ -4404,7 +4404,7 @@ void Playlist::ensureItemCentered( TQListViewItem *item ) //HACK -- apparently the various metrics aren't reliable while the UI is still updating & stuff m_itemToReallyCenter = item; - TQTimer::singleShot( 0, this, TQT_SLOT( reallyEnsureItemCentered() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( reallyEnsureItemCentered() ) ); } void @@ -4577,7 +4577,7 @@ Playlist::slotMouseButtonPressed( int button, TQListViewItem *after, const TQPoi { switch( button ) { - case Qt::MidButton: + case TQt::MidButton: { const TQString path = TQApplication::clipboard()->text( TQClipboard::Selection ); const KURL url = KURL::fromPathOrURL( path ); @@ -4588,7 +4588,7 @@ Playlist::slotMouseButtonPressed( int button, TQListViewItem *after, const TQPoi break; } - case Qt::RightButton: + case TQt::RightButton: showContextMenu( after, p, col ); break; @@ -4600,7 +4600,7 @@ Playlist::slotMouseButtonPressed( int button, TQListViewItem *after, const TQPoi void Playlist::slotContentsMoving() { Amarok::ToolTip::hideTips(); - TQTimer::singleShot( 0, this, TQT_SLOT( contentsMouseMoveEvent() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( contentsMouseMoveEvent() ) ); } void @@ -4789,7 +4789,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) lineEdit1 = new TQLineEdit( this, "ColumnName" ); lineEdit2 = new TQLineEdit( this, "Command" ); - groupBox1 = new TQGroupBox( 1, Qt::Vertical, i18n( "Examples" ), this ); + groupBox1 = new TQGroupBox( 1, TQt::Vertical, i18n( "Examples" ), this ); groupBox1->layout()->setMargin( 11 ); new KActiveLabel( i18n( "file --brief %f\n" "ls -sh %f\n" "basename %f\n" "dirname %f" ), groupBox1 ); @@ -4822,16 +4822,16 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) // connects connect( child( "OkButton" ), - TQT_SIGNAL(clicked()), - TQT_SLOT(accept()) ); + TQ_SIGNAL(clicked()), + TQ_SLOT(accept()) ); connect( child( "CancelButton" ), - TQT_SIGNAL(clicked()), - TQT_SLOT(reject()) ); + TQ_SIGNAL(clicked()), + TQ_SLOT(reject()) ); } - TQString command() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child("Command")))->text(); } - TQString name() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child("ColumnName")))->text(); } + TQString command() { return static_cast<KLineEdit*>(child("Command"))->text(); } + TQString name() { return static_cast<KLineEdit*>(child("ColumnName"))->text(); } }; void diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h index 0973b4dc..5f960f13 100644 --- a/amarok/src/playlist.h +++ b/amarok/src/playlist.h @@ -78,7 +78,7 @@ class Medium; class Playlist : private TDEListView, public EngineObserver, public Amarok::ToolTipClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp index 87c64403..c3a4d7fe 100644 --- a/amarok/src/playlistbrowser.cpp +++ b/amarok/src/playlistbrowser.cpp @@ -165,7 +165,7 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) TDEPopupMenu *playlistMenu = new TDEPopupMenu( this ); playlistMenu->insertItem( i18n("New..."), PLAYLIST ); 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(); addMenu->insertItem( i18n("Playlist"), playlistMenu ); @@ -173,10 +173,10 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) addMenu->insertItem( i18n("Dynamic Playlist..."), ADDDYNAMIC); addMenu->insertItem( i18n("Radio Stream..."), STREAM ); 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, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), m_ac ); - removeButton = new TDEAction( i18n("Delete"), Amarok::icon( "remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeSelectedItems() ), 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, TQ_SLOT( removeSelectedItems() ), m_ac ); m_toolbar = new Browser::ToolBar( browserBox ); m_toolbar->setIconText( TDEToolBar::IconTextRight, false ); //we want the open button to have text on right @@ -191,7 +191,7 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) removeButton->setEnabled( false ); //</Toolbar> - m_splitter = new TQSplitter( Qt::Vertical, browserBox ); + m_splitter = new TQSplitter( TQt::Vertical, browserBox ); m_splitter->setChildrenCollapsible( false ); // hiding the InfoPane entirely can only be confusing m_listview = new PlaylistBrowserView( m_splitter ); @@ -200,18 +200,18 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) m_listview->setSorting( 0, sort == TQt::Ascending ? true : false ); 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 - connect( m_listview, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( showContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( m_listview, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( invokeItem( TQListViewItem *, const TQPoint &, int ) ) ); - connect( m_listview, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), - this, TQT_SLOT( renamePlaylist( TQListViewItem*, const TQString&, int ) ) ); - connect( m_listview, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - this, TQT_SLOT( currentItemChanged( TQListViewItem * ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), TQT_SLOT( collectionScanDone() ) ); + connect( m_listview, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( showContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_listview, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( invokeItem( TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_listview, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + this, TQ_SLOT( renamePlaylist( TQListViewItem*, const TQString&, int ) ) ); + connect( m_listview, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( currentItemChanged( TQListViewItem * ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( scanDone( bool ) ), TQ_SLOT( collectionScanDone() ) ); setMinimumWidth( m_toolbar->sizeHint().width() ); @@ -350,7 +350,7 @@ PlaylistBrowser::setInfo( const TQString &title, const TQString &info ) void PlaylistBrowser::resizeEvent( TQResizeEvent * ) { - if( TQT_TQWIDGET( m_infoPane->child( "container" ) )->isShown() ) + if( static_cast<TQWidget*>( m_infoPane->child( "container" ) )->isShown() ) m_infoPane->setMaximumHeight( ( int )( m_splitter->height() / 1.5 ) ); } @@ -1518,7 +1518,7 @@ bool PlaylistBrowser::deleteSelectedPodcastItems( const bool removeItem, const b delete item; } 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; } @@ -1577,8 +1577,8 @@ void PlaylistBrowser::downloadPodcastQueue() //SLOT first->downloadMedia(); m_podcastDownloadQueue.removeFirst(); - connect( first, TQT_SIGNAL( downloadFinished() ), this, TQT_SLOT( downloadPodcastQueue() ) ); - connect( first, TQT_SIGNAL( downloadAborted() ), this, TQT_SLOT( abortPodcastQueue() ) ); + connect( first, TQ_SIGNAL( downloadFinished() ), this, TQ_SLOT( downloadPodcastQueue() ) ); + connect( first, TQ_SIGNAL( downloadAborted() ), this, TQ_SLOT( abortPodcastQueue() ) ); } void PlaylistBrowser::abortPodcastQueue() //SLOT @@ -2574,12 +2574,12 @@ PlaylistBrowserView::PlaylistBrowserView( TQWidget *parent, const char *name ) setTreeStepSize( 20 ); - connect( this, TQT_SIGNAL( mouseButtonPressed ( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( mousePressed( int, TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed ( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( mousePressed( int, TQListViewItem *, const TQPoint &, int ) ) ); //TODO moving tracks - //connect( this, TQT_SIGNAL( moved(TQListViewItem *, TQListViewItem *, TQListViewItem * )), - // this, TQT_SLOT( itemMoved(TQListViewItem *, TQListViewItem *, TQListViewItem * ))); + //connect( this, TQ_SIGNAL( moved(TQListViewItem *, TQListViewItem *, TQListViewItem * )), + // this, TQ_SLOT( itemMoved(TQListViewItem *, TQListViewItem *, TQListViewItem * ))); } PlaylistBrowserView::~PlaylistBrowserView() { } @@ -2768,7 +2768,7 @@ void PlaylistBrowserView::mousePressed( int button, TQListViewItem *item, const // this function expande/collapse the playlist if the +/- symbol has been pressed // and show the save menu if the save icon has been pressed - if( !item || button != Qt::LeftButton ) return; + if( !item || button != TQt::LeftButton ) return; if( isPlaylist( item ) ) { @@ -3099,9 +3099,9 @@ PlaylistDialog::PlaylistDialog() edit->setFocus(); label->setBuddy( edit ); enableButtonOK( false ); - connect( edit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( const TQString& ) ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotCustomPath() ) ); + connect( edit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotCustomPath() ) ); } void PlaylistDialog::slotOk() @@ -3166,7 +3166,7 @@ InfoPane::InfoPane( TQWidget *parent ) m_pushButton = new KPushButton( KGuiItem( i18n("&Show Extended Info"), "info" ), this ); m_pushButton->setToggleButton( true ); 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. setFixedHeight( m_pushButton->sizeHint().height() ); @@ -3183,7 +3183,7 @@ InfoPane::~InfoPane() int InfoPane::getHeight() { - if( TQT_TQWIDGET( child( "container" ) )->isShown() ) + if( static_cast<TQWidget*>( child( "container" ) )->isShown() ) { //If the InfoPane is shown, return true height. return static_cast<TQSplitter*>( parentWidget() )->sizes().last(); @@ -3227,7 +3227,7 @@ InfoPane::toggle( bool toggled ) setMinimumHeight( 150 ); } - TQT_TQWIDGET( child( "container" ) )->setShown( toggled ); + static_cast<TQWidget*>( child( "container" ) )->setShown( toggled ); } void @@ -3237,7 +3237,7 @@ InfoPane::setInfo( const TQString &title, const TQString &info ) //whether there is content to show. Otherwise, just remember what we wanted to do //so we can do it later, when the user does hide the pane. m_enable = !( info.isEmpty() && title.isEmpty() ); - if ( !TQT_TQWIDGET(child("container"))->isShown() ) + if ( !static_cast<TQWidget*>( child("container") )->isShown() ) m_pushButton->setEnabled( m_enable ); if( m_pushButton->isOn() ) diff --git a/amarok/src/playlistbrowser.h b/amarok/src/playlistbrowser.h index bcb63ef2..b9527bf9 100644 --- a/amarok/src/playlistbrowser.h +++ b/amarok/src/playlistbrowser.h @@ -43,7 +43,7 @@ class PlaylistTrackItem; class PlaylistBrowser : public TQVBox { - Q_OBJECT + TQ_OBJECT friend class DynamicMode; friend class PlaylistBrowserView; @@ -241,7 +241,7 @@ class PlaylistBrowser : public TQVBox class PlaylistBrowserView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class PlaylistEntry; @@ -273,7 +273,7 @@ class PlaylistBrowserView : public TDEListView class PlaylistDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: static TQString getSaveFileName( const TQString &suggestion = TQString(), bool proposeOverwriting = false ); @@ -393,7 +393,7 @@ fileDirPath( const TQString &filePath ) class InfoPane : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index 9932a5fd..ea92a1e5 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -640,7 +640,7 @@ void PlaylistEntry::load() //starts loading animation m_iconCounter = 1; 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 while( firstChild() ) @@ -1362,7 +1362,7 @@ TQDomElement LastFmEntry::xml() const StreamEditor::StreamEditor( TQWidget *parent, const TQString &title, const TQString &url, bool readonly ) : KDialogBase( parent, "StreamEditor", true, TQString(), Ok|Cancel) { - makeGridMainWidget( 2, Qt::Horizontal ); + makeGridMainWidget( 2, TQt::Horizontal ); TQLabel *nameLabel = new TQLabel( i18n("&Name:"), mainWidget() ); m_nameLineEdit = new KLineEdit( title, mainWidget() ); @@ -1791,7 +1791,7 @@ PodcastChannel::downloadChildQueue() first->downloadMedia(); m_podcastDownloadQueue.removeFirst(); - connect( first, TQT_SIGNAL( downloadFinished() ), this, TQT_SLOT( downloadChildQueue() ) ); + connect( first, TQ_SIGNAL( downloadFinished() ), this, TQ_SLOT( downloadChildQueue() ) ); } void @@ -1801,15 +1801,15 @@ PodcastChannel::fetch() m_iconCounter = 1; 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 ); Amarok::StatusBar::instance()->newProgressOperation( m_podcastJob ) .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 @@ -2552,7 +2552,7 @@ PodcastEpisode::downloadMedia() m_iconCounter = 1; startAnimation(); - connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); + connect( &m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) ); KURL localDir; PodcastChannel *channel = dynamic_cast<PodcastChannel*>(m_parent); @@ -2571,11 +2571,11 @@ PodcastEpisode::downloadMedia() .setDescription( title().isEmpty() ? i18n( "Downloading Podcast Media" ) : i18n( "Downloading Podcast \"%1\"" ).arg( title() ) ) - .setAbortSlot( this, TQT_SLOT( abortDownload()) ) - .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ) ); + .setAbortSlot( this, TQ_SLOT( abortDownload()) ) + .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, TQT_SIGNAL( redirection( TDEIO::Job *,const KURL& ) ), TQT_SLOT( redirected( TDEIO::Job *,const KURL& ) ) ); + connect( m_podcastEpisodeJob, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( downloadResult( TDEIO::Job * ) ) ); + 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*/ @@ -3488,7 +3488,7 @@ void ShoutcastBrowser::setOpen( bool open ) if( !m_animationTimer.isActive() ) 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" ); TQString tmpfile = tmpdirs[0]; @@ -3499,9 +3499,9 @@ void ShoutcastBrowser::setOpen( bool open ) { m_downloading = true; m_cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml", tmpfile, false ); - connect( m_cj, TQT_SIGNAL( copyingDone( TDEIO::Job*, const KURL&, const KURL&, bool, bool)) - , this, TQT_SLOT(doneGenreDownload(TDEIO::Job*, const KURL&, const KURL&, bool, bool ))); - connect( m_cj, TQT_SIGNAL( result( TDEIO::Job* )), this, TQT_SLOT( jobFinished( TDEIO::Job* ))); + connect( m_cj, TQ_SIGNAL( copyingDone( TDEIO::Job*, const KURL&, const KURL&, bool, bool)) + , this, TQ_SLOT(doneGenreDownload(TDEIO::Job*, const KURL&, const KURL&, bool, bool ))); + connect( m_cj, TQ_SIGNAL( result( TDEIO::Job* )), this, TQ_SLOT( jobFinished( TDEIO::Job* ))); } TQListViewItem::setOpen( open ); @@ -3646,7 +3646,7 @@ void ShoutcastGenre::setOpen( bool open ) if( !m_animationTimer.isActive() ) 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" ); @@ -3666,10 +3666,10 @@ void ShoutcastGenre::startGenreDownload( TQString genre, TQString tmppath ) { 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 ); - connect( cj, TQT_SIGNAL( copyingDone ( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ), - this, TQT_SLOT( doneListDownload( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ) ); - connect( cj, TQT_SIGNAL( result ( TDEIO::Job* ) ), - this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) ); + connect( cj, TQ_SIGNAL( copyingDone ( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ), + this, TQ_SLOT( doneListDownload( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ) ); + connect( cj, TQ_SIGNAL( result ( TDEIO::Job* ) ), + this, TQ_SLOT( jobFinished( TDEIO::Job* ) ) ); m_totalJobs++; } diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h index 573f6ec5..7fa43e8d 100644 --- a/amarok/src/playlistbrowseritem.h +++ b/amarok/src/playlistbrowseritem.h @@ -49,7 +49,7 @@ namespace TDEIO { class Job; class TransferJob; class CopyJob; } //podcast downl /* A base class to be able to use polymorphism and avoid tons of casts */ class PlaylistBrowserEntry : public TQObject, public TDEListViewItem { - Q_OBJECT + TQ_OBJECT public: PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after ) @@ -86,7 +86,7 @@ class PlaylistBrowserEntry : public TQObject, public TDEListViewItem class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode { - Q_OBJECT + TQ_OBJECT public: DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &title ); @@ -107,7 +107,7 @@ class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode class PlaylistCategory : public PlaylistBrowserEntry { - Q_OBJECT + TQ_OBJECT public: PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQString &, bool isFolder=false ); @@ -151,7 +151,7 @@ class PlaylistCategory : public PlaylistBrowserEntry class PlaylistEntry : public PlaylistBrowserEntry { - Q_OBJECT + TQ_OBJECT friend class PlaylistTrackItem; @@ -233,7 +233,7 @@ class PlaylistEntry : public PlaylistBrowserEntry class PlaylistTrackItem : public PlaylistBrowserEntry { - Q_OBJECT + TQ_OBJECT friend class TrackItemInfo; @@ -258,7 +258,7 @@ class PlaylistTrackItem : public PlaylistBrowserEntry /// Stored in the database class PodcastEpisode : public PlaylistBrowserEntry { - Q_OBJECT + TQ_OBJECT public: @@ -346,7 +346,7 @@ class PodcastEpisode : public PlaylistBrowserEntry /// Stored in the database class PodcastChannel : public PlaylistBrowserEntry { - Q_OBJECT + TQ_OBJECT public: @@ -451,7 +451,7 @@ class PodcastChannel : public PlaylistBrowserEntry class StreamEntry : public PlaylistBrowserEntry { - Q_OBJECT + TQ_OBJECT public: StreamEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &, const TQString &t ); @@ -485,7 +485,7 @@ class StreamEntry : public PlaylistBrowserEntry class LastFmEntry : public StreamEntry { - Q_OBJECT + TQ_OBJECT public: LastFmEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &u, const TQString &t ) @@ -518,7 +518,7 @@ class StreamEditor : public KDialogBase class SmartPlaylist : public PlaylistBrowserEntry { - Q_OBJECT + TQ_OBJECT public: SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &query ); @@ -589,7 +589,7 @@ class TrackItemInfo */ class ShoutcastBrowser : public PlaylistCategory { - Q_OBJECT + TQ_OBJECT public: ShoutcastBrowser( PlaylistCategory* parent ); @@ -619,7 +619,7 @@ class ShoutcastBrowser : public PlaylistCategory */ class ShoutcastGenre : public PlaylistCategory { - Q_OBJECT + TQ_OBJECT public: ShoutcastGenre( ShoutcastBrowser *browser, TQListViewItem *after, TQString genre ); diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index e6522b27..c07f6e4b 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -615,7 +615,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co // Left part if( column == listView()->m_firstColumn ) { - TQImage tmpImage = currentTrackLeft.smoothScale( 1, height(), TQ_ScaleMax ); + TQImage tmpImage = currentTrackLeft.smoothScale( 1, height(), TQImage::ScaleMax ); TDEIconEffect::colorize( tmpImage, glowBase, colorize ); imageTransparency( tmpImage, intensity ); p.drawImage( 0, 0, tmpImage, 0, 0, tmpImage.width() - 1 ); //HACK @@ -627,7 +627,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co else if( column == Playlist::instance()->mapToLogicalColumn( Playlist::instance()->numVisibleColumns() - 1 ) ) { - TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQ_ScaleMax ); + TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQImage::ScaleMax ); TDEIconEffect::colorize( tmpImage, glowBase, colorize ); imageTransparency( tmpImage, intensity ); p.drawImage( width - tmpImage.width(), 0, tmpImage ); diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp index 0eebba0b..11943a0b 100644 --- a/amarok/src/playlistloader.cpp +++ b/amarok/src/playlistloader.cpp @@ -73,7 +73,7 @@ public: UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options ) - : ThreadManager::DependentJob( TQT_TQOBJECT(Playlist::instance()), "UrlLoader" ) + : ThreadManager::DependentJob( Playlist::instance(), "UrlLoader" ) , m_markerListViewItem( new PlaylistItem( Playlist::instance(), after ) ) , m_playFirstUrl( options & (Playlist::StartPlay | Playlist::DirectPlay) ) , m_coloring( options & Playlist::Colorize ) @@ -83,8 +83,8 @@ UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options , m_xmlSource( 0 ) { - connect( this, TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), - Playlist::instance(), TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ) ); + connect( this, TQ_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 @@ -95,7 +95,7 @@ UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options Amarok::StatusBar::instance()->newProgressOperation( this ) .setDescription( m_description ) .setStatus( i18n("Preparing") ) - .setAbortSlot( this, TQT_SLOT(abort()) ) + .setAbortSlot( this, TQ_SLOT(abort()) ) .setTotalSteps( 100 ); foreachType( KURL::List, urls ) { @@ -459,10 +459,10 @@ UrlLoader::loadXml( const KURL &url ) delete m_xmlSource; m_xmlSource = new TQXmlInputSource( file ); MyXmlLoader loader; - connect( &loader, TQT_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), - this, TQT_SLOT( slotNewBundle( const MetaBundle&, const XmlAttributeList& ) ) ); - connect( &loader, TQT_SIGNAL( playlistInfo( const TQString&, const TQString&, const TQString& ) ), - this, TQT_SLOT( slotPlaylistInfo( const TQString&, const TQString&, const TQString& ) ) ); + connect( &loader, TQ_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), + this, TQ_SLOT( slotNewBundle( const MetaBundle&, const XmlAttributeList& ) ) ); + connect( &loader, TQ_SIGNAL( playlistInfo( const TQString&, const TQString&, const TQString& ) ), + this, TQ_SLOT( slotPlaylistInfo( const TQString&, const TQString&, const TQString& ) ) ); loader.load( m_xmlSource ); if( !m_xml.isEmpty() ) { @@ -515,7 +515,7 @@ void UrlLoader::slotPlaylistInfo( const TQString &, const TQString &version, con "and this version can no longer read it.\n" "You will have to create a new one.\n" "Sorry :(" ) ); - static_cast<MyXmlLoader*>( const_cast<TQT_BASE_OBJECT_NAME*>( sender() ) )->abort(); //HACK? + static_cast<MyXmlLoader*>( const_cast<TQObject*>( sender() ) )->abort(); //HACK? return; } else @@ -996,7 +996,7 @@ RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem Amarok::StatusBar::instance()->newProgressOperation( job ) .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(); } diff --git a/amarok/src/playlistloader.h b/amarok/src/playlistloader.h index 357a9526..ac59cc9c 100644 --- a/amarok/src/playlistloader.h +++ b/amarok/src/playlistloader.h @@ -108,7 +108,7 @@ class UrlLoader : public JobBase class UrlLoader : public ThreadManager::DependentJob #endif // Q_MOC_RUN { - Q_OBJECT + TQ_OBJECT public: @@ -180,7 +180,7 @@ public: */ class RemotePlaylistFetcher : public TQObject { - Q_OBJECT + TQ_OBJECT const KURL m_source; @@ -203,7 +203,7 @@ private slots: class MyXmlLoader: public MetaBundle::XmlLoader { - Q_OBJECT + TQ_OBJECT public: MyXmlLoader() { } diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h index bf35a57e..1296abdd 100644 --- a/amarok/src/playlistselection.h +++ b/amarok/src/playlistselection.h @@ -19,7 +19,7 @@ class DynamicMode; //this is a widget used in newdynamic.ui class PlaylistSelection : public TDEListView { - Q_OBJECT + TQ_OBJECT public: PlaylistSelection(TQWidget* parent, const char* name); diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp index c7f6c794..f955cb7a 100644 --- a/amarok/src/playlistwindow.cpp +++ b/amarok/src/playlistwindow.cpp @@ -123,38 +123,38 @@ PlaylistWindow::PlaylistWindow() new K3bExporter(); - KStdAction::configureToolbars( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigToolBars() ), ac ); - KStdAction::keyBindings( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigShortcuts() ), ac ); - KStdAction::keyBindings( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); - KStdAction::preferences( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigAmarok() ), ac ); + KStdAction::configureToolbars( kapp, TQ_SLOT( slotConfigToolBars() ), ac ); + KStdAction::keyBindings( kapp, TQ_SLOT( slotConfigShortcuts() ), ac ); + KStdAction::keyBindings( kapp, TQ_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); + KStdAction::preferences( kapp, TQ_SLOT( slotConfigAmarok() ), ac ); ac->action("options_configure_globals")->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::KeyBindings))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::ConfigureToolbars))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::Preferences))->setIcon( Amarok::icon( "configure" ) ); - KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), ac ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); + KStdAction::quit( kapp, TQ_SLOT( quit() ), ac ); + KStdAction::open( this, TQ_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); ac->action( "playlist_add" )->setIcon( Amarok::icon( "files" ) ); - KStdAction::open( TQT_TQOBJECT(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" ) ); - KStdAction::save( TQT_TQOBJECT(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" ) ); #ifndef TQ_WS_MAC - KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenu()), ac ); + KStdAction::showMenubar( this, TQ_SLOT(slotToggleMenu()), ac ); #endif //FIXME: after string freeze rename to "Burn Current Playlist"? - new TDEAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, TQT_TQOBJECT(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() ); - new TDEAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" ); - new TDEAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, TQT_TQOBJECT(this), TQT_SLOT(playAudioCD()), ac, "play_audiocd" ); - TDEAction *playPause = new TDEAction( i18n( "&Play/Pause" ), Amarok::icon( "play" ), Key_Space, ec, TQT_SLOT( playPause() ), ac, "play_pause" ); - new TDEAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showScriptSelector()), ac, "script_manager" ); - new TDEAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, TQT_TQOBJECT(this), TQT_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 *seekBackward = new TDEAction( i18n( "&Seek Backward" ), Amarok::icon( "rewind" ), Key_Left, ec, TQT_SLOT( seekBackward() ), ac, "seek_backward" ); - new TDEAction( i18n("Statistics"), Amarok::icon( "info" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showStatistics()), ac, "statistics" ); - new TDEAction( i18n("Update Collection"), Amarok::icon( "refresh" ), 0, CollectionDB::instance(), TQT_SLOT( scanModifiedDirs() ), actionCollection(), "update_collection" ); + 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, TQ_SLOT(playAudioCD()), ac, "play_audiocd" ); + 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, TQ_SLOT(showScriptSelector()), ac, "script_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, TQ_SLOT( seekForward() ), ac, "seek_forward" ); + 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, TQ_SLOT(showStatistics()), ac, "statistics" ); + 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" << "Electronica" << "Favorites" << "Heavy Metal" << "Hip Hop" << "Indie Rock" @@ -164,39 +164,39 @@ PlaylistWindow::PlaylistWindow() TDEPopupMenu* playTagRadioMenu = new TDEPopupMenu( this ); int id = 0; foreach( m_lastfmTags ) { - playTagRadioMenu->insertItem( *it, this, TQT_SLOT( playLastfmGlobaltag( int ) ), 0, id ); + playTagRadioMenu->insertItem( *it, this, TQ_SLOT( playLastfmGlobaltag( int ) ), 0, id ); ++id; } TDEPopupMenu* addTagRadioMenu = new TDEPopupMenu( this ); id = 0; foreach( m_lastfmTags ) { - addTagRadioMenu->insertItem( *it, this, TQT_SLOT( addLastfmGlobaltag( int ) ), 0, id ); + addTagRadioMenu->insertItem( *it, this, TQ_SLOT( addLastfmGlobaltag( int ) ), 0, id ); ++id; } TDEActionMenu* playLastfm = new TDEActionMenu( i18n( "Play las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_play" ); TQPopupMenu* playLastfmMenu = playLastfm->popupMenu(); - playLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQT_SLOT( playLastfmPersonal() ) ); - playLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQT_SLOT( playLastfmNeighbor() ) ); - playLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQT_SLOT( playLastfmCustom() ) ); + playLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQ_SLOT( playLastfmPersonal() ) ); + playLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQ_SLOT( playLastfmNeighbor() ) ); + playLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQ_SLOT( playLastfmCustom() ) ); playLastfmMenu->insertItem( i18n( "Global Tag Radio" ), playTagRadioMenu ); TDEActionMenu* addLastfm = new TDEActionMenu( i18n( "Add las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_add" ); TQPopupMenu* addLastfmMenu = addLastfm->popupMenu(); - addLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQT_SLOT( addLastfmPersonal() ) ); - addLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQT_SLOT( addLastfmNeighbor() ) ); - addLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQT_SLOT( addLastfmCustom() ) ); + addLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQ_SLOT( addLastfmPersonal() ) ); + addLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQ_SLOT( addLastfmNeighbor() ) ); + addLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQ_SLOT( addLastfmCustom() ) ); addLastfmMenu->insertItem( i18n( "Global Tag Radio" ), addTagRadioMenu ); 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( "Play" ), Amarok::icon( "play" ), 0, ec, TQT_SLOT( play() ), ac, "play" ); - new TDEAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQT_SLOT( pause() ), ac, "pause" ); - new TDEAction( i18n( "Next Track" ), Amarok::icon( "next" ), 0, ec, TQT_SLOT( next() ), ac, "next" ); + new TDEAction( i18n( "Previous Track" ), Amarok::icon( "back" ), 0, ec, TQ_SLOT( previous() ), ac, "prev" ); + new TDEAction( i18n( "Play" ), Amarok::icon( "play" ), 0, ec, TQ_SLOT( play() ), ac, "play" ); + new TDEAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQ_SLOT( pause() ), ac, "pause" ); + 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, TQT_TQOBJECT(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 @@ -287,10 +287,10 @@ void PlaylistWindow::init() m_lineEdit->setFrame( TQFrame::Sunken ); m_lineEdit->installEventFilter( this ); //we intercept keyEvents - connect( button, TQT_SIGNAL(clicked()), m_lineEdit, TQT_SLOT(clear()) ); - connect( m_lineEdit, TQT_SIGNAL(textChanged( const TQString& )), - playlist, TQT_SLOT(setFilterSlot( const TQString& )) ); - connect( filterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFilter() ) ); + connect( button, TQ_SIGNAL(clicked()), m_lineEdit, TQ_SLOT(clear()) ); + connect( m_lineEdit, TQ_SIGNAL(textChanged( const TQString& )), + playlist, TQ_SLOT(setFilterSlot( const TQString& )) ); + connect( filterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFilter() ) ); TQToolTip::add( button, i18n( "Clear search field" ) ); 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 ); 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 ); #ifndef TQ_WS_MAC @@ -330,7 +330,7 @@ void PlaylistWindow::init() actionsMenu->insertSeparator(); 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 //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 ); actionCollection()->action("queue_manager")->plug( m_toolsMenu ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR ); - m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), TQT_TQOBJECT(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("statistics")->plug( m_toolsMenu ); m_toolsMenu->insertSeparator(); @@ -381,8 +381,8 @@ void PlaylistWindow::init() m_toolsMenu->setItemEnabled( Amarok::Menu::ID_SHOW_VIS_SELECTOR, false ); #endif - connect( m_toolsMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( toolsMenuAboutToShow() ) ); - connect( m_toolsMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotMenuActivated(int) ) ); + connect( m_toolsMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( toolsMenuAboutToShow() ) ); + connect( m_toolsMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotMenuActivated(int) ) ); //END Tools 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::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 m_menubar->insertItem( i18n( "&File" ), actionsMenu ); @@ -424,7 +424,7 @@ void PlaylistWindow::init() layV->addWidget( statusbar ); //The volume slider later becomes our FocusProxy, so all wheelEvents get redirected to it - m_toolbar->setFocusPolicy( TQ_WheelFocus ); + m_toolbar->setFocusPolicy( TQWidget::WheelFocus ); m_toolbar->setFlat( true ); m_toolbar->setMovingEnabled( false ); playlist->setMargin( 2 ); @@ -474,8 +474,8 @@ void PlaylistWindow::init() { addInstBrowserMacro( MediaBrowser, "MediaBrowser", i18n("Devices"), Amarok::icon( "device" ) ) //to re-enable mediabrowser hiding, uncomment this: - //connect( MediaBrowser::instance(), TQT_SIGNAL( availabilityChanged( bool ) ), - // this, TQT_SLOT( mbAvailabilityChanged( bool ) ) ); + //connect( MediaBrowser::instance(), TQ_SIGNAL( availabilityChanged( bool ) ), + // this, TQ_SLOT( mbAvailabilityChanged( bool ) ) ); m_browsers->makeDropProxy( "MediaBrowser", MediaBrowser::queue() ); } @@ -484,17 +484,17 @@ void PlaylistWindow::init() } //</Browsers> - connect( Playlist::instance()->qscrollview(), TQT_SIGNAL( dynamicModeChanged( const DynamicMode* ) ), - PlaylistBrowser::instance(), TQT_SLOT( loadDynamicItems() ) ); + connect( Playlist::instance()->qscrollview(), TQ_SIGNAL( dynamicModeChanged( const DynamicMode* ) ), + PlaylistBrowser::instance(), TQ_SLOT( loadDynamicItems() ) ); tqApp->installEventFilter( this ); // keyboards shortcuts for the browsers - connect( playlist, TQT_SIGNAL( itemCountChanged( int, int, int, int, int, int ) ), - statusbar, TQT_SLOT( slotItemCountChanged( int, int, int, int, int, int ) ) ); - connect( playlist, TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), - statusbar, TQT_SLOT( updateQueueLabel() ) ); - connect( playlist, TQT_SIGNAL( aboutToClear() ), m_lineEdit, TQT_SLOT( clear() ) ); + connect( playlist, TQ_SIGNAL( itemCountChanged( int, int, int, int, int, int ) ), + statusbar, TQ_SLOT( slotItemCountChanged( int, int, int, int, int, int ) ) ); + connect( playlist, TQ_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), + statusbar, TQ_SLOT( updateQueueLabel() ) ); + connect( playlist, TQ_SIGNAL( aboutToClear() ), m_lineEdit, TQ_SLOT( clear() ) ); Amarok::MessageQueue::instance()->sendMessages(); } @@ -506,7 +506,7 @@ void PlaylistWindow::slotSetFilter( const TQString &filter ) //SLOT void PlaylistWindow::slotEditFilter() //SLOT { 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() ) m_lineEdit->setText( fd->filter() ); delete fd; @@ -554,7 +554,7 @@ void PlaylistWindow::createGUI() (*it)->unplug( m_toolbar ); KXMLGUIBuilder builder( this ); - KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); + KXMLGUIFactory factory( &builder, this ); //build Toolbar, plug actions factory.addClient( this ); @@ -578,7 +578,7 @@ void PlaylistWindow::createGUI() const TQStringList::ConstIterator last = list.fromLast(); for( TQStringList::ConstIterator it = list.constBegin(); it != end; ++it ) { - TDEToolBarButton* const button = static_cast<TDEToolBarButton*>( TQT_TQWIDGET(m_toolbar->child( (*it).latin1() )) ); + TDEToolBarButton* const button = static_cast<TDEToolBarButton*>( m_toolbar->child( (*it).latin1() ) ); if ( it == last ) { //if the user has no PlayerWindow, he MUST have the menu action plugged @@ -589,7 +589,7 @@ void PlaylistWindow::createGUI() if ( button ) { button->modeChange(); - button->setFocusPolicy( TQ_NoFocus ); + button->setFocusPolicy( TQWidget::NoFocus ); } } @@ -639,7 +639,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) //there are a few keypresses that we intercept - #define e TQT_TQKEYEVENT(e) + #define e static_cast<TQKeyEvent*>(e) if(( e->key() == Key_F2 ) && (e->state() == 0)) { @@ -682,7 +682,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) } } - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) ) //the search lineedit + if( o == m_lineEdit ) //the search lineedit { TQListViewItem *item; switch( e->key() ) @@ -753,7 +753,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) //following are for Playlist::instance() only //we don't handle these in the playlist because often we manipulate the lineEdit too - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(pl) ) + if( o == pl ) { if( pl->currentItem() && ( e->key() == Key_Up && pl->currentItem()->itemAbove() == 0 && !(e->state() & TQt::ShiftButton) ) ) { @@ -805,7 +805,7 @@ void PlaylistWindow::closeEvent( TQCloseEvent *e ) Q_UNUSED( e ); hide(); #else - Amarok::genericEventHandler( TQT_TQWIDGET(this), TQT_TQEVENT(e) ); + Amarok::genericEventHandler( this, e ); #endif } @@ -1079,7 +1079,7 @@ void PlaylistWindow::slotMenuActivated( int index ) //SLOT case ID_SHOW_PLAYERWINDOW: AmarokConfig::setShowPlayerWindow( !AmarokConfig::showPlayerWindow() ); m_settingsMenu->changeItem( index, AmarokConfig::showPlayerWindow() ? i18n("Hide Player &Window") : i18n("Show Player &Window") ); - TQTimer::singleShot( 0, kapp, TQT_SLOT( applySettings() ) ); + TQTimer::singleShot( 0, kapp, TQ_SLOT( applySettings() ) ); break; case Amarok::Menu::ID_RESCAN_COLLECTION: 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 void DynamicBar::init() { - connect(Playlist::instance()->qscrollview(), TQT_SIGNAL(dynamicModeChanged(const DynamicMode*)), - TQT_SLOT(slotNewDynamicMode(const DynamicMode*))); + connect(Playlist::instance()->qscrollview(), TQ_SIGNAL(dynamicModeChanged(const DynamicMode*)), + TQ_SLOT(slotNewDynamicMode(const DynamicMode*))); 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" ); - 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" ); - 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() ); } diff --git a/amarok/src/playlistwindow.h b/amarok/src/playlistwindow.h index 13656fd4..92550d13 100644 --- a/amarok/src/playlistwindow.h +++ b/amarok/src/playlistwindow.h @@ -40,7 +40,7 @@ class TQTimer; */ class PlaylistWindow : public TQWidget, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: @@ -124,7 +124,7 @@ class PlaylistWindow : public TQWidget, public KXMLGUIClient class DynamicTitle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DynamicTitle( TQWidget* parent ); @@ -142,7 +142,7 @@ class DynamicTitle : public TQWidget class DynamicBar : public TQHBox { - Q_OBJECT + TQ_OBJECT public: DynamicBar( TQWidget* parent ); diff --git a/amarok/src/plugin/pluginconfig.h b/amarok/src/plugin/pluginconfig.h index b3d240b3..3869e7c8 100644 --- a/amarok/src/plugin/pluginconfig.h +++ b/amarok/src/plugin/pluginconfig.h @@ -18,7 +18,7 @@ namespace Amarok class LIBAMAROK_EXPORT PluginConfig : public TQObject { - Q_OBJECT + TQ_OBJECT signals: diff --git a/amarok/src/podcastsettings.cpp b/amarok/src/podcastsettings.cpp index 61fff37c..2ee91e60 100644 --- a/amarok/src/podcastsettings.cpp +++ b/amarok/src/podcastsettings.cpp @@ -102,13 +102,13 @@ PodcastSettingsDialog::init() enableButtonOK( false ); // 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_saveLocation, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( m_ps->m_autoFetchCheck, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); - connect( m_ps->m_streamRadio, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); - connect( m_ps->m_addToMediaDeviceCheck, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); - connect( m_ps->m_downloadRadio, TQT_SIGNAL(clicked()), TQT_SLOT(checkModified()) ); - connect( m_ps->m_purgeCheck, TQT_SIGNAL(clicked()), 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, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( m_ps->m_autoFetchCheck, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) ); + connect( m_ps->m_streamRadio, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) ); + connect( m_ps->m_addToMediaDeviceCheck, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) ); + connect( m_ps->m_downloadRadio, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) ); + connect( m_ps->m_purgeCheck, TQ_SIGNAL(clicked()), TQ_SLOT(checkModified()) ); } bool diff --git a/amarok/src/podcastsettings.h b/amarok/src/podcastsettings.h index b4a0c0cd..5beb0e3d 100644 --- a/amarok/src/podcastsettings.h +++ b/amarok/src/podcastsettings.h @@ -47,7 +47,7 @@ class PodcastSettings class PodcastSettingsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp index 17132457..163dba48 100644 --- a/amarok/src/prettypopupmenu.cpp +++ b/amarok/src/prettypopupmenu.cpp @@ -174,7 +174,7 @@ PrettyPopupMenu::paintEvent( TQPaintEvent* e ) drawContents( &p ); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); diff --git a/amarok/src/prettypopupmenu.h b/amarok/src/prettypopupmenu.h index 3485aaea..5c2705e9 100644 --- a/amarok/src/prettypopupmenu.h +++ b/amarok/src/prettypopupmenu.h @@ -41,7 +41,7 @@ class TQSize; */ class PrettyPopupMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp index 62281201..afa63ca4 100644 --- a/amarok/src/queuemanager.cpp +++ b/amarok/src/queuemanager.cpp @@ -317,19 +317,19 @@ QueueManager::QueueManager( TQWidget *parent, const char *name ) m_add->setEnabled( false ); m_clear->setEnabled( false ); - connect( m_up, TQT_SIGNAL( clicked() ), m_listview, TQT_SLOT( moveSelectedUp() ) ); - connect( m_down, TQT_SIGNAL( clicked() ), m_listview, TQT_SLOT( moveSelectedDown() ) ); - connect( m_remove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeSelected() ) ); - connect( m_add, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addItems() ) ); - connect( m_clear, TQT_SIGNAL( clicked() ), m_listview, TQT_SLOT( clear() ) ); + connect( m_up, TQ_SIGNAL( clicked() ), m_listview, TQ_SLOT( moveSelectedUp() ) ); + connect( m_down, TQ_SIGNAL( clicked() ), m_listview, TQ_SLOT( moveSelectedDown() ) ); + connect( m_remove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeSelected() ) ); + connect( m_add, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addItems() ) ); + connect( m_clear, TQ_SIGNAL( clicked() ), m_listview, TQ_SLOT( clear() ) ); Playlist *pl = Playlist::instance(); - connect( pl, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateButtons() ) ); - connect( m_listview, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateButtons() ) ); - connect( pl, TQT_SIGNAL( queueChanged(const PLItemList &, const PLItemList &) ), - TQT_SLOT( changeQueuedItems(const PLItemList &, const PLItemList &) ) ); - connect( this, TQT_SIGNAL( applyClicked()), TQT_SLOT( applyNow() ) ); - connect( m_listview, TQT_SIGNAL( changed() ), this, TQT_SLOT ( changed() ) ); + connect( pl, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( updateButtons() ) ); + connect( m_listview, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( updateButtons() ) ); + connect( pl, TQ_SIGNAL( queueChanged(const PLItemList &, const PLItemList &) ), + TQ_SLOT( changeQueuedItems(const PLItemList &, const PLItemList &) ) ); + connect( this, TQ_SIGNAL( applyClicked()), TQ_SLOT( applyNow() ) ); + connect( m_listview, TQ_SIGNAL( changed() ), this, TQ_SLOT ( changed() ) ); s_instance->enableButtonApply(false); insertItems(); diff --git a/amarok/src/queuemanager.h b/amarok/src/queuemanager.h index fc429cc3..e5a281ea 100644 --- a/amarok/src/queuemanager.h +++ b/amarok/src/queuemanager.h @@ -36,7 +36,7 @@ class QueueItem : public TDEListViewItem class QueueList : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class QueueManager; @@ -68,7 +68,7 @@ class QueueList : public TDEListView class QueueManager : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp index cf38afab..de2dc10d 100644 --- a/amarok/src/refreshimages.cpp +++ b/amarok/src/refreshimages.cpp @@ -66,7 +66,7 @@ RefreshImages::RefreshImages() it++; //iterate to the next set 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( "Item" ) .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) diff --git a/amarok/src/refreshimages.h b/amarok/src/refreshimages.h index a83427ca..89fbd0a9 100644 --- a/amarok/src/refreshimages.h +++ b/amarok/src/refreshimages.h @@ -25,7 +25,7 @@ class JobInfo class RefreshImages : public TQObject { - Q_OBJECT + TQ_OBJECT public: RefreshImages(); diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp index 57fd7c9a..f82adc1d 100644 --- a/amarok/src/scancontroller.cpp +++ b/amarok/src/scancontroller.cpp @@ -76,9 +76,9 @@ ScanController::ScanController( CollectionDB* parent, bool incremental, const TQ m_reader->setContentHandler( this ); 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 << "--nocrashhandler"; // We want to be able to catch SIGSEGV @@ -173,11 +173,11 @@ ScanController::initIncremental() DEBUG_BLOCK connect( CollectionDB::instance(), - TQT_SIGNAL( fileMoved( const TQString &, const TQString & ) ), - TQT_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); + TQ_SIGNAL( fileMoved( const TQString &, const TQString & ) ), + TQ_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); connect( CollectionDB::instance(), - TQT_SIGNAL( fileMoved( const TQString &, const TQString &, const TQString & ) ), - TQT_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); + TQ_SIGNAL( fileMoved( const TQString &, const TQString &, const TQString & ) ), + TQ_SLOT( slotFileMoved( const TQString &, const TQString & ) ) ); IdList list = MountPointManager::instance()->getMountedDeviceIds(); TQString deviceIds; @@ -489,7 +489,7 @@ ScanController::startElement( const TQString&, const TQString& localName, const TQValueList< TQPair<TQString, TQString> > covers; for( uint i = 0; i < list.count(); ) { - covers += tqMakePair( list[i], list[i + 1] ); + covers += qMakePair( list[i], list[i + 1] ); i += 2; } @@ -534,7 +534,7 @@ ScanController::customEvent( TQCustomEvent* e ) delete m_scanner; // Reusing doesn't work, so we have to destroy and reinstantiate 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 << "--nocrashhandler"; // We want to be able to catch SIGSEGV diff --git a/amarok/src/scancontroller.h b/amarok/src/scancontroller.h index ae707c7b..f5fbb50c 100644 --- a/amarok/src/scancontroller.h +++ b/amarok/src/scancontroller.h @@ -50,7 +50,7 @@ class ScanController : public JobBase, public TQXmlDefaultHandler class ScanController : public ThreadManager::DependentJob, public TQXmlDefaultHandler #endif // Q_MOC_RUN { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp index dbdfdc32..55f8f186 100644 --- a/amarok/src/scriptmanager.cpp +++ b/amarok/src/scriptmanager.cpp @@ -179,17 +179,17 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name ) m_scoreCategory ->setOpen( config->readBoolEntry( "Score category State" ) ); m_transcodeCategory->setOpen( config->readBoolEntry( "Transcode category open" ) ); - connect( m_gui->listView, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), TQT_SLOT( slotCurrentChanged( TQListViewItem* ) ) ); - connect( m_gui->listView, TQT_SIGNAL( doubleClicked ( TQListViewItem*, const TQPoint&, int ) ), TQT_SLOT( slotRunScript() ) ); - connect( m_gui->listView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ), TQT_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint& ) ) ); - - connect( m_gui->installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotInstallScript() ) ); - connect( m_gui->retrieveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRetrieveScript() ) ); - connect( m_gui->uninstallButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotUninstallScript() ) ); - connect( m_gui->runButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRunScript() ) ); - connect( m_gui->stopButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStopScript() ) ); - connect( m_gui->configureButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureScript() ) ); - connect( m_gui->aboutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAboutScript() ) ); + connect( m_gui->listView, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), TQ_SLOT( slotCurrentChanged( TQListViewItem* ) ) ); + connect( m_gui->listView, TQ_SIGNAL( doubleClicked ( TQListViewItem*, const TQPoint&, int ) ), TQ_SLOT( slotRunScript() ) ); + connect( m_gui->listView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ), TQ_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint& ) ) ); + + connect( m_gui->installButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotInstallScript() ) ); + connect( m_gui->retrieveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRetrieveScript() ) ); + connect( m_gui->uninstallButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotUninstallScript() ) ); + connect( m_gui->runButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRunScript() ) ); + connect( m_gui->stopButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotStopScript() ) ); + connect( m_gui->configureButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureScript() ) ); + connect( m_gui->aboutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAboutScript() ) ); m_gui->installButton ->setIconSet( SmallIconSet( Amarok::icon( "files" ) ) ); 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() ) ); 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 - TQTimer::singleShot( 0, this, TQT_SLOT( findScripts() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( findScripts() ) ); } @@ -500,7 +500,7 @@ ScriptManager::slotRetrieveScript() d->setType( "amarok/script" ); // you have to do this by hand when providing your own Engine 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" ); d->exec(); @@ -570,14 +570,14 @@ ScriptManager::slotRunScript( bool silent ) TQListViewItem* const li = m_gui->listView->currentItem(); const TQString name = li->text( 0 ); - if( m_scripts[name].type == "lyrics" && lyricsScriptRunning() != TQString() ) { + if( m_scripts[name].type == "lyrics" && !lyricsScriptRunning().isEmpty() ) { if( !silent ) KMessageBox::sorry( 0, i18n( "Another lyrics script is already running. " "You may only run one lyrics script at a time." ) ); return false; } - if( m_scripts[name].type == "transcode" && transcodeScriptRunning() != TQString() ) { + if( m_scripts[name].type == "transcode" && !transcodeScriptRunning().isEmpty() ) { if( !silent ) KMessageBox::sorry( 0, i18n( "Another transcode script is already running. " "You may only run one transcode script at a time." ) ); @@ -593,9 +593,9 @@ ScriptManager::slotRunScript( bool silent ) *script << url.path(); script->setWorkingDirectory( Amarok::saveLocation( "scripts-data/" ) ); - connect( script, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotReceivedStderr( TDEProcess*, char*, int ) ) ); - connect( script, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), TQT_SLOT( slotReceivedStdout( TDEProcess*, char*, int ) ) ); - connect( script, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( scriptFinished( TDEProcess* ) ) ); + connect( script, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQ_SLOT( slotReceivedStderr( TDEProcess*, char*, int ) ) ); + connect( script, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), TQ_SLOT( slotReceivedStdout( TDEProcess*, char*, int ) ) ); + connect( script, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( scriptFinished( TDEProcess* ) ) ); if( script->start( TDEProcess::NotifyOnExit ) ) { @@ -677,7 +677,7 @@ ScriptManager::slotAboutScript() about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).arg( name ) ) ); about->setProduct( "", "", "", "" ); // Get rid of the confusing KDE version text - TQLabel* product = static_cast<TQLabel*>( TQT_TQWIDGET(about->mainWidget()->child( "version" )) ); + TQLabel* product = static_cast<TQLabel*>( about->mainWidget()->child( "version" ) ); if( product ) product->setText( i18n( "%1 Amarok Script" ).arg( name ) ); about->addTextPage( i18n( "About" ), readme.readAll(), true ); diff --git a/amarok/src/scriptmanager.h b/amarok/src/scriptmanager.h index 948ef0cd..d3770d0e 100644 --- a/amarok/src/scriptmanager.h +++ b/amarok/src/scriptmanager.h @@ -55,7 +55,7 @@ class KProcIO; class ScriptManager : public KDialogBase, public EngineObserver { - Q_OBJECT + TQ_OBJECT friend class AmarokScriptNewStuff; diff --git a/amarok/src/scripts/alarm/alarm.py b/amarok/src/scripts/alarm/alarm.py index 97152c73..97345e26 100755 --- a/amarok/src/scripts/alarm/alarm.py +++ b/amarok/src/scripts/alarm/alarm.py @@ -4,7 +4,7 @@ # Config dialog for alarm script # (c) 2005 Mark Kretschmann <markey@web.de> # -# Depends on: Python 2.2, PyQt +# Depends on: Python 3, PyTQt ############################################################################ # # This program is free software; you can redistribute it and/or modify @@ -14,56 +14,56 @@ # ############################################################################ -from ConfigParser import * -import Queue +from configparser import * +import queue import os.path import sys import threading from os import * try: - from qt import * + from PyTQt.tqt import * except: - popen( "kdialog --sorry 'PyQt (Qt bindings for Python) is required for this script.'" ) + popen( "kdialog --sorry 'PyTQt (TQt bindings for Python) is required for this script.'" ) raise -class ConfigDialog( QDialog ): +class ConfigDialog( TQDialog ): def __init__( self ): - QDialog.__init__( self ) - self.setWFlags( Qt.WDestructiveClose ) + TQDialog.__init__( self ) + self.setWFlags( TQt.WDestructiveClose ) self.setCaption( "Alarm Script - Amarok" ) - self.lay = QHBoxLayout( self ) + self.lay = TQHBoxLayout( self ) - self.vbox = QVBox( self ) + self.vbox = TQVBox( self ) self.lay.addWidget( self.vbox ) - self.htopbox = QHBox( self.vbox ) - QLabel( "Alarm time: ", self.htopbox ) - self.timeEdit = QTimeEdit( self.htopbox ) + self.htopbox = TQHBox( self.vbox ) + TQLabel( "Alarm time: ", self.htopbox ) + self.timeEdit = TQTimeEdit( self.htopbox ) - self.hbox = QHBox( self.vbox ) + self.hbox = TQHBox( self.vbox ) - self.ok = QPushButton( self.hbox ) + self.ok = TQPushButton( self.hbox ) self.ok.setText( "Ok" ) - self.cancel = QPushButton( self.hbox ) + self.cancel = TQPushButton( self.hbox ) self.cancel.setText( "Cancel" ) self.cancel.setDefault( True ) - self.connect( self.ok, SIGNAL( "clicked()" ), self.save ) - self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT( "reject()" ) ) + self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.save ) + self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "reject()" ) ) self.adjustSize() def __del__( self ): - print "ConfigDialog dtor" + print("ConfigDialog dtor") def save( self ): wakeTime = str( self.timeEdit.time().toString() ) - print wakeTime + print(wakeTime) self.file = file( "alarmrc", 'w' ) @@ -76,24 +76,24 @@ class ConfigDialog( QDialog ): self.accept() -class Alarm( QApplication ): +class Alarm( TQApplication ): def __init__( self, args ): - QApplication.__init__( self, args ) + TQApplication.__init__( self, args ) - self.queue = Queue.Queue() + self.queue = queue.Queue() self.startTimer( 100 ) self.t = threading.Thread( target = self.readStdin ) self.t.start() - self.alarmTimer = QTimer() - self.connect( self.alarmTimer, SIGNAL( "timeout()" ), self.wakeup ) + self.alarmTimer = TQTimer() + self.connect( self.alarmTimer, TQ_SIGNAL( "timeout()" ), self.wakeup ) self.readSettings() def __del__( self ): - print "Alarm dtor" + print("Alarm dtor") def wakeup( self ): popen( "dcop amarok player play" ) @@ -106,10 +106,10 @@ class Alarm( QApplication ): try: timestr = config.get( "General", "alarmtime" ) - print "Alarm Time: " + timestr + print("Alarm Time: " + timestr) - time = QTime.fromString( timestr ) - secondsleft = QTime.currentTime().secsTo( time ) + time = TQTime.fromString( timestr ) + secondsleft = TQTime.currentTime().secsTo( time ) if secondsleft > 0: self.alarmTimer.start( secondsleft * 1000, True ) @@ -137,18 +137,18 @@ class Alarm( QApplication ): def timerEvent( self, event ): if not self.queue.empty(): - string = QString( self.queue.get_nowait() ) - print "[Alarm Script] Received notification: " + str( string ) + eventStr = TQString( self.queue.get_nowait() ) + print("[Alarm Script] Received notification: " + str( eventStr )) - if string.contains( "configure" ): + if eventStr.contains( "configure" ): self.configure() def configure( self ): - print "Alarm Script: configuration" + print("Alarm Script: configuration") self.dia = ConfigDialog() self.dia.show() - self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings ) + self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings ) ############################################################################ diff --git a/amarok/src/scripts/amarok_live/amarok_live.py b/amarok/src/scripts/amarok_live/amarok_live.py index f482b490..64a39477 100755 --- a/amarok/src/scripts/amarok_live/amarok_live.py +++ b/amarok/src/scripts/amarok_live/amarok_live.py @@ -2,12 +2,12 @@ ############################################################################ # Python wrapper script for running the Amarok LiveCD remastering scripts -# from within Amarok. Based on the Python-Qt template script for Amarok +# from within Amarok. Based on the Python-TQt template script for Amarok # (c) 2005 Mark Kretschmann <markey@web.de> # # (c) 2005 Leo Franchi <lfranchi@gmail.com> # -# Depends on: Python 2.2, PyQt +# Depends on: Python 3, PyTQt ############################################################################ # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # ############################################################################ -import ConfigParser +import configparser import os import sys import threading @@ -25,9 +25,9 @@ import signal from time import sleep try: - from qt import * + from TQt.tqt import * except: - os.popen( "kdialog --sorry 'PyQt (Qt bindings for Python) is required for this script.'" ) + os.popen( "kdialog --sorry 'PyTQt (TQt bindings for Python) is required for this script.'" ) raise @@ -35,34 +35,34 @@ except: debug_prefix = "LiveCD Remastering" -class ConfigDialog ( QDialog ): +class ConfigDialog ( TQDialog ): """ Configuration widget """ def __init__( self ): - QDialog.__init__( self ) - self.setWFlags( Qt.WDestructiveClose ) + TQDialog.__init__( self ) + self.setWFlags( TQt.WDestructiveClose ) self.setCaption("Amarok Live! Configuration") - self.lay = QGridLayout( self, 3, 2) + self.lay = TQGridLayout( self, 3, 2) self.lay.addColSpacing( 0, 300 ) - self.isopath = QLineEdit( self ) + self.isopath = TQLineEdit( self ) self.isopath.setText( "Path to Amarok Live! iso" ) - self.tmppath = QLineEdit( self ) + self.tmppath = TQLineEdit( self ) self.tmppath.setText( "Temporary directory used, 2.5gb free needed" ) self.lay.addWidget( self.isopath, 0, 0 ) self.lay.addWidget( self.tmppath, 1, 0 ) - self.isobutton = QPushButton( self ) + self.isobutton = TQPushButton( self ) self.isobutton.setText("Browse..." ) - self.tmpbutton = QPushButton( self ) + self.tmpbutton = TQPushButton( self ) self.tmpbutton.setText("Browse..." ) - self.cancel = QPushButton( self ) + self.cancel = TQPushButton( self ) self.cancel.setText( "Cancel" ) - self.ok = QPushButton( self ) + self.ok = TQPushButton( self ) self.ok.setText( "Ok" ) self.lay.addWidget( self.isobutton, 0, 1 ) @@ -70,23 +70,23 @@ class ConfigDialog ( QDialog ): self.lay.addWidget( self.cancel, 2, 1 ) self.lay.addWidget( self.ok, 2, 0) - self.connect( self.isobutton, SIGNAL( "clicked()" ), self.browseISO ) - self.connect( self.tmpbutton, SIGNAL( "clicked()" ), self.browsePath ) + self.connect( self.isobutton, TQ_SIGNAL( "clicked()" ), self.browseISO ) + self.connect( self.tmpbutton, TQ_SIGNAL( "clicked()" ), self.browsePath ) - self.connect( self.ok, SIGNAL( "clicked()" ), self.save ) - self.connect( self.ok, SIGNAL( "clicked()" ), self.unpack ) -# self.connect( self.ok, SIGNAL( "clicked()" ), self.destroy ) - self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT("reject()") ) + self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.save ) + self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.unpack ) +# self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.destroy ) + self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT("reject()") ) self.adjustSize() path = None try: - config = ConfigParser.ConfigParser() + config = configparser.ConfigParser() config.read( "remasterrc" ) path = config.get( "General", "path" ) iso = config.get( "General", "iso") - + if not path == "": self.tmppath.setText(path) if not iso == "": self.isopath.setText(iso) except: @@ -97,7 +97,7 @@ class ConfigDialog ( QDialog ): def save( self ): """ Saves configuration to file """ self.file = file( "remasterrc", 'w' ) - self.config = ConfigParser.ConfigParser() + self.config = configparser.ConfigParser() self.config.add_section( "General" ) self.config.set( "General", "path", self.tmppath.text() ) self.config.set( "General", "iso", self.isopath.text() ) @@ -109,7 +109,7 @@ class ConfigDialog ( QDialog ): def clear(): self.file = file( "remasterrc", 'w' ) - self.config = ConfigParser.ConfigParser() + self.config = configparser.ConfigParser() self.config.add_section( "General" ) self.config.set( "General", "path", "" ) self.config.set( "General", "iso", "" ) @@ -118,7 +118,7 @@ class ConfigDialog ( QDialog ): def browseISO( self ): - path = QFileDialog.getOpenFileName( "/home", + path = TQFileDialog.getOpenFileName( "/home", "CD Images (*.iso)", self, "iso choose dialogr", @@ -126,8 +126,8 @@ class ConfigDialog ( QDialog ): self.isopath.setText( path ) def browsePath( self ): - - tmp = QFileDialog.getExistingDirectory( "/home", + + tmp = TQFileDialog.getExistingDirectory( "/home", self, "get tmp dir", "Choose working directory", @@ -147,7 +147,7 @@ class ConfigDialog ( QDialog ): path, iso = self.readConfig() os.system("tdesu -t sh %s/amarok.live.remaster.part1.sh %s %s" % (scriptdir, path, iso)) #os.wait() - print "got path: %s" % path + print("got path: %s" % path) @@ -156,7 +156,7 @@ class ConfigDialog ( QDialog ): path = "" iso = "" try: - config = ConfigParser.ConfigParser() + config = configparser.ConfigParser() config.read("remasterrc") path = config.get("General", "path") iso = config.get("General", "iso") @@ -166,19 +166,18 @@ class ConfigDialog ( QDialog ): -class Notification( QCustomEvent ): - __super_init = QCustomEvent.__init__ +class Notification( TQCustomEvent ): + __super_init = TQCustomEvent.__init__ def __init__( self, str ): - - self.__super_init(QCustomEvent.User + 1) - self.string = str + self.__super_init(TQCustomEvent.User + 1) + self.eventStr = str -class Remasterer( QApplication ): - """ The main application, also sets up the Qt event loop """ +class Remasterer( TQApplication ): + """ The main application, also sets up the TQt event loop """ def __init__( self, args ): - QApplication.__init__( self, args ) + TQApplication.__init__( self, args ) debug( "Started." ) # Start separate thread for reading data from stdin @@ -187,13 +186,12 @@ class Remasterer( QApplication ): self.readSettings() - # ugly hack, thanks mp8 anyway os.system("dcop amarok script removeCustomMenuItem \"Amarok live\" \"Add playlist to livecd\"") os.system("dcop amarok script removeCustomMenuItem \"Amarok live\" \"Add selected to livecd\"") os.system("dcop amarok script removeCustomMenuItem \"Amarok live\" \"Create Remastered CD\"") os.system("dcop amarok script removeCustomMenuItem \"Amarok live\" \"Clear Music on livecd\"") - + os.system("dcop amarok script addCustomMenuItem \"Amarok live\" \"Add playlist to livecd\"") os.system("dcop amarok script addCustomMenuItem \"Amarok live\" \"Add selected to livecd\"") os.system("dcop amarok script addCustomMenuItem \"Amarok live\" \"Create Remastered CD\"") @@ -234,22 +232,22 @@ class Remasterer( QApplication ): def customEvent( self, notification ): """ Handles notifications """ - string = QString(notification.string) - debug( "Received notification: " + str( string ) ) + eventStr = TQString(notification.eventStr) + debug( "Received notification: " + str( eventStr ) ) - if string.contains( "configure" ): + if eventStr.contains( "configure" ): self.configure() - if string.contains( "stop"): + if eventStr.contains( "stop" ): self.stop() - elif string.contains( "customMenuClicked" ): - if "selected" in string: - self.copyTrack( string ) - elif "playlist" in string: + elif eventStr.contains( "customMenuClicked" ): + if eventStr.contains( "selected" ): + self.copyTrack( eventStr ) + elif eventStr.contains( "playlist" ): self.copyPlaylist() - elif "Create" in string: + elif eventStr.contains( "Create" ): self.createCD() - elif "Clear" in string: + elif eventStr.contains( "Clear" ): self.clearCD() @@ -261,10 +259,10 @@ class Remasterer( QApplication ): self.dia = ConfigDialog() self.dia.show() - #self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings ) + #self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings ) def clearCD( self ): - + self.dia = ConfigDialog() path, iso = self.dia.readConfig() @@ -274,7 +272,7 @@ class Remasterer( QApplication ): stop() def stop( self ): - + fd = open("/tmp/amarok.stop", "w") fd.write( "stopping") fd.close() @@ -297,22 +295,22 @@ class Remasterer( QApplication ): os.system("dcop amarok playlist saveM3u '%s' false" % tmpfileloc) tmpfile = open(tmpfileloc) - import urllib + import urllib.request, urllib.parse, urllib.error files = "" m3u = "" for line in tmpfile.readlines(): if line[0] != "#": - + line = line.strip() # get filename name = line.split("/")[-1] - #make url - url = "file://" + urllib.quote(line) + #make url + url = "file://" + urllib.parse.quote(line) - #make path on livecd + #make path on livecd livecdpath = "/music/" + name files += url + " " @@ -333,7 +331,7 @@ class Remasterer( QApplication ): m3uOut.write(m3u) m3uOut.close() - + os.system("mv /tmp/amarok.live.%s.m3u %s/amarok.live/playlist/" % (suffix,path)) os.system("rm /tmp/amarok.live.%s.m3u" % suffix) @@ -355,7 +353,7 @@ class Remasterer( QApplication ): #trying out a new one #files = event.split(":")[-1][3:-2].replace("\"Amarok live!\" \"add to livecd\" ", "").split("\" \"") #and another - + files = event.replace("customMenuClicked: Amarok live Add selected to livecd", "").split() allfiles = "" @@ -365,7 +363,7 @@ class Remasterer( QApplication ): os.system("kfmclient copy %s file://%s/amarok.live/music/" % (allfiles, path)) def createCD( self ): - + self.dia = ConfigDialog() path,iso = self.dia.readConfig() if path == "": @@ -394,7 +392,7 @@ def onSignal( signum, stackframe ): fd.write( "stopping") fd.close() - print 'STOPPING' + print('STOPPING') os.system("dcop amarok script removeCustomMenuItem \"Amarok live\" \"Add playlist to livecd\"") os.system("dcop amarok script removeCustomMenuItem \"Amarok live\" \"Add selected to livecd\"") @@ -405,7 +403,7 @@ def onSignal( signum, stackframe ): def debug( message ): """ Prints debug message to stdout """ - print debug_prefix + " " + message + print(debug_prefix + " " + message) def main(): app = Remasterer( sys.argv ) @@ -420,7 +418,7 @@ if __name__ == "__main__": mainapp = threading.Thread(target=main) mainapp.start() signal.signal(15, onSignal) - print signal.getsignal(15) + print(signal.getsignal(15)) while 1: sleep(120) #main( sys.argv ) diff --git a/amarok/src/scripts/common/Publisher.py b/amarok/src/scripts/common/Publisher.py index 06f28e59..9d16f29b 100644 --- a/amarok/src/scripts/common/Publisher.py +++ b/amarok/src/scripts/common/Publisher.py @@ -18,7 +18,7 @@ from string import split publisher = None # SIGTERM handler must be able to reach this class Publisher: - + active = False zeroconf = None localip = None @@ -26,31 +26,29 @@ class Publisher: def services(self): # override this to provide list of services to register return [] - - def run(self): - + + def run(self): self.localhostname = split(socket.gethostname(),'.')[0]+'.local.' - try: - self.localip = socket.gethostbyname(self.localhostname) - self.zeroconf = Zeroconf.Zeroconf(self.localip) - except: - return - self.active = True + try: + self.localip = socket.gethostbyname(self.localhostname) + self.zeroconf = Zeroconf.Zeroconf(self.localip) + except: + return + + self.active = True toRegister = self.services() for i in toRegister: service = Zeroconf.ServiceInfo( - i["type"]+".local.", - i["name"]+"."+i["type"]+".local.", - socket.inet_aton(self.localip), - i["port"], - 0, - 0, - i["properties"], - self.localhostname) - self.zeroconf.registerService(service) + i["type"]+".local.", + i["name"]+"."+i["type"]+".local.", + socket.inet_aton(self.localip), + i["port"], + 0, + 0, + i["properties"], + self.localhostname) + self.zeroconf.registerService(service) def shutdown(self): if self.active: self.zeroconf.close() - - diff --git a/amarok/src/scripts/common/Zeroconf.py b/amarok/src/scripts/common/Zeroconf.py index fa508393..7c790721 100644 --- a/amarok/src/scripts/common/Zeroconf.py +++ b/amarok/src/scripts/common/Zeroconf.py @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301 USA - + """ """ patch for meta-service (_services._dns-sd._udp) publishing """ @@ -87,6 +87,7 @@ import socket import threading import select import traceback +from functools import reduce __all__ = ["Zeroconf", "ServiceInfo", "ServiceBrowser"] @@ -103,7 +104,7 @@ _LISTENER_TIME = 200 _BROWSER_TIME = 500 # Some DNS constants - + _MDNS_ADDR = '224.0.0.251' _MDNS_PORT = 5353; _DNS_PORT = 53; @@ -212,7 +213,7 @@ class DNSEntry(object): """A DNS entry""" def __init__(self, name, type, clazz): - self.key = string.lower(name) + self.key = name.lower() self.name = name self.type = type self.clazz = clazz & _CLASS_MASK @@ -821,7 +822,7 @@ class DNSCache(object): """Returns a list of all entries""" def add(x, y): return x+y try: - return reduce(add, self.cache.values()) + return reduce(add, list(self.cache.values())) except: return [] @@ -870,7 +871,7 @@ class Engine(threading.Thread): def getReaders(self): result = [] self.condition.acquire() - result = self.readers.keys() + result = list(self.readers.keys()) self.condition.release() return result @@ -1008,7 +1009,7 @@ class ServiceBrowser(threading.Thread): if self.nextTime <= now: out = DNSOutgoing(_FLAGS_QR_QUERY) out.addQuestion(DNSQuestion(self.type, _TYPE_PTR, _CLASS_IN)) - for record in self.services.values(): + for record in list(self.services.values()): if not record.isExpired(now): out.addAnswerAtTime(record, now) self.zeroconf.send(out) @@ -1335,7 +1336,7 @@ class Zeroconf(object): changed if needed to make it unique on the network.""" self.checkService(info) self.services[info.name.lower()] = info - if self.servicetypes.has_key(info.type): + if info.type in self.servicetypes: self.servicetypes[info.type]+=1 else: self.servicetypes[info.type]=1 @@ -1387,7 +1388,7 @@ class Zeroconf(object): def unregisterAllServices(self): """Unregister all registered services.""" - print 'Unregistering ',len(self.services),' services' + print('Unregistering ',len(self.services),' services') if len(self.services) > 0: now = currentTimeMillis() nextTime = now @@ -1398,7 +1399,7 @@ class Zeroconf(object): now = currentTimeMillis() continue out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA) - for info in self.services.values(): + for info in list(self.services.values()): out.addAnswerAtTime(DNSPointer(info.type, _TYPE_PTR, _CLASS_IN, 0, info.name), 0) out.addAnswerAtTime(DNSService(info.name, _TYPE_SRV, _CLASS_IN, 0, info.priority, info.weight, info.port, info.server), 0) out.addAnswerAtTime(DNSText(info.name, _TYPE_TXT, _CLASS_IN, 0, info.text), 0) @@ -1495,11 +1496,11 @@ class Zeroconf(object): for question in msg.questions: if question.type == _TYPE_PTR: if question.name == "_services._dns-sd._udp.local.": - for stype in self.servicetypes.keys(): + for stype in list(self.servicetypes.keys()): if out is None: out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA) out.addAnswer(msg, DNSPointer("_services._dns-sd._udp.local.", _TYPE_PTR, _CLASS_IN, _DNS_TTL, stype)) - for service in self.services.values(): + for service in list(self.services.values()): if question.name == service.type: if out is None: out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA) @@ -1511,7 +1512,7 @@ class Zeroconf(object): # Answer A record queries for any service addresses we know if question.type == _TYPE_A or question.type == _TYPE_ANY: - for service in self.services.values(): + for service in list(self.services.values()): if service.server == question.name.lower(): out.addAnswer(msg, DNSAddress(question.name, _TYPE_A, _CLASS_IN | _CLASS_UNIQUE, _DNS_TTL, service.address)) @@ -1544,10 +1545,10 @@ class Zeroconf(object): def close(self): """Ends the background threads, and prevent this instance from servicing further queries.""" - print 'in close' + print('in close') if globals()['_GLOBAL_DONE'] == 0: globals()['_GLOBAL_DONE'] = 1 - print 'closing globals' + print('closing globals') self.notifyAll() self.engine.notify() self.unregisterAllServices() @@ -1558,21 +1559,21 @@ class Zeroconf(object): # query (for Zoe), and service unregistration. if __name__ == '__main__': - print "Multicast DNS Service Discovery for Python, version", __version__ + print("Multicast DNS Service Discovery for Python, version", __version__) r = Zeroconf() - print "1. Testing registration of a service..." + print("1. Testing registration of a service...") desc = {'version':'0.10','a':'test value', 'b':'another value'} info = ServiceInfo("_http._tcp.local.", "My Service Name._http._tcp.local.", socket.inet_aton("127.0.0.1"), 1234, 0, 0, desc) - print " Registering service..." + print(" Registering service...") r.registerService(info) - print " Registration done." - print "2. Testing query of service information..." - print " Getting ZOE service:", str(r.getServiceInfo("_http._tcp.local.", "ZOE._http._tcp.local.")) - print " Query done." - print "3. Testing query of own service..." - print " Getting self:", str(r.getServiceInfo("_http._tcp.local.", "My Service Name._http._tcp.local.")) - print " Query done." - print "4. Testing unregister of service information..." + print(" Registration done.") + print("2. Testing query of service information...") + print(" Getting ZOE service:", str(r.getServiceInfo("_http._tcp.local.", "ZOE._http._tcp.local."))) + print(" Query done.") + print("3. Testing query of own service...") + print(" Getting self:", str(r.getServiceInfo("_http._tcp.local.", "My Service Name._http._tcp.local."))) + print(" Query done.") + print("4. Testing unregister of service information...") r.unregisterService(info) - print " Unregister done." + print(" Unregister done.") r.close() diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb index de541510..0965be6c 100644 --- a/amarok/src/scripts/databasescripts/databaseScripts.rb +++ b/amarok/src/scripts/databasescripts/databaseScripts.rb @@ -20,14 +20,14 @@ rescue LoadError exit end -class DatabaseScriptChooser < Qt::Dialog +class DatabaseScriptChooser < TQt::Dialog attr_reader :m_optionCombo attr_reader :m_saveText attr_reader :m_saveDir attr_reader :m_okayButton - Q_SLOTS 'optionChanged(int)', 'textChanged(const QString &)', 'accept()', 'cancel()' + slots 'optionChanged(int)', 'textChanged(const TQString &)', 'accept()', 'cancel()' def initialize(parent = nil, name = nil, modal = false, fl = 0) super @@ -36,16 +36,16 @@ class DatabaseScriptChooser < Qt::Dialog setName("Database Script Chooser") end - @Form1Layout = Qt::GridLayout.new(self, 1, 1, 2, 2, 'Form1Layout') + @Form1Layout = TQt::GridLayout.new(self, 1, 1, 2, 2, 'Form1Layout') - @layout3 = Qt::VBoxLayout.new(nil, 0, 2, 'layout3') + @layout3 = TQt::VBoxLayout.new(nil, 0, 2, 'layout3') - @m_optionCombo = Qt::ComboBox.new(false, self, "m_optionCombo") + @m_optionCombo = TQt::ComboBox.new(false, self, "m_optionCombo") @layout3.addWidget(@m_optionCombo) - @layout1 = Qt::HBoxLayout.new(nil, 0, 2, 'layout1') + @layout1 = TQt::HBoxLayout.new(nil, 0, 2, 'layout1') - @m_saveText = Qt::Label.new(self, "m_saveText") + @m_saveText = TQt::Label.new(self, "m_saveText") @layout1.addWidget(@m_saveText) @m_saveDir = KDE::URLRequester.new(self, "m_saveDir") @@ -54,32 +54,32 @@ class DatabaseScriptChooser < Qt::Dialog @layout1.addWidget(@m_saveDir) @layout3.addLayout(@layout1) - @spacer1 = Qt::SpacerItem.new(20, 21, Qt::SizePolicy::Minimum, Qt::SizePolicy::Expanding) + @spacer1 = TQt::SpacerItem.new(20, 21, TQt::SizePolicy::Minimum, TQt::SizePolicy::Expanding) @layout3.addItem(@spacer1) - @layout2 = Qt::HBoxLayout.new(nil, 0, 2, 'layout2') + @layout2 = TQt::HBoxLayout.new(nil, 0, 2, 'layout2') - @m_cancelButton = Qt::PushButton.new(self, "@m_cancelButton") + @m_cancelButton = TQt::PushButton.new(self, "@m_cancelButton") @layout2.addWidget(@m_cancelButton) - @spacer2 = Qt::SpacerItem.new(61, 20, Qt::SizePolicy::Expanding, Qt::SizePolicy::Minimum) + @spacer2 = TQt::SpacerItem.new(61, 20, TQt::SizePolicy::Expanding, TQt::SizePolicy::Minimum) @layout2.addItem(@spacer2) - @m_okayButton = Qt::PushButton.new(self, "m_okayButton") + @m_okayButton = TQt::PushButton.new(self, "m_okayButton") @layout2.addWidget(@m_okayButton) @layout3.addLayout(@layout2) - connect( @m_optionCombo, SIGNAL( "activated(int)" ), self, SLOT( "optionChanged(int)" ) ); - connect( @m_okayButton, SIGNAL( "clicked()" ), self, SLOT( "accept()" ) ) - connect( @m_cancelButton, SIGNAL( "clicked()" ), self, SLOT( "cancel()" ) ) + connect( @m_optionCombo, TQ_SIGNAL( "activated(int)" ), self, TQ_SLOT( "optionChanged(int)" ) ); + connect( @m_okayButton, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "accept()" ) ) + connect( @m_cancelButton, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "cancel()" ) ) - connect( @m_saveDir, SIGNAL( "textChanged(const QString &)" ), - self, SLOT( "textChanged(const QString &)" ) ); + connect( @m_saveDir, TQ_SIGNAL( "textChanged(const TQString &)" ), + self, TQ_SLOT( "textChanged(const TQString &)" ) ); @Form1Layout.addLayout(@layout3, 0, 0) languageChange() - resize( Qt::Size.new(356, 137).expandedTo(minimumSizeHint()) ) + resize( TQt::Size.new(356, 137).expandedTo(minimumSizeHint()) ) clearWState( WState_Polished ) end diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui index 96e869bf..b63327d8 100644 --- a/amarok/src/scripts/graphequalizer/eqdialog.ui +++ b/amarok/src/scripts/graphequalizer/eqdialog.ui @@ -200,9 +200,9 @@ <include location="local" impldecl="in implementation">eqdialog.ui.h</include> <include location="global" impldecl="in implementation">equalizercanvasview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>eqGroupBox_toggled( bool eqEnabled )</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">init()</function> </functions> diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.h b/amarok/src/scripts/graphequalizer/equalizercanvasview.h index c894dc11..0665e4cd 100644 --- a/amarok/src/scripts/graphequalizer/equalizercanvasview.h +++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.h @@ -42,7 +42,7 @@ private: */ class EqualizerCanvasView : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: EqualizerCanvasView(TQWidget *parent, const char *name); @@ -64,7 +64,7 @@ private: class CallAmarok : public TQObject { - Q_OBJECT + TQ_OBJECT public: CallAmarok(TQObject* parent, const char *name, diff --git a/amarok/src/scripts/graphequalizer/equalizerdialog.h b/amarok/src/scripts/graphequalizer/equalizerdialog.h index d804e41b..585bd258 100644 --- a/amarok/src/scripts/graphequalizer/equalizerdialog.h +++ b/amarok/src/scripts/graphequalizer/equalizerdialog.h @@ -28,7 +28,7 @@ */ class EqualizerDialog : public TQDialog { -Q_OBJECT +TQ_OBJECT public: EqualizerDialog(); diff --git a/amarok/src/scripts/graphequalizer/main.cpp b/amarok/src/scripts/graphequalizer/main.cpp index 6bd13e61..6813cff5 100644 --- a/amarok/src/scripts/graphequalizer/main.cpp +++ b/amarok/src/scripts/graphequalizer/main.cpp @@ -42,9 +42,9 @@ int main(int argc, char **argv) mainWin->show(); StdinReader* listen = new StdinReader(mainWin, "ioListener"); CallAmarok* ca = new CallAmarok(mainWin,"ca", mainWin->canvasView,mainWin->preampSlider); - mainWin->connect(listen, TQT_SIGNAL(openWindow()), mainWin, TQT_SLOT(show())); - mainWin->connect(mainWin->canvasView,TQT_SIGNAL(eqChanged()),ca, TQT_SLOT(updateEq())); - mainWin->connect(mainWin->preampSlider,TQT_SIGNAL(sliderReleased()),ca, TQT_SLOT(updateEq())); + mainWin->connect(listen, TQ_SIGNAL(openWindow()), mainWin, TQ_SLOT(show())); + mainWin->connect(mainWin->canvasView,TQ_SIGNAL(eqChanged()),ca, TQ_SLOT(updateEq())); + mainWin->connect(mainWin->preampSlider,TQ_SIGNAL(sliderReleased()),ca, TQ_SLOT(updateEq())); return app.exec(); } diff --git a/amarok/src/scripts/graphequalizer/stdinreader.h b/amarok/src/scripts/graphequalizer/stdinreader.h index b0d2003c..33edd8d9 100644 --- a/amarok/src/scripts/graphequalizer/stdinreader.h +++ b/amarok/src/scripts/graphequalizer/stdinreader.h @@ -11,7 +11,7 @@ class StdinReader : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -19,7 +19,7 @@ public: :TQObject(parent,name) { 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() { } diff --git a/amarok/src/scripts/playlist2html/Playlist.py b/amarok/src/scripts/playlist2html/Playlist.py index e91f2944..91d6c971 100644 --- a/amarok/src/scripts/playlist2html/Playlist.py +++ b/amarok/src/scripts/playlist2html/Playlist.py @@ -16,7 +16,7 @@ class Track(object): __Q_SLOTS__ = FIELDS def __init__(self, **kwargs): - for key,value in kwargs.iteritems(): + for key,value in kwargs.items(): setattr(self, key, value) diff --git a/amarok/src/scripts/playlist2html/PlaylistServer.py b/amarok/src/scripts/playlist2html/PlaylistServer.py index 8fb2d640..6d259fa9 100644 --- a/amarok/src/scripts/playlist2html/PlaylistServer.py +++ b/amarok/src/scripts/playlist2html/PlaylistServer.py @@ -9,8 +9,8 @@ License: GPL """ -import SimpleHTTPServer -import BaseHTTPServer +import http.server +import http.server from Playlist import Playlist # the port number to listen to @@ -19,7 +19,7 @@ PORT = 4773 PLIST = None -class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): +class RequestHandler(http.server.SimpleHTTPRequestHandler): """We need our own 'RequestHandler, to handle the requests, that arrive at our server.""" @@ -35,7 +35,7 @@ def main(): """main is the starting-point for our script.""" global PLIST PLIST = Playlist() - srv = BaseHTTPServer.HTTPServer(('',PORT),RequestHandler) + srv = http.server.HTTPServer(('',PORT),RequestHandler) srv.serve_forever() diff --git a/amarok/src/scripts/playlist2html/playlist2html.py b/amarok/src/scripts/playlist2html/playlist2html.py index 1b868f07..e5531d81 100644 --- a/amarok/src/scripts/playlist2html/playlist2html.py +++ b/amarok/src/scripts/playlist2html/playlist2html.py @@ -10,7 +10,7 @@ def main(): stdin = os.popen("kdialog --getsaveurl %s"%(user.home)) dest = stdin.readline().strip()[5:] plist = Playlist() - print dest + print(dest) try: f = open(dest, "w") f.write(plist.toHtml()) diff --git a/amarok/src/scripts/score_default/score_default.rb b/amarok/src/scripts/score_default/score_default.rb index f80a3a7d..0eb00727 100644 --- a/amarok/src/scripts/score_default/score_default.rb +++ b/amarok/src/scripts/score_default/score_default.rb @@ -6,7 +6,7 @@ # # License: GNU General Public License V2 -require 'uri' +require 'cgi' loop do args = gets.chomp.split(" ") @@ -30,7 +30,7 @@ loop do newscore = ( ( prevscore * playcount ) + percentage ) / ( playcount + 1 ) end - system( "dcop", "amarok", "player", "setScoreByPath", URI::decode( url ), newscore.to_s ) + system( "dcop", "amarok", "player", "setScoreByPath", CGI::unescape( url ), newscore.to_s ) end end diff --git a/amarok/src/scripts/templates/amarok.rb b/amarok/src/scripts/templates/amarok.rb index a0bbef95..42a7ca0c 100644 --- a/amarok/src/scripts/templates/amarok.rb +++ b/amarok/src/scripts/templates/amarok.rb @@ -18,14 +18,14 @@ # 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################ -class QtIoListener < Qt::Object - Q_SLOTS 'dataRecieved()' +class QtIoListener < TQt::Object + slots 'dataRecieved()' def initialize(app, iostream, lineHandler) super(app) @lineHandler = lineHandler @iostream = iostream - streamListener = Qt::SocketNotifier.new(iostream.fileno, Qt::SocketNotifier.Read, app, 'stdinWatcher') - Qt::Object.connect(streamListener, SIGNAL("activated(int)"), self, SLOT("dataRecieved()") ) + streamListener = TQt::SocketNotifier.new(iostream.fileno, TQt::SocketNotifier.Read, app, 'stdinWatcher') + TQt::Object.connect(streamListener, TQ_SIGNAL("activated(int)"), self, TQ_SLOT("dataRecieved()") ) end def dataRecieved diff --git a/amarok/src/scripts/templates/python_qt_template.py b/amarok/src/scripts/templates/python_qt_template.py index e5639e8b..88775b45 100755 --- a/amarok/src/scripts/templates/python_qt_template.py +++ b/amarok/src/scripts/templates/python_qt_template.py @@ -1,10 +1,10 @@ #!/usr/bin/env python ############################################################################ -# Python-Qt template script for Amarok +# Python-TQt template script for Amarok # (c) 2005 Mark Kretschmann <markey@web.de> # -# Depends on: Python 2.2, PyQt +# Depends on: Python 3, PyTQt ############################################################################ # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # ############################################################################ -import ConfigParser +import configparser import os import sys import threading @@ -22,9 +22,9 @@ import signal from time import sleep try: - from qt import * + from PyTQt.tqt import * except: - os.popen( "kdialog --sorry 'PyQt (Qt bindings for Python) is required for this script.'" ) + os.popen( "kdialog --sorry 'PyTQt (TQt bindings for Python) is required for this script.'" ) raise @@ -32,17 +32,17 @@ except: debug_prefix = "[Test Script]" -class ConfigDialog( QDialog ): +class ConfigDialog( TQDialog ): """ Configuration widget """ def __init__( self ): - QDialog.__init__( self ) - self.setWFlags( Qt.WDestructiveClose ) + TQDialog.__init__( self ) + self.setWFlags( TQt.WDestructiveClose ) self.setCaption( "Test Script - Amarok" ) foo = None try: - config = ConfigParser.ConfigParser() + config = configparser.ConfigParser() config.read( "testrc" ) foo = config.get( "General", "foo" ) except: @@ -55,7 +55,7 @@ class ConfigDialog( QDialog ): self.file = file( "testrc", 'w' ) - self.config = ConfigParser.ConfigParser() + self.config = configparser.ConfigParser() self.config.add_section( "General" ) self.config.set( "General", "foo", foovar ) self.config.write( self.file ) @@ -64,17 +64,17 @@ class ConfigDialog( QDialog ): self.accept() -class Notification( QCustomEvent ): - __super_init = QCustomEvent.__init__ +class Notification( TQCustomEvent ): + __super_init = TQCustomEvent.__init__ def __init__( self, str ): - self.__super_init(QCustomEvent.User + 1) - self.string = str + self.__super_init(TQCustomEvent.User + 1) + self.eventStr = str -class Test( QApplication ): - """ The main application, also sets up the Qt event loop """ +class Test( TQApplication ): + """ The main application, also sets up the TQt event loop """ def __init__( self, args ): - QApplication.__init__( self, args ) + TQApplication.__init__( self, args ) debug( "Started." ) # Start separate thread for reading data from stdin @@ -117,25 +117,25 @@ class Test( QApplication ): def customEvent( self, notification ): """ Handles notifications """ - string = QString(notification.string) - debug( "Received notification: " + str( string ) ) + eventStr = TQString(notification.eventStr) + debug( "Received notification: " + str( eventStr ) ) - if string.contains( "configure" ): + if eventStr.contains( "configure" ): self.configure() - if string.contains( "engineStateChange: play" ): + if eventStr.contains( "engineStateChange: play" ): self.engineStatePlay() - if string.contains( "engineStateChange: idle" ): + if eventStr.contains( "engineStateChange: idle" ): self.engineStateIdle() - if string.contains( "engineStateChange: pause" ): + if eventStr.contains( "engineStateChange: pause" ): self.engineStatePause() - if string.contains( "engineStateChange: empty" ): + if eventStr.contains( "engineStateChange: empty" ): self.engineStatePause() - if string.contains( "trackChange" ): + if eventStr.contains( "trackChange" ): self.trackChange() # Notification callbacks. Implement these functions to react to specific notification @@ -146,7 +146,7 @@ class Test( QApplication ): self.dia = ConfigDialog() self.dia.show() - self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings ) + self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings ) def engineStatePlay( self ): """ Called when Engine state changes to Play """ @@ -174,7 +174,7 @@ class Test( QApplication ): def debug( message ): """ Prints debug message to stdout """ - print debug_prefix + " " + message + print(debug_prefix + " " + message) def main( ): app = Test( sys.argv ) diff --git a/amarok/src/scripts/templates/ruby_qt_template.rb b/amarok/src/scripts/templates/ruby_qt_template.rb index 9e75f7a3..4a13d11f 100644 --- a/amarok/src/scripts/templates/ruby_qt_template.rb +++ b/amarok/src/scripts/templates/ruby_qt_template.rb @@ -59,7 +59,7 @@ class ExampleActions < AmaroKSlots @app.exit end end -a = Qt::Application.new(ARGV) +a = TQt::Application.new(ARGV) e = ExampleActions.new(a) AmarokCommunication = AmaroKLib.new(a, e) a.exec()
\ No newline at end of file diff --git a/amarok/src/scripts/webcontrol/Playlist.py b/amarok/src/scripts/webcontrol/Playlist.py index e2d888c6..a049abab 100644 --- a/amarok/src/scripts/webcontrol/Playlist.py +++ b/amarok/src/scripts/webcontrol/Playlist.py @@ -30,7 +30,7 @@ class Track(object): max_field_value_lengths = [(0,"")] * len(FIELDS) def __init__(self, **kwargs): - for key,value in kwargs.iteritems(): + for key,value in kwargs.items(): setattr(self, key, value) @@ -53,14 +53,14 @@ class Track(object): index = 0 # for f in self.__Q_SLOTS__ : -# print string.strip(f) +# print f.strip() for i in [getattr(self,f) for f in self.__Q_SLOTS__ ]: - if len(string.strip(i)) > Track.max_field_value_lengths[index][0]: - Track.max_field_value_lengths[index] = (len(string.strip(i)),i) + if len(i.strip()) > Track.max_field_value_lengths[index][0]: + Track.max_field_value_lengths[index] = (len(i.strip()),i) index += 1 - tr_style = '' + tr_style = '' tr_id = '' if style: diff --git a/amarok/src/scripts/webcontrol/RequestHandler.py b/amarok/src/scripts/webcontrol/RequestHandler.py index 8519ef35..2d0b2cb3 100644 --- a/amarok/src/scripts/webcontrol/RequestHandler.py +++ b/amarok/src/scripts/webcontrol/RequestHandler.py @@ -11,8 +11,8 @@ License: GPL """ -import SimpleHTTPServer -import BaseHTTPServer +import http.server +import http.server from Playlist import Playlist import Globals @@ -63,8 +63,7 @@ class AmarokStatus: if self.playState != -1: res = self.playState == self.EnginePlay else: - res = string.find(self.dcop_isplaying.result(), "true") >= 0 - if res: + if "true" in self.dcop_isplaying.result(): self.playState = self.EnginePlay else: self.playState = self.EnginePause @@ -85,7 +84,7 @@ class AmarokStatus: def controlsEnabled(self): return self.allowControl -class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): +class RequestHandler(http.server.SimpleHTTPRequestHandler): """We need our own 'RequestHandler, to handle the requests, that arrive at our server.""" @@ -144,10 +143,10 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): # abort a request that has already been completed # probably a refresh from the users browser - if qmap.has_key("reqid") and req_id == int(qmap["reqid"]): + if "reqid" in qmap and req_id == int(qmap["reqid"]): return 0 - if qmap.has_key("action"): + if "action" in qmap: a = qmap["action"] if a == "stop": self._amarokStop() @@ -193,9 +192,9 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): # get the sessions last reqid last_req_id = 0 session_id = None - if qmap.has_key("sesid"): + if "sesid" in qmap: session_id = qmap["sesid"] - if REQ_IDS.has_key(session_id): + if session_id in REQ_IDS: last_req_id = REQ_IDS[session_id] else: REQ_IDS[session_id] = last_req_id @@ -229,15 +228,15 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): # Surely there must be a better way that this:) # self.send_response(200) - if string.find(self.path, ".png") >= 0: + if ".png" in self.path: self.send_header("content-type","image/png") self.end_headers() self._sendFile(self.path) - elif string.find(self.path, ".js") >= 0: + elif ".js" in self.path: self.send_header("content-type","text/plain") self.end_headers() self._sendFile(self.path) - elif string.find(self.path, ".css") >= 0: + elif ".css" in self.path: self.send_header("content-type","text/css") self.end_headers() self._sendFile(self.path) @@ -257,7 +256,7 @@ def main(): """main is the starting-point for our script.""" global PLIST PLIST = Playlist() - srv = BaseHTTPServer.HTTPServer(('',Globals.PORT),RequestHandler) + srv = http.server.HTTPServer(('',Globals.PORT),RequestHandler) srv.serve_forever() diff --git a/amarok/src/scripts/webcontrol/WebControl.py b/amarok/src/scripts/webcontrol/WebControl.py index e172a157..4c35eb04 100755 --- a/amarok/src/scripts/webcontrol/WebControl.py +++ b/amarok/src/scripts/webcontrol/WebControl.py @@ -4,11 +4,11 @@ # (c) 2005 Jonas Drewsen <kde@xspect.dk> # (c) 2006 Peter C. Ndikuwera <pndiku@gmail.com> # -# Depends on: Python 2.2, PyQt +# Depends on: Python 3, PyTQt # ############################################################################ # Based on -# Python-Qt template script for Amarok +# PyTQt template script for Amarok # (c) 2005 Mark Kretschmann <markey@web.de> # ############################################################################ @@ -20,7 +20,7 @@ # ############################################################################ -import ConfigParser +import configparser import os import sys import socket @@ -31,7 +31,7 @@ from time import sleep import Globals from Playlist import Playlist import RequestHandler -import BaseHTTPServer +import http.server from WebPublisher import * import time @@ -40,9 +40,9 @@ import time import string try: - from qt import * + from PyTQt.tqt import * except: - os.popen( "kdialog --sorry 'PyQt (Qt bindings for Python) is required for this script.'" ) + os.popen( "kdialog --sorry 'PyTQt (TQt bindings for Python) is required for this script.'" ) raise @@ -50,52 +50,52 @@ except: debug_prefix = "[WebControl Script]" -class ConfigDialog( QDialog ): +class ConfigDialog( TQDialog ): """ Configuration widget """ def __init__( self ): - QDialog.__init__( self ) - self.setWFlags( Qt.WDestructiveClose ) + TQDialog.__init__( self ) + self.setWFlags( TQt.WDestructiveClose ) self.setCaption( "WebControl - Amarok" ) - self.config = ConfigParser.ConfigParser() + self.config = configparser.ConfigParser() allowControl = RequestHandler.AmarokStatus.allowControl - publish = RequestHandler.AmarokStatus.publish + publish = RequestHandler.AmarokStatus.publish try: - config = ConfigParser.ConfigParser() + config = configparser.ConfigParser() config.read( "webcontrolrc" ) - allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0 - publish = string.find(config.get( "General", "publish" ), "True") >= 0 + allowControl = "True" in config.get( "General", "allowcontrol" ) + publish = "True" in config.get( "General", "publish" ) except: pass - self.lay = QHBoxLayout( self ) + self.lay = TQHBoxLayout( self ) - self.vbox = QVBox( self ) + self.vbox = TQVBox( self ) self.lay.addWidget( self.vbox ) - self.hbox1 = QHBox( self.vbox ) + self.hbox1 = TQHBox( self.vbox ) - self.allowControl = QCheckBox( QString("Allow control"), self.hbox1 ) + self.allowControl = TQCheckBox( TQString("Allow control"), self.hbox1 ) self.allowControl.setChecked(allowControl) - self.hbox1 = QHBox( self.vbox ) + self.hbox1 = TQHBox( self.vbox ) - self.publish = QCheckBox( QString("Publish"), self.hbox1 ) + self.publish = TQCheckBox( TQString("Publish"), self.hbox1 ) self.publish.setChecked(publish) - self.hbox = QHBox( self.vbox ) + self.hbox = TQHBox( self.vbox ) - self.ok = QPushButton( self.hbox ) + self.ok = TQPushButton( self.hbox ) self.ok.setText( "Ok" ) - self.cancel = QPushButton( self.hbox ) + self.cancel = TQPushButton( self.hbox ) self.cancel.setText( "Cancel" ) self.cancel.setDefault( True ) - self.connect( self.ok, SIGNAL( "clicked()" ), self.save ) - self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT( "reject()" ) ) + self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.save ) + self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "reject()" ) ) self.adjustSize() @@ -104,7 +104,7 @@ class ConfigDialog( QDialog ): self.file = file( "webcontrolrc", 'w' ) - self.config = ConfigParser.ConfigParser() + self.config = configparser.ConfigParser() self.config.add_section( "General" ) self.config.set( "General", "allowcontrol", self.allowControl.isChecked() ) self.config.set( "General", "publish", self.publish.isChecked() ) @@ -114,17 +114,17 @@ class ConfigDialog( QDialog ): self.accept() -class Notification( QCustomEvent ): - __super_init = QCustomEvent.__init__ +class Notification( TQCustomEvent ): + __super_init = TQCustomEvent.__init__ def __init__( self, str ): - self.__super_init(QCustomEvent.User + 1) - self.string = str + self.__super_init(TQCustomEvent.User + 1) + self.eventStr = str -class WebControl( QApplication ): - """ The main application, also sets up the Qt event loop """ +class WebControl( TQApplication ): + """ The main application, also sets up the TQt event loop """ def __init__( self, args ): - QApplication.__init__( self, args ) + TQApplication.__init__( self, args ) debug( "Started." ) self.readSettings() @@ -138,16 +138,16 @@ class WebControl( QApplication ): while p_incr < 10: try: - p_i=p_incr+Globals.PORT - self.srv = BaseHTTPServer.HTTPServer(('',p_i),RequestHandler.RequestHandler) - publisher.port = p_i - break - except socket.error: - p_incr+=1 - + p_i=p_incr+Globals.PORT + self.srv = http.server.HTTPServer(('',p_i),RequestHandler.RequestHandler) + publisher.port = p_i + break + except socket.error: + p_incr+=1 + self.zeroconfPublishing() - self.snsrv = QSocketNotifier(self.srv.fileno(), QSocketNotifier.Read) - self.snsrv.connect( self.snsrv, SIGNAL('activated(int)'), self.readSocket ) + self.snsrv = TQSocketNotifier(self.srv.fileno(), TQSocketNotifier.Read) + self.snsrv.connect( self.snsrv, TQ_SIGNAL('activated(int)'), self.readSocket ) def readSocket( self ): # Got a read event on the HTTP server socket. @@ -155,15 +155,15 @@ class WebControl( QApplication ): def readSettings( self ): """ Reads settings from configuration file """ - config = ConfigParser.ConfigParser() + config = configparser.ConfigParser() config.read( "webcontrolrc" ) try: - RequestHandler.AmarokStatus.allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0 - RequestHandler.AmarokStatus.publish = string.find(config.get( "General", "publish" ), "True") >= 0 + RequestHandler.AmarokStatus.allowControl = "True" in config.get( "General", "allowcontrol" ) + RequestHandler.AmarokStatus.publish = "True" in config.get( "General", "publish" ) except: debug( "No config file found, using defaults." ) - + def postConfigure( self ): self.readSettings() @@ -195,32 +195,32 @@ class WebControl( QApplication ): def customEvent( self, notification ): """ Handles the notifications """ - string = QString(notification.string) - debug( "Received notification: " + str( string ) ) + eventStr = TQString(notification.eventStr) + debug( "Received notification: " + str( eventStr ) ) - if string.contains( "configure" ): + if eventStr.contains( "configure" ): self.configure() - elif string.contains( "exit" ): + elif eventStr.contains( "exit" ): cleanup(None,None) - elif string.contains( "engineStateChange: play" ): + elif eventStr.contains( "engineStateChange: play" ): self.engineStatePlay() - elif string.contains( "engineStateChange: idle" ): + elif eventStr.contains( "engineStateChange: idle" ): self.engineStateIdle() - elif string.contains( "engineStateChange: pause" ): + elif eventStr.contains( "engineStateChange: pause" ): self.engineStatePause() - elif string.contains( "engineStateChange: empty" ): + elif eventStr.contains( "engineStateChange: empty" ): self.engineStatePause() - elif string.contains( "trackChange" ): + elif eventStr.contains( "trackChange" ): self.trackChange() else: - debug( "Unknown notification: " + str(string) + " -> ignoring") + debug( "Unknown notification: " + str(eventStr) + " -> ignoring") # Notification callbacks. Implement these functions to react to specific notification # events from Amarok: @@ -230,7 +230,7 @@ class WebControl( QApplication ): self.dia = ConfigDialog() self.dia.show() - self.connect( self.dia, SIGNAL( "destroyed()" ), self.postConfigure ) + self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.postConfigure ) def engineStatePlay( self ): """ Called when Engine state changes to Play """ @@ -260,7 +260,6 @@ class WebControl( QApplication ): RequestHandler.AmarokStatus.dcop_trackcurrenttime.result() RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") RequestHandler.AmarokStatus.dcop_tracktotaltime.result() - @@ -269,21 +268,21 @@ class WebControl( QApplication ): def debug( message ): """ Prints debug message to stdout """ - print debug_prefix + " " + message + print(debug_prefix + " " + message) def cleanup(sig,frame): publisher.shutdown() - os._exit(0) + os._exit(0) def guithread(): - app = WebControl( sys.argv ) - app.exec_loop() + app = WebControl( sys.argv ) + app.exec_loop() if __name__ == "__main__": Globals.EXEC_PATH = os.path.abspath(sys.path[0]) - gui = threading.Thread(target=guithread) - gui.start() - signal.signal(signal.SIGTERM,cleanup) + gui = threading.Thread(target=guithread) + gui.start() + signal.signal(signal.SIGTERM,cleanup) # just wait quietly for the end - while 1: sleep(120) + while 1: sleep(120) diff --git a/amarok/src/scripts/webcontrol/WebPublisher.py b/amarok/src/scripts/webcontrol/WebPublisher.py index 2cb649de..38eadc08 100644 --- a/amarok/src/scripts/webcontrol/WebPublisher.py +++ b/amarok/src/scripts/webcontrol/WebPublisher.py @@ -20,15 +20,15 @@ import string temp=sys.path[:] sys.path.insert(0,os.path.abspath(os.path.dirname(sys.argv[0])+'/../common')) if not os.getenv("TDEDIR") is None: sys.path.insert(0,os.getenv("TDEDIR")+"/share/apps/amarok/scripts/common") -if not os.getenv("TDEDIRS") is None: sys.path=[p+"/share/apps/amarok/scripts/common" for p in string.split(os.getenv("TDEDIRS"),os.pathsep)]+sys.path +if not os.getenv("TDEDIRS") is None: sys.path=[p+"/share/apps/amarok/scripts/common" for p in os.pathsep.split(os.getenv("TDEDIRS"))]+sys.path from Publisher import * sys.path=temp class WebPublisher(Publisher): - + port = None def services(self): return [{ "name" : "Amarok WebControl for "+getpass.getuser(), "port": self.port, "type": "_http._tcp", "properties": {}}] - -publisher = WebPublisher()
\ No newline at end of file + +publisher = WebPublisher() diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp index 1acab62a..f8c83823 100644 --- a/amarok/src/scrobbler.cpp +++ b/amarok/src/scrobbler.cpp @@ -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 ); - connect( m_similarArtistsJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( audioScrobblerSimilarArtistsResult( TDEIO::Job* ) ) ); - connect( m_similarArtistsJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( audioScrobblerSimilarArtistsData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( m_similarArtistsJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( audioScrobblerSimilarArtistsResult( TDEIO::Job* ) ) ); + connect( m_similarArtistsJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( audioScrobblerSimilarArtistsData( TDEIO::Job*, const TQByteArray& ) ) ); } } @@ -270,7 +270,7 @@ SubmitItem::SubmitItem( m_album = album; m_title = title; m_length = length; - m_playStartTime = now ? TQDateTime::currentDateTime( Qt::UTC ).toTime_t() : 0; + m_playStartTime = now ? TQDateTime::currentDateTime( TQt::UTC ).toTime_t() : 0; } @@ -393,7 +393,7 @@ ScrobblerSubmitter::ScrobblerSubmitter() , m_lastSubmissionFinishTime( 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(); } @@ -422,7 +422,7 @@ ScrobblerSubmitter::~ScrobblerSubmitter() void ScrobblerSubmitter::performHandshake() { TQString handshakeUrl = TQString(); - uint currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + uint currentTime = TQDateTime::currentDateTime( TQt::UTC ).toTime_t(); if ( PROTOCOL_VERSION == "1.1" ) { @@ -485,7 +485,7 @@ void ScrobblerSubmitter::performHandshake() m_inProgress = true; 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 ) .setDescription( i18n( "Submitting to last.fm" ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( audioScrobblerSubmitResult( TDEIO::Job* ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( audioScrobblerSubmitData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( audioScrobblerSubmitResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( audioScrobblerSubmitData( TDEIO::Job*, const TQByteArray& ) ) ); } @@ -665,7 +665,7 @@ void ScrobblerSubmitter::scheduledTimeReached() */ void ScrobblerSubmitter::audioScrobblerHandshakeResult( TDEIO::Job* job ) //SLOT { - m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + m_prevSubmitTime = TQDateTime::currentDateTime( TQt::UTC ).toTime_t(); m_inProgress = false; if ( job->error() ) { @@ -745,7 +745,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( TDEIO::Job* job ) //SLOT */ void ScrobblerSubmitter::audioScrobblerSubmitResult( TDEIO::Job* job ) //SLOT { - m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + m_prevSubmitTime = TQDateTime::currentDateTime( TQt::UTC ).toTime_t(); m_inProgress = false; if ( job->error() ) { @@ -891,7 +891,7 @@ SubmitItem* ScrobblerSubmitter::dequeueItem() SubmitItem* item = 0; if( m_lastSubmissionFinishTime > 0 && !m_holdFakeQueue && m_fakeQueue.getFirst() ) { - uint limit = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + uint limit = TQDateTime::currentDateTime( TQt::UTC ).toTime_t(); if ( m_submitQueue.getFirst() ) if ( m_submitQueue.getFirst()->playStartTime() <= limit ) @@ -1047,7 +1047,7 @@ void ScrobblerSubmitter::saveSubmitQueue() } if ( m_lastSubmissionFinishTime == 0 ) - m_lastSubmissionFinishTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + m_lastSubmissionFinishTime = TQDateTime::currentDateTime( TQt::UTC ).toTime_t(); TQDomDocument newdoc; TQDomElement submitQueue = newdoc.createElement( "submit" ); @@ -1127,7 +1127,7 @@ bool ScrobblerSubmitter::schedule( bool failure ) if ( m_inProgress || !canSubmit() ) return false; - uint when, currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + uint when, currentTime = TQDateTime::currentDateTime( TQt::UTC ).toTime_t(); if ( currentTime - m_prevSubmitTime > m_interval ) when = 0; else diff --git a/amarok/src/scrobbler.h b/amarok/src/scrobbler.h index 5fb8e140..4a60f7ca 100644 --- a/amarok/src/scrobbler.h +++ b/amarok/src/scrobbler.h @@ -28,7 +28,7 @@ class Scrobbler : public TQObject, public EngineObserver { friend class MediaDevice; - Q_OBJECT + TQ_OBJECT public: @@ -115,7 +115,7 @@ class SubmitQueue : public TQPtrList<SubmitItem> class ScrobblerSubmitter : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp index 8f1379db..e571f15f 100644 --- a/amarok/src/sliderwidget.cpp +++ b/amarok/src/sliderwidget.cpp @@ -41,7 +41,7 @@ #include <tdepopupmenu.h> #include <kstandarddirs.h> -Amarok::Slider::Slider( Qt::Orientation orientation, TQWidget *parent, uint max ) +Amarok::Slider::Slider( TQt::Orientation orientation, TQWidget *parent, uint max ) : TQSlider( orientation, parent ) , m_sliding( false ) , m_outside( false ) @@ -53,7 +53,7 @@ Amarok::Slider::Slider( Qt::Orientation orientation, TQWidget *parent, uint max void Amarok::Slider::wheelEvent( TQWheelEvent *e ) { - if( orientation() == Qt::Vertical ) { + if( orientation() == TQt::Vertical ) { // Will be handled by the parent widget e->ignore(); return; @@ -78,7 +78,7 @@ Amarok::Slider::mouseMoveEvent( TQMouseEvent *e ) //feels better, but using set value of 20 is bad of course TQRect rect( -20, -20, width()+40, height()+40 ); - if ( orientation() == Qt::Horizontal && !rect.contains( e->pos() ) ) { + if ( orientation() == TQt::Horizontal && !rect.contains( e->pos() ) ) { if ( !m_outside ) TQSlider::setValue( m_prevValue ); m_outside = true; @@ -94,7 +94,7 @@ Amarok::Slider::mouseMoveEvent( TQMouseEvent *e ) void Amarok::Slider::slideEvent( TQMouseEvent *e ) { - TQSlider::setValue( orientation() == Qt::Horizontal + TQSlider::setValue( orientation() == TQt::Horizontal ? ((TQApplication::reverseLayout()) ? TQRangeControl::valueFromPosition( width() - (e->pos().x() - sliderRect().width()/2), width() + sliderRect().width() ) : TQRangeControl::valueFromPosition( e->pos().x() - sliderRect().width()/2, width() - sliderRect().width() ) ) @@ -140,7 +140,7 @@ Amarok::Slider::setValue( int newValue ) #define THICKNESS 7 #define MARGIN 3 -Amarok::PrettySlider::PrettySlider( Qt::Orientation orientation, SliderMode mode, +Amarok::PrettySlider::PrettySlider( TQt::Orientation orientation, SliderMode mode, TQWidget *parent, uint max ) : Amarok::Slider( orientation, parent, max ) , m_mode( mode ) @@ -149,17 +149,17 @@ Amarok::PrettySlider::PrettySlider( Qt::Orientation orientation, SliderMode mode if( m_mode == Pretty) { setWFlags( TQt::WNoAutoErase ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } // We only have to connect this *once*, since our MetaBundle // doesn't get destroyed until we do. - connect( &m_bundle.moodbar(), TQT_SIGNAL( jobEvent( int ) ), - TQT_SLOT( moodbarJobEvent( int ) ) ); + connect( &m_bundle.moodbar(), TQ_SIGNAL( jobEvent( int ) ), + TQ_SLOT( moodbarJobEvent( int ) ) ); // We want to know if we should reset our moodbar data - connect( App::instance(), TQT_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), - TQT_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); + connect( App::instance(), TQ_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), + TQ_SLOT( slotMoodbarPrefs( bool, bool, int, bool ) ) ); } @@ -175,7 +175,7 @@ void Amarok::PrettySlider::slideEvent( TQMouseEvent *e ) { if( m_mode == Pretty || m_showingMoodbar ) - TQSlider::setValue( orientation() == Qt::Horizontal + TQSlider::setValue( orientation() == TQt::Horizontal ? TQRangeControl::valueFromPosition( e->pos().x(), width()-2 ) : TQRangeControl::valueFromPosition( e->pos().y(), height()-2 ) ); else @@ -192,7 +192,7 @@ namespace Amarok { void Amarok::PrettySlider::paintEvent( TQPaintEvent *e ) { - const int w = orientation() == Qt::Horizontal ? width() : height(); + const int w = orientation() == TQt::Horizontal ? width() : height(); const int pos = int( double( w-2 ) / maxValue() * Slider::value() ); int h = THICKNESS; @@ -203,7 +203,7 @@ Amarok::PrettySlider::paintEvent( TQPaintEvent *e ) if( m_showingMoodbar ) { if( m_mode == Normal ) - h = (orientation() == Qt::Vertical ? width() : height()) - 2*MARGIN; + h = (orientation() == TQt::Vertical ? width() : height()) - 2*MARGIN; mood = m_bundle.moodbar().draw( w, h ); } // If we're a Normal PrettySlider and we have no moodbar, @@ -219,7 +219,7 @@ Amarok::PrettySlider::paintEvent( TQPaintEvent *e ) buf.fill( parentWidget()->backgroundColor() ); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { p.translate( 0, height()-1 ); p.rotate( -90 ); //90 degrees clockwise @@ -351,13 +351,13 @@ Amarok::PrettySlider::sizeHint() const ////////////////////////////////////////////////////////////////////////////////////////// Amarok::VolumeSlider::VolumeSlider( TQWidget *parent, uint max ) - : Amarok::Slider( Qt::Horizontal, parent, max ) + : Amarok::Slider( TQt::Horizontal, parent, max ) , m_animCount( 0 ) , m_animTimer( new TQTimer( this ) ) , m_pixmapInset( TQPixmap( locate( "data","amarok/images/volumeslider-inset.png" ) ) ) { setWFlags( getWFlags() | WNoAutoErase ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); if (TQPaintDevice::x11AppDepth() == 32) m_pixmapInset.convertFromImage(KImageEffect::convertToPremultipliedAlpha( m_pixmapInset.convertToImage() )); @@ -383,7 +383,7 @@ Amarok::VolumeSlider::VolumeSlider( TQWidget *parent, uint max ) setMinimumWidth( m_pixmapInset.width() ); 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 @@ -420,7 +420,7 @@ Amarok::VolumeSlider::slotAnimTimer() //SLOT void Amarok::VolumeSlider::mousePressEvent( TQMouseEvent *e ) { - if( e->button() != Qt::RightButton ) { + if( e->button() != TQt::RightButton ) { Amarok::Slider::mousePressEvent( e ); slideEvent( e ); } @@ -442,7 +442,7 @@ Amarok::VolumeSlider::contextMenuEvent( TQContextMenuEvent *e ) { menu.insertSeparator(); menu.insertItem( SmallIconSet( "equalizer" ), i18n( "&Equalizer" ), - kapp, TQT_SLOT( slotConfigEqualizer() ) ); + kapp, TQ_SLOT( slotConfigEqualizer() ) ); } const int n = menu.exec( mapToGlobal( e->pos() ) ); diff --git a/amarok/src/sliderwidget.h b/amarok/src/sliderwidget.h index b3d205d4..b2ba6915 100644 --- a/amarok/src/sliderwidget.h +++ b/amarok/src/sliderwidget.h @@ -37,11 +37,11 @@ namespace Amarok { class Slider : public TQSlider { - Q_OBJECT + TQ_OBJECT public: - Slider( Qt::Orientation, TQWidget*, uint max = 0 ); + Slider( TQt::Orientation, TQWidget*, uint max = 0 ); virtual void setValue( int ); @@ -69,7 +69,7 @@ namespace Amarok int adjustValue( int v ) const { int mp = (minValue() + maxValue()) / 2; - return orientation() == Qt::Vertical ? mp - (v - mp) : v; + return orientation() == TQt::Vertical ? mp - (v - mp) : v; } private: @@ -83,7 +83,7 @@ namespace Amarok class PrettySlider : public Slider { - Q_OBJECT + TQ_OBJECT public: @@ -93,7 +93,7 @@ namespace Amarok Pretty } SliderMode; - PrettySlider( Qt::Orientation orientation, SliderMode mode, + PrettySlider( TQt::Orientation orientation, SliderMode mode, TQWidget *parent, uint max = 0 ); virtual void newBundle( const MetaBundle &bundle ); @@ -118,7 +118,7 @@ namespace Amarok class VolumeSlider: public Slider { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp index 5d478357..d59921e3 100644 --- a/amarok/src/smartplaylisteditor.cpp +++ b/amarok/src/smartplaylisteditor.cpp @@ -238,12 +238,12 @@ void SmartPlaylistEditor::init(TQString defaultName) //add stretch static_cast<TQHBox *>(mainWidget())->setStretchFactor(new TQWidget(mainWidget()), 1); - connect( m_matchAnyCheck, TQT_SIGNAL( toggled(bool) ), m_criteriaAnyGroupBox, TQT_SLOT( setEnabled(bool) ) ); - connect( m_matchAllCheck, TQT_SIGNAL( toggled(bool) ), m_criteriaAllGroupBox, TQT_SLOT( setEnabled(bool) ) ); - connect( m_orderCheck, TQT_SIGNAL( toggled(bool) ), orderBox, TQT_SLOT( setEnabled(bool) ) ); - connect( m_limitCheck, TQT_SIGNAL( toggled(bool) ), limitBox, TQT_SLOT( setEnabled(bool) ) ); - connect( m_expandCheck, TQT_SIGNAL( toggled(bool) ), expandBox, TQT_SLOT( setEnabled(bool) ) ); - connect( m_orderCombo, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( updateOrderTypes(int) ) ); + connect( m_matchAnyCheck, TQ_SIGNAL( toggled(bool) ), m_criteriaAnyGroupBox, TQ_SLOT( setEnabled(bool) ) ); + connect( m_matchAllCheck, TQ_SIGNAL( toggled(bool) ), m_criteriaAllGroupBox, TQ_SLOT( setEnabled(bool) ) ); + connect( m_orderCheck, TQ_SIGNAL( toggled(bool) ), orderBox, TQ_SLOT( setEnabled(bool) ) ); + connect( m_limitCheck, TQ_SIGNAL( toggled(bool) ), limitBox, TQ_SLOT( setEnabled(bool) ) ); + connect( m_expandCheck, TQ_SIGNAL( toggled(bool) ), expandBox, TQ_SLOT( setEnabled(bool) ) ); + connect( m_orderCombo, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( updateOrderTypes(int) ) ); m_criteriaAnyGroupBox->setEnabled( false ); m_criteriaAllGroupBox->setEnabled( false ); @@ -426,15 +426,15 @@ CriteriaEditor::CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, i m_removeButton->setUsesTextLabel( true ); m_removeButton->setTextLabel("-"); - connect( m_fieldCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotFieldSelected(int) ) ); - connect( m_criteriaCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( loadEditWidgets() ) ); + connect( m_fieldCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotFieldSelected(int) ) ); + connect( m_criteriaCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( loadEditWidgets() ) ); if (criteriaType == SmartPlaylistEditor::criteriaAny) { - connect( m_addButton, TQT_SIGNAL( clicked() ), editor, TQT_SLOT( addCriteriaAny() ) ); - connect( m_removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveCriteriaAny() ) ); + connect( m_addButton, TQ_SIGNAL( clicked() ), editor, TQ_SLOT( addCriteriaAny() ) ); + connect( m_removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveCriteriaAny() ) ); } else { - connect( m_addButton, TQT_SIGNAL( clicked() ), editor, TQT_SLOT( addCriteriaAll() ) ); - connect( m_removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveCriteriaAll() ) ); + connect( m_addButton, TQ_SIGNAL( clicked() ), editor, TQ_SLOT( addCriteriaAll() ) ); + connect( m_removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveCriteriaAll() ) ); } if ( !criteria.isNull() ) { @@ -862,9 +862,9 @@ void CriteriaEditor::loadEditWidgets() /* Store lastCriteria. This information is used above to decide whether it's necessary to change the Widgets */ m_lastCriteria = m_criteriaCombo->currentText(); - TQObjectList* list = m_editBox->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList* list = m_editBox->queryList( "TQWidget" ); for( TQObject *obj = list->first(); obj; obj = list->next() ) - TQT_TQWIDGET(obj)->deleteLater(); + obj->deleteLater(); delete list; diff --git a/amarok/src/smartplaylisteditor.h b/amarok/src/smartplaylisteditor.h index ca2d4aa4..6f6b3834 100644 --- a/amarok/src/smartplaylisteditor.h +++ b/amarok/src/smartplaylisteditor.h @@ -25,7 +25,7 @@ class CriteriaEditor; class SmartPlaylistEditor : public KDialogBase { -Q_OBJECT +TQ_OBJECT friend class CriteriaEditor; @@ -83,7 +83,7 @@ Q_OBJECT class CriteriaEditor : public TQHBox { -Q_OBJECT +TQ_OBJECT public: CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, int criteriaType, TQDomElement criteria = TQDomElement() ); diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp index 673733e1..153287ff 100644 --- a/amarok/src/socketserver.cpp +++ b/amarok/src/socketserver.cpp @@ -101,9 +101,9 @@ Vis::SocketServer::newConnection( int sockfd ) /// @class Vis::SocketNotifier Vis::SocketNotifier::SocketNotifier( int sockfd ) - : TQSocketNotifier( sockfd, TQSocketNotifier::Read, TQT_TQOBJECT(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 @@ -150,12 +150,12 @@ Vis::Selector::instance() debug() << bool(o == 0) << endl; - return o ? static_cast<Selector*>( TQT_TQWIDGET(o) ) : new Selector( parent ); + return o ? static_cast<Selector*>( o ) : new Selector( parent ); } Vis::Selector::Selector( TQWidget *parent ) : TQListView( parent, "Vis::Selector::instance", TQt::WType_Dialog ) - , m_server( new SocketServer( TQT_TQOBJECT(this) ) ) + , m_server( new SocketServer( this ) ) { Amarok::OverrideCursor waitcursor; @@ -173,8 +173,8 @@ Vis::Selector::Selector( TQWidget *parent ) reinterpret_cast<TQWidget*>(header())->hide(); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(rightButton( TQListViewItem*, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(rightButton( TQListViewItem*, const TQPoint&, int )) ); // Can I get a pointer to the data section of a TQCString? char str[4096]; @@ -286,9 +286,9 @@ Vis::Selector::Item::stateChange( bool ) //SLOT << Selector::instance()->m_server->path() << 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 - 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"; if( m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) break; diff --git a/amarok/src/socketserver.h b/amarok/src/socketserver.h index bcc173b7..3c94d4f5 100644 --- a/amarok/src/socketserver.h +++ b/amarok/src/socketserver.h @@ -49,7 +49,7 @@ namespace Vis class SocketNotifier : public TQSocketNotifier { - Q_OBJECT + TQ_OBJECT public: @@ -61,7 +61,7 @@ namespace Vis class Selector : public TQListView { - Q_OBJECT + TQ_OBJECT Selector( TQWidget *parent=0 ); SocketServer *m_server; diff --git a/amarok/src/starmanager.cpp b/amarok/src/starmanager.cpp index adeb8665..74e3193c 100644 --- a/amarok/src/starmanager.cpp +++ b/amarok/src/starmanager.cpp @@ -62,7 +62,7 @@ StarManager::reinitStars( int height, int margin ) } int hval = m_height + m_margin * 2 - 4 + ( ( m_height % 2 ) ? 1 : 0 ); - TQImage star = TQImage( locate( "data", "amarok/images/star.png" ) ).smoothScale( hval, hval, TQ_ScaleMin ); + TQImage star = TQImage( locate( "data", "amarok/images/star.png" ) ).smoothScale( hval, hval, TQImage::ScaleMin ); TQImage fullStar = TQImage( locate( "data", "amarok/images/star.png" ) ); m_star = star.copy(); m_fullStar = fullStar.copy(); @@ -71,7 +71,7 @@ StarManager::reinitStars( int height, int margin ) m_greyedStar = star.copy(); TDEIconEffect::toGray( m_greyedStar, 1.0 ); m_greyedStarPix.convertFromImage( m_greyedStar ); - TQImage half = TQImage( locate( "data", "amarok/images/smallstar.png" ) ).smoothScale( hval, hval, TQ_ScaleMin ); + TQImage half = TQImage( locate( "data", "amarok/images/smallstar.png" ) ).smoothScale( hval, hval, TQImage::ScaleMin ); TQImage fullHalf = TQImage( locate( "data", "amarok/images/smallstar.png" ) ); m_halfStar = half.copy(); m_fullHalfStar = fullHalf.copy(); @@ -106,7 +106,7 @@ StarManager::reinitStars( int height, int margin ) CollectionView::instance()->triggerUpdate(); // FIXME // Not ideal but should work sufficiently for now - emit ratingsColorsChanged(TQString::null); + emit ratingsColorsChanged(TQString()); } TQPixmap* diff --git a/amarok/src/starmanager.h b/amarok/src/starmanager.h index ebcbdaf3..257619fe 100644 --- a/amarok/src/starmanager.h +++ b/amarok/src/starmanager.h @@ -20,7 +20,7 @@ class StarManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index 906b481d..c2ce71d8 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -81,10 +81,10 @@ Statistics::Statistics( TQWidget *parent, const char *name ) m_lineEdit->setFrame( TQFrame::Sunken ); m_lineEdit->installEventFilter( this ); //we intercept keyEvents - connect( button, TQT_SIGNAL( clicked() ) , m_lineEdit , TQT_SLOT( clear() ) ); - connect( m_timer, TQT_SIGNAL( timeout() ) , TQT_SLOT( slotSetFilter() ) ); - connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotSetFilterTimeout() ) ); - connect( m_lineEdit, TQT_SIGNAL( returnPressed() ) , TQT_SLOT( slotSetFilter() ) ); + connect( button, TQ_SIGNAL( clicked() ) , m_lineEdit , TQ_SLOT( clear() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ) , TQ_SLOT( slotSetFilter() ) ); + connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotSetFilterTimeout() ) ); + connect( m_lineEdit, TQ_SIGNAL( returnPressed() ) , TQ_SLOT( slotSetFilter() ) ); TQToolTip::add( button, i18n( "Clear search field" ) ); } //</Search LineEdit> @@ -134,11 +134,11 @@ StatisticsList::StatisticsList( TQWidget *parent, const char *name ) setAcceptDrops( false ); setDragEnabled( true ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem*) ), TQT_SLOT( startHover( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( clearHover() ) ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem*) ), TQT_SLOT( itemClicked( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( showContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem*) ), TQ_SLOT( startHover( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( clearHover() ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem*) ), TQ_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( showContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); if( CollectionDB::instance()->isEmpty() ) return; @@ -694,7 +694,7 @@ StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, TDEListVi setText( 0, text ); - connect( m_animTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAnimTimer() ) ); + connect( m_animTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAnimTimer() ) ); } void diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h index 6dc22ee9..89508661 100644 --- a/amarok/src/statistics.h +++ b/amarok/src/statistics.h @@ -31,7 +31,7 @@ class StatisticsDetailedItem; class Statistics : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -54,7 +54,7 @@ class Statistics : public KDialogBase class StatisticsList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: @@ -93,7 +93,7 @@ class StatisticsList : public TDEListView /// The listview items which are the headers for the categories class StatisticsItem : public TQObject, public TDEListViewItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/statusbar/popupMessage.cpp b/amarok/src/statusbar/popupMessage.cpp index 00c24c1c..046d9136 100644 --- a/amarok/src/statusbar/popupMessage.cpp +++ b/amarok/src/statusbar/popupMessage.cpp @@ -86,7 +86,7 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con hbox->addItem( new TQSpacerItem( 4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); 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 ) @@ -97,32 +97,32 @@ void PopupMessage::addWidget( TQWidget *widget ) void PopupMessage::setShowCloseButton( const bool show ) { - static_cast<KPushButton*>(TQT_TQWIDGET(child( "closeButton" )))->setShown( show ); + static_cast<KPushButton*>(child( "closeButton" ))->setShown( show ); adjustSize(); } void PopupMessage::setShowCounter( const bool show ) { m_showCounter = show; - static_cast<TQFrame*>(TQT_TQWIDGET(child( "counterVisual" )))->setShown( show ); + static_cast<TQFrame*>(child( "counterVisual" ))->setShown( show ); adjustSize(); } void PopupMessage::setText( const TQString &text ) { - static_cast<KActiveLabel*>(TQT_TQWIDGET(child( "label" )))->setText( text ); + static_cast<KActiveLabel*>(child( "label" ))->setText( text ); adjustSize(); } void PopupMessage::setImage( const TQString &location ) { - static_cast<TQLabel*>(TQT_TQWIDGET(child( "image" )))->setPixmap( TQPixmap( location ) ); + static_cast<TQLabel*>(child( "image" ))->setPixmap( TQPixmap( location ) ); adjustSize(); } void PopupMessage::setImage( const TQPixmap &pix ) { - static_cast<TQLabel*>(TQT_TQWIDGET(child( "image" )))->setPixmap( pix ); + static_cast<TQLabel*>(child( "image" ))->setPixmap( pix ); adjustSize(); } diff --git a/amarok/src/statusbar/popupMessage.h b/amarok/src/statusbar/popupMessage.h index 1db568eb..d5bea33e 100644 --- a/amarok/src/statusbar/popupMessage.h +++ b/amarok/src/statusbar/popupMessage.h @@ -39,7 +39,7 @@ namespace KDE */ class PopupMessage : public OverlayWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/statusbar/progressBar.cpp b/amarok/src/statusbar/progressBar.cpp index 65d7c5eb..8c8b77c4 100644 --- a/amarok/src/statusbar/progressBar.cpp +++ b/amarok/src/statusbar/progressBar.cpp @@ -77,8 +77,8 @@ ProgressBar::setStatus( const TQString &text ) ProgressBar& ProgressBar::setAbortSlot( TQObject *receiver, const char *slot ) { - connect( m_abort, TQT_SIGNAL(clicked()), receiver, slot ); - connect( m_abort, TQT_SIGNAL(clicked()), this, TQT_SLOT(hide()) ); + connect( m_abort, TQ_SIGNAL(clicked()), receiver, slot ); + connect( m_abort, TQ_SIGNAL(clicked()), this, TQ_SLOT(hide()) ); m_abort->show(); parentWidget()->adjustSize(); @@ -90,7 +90,7 @@ ProgressBar& ProgressBar::setProgressSignal( TQObject *sender, const char *signal ) { 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; } diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp index 80e17450..2ea6cbd1 100644 --- a/amarok/src/statusbar/queueLabel.cpp +++ b/amarok/src/statusbar/queueLabel.cpp @@ -46,11 +46,11 @@ QueueLabel::QueueLabel( TQWidget *parent, const char *name ) , m_tooltipShowing( false ) , m_tooltipHidden( false ) { - connect( this, TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ), - Playlist::instance(), TQT_SIGNAL( queueChanged( const PLItemList &, const PLItemList & ) ) ); + connect( this, TQ_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 & ) ), - this, TQT_SLOT( slotCoverChanged( const TQString &, const TQString & ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString &, const TQString & ) ), + this, TQ_SLOT( slotCoverChanged( const TQString &, const TQString & ) ) ); setNum( 0 ); } @@ -130,7 +130,7 @@ void QueueLabel::setNum( int num ) void QueueLabel::enterEvent( TQEvent* ) { m_tooltipHidden = false; - TQTimer::singleShot( 1000, this, TQT_SLOT(aboutToShow()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(aboutToShow()) ); } void QueueLabel::leaveEvent( TQEvent* ) diff --git a/amarok/src/statusbar/queueLabel.h b/amarok/src/statusbar/queueLabel.h index 42bb59b9..19f21d0d 100644 --- a/amarok/src/statusbar/queueLabel.h +++ b/amarok/src/statusbar/queueLabel.h @@ -28,7 +28,7 @@ class QueueLabel: public TQLabel //homonym, heh heh { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h index 235c2779..b090182d 100644 --- a/amarok/src/statusbar/selectLabel.h +++ b/amarok/src/statusbar/selectLabel.h @@ -37,7 +37,7 @@ class SelectLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT Amarok::SelectAction const*const m_action; @@ -53,9 +53,9 @@ class SelectLabel : public TQLabel , m_tooltipShowing( false ) , m_tooltipHidden( false ) { - connect( this, TQT_SIGNAL( activated( int ) ), action, TQT_SLOT( setCurrentItem( int ) ) ); - connect( action, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setCurrentItem( int ) ) ); - connect( action, TQT_SIGNAL( enabled( bool ) ), this, TQT_SLOT( setEnabled( bool ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), action, TQ_SLOT( setCurrentItem( int ) ) ); + connect( action, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setCurrentItem( int ) ) ); + connect( action, TQ_SIGNAL( enabled( bool ) ), this, TQ_SLOT( setEnabled( bool ) ) ); setCurrentItem( currentItem() ); } @@ -89,7 +89,7 @@ class SelectLabel : public TQLabel { //Show the tooltip after 1/2 second m_tooltipHidden = false; - TQTimer::singleShot( 500, this, TQT_SLOT(aboutToShow()) ); + TQTimer::singleShot( 500, this, TQ_SLOT(aboutToShow()) ); } void leaveEvent( TQEvent* ) diff --git a/amarok/src/statusbar/squeezedtextlabel.h b/amarok/src/statusbar/squeezedtextlabel.h index 67723d6e..40e1826c 100644 --- a/amarok/src/statusbar/squeezedtextlabel.h +++ b/amarok/src/statusbar/squeezedtextlabel.h @@ -28,7 +28,7 @@ namespace KDE { //KSqueezedTextLabel, except it works with rich text and puts the ellipsis on the right, as it looks nicer //that way in our case. class SqueezedTextLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp index 56e5c421..b0076832 100644 --- a/amarok/src/statusbar/statusBarBase.cpp +++ b/amarok/src/statusbar/statusBarBase.cpp @@ -64,7 +64,7 @@ namespace SingleShotPool TQTimer *timer = static_cast<TQTimer*>( receiver->child( slot ) ); if( !timer ) { timer = new TQTimer( receiver, slot ); - receiver->connect( timer, TQT_SIGNAL(timeout()), slot ); + receiver->connect( timer, TQ_SIGNAL(timeout()), slot ); } timer->start( timeout, true ); @@ -74,7 +74,7 @@ namespace SingleShotPool { TQTimer *timer = static_cast<TQTimer*>( parent->child( slot ) ); - return timer && timer->isA( TQTIMER_OBJECT_NAME_STRING ) && timer->isActive(); + return timer && timer->isA( "TQTimer" ) && timer->isActive(); } } @@ -115,15 +115,15 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) shortLongButton->setIconSet( SmallIconSet( "edit_add" ) ); 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" ) ); b2->setIconSet( SmallIconSet( "2uparrow") ); b2->setToggleButton( true ); TQToolTip::add( b1, i18n( "Abort all background-operations" ) ); TQToolTip::add( b2, i18n( "Show progress detail" ) ); - connect( b1, TQT_SIGNAL(clicked()), TQT_SLOT(abortAllProgressOperations()) ); - connect( b2, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggleProgressWindow( bool )) ); + connect( b1, TQ_SIGNAL(clicked()), TQ_SLOT(abortAllProgressOperations()) ); + connect( b2, TQ_SIGNAL(toggled( bool )), TQ_SLOT(toggleProgressWindow( bool )) ); m_popupProgress = new OverlayWidget( this, mainProgressBarBox, "popupProgress" ); m_popupProgress->setMargin( 1 ); @@ -148,23 +148,23 @@ StatusBar::polish() TQWidget::polish(); int h = 0; - TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false ); + TQObjectList *list = queryList( "TQWidget", 0, false, false ); for( TQObject * o = list->first(); o; o = list->next() ) { - int _h = TQT_TQWIDGET( o ) ->minimumSizeHint().height(); + int _h = static_cast<TQWidget*>( o ) ->minimumSizeHint().height(); if ( _h > h ) h = _h; -// debug() << o->className() << ", " << o->name() << ": " << _h << ": " << TQT_TQWIDGET(o)->minimumHeight() << endl; +// debug() << o->className() << ", " << o->name() << ": " << _h << ": " << static_cast<TQWidget*>(o)->minimumHeight() << endl; - if ( o->inherits( TQLABEL_OBJECT_NAME_STRING ) ) - static_cast<TQLabel*>(TQT_TQWIDGET(o))->setIndent( 4 ); + if ( o->inherits( "TQLabel" ) ) + static_cast<TQLabel*>(o)->setIndent( 4 ); } h -= 4; // it's too big usually for ( TQObject * o = list->first(); o; o = list->next() ) - TQT_TQWIDGET(o)->setFixedHeight( h ); + static_cast<TQWidget*>(o)->setFixedHeight( h ); delete list; } @@ -172,16 +172,16 @@ StatusBar::polish() void StatusBar::paintEvent( TQPaintEvent* ) { - TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false ); + TQObjectList *list = queryList( "TQWidget", 0, false, false ); TQPainter p( this ); for( TQObject * o = list->first(); o; o = list->next() ) { - TQWidget *w = TQT_TQWIDGET( o ); + TQWidget *w = static_cast<TQWidget*>( o ); if ( !w->isVisible() ) continue; - style().tqdrawPrimitive( + style().drawPrimitive( TQStyle::PE_StatusBarSection, &p, TQRect( w->x() - 1, w->y() - 1, w->width() + 2, w->height() + 2 ), @@ -224,7 +224,7 @@ StatusBar::shortMessage( const TQString &text, bool longShort ) m_mainTextLabel->setText( text ); m_mainTextLabel->setPalette( TQToolTip::palette() ); - SingleShotPool::startTimer( longShort ? 8000 : 5000, TQT_TQOBJECT(this), TQT_SLOT(resetMainText()) ); + SingleShotPool::startTimer( longShort ? 8000 : 5000, this, TQ_SLOT(resetMainText()) ); writeLogFile( text ); } @@ -236,7 +236,7 @@ StatusBar::resetMainText() // debug() << sender()->name() << endl; // don't reset if we are showing a shortMessage - if( SingleShotPool::isActive( TQT_TQOBJECT(this), TQT_SLOT(resetMainText()) ) ) + if( SingleShotPool::isActive( this, TQ_SLOT(resetMainText()) ) ) return; m_mainTextLabel->unsetPalette(); @@ -288,7 +288,7 @@ StatusBar::longMessage( const TQString &text, int type ) PopupMessage *message; 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 ); TQString image; @@ -330,7 +330,7 @@ StatusBar::longMessage( const TQString &text, int type ) void StatusBar::popupDeleted( TQObject *obj ) { - m_messageQueue.remove( TQT_TQWIDGET( obj ) ); + m_messageQueue.remove( static_cast<TQWidget*>( obj ) ); } void @@ -385,11 +385,11 @@ StatusBar::newProgressOperation( TQObject *owner ) 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 // after the ProgressBar is setup - SingleShotPool::startTimer( 0, TQT_TQOBJECT(this), TQT_SLOT(updateProgressAppearance()) ); + SingleShotPool::startTimer( 0, this, TQ_SLOT(updateProgressAppearance()) ); progressBox()->show(); cancelButton()->setEnabled( true ); @@ -407,9 +407,9 @@ StatusBar::newProgressOperation( TDEIO::Job *job ) if(!allDone()) toggleProgressWindowButton()->show(); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(endProgressOperation()) ); - //TODO connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *job, const TQString& )), TQT_SLOT() ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )), TQT_SLOT(setProgress( TDEIO::Job*, unsigned long )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), TQ_SLOT(endProgressOperation()) ); + //TODO connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job *job, const TQString& )), TQ_SLOT() ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job*, unsigned long )), TQ_SLOT(setProgress( TDEIO::Job*, unsigned long )) ); return bar; } @@ -417,7 +417,7 @@ StatusBar::newProgressOperation( TDEIO::Job *job ) void StatusBar::endProgressOperation() { - TQObject *owner = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); //HACK deconsting it + TQObject *owner = const_cast<TQObject*>( sender() ); TDEIO::Job *job = dynamic_cast<TDEIO::Job*>( owner ); //FIXME doesn't seem to work for TDEIO::DeleteJob, it has it's own error handler and returns no error too @@ -439,7 +439,7 @@ StatusBar::endProgressOperation( TQObject *owner ) if ( !m_progressMap.contains( owner ) ) { - SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); + SingleShotPool::startTimer( 2000, this, TQ_SLOT(hideMainProgressBar()) ); return ; } @@ -447,7 +447,7 @@ StatusBar::endProgressOperation( TQObject *owner ) if( allDone() && !m_popupProgress->isShown() ) { cancelButton()->setEnabled( false ); - SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); + SingleShotPool::startTimer( 2000, this, TQ_SLOT(hideMainProgressBar()) ); } updateTotalProgress(); @@ -471,7 +471,7 @@ StatusBar::toggleProgressWindow( bool show ) //slot m_popupProgress->setShown( show ); if( !show ) - SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); + SingleShotPool::startTimer( 2000, this, TQ_SLOT(hideMainProgressBar()) ); } void @@ -509,7 +509,7 @@ StatusBar::hideMainProgressBar() void StatusBar::setProgress( int steps ) { - setProgress( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())), steps ); + setProgress( sender(), steps ); } void @@ -551,7 +551,7 @@ StatusBar::setProgressStatus( const TQObject *owner, const TQString &text ) void StatusBar::incrementProgress() { - incrementProgress( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()) )); + incrementProgress( sender() ); } void diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h index eda027ce..446de7b5 100644 --- a/amarok/src/statusbar/statusBarBase.h +++ b/amarok/src/statusbar/statusBarBase.h @@ -53,7 +53,7 @@ namespace KDE * statusbar->newProgressOperation( myObject ) * .setDescription( i18n("MyProgressOperation") ) * .setStatus( i18n("Stage1") ) - * .setAbortSlot( myObject, TQT_SLOT(abort()) ) + * .setAbortSlot( myObject, TQ_SLOT(abort()) ) * .setTotalSteps( 100 ); * * The newProgressOperation function returns a KDE::ProgressBar, which is @@ -78,7 +78,7 @@ namespace KDE class LIBAMAROK_EXPORT StatusBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -214,10 +214,10 @@ namespace KDE int m_logCounter; - TQWidget *cancelButton() { return TQT_TQWIDGET( child( "cancelButton" ) ); } - TQWidget *toggleProgressWindowButton() { return TQT_TQWIDGET( child( "showAllProgressDetails" ) ); } - TQWidget *progressBox() { return TQT_TQWIDGET( child( "progressBox" ) ); } - TQWidget *shortLongButton() { return TQT_TQWIDGET( child( "shortLongButton" ) ); } + TQWidget *cancelButton() { return static_cast<TQWidget*>( child( "cancelButton" ) ); } + TQWidget *toggleProgressWindowButton() { return static_cast<TQWidget*>( child( "showAllProgressDetails" ) ); } + TQWidget *progressBox() { return static_cast<TQWidget*>( child( "progressBox" ) ); } + TQWidget *shortLongButton() { return static_cast<TQWidget*>( child( "shortLongButton" ) ); } OverlayWidget *m_popupProgress; TQProgressBar *m_mainProgressBar; diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp index 363ba6b0..588ae3c0 100644 --- a/amarok/src/statusbar/statusbar.cpp +++ b/amarok/src/statusbar/statusbar.cpp @@ -72,7 +72,7 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) TQWidget *positionBox = new TQWidget( this, "positionBox" ); TQBoxLayout *box = new TQHBoxLayout( positionBox, 1, 3 ); - m_slider = new Amarok::PrettySlider( Qt::Horizontal, Amarok::PrettySlider::Normal, + m_slider = new Amarok::PrettySlider( TQt::Horizontal, Amarok::PrettySlider::Normal, positionBox ); // the two time labels. m_timeLable is the left one, @@ -109,15 +109,15 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) if( !AmarokConfig::leftTimeDisplayEnabled() ) m_timeLabel->hide(); - connect( m_slider, TQT_SIGNAL(sliderReleased( int )), EngineController::instance(), TQT_SLOT(seek( int )) ); - connect( m_slider, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(drawTimeDisplay( int )) ); + connect( m_slider, TQ_SIGNAL(sliderReleased( int )), EngineController::instance(), TQ_SLOT(seek( int )) ); + connect( m_slider, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(drawTimeDisplay( int )) ); // set us up the bomb engineStateChanged( Engine::Empty ); //slotItemCountChanged( 0 ); // 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 ); diff --git a/amarok/src/statusbar/statusbar.h b/amarok/src/statusbar/statusbar.h index f7d0b143..7aec23b1 100644 --- a/amarok/src/statusbar/statusbar.h +++ b/amarok/src/statusbar/statusbar.h @@ -35,7 +35,7 @@ namespace Amarok class StatusBar : public KDE::StatusBar, public EngineObserver { - Q_OBJECT + TQ_OBJECT LIBAMAROK_EXPORT static StatusBar* s_instance; diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h index 61339cd7..20e3ec98 100644 --- a/amarok/src/statusbar/toggleLabel.h +++ b/amarok/src/statusbar/toggleLabel.h @@ -37,7 +37,7 @@ class ToggleLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT TDEToggleAction const*const m_action; @@ -53,9 +53,9 @@ class ToggleLabel : public TQLabel , m_tooltipShowing( false ) , m_tooltipHidden( false ) { - connect( this, TQT_SIGNAL(toggled( bool )), action, TQT_SLOT(setChecked( bool )) ); - connect( action, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(setChecked( bool )) ); - connect( action, TQT_SIGNAL(enabled( bool )), this, TQT_SLOT(setEnabled( bool )) ); + connect( this, TQ_SIGNAL(toggled( bool )), action, TQ_SLOT(setChecked( bool )) ); + connect( action, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(setChecked( bool )) ); + connect( action, TQ_SIGNAL(enabled( bool )), this, TQ_SLOT(setEnabled( bool )) ); setChecked( isChecked() ); } @@ -79,7 +79,7 @@ class ToggleLabel : public TQLabel { //Show the tooltip after 1/2 second m_tooltipHidden = false; - TQTimer::singleShot( 500, this, TQT_SLOT(aboutToShow()) ); + TQTimer::singleShot( 500, this, TQ_SLOT(aboutToShow()) ); } void leaveEvent( TQEvent* ) diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp index 9a4e0027..01d46b9a 100644 --- a/amarok/src/systray.cpp +++ b/amarok/src/systray.cpp @@ -53,7 +53,7 @@ Amarok::TrayIcon::TrayIcon( TQWidget *playerWidget ) //seems to be necessary TDEAction *quit = actionCollection()->action( "file_quit" ); quit->disconnect(); - connect( quit, TQT_SIGNAL(activated()), kapp, TQT_SLOT(quit()) ); + connect( quit, TQ_SIGNAL(activated()), kapp, TQ_SLOT(quit()) ); baseIcon = KSystemTray::loadIcon( "amarok" ); playOverlay = Amarok::loadOverlay( "play", baseIcon.width() ); @@ -75,7 +75,7 @@ Amarok::TrayIcon::event( TQEvent *e ) return Amarok::genericEventHandler( this, e ); case TQEvent::Timer: - if( TQT_TQTIMEREVENT(e)->timerId() != blinkTimerID ) + if( static_cast<TQTimerEvent*>(e)->timerId() != blinkTimerID ) return KSystemTray::event( e ); // if we're playing, blink icon @@ -88,7 +88,7 @@ Amarok::TrayIcon::event( TQEvent *e ) return true; case TQEvent::MouseButtonPress: - if( TQT_TQMOUSEEVENT(e)->button() == Qt::MidButton ) + if( static_cast<TQMouseEvent*>(e)->button() == TQt::MidButton ) { EngineController::instance()->playPause(); diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp index 6b8886e5..3b9375bd 100644 --- a/amarok/src/tagdialog.cpp +++ b/amarok/src/tagdialog.cpp @@ -18,8 +18,6 @@ #include "tagguesserconfigdialog.h" #include "trackpickerdialog.h" -#include <taglib/tfile.h> //TagLib::File::isWritable - #include <tqdom.h> #include <tqfile.h> #include <tqheader.h> @@ -294,8 +292,8 @@ TagDialog::musicbrainzQuery() //SLOT m_mbTrack = m_bundle.url(); KTRMLookup* ktrm = new KTRMLookup( m_mbTrack.path(), true ); - connect( ktrm, TQT_SIGNAL( sigResult( KTRMResultList, TQString ) ), TQT_SLOT( queryDone( KTRMResultList, TQString ) ) ); - connect( pushButton_cancel, TQT_SIGNAL( clicked() ), ktrm, TQT_SLOT( deleteLater() ) ); + connect( ktrm, TQ_SIGNAL( sigResult( KTRMResultList, TQString ) ), TQ_SLOT( queryDone( KTRMResultList, TQString ) ) ); + connect( pushButton_cancel, TQ_SIGNAL( clicked() ), ktrm, TQ_SLOT( deleteLater() ) ); pushButton_musicbrainz->setEnabled( false ); pushButton_musicbrainz->setText( i18n( "Generating audio fingerprint..." ) ); @@ -316,7 +314,7 @@ TagDialog::queryDone( KTRMResultList results, TQString error ) //SLOT { TrackPickerDialog* t = new TrackPickerDialog( m_mbTrack.filename(), results, this ); 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 { KMessageBox::sorry( this, i18n( "The track was not found in the MusicBrainz database." ) ); @@ -427,8 +425,8 @@ void TagDialog::init() const TQStringList favoriteLabels = CollectionDB::instance()->favoriteLabels(); TQString html = generateHTML( favoriteLabels ); m_labelCloud->set( html ); - connect( m_labelCloud->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( openURLRequest( const KURL & ) ) ); + connect( m_labelCloud->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( openURLRequest( const KURL & ) ) ); // looks better to have a blank label than 0, we can't do this in // the UI file due to bug in Designer @@ -451,62 +449,62 @@ void TagDialog::init() //HACK due to deficiency in TQt that will be addressed in version 4 // TQSpinBox doesn't emit valueChanged if you edit the value with // 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_track->child( "qt_spinbox_edit" ), TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( kIntSpinBox_score->child( "qt_spinbox_edit" ), TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( kIntSpinBox_discNumber->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" ), TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( kIntSpinBox_score->child( "qt_spinbox_edit" ), TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( kIntSpinBox_discNumber->child( "qt_spinbox_edit" ), TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); // Connects for modification check - connect( kLineEdit_title, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( kComboBox_composer,TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); - connect( kComboBox_composer,TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( kComboBox_artist, TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); - connect( kComboBox_artist, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( kComboBox_album, TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); - connect( kComboBox_album, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( kComboBox_genre, TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); - connect( kComboBox_genre, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( kComboBox_rating, TQT_SIGNAL(activated( int )), TQT_SLOT(checkModified()) ); - connect( kComboBox_rating, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); - connect( kIntSpinBox_track, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(checkModified()) ); - connect( kIntSpinBox_year, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(checkModified()) ); - connect( kIntSpinBox_score, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(checkModified()) ); - connect( kTextEdit_comment, TQT_SIGNAL(textChanged()), TQT_SLOT(checkModified()) ); - connect( kTextEdit_lyrics, TQT_SIGNAL(textChanged()), TQT_SLOT(checkModified()) ); - connect( kTextEdit_selectedLabels, TQT_SIGNAL(textChanged()), TQT_SLOT(checkModified()) ); + connect( kLineEdit_title, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( kComboBox_composer,TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) ); + connect( kComboBox_composer,TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( kComboBox_artist, TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) ); + connect( kComboBox_artist, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( kComboBox_album, TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) ); + connect( kComboBox_album, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( kComboBox_genre, TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) ); + connect( kComboBox_genre, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( kComboBox_rating, TQ_SIGNAL(activated( int )), TQ_SLOT(checkModified()) ); + connect( kComboBox_rating, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(checkModified()) ); + connect( kIntSpinBox_track, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(checkModified()) ); + connect( kIntSpinBox_year, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(checkModified()) ); + connect( kIntSpinBox_score, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(checkModified()) ); + connect( kTextEdit_comment, TQ_SIGNAL(textChanged()), TQ_SLOT(checkModified()) ); + connect( kTextEdit_lyrics, TQ_SIGNAL(textChanged()), TQ_SLOT(checkModified()) ); + connect( kTextEdit_selectedLabels, TQ_SIGNAL(textChanged()), TQ_SLOT(checkModified()) ); // Remember original button text m_buttonMbText = pushButton_musicbrainz->text(); - connect( pushButton_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelPressed()) ); - connect( pushButton_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( pushButton_open, TQT_SIGNAL(clicked()), TQT_SLOT(openPressed()) ); - connect( pushButton_previous, TQT_SIGNAL(clicked()), TQT_SLOT(previousTrack()) ); - connect( pushButton_next, TQT_SIGNAL(clicked()), TQT_SLOT(nextTrack()) ); - connect( checkBox_perTrack, TQT_SIGNAL(clicked()), TQT_SLOT(perTrack()) ); + connect( pushButton_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancelPressed()) ); + connect( pushButton_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( pushButton_open, TQ_SIGNAL(clicked()), TQ_SLOT(openPressed()) ); + connect( pushButton_previous, TQ_SIGNAL(clicked()), TQ_SLOT(previousTrack()) ); + connect( pushButton_next, TQ_SIGNAL(clicked()), TQ_SLOT(nextTrack()) ); + connect( checkBox_perTrack, TQ_SIGNAL(clicked()), TQ_SLOT(perTrack()) ); // set an icon for the open-in-konqui button pushButton_open->setIconSet( SmallIconSet( Amarok::icon( "files" ) ) ); //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 - connect( CollectionDB::instance(), TQT_SIGNAL( coverFetched( const TQString&, const TQString& ) ), - this, TQT_SLOT( loadCover( const TQString&, const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ), - this, TQT_SLOT( loadCover( const TQString&, const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( coverFetched( const TQString&, const TQString& ) ), + this, TQ_SLOT( loadCover( const TQString&, const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString&, const TQString& ) ), + this, TQ_SLOT( loadCover( const TQString&, const TQString& ) ) ); #if HAVE_TUNEPIMP - connect( pushButton_musicbrainz, TQT_SIGNAL(clicked()), TQT_SLOT(musicbrainzQuery()) ); + connect( pushButton_musicbrainz, TQ_SIGNAL(clicked()), TQ_SLOT(musicbrainzQuery()) ); #else TQToolTip::add( pushButton_musicbrainz, i18n("Please install MusicBrainz to enable this functionality") ); #endif - connect( pushButton_guessTags, TQT_SIGNAL(clicked()), TQT_SLOT( guessFromFilename() ) ); - connect( pushButton_setFilenameSchemes, TQT_SIGNAL(clicked()), TQT_SLOT( setFileNameSchemes() ) ); + connect( pushButton_guessTags, TQ_SIGNAL(clicked()), TQ_SLOT( guessFromFilename() ) ); + connect( pushButton_setFilenameSchemes, TQ_SIGNAL(clicked()), TQ_SLOT( setFileNameSchemes() ) ); if( m_urlList.count() ) { //editing multiple tracks m_perTrack = false; @@ -1415,8 +1413,7 @@ TagDialog::openURLRequest(const KURL &url ) //SLOT bool TagDialog::writeTag( MetaBundle &mb, bool updateCB ) { - TQCString path = TQFile::encodeName( mb.url().path() ); - if ( !TagLib::File::isWritable( path ) ) { + if (access(mb.url().path().local8Bit().data(), R_OK|W_OK)) { Amarok::StatusBar::instance()->longMessage( i18n( "The file %1 is not writable." ).arg( mb.url().fileName() ), KDE::StatusBar::Error ); return false; @@ -1455,8 +1452,7 @@ bool TagDialogWriter::doJob() { for( int i = 0, size=m_tags.size(); i<size; ++i ) { - TQCString path = TQFile::encodeName( m_tags[i].url().path() ); - if ( !TagLib::File::isWritable( path ) ) { + if (access(m_tags[i].url().path().local8Bit().data(), R_OK|W_OK)) { Amarok::StatusBar::instance()->longMessageThreadSafe( i18n( "The file %1 is not writable." ).arg( m_tags[i].url().fileName() ), KDE::StatusBar::Error ); m_failed += true; diff --git a/amarok/src/tagdialog.h b/amarok/src/tagdialog.h index 42068a39..d3ba9de1 100644 --- a/amarok/src/tagdialog.h +++ b/amarok/src/tagdialog.h @@ -33,7 +33,7 @@ namespace TagLib { class TagDialog : public TagDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui index 6556725d..bd3b98cd 100644 --- a/amarok/src/tagguesserconfigdialog.ui +++ b/amarok/src/tagguesserconfigdialog.ui @@ -193,7 +193,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <include location="global" impldecl="in implementation">tdelistview.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<Q_SLOTS> +<slots> <slot specifier="non virtual">slotCurrentChanged( TQListViewItem * item )</slot> <slot>accept()</slot> <slot>reject()</slot> @@ -203,7 +203,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <slot specifier="non virtual">slotAddClicked()</slot> <slot specifier="non virtual">slotModifyClicked()</slot> <slot specifier="non virtual">slotRemoveClicked()</slot> -</Q_SLOTS> +</slots> <forwards> <forward>class TQListViewItem;</forward> </forwards> diff --git a/amarok/src/tagguesserconfigdialog.ui.h b/amarok/src/tagguesserconfigdialog.ui.h index 88f5d0b6..2e7ef68a 100644 --- a/amarok/src/tagguesserconfigdialog.ui.h +++ b/amarok/src/tagguesserconfigdialog.ui.h @@ -47,17 +47,17 @@ void TagGuesserConfigDialog::init() item->moveItem( lvSchemes->lastItem() ); } - connect( lvSchemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotCurrentChanged( TQListViewItem * ) ) ); - connect( lvSchemes, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( slotRenameItem( TQListViewItem *, const TQPoint &, int ) ) ); - connect( bMoveUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUpClicked() ) ); - connect( bMoveDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDownClicked() ) ); - connect( bAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddClicked() ) ); - connect( bModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModifyClicked() ) ); - connect( bRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveClicked() ) ); - connect( bOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( bCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( lvSchemes, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotCurrentChanged( TQListViewItem * ) ) ); + connect( lvSchemes, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( slotRenameItem( TQListViewItem *, const TQPoint &, int ) ) ); + connect( bMoveUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUpClicked() ) ); + connect( bMoveDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDownClicked() ) ); + connect( bAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddClicked() ) ); + connect( bModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModifyClicked() ) ); + connect( bRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveClicked() ) ); + connect( bOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( bCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); lvSchemes->setSelected( lvSchemes->firstChild(), true ); slotCurrentChanged( lvSchemes->currentItem() ); diff --git a/amarok/src/threadmanager.cpp b/amarok/src/threadmanager.cpp index 71b59f38..10e2c367 100644 --- a/amarok/src/threadmanager.cpp +++ b/amarok/src/threadmanager.cpp @@ -396,7 +396,7 @@ ThreadManager::Job::customEvent( TQCustomEvent *e ) case -1: StatusBar::instance()->newProgressOperation( this ) .setDescription( m_description ) - .setAbortSlot( this, TQT_SLOT(abort()) ) + .setAbortSlot( this, TQ_SLOT(abort()) ) .setTotalSteps( 100 ); break; @@ -411,7 +411,7 @@ ThreadManager::DependentJob::DependentJob( TQObject *dependent, const char *name : Job( name ) , 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 ) ); } diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h index 06657535..4a79ee11 100644 --- a/amarok/src/threadmanager.h +++ b/amarok/src/threadmanager.h @@ -78,9 +78,9 @@ */ -/// This class is because moc "is really good" (no nested Q_OBJECT classes) +/// This class is because moc "is really good" (no nested TQ_OBJECT classes) class LIBAMAROK_EXPORT JobBase : public TQObject { - Q_OBJECT + TQ_OBJECT protected: @@ -240,7 +240,7 @@ public: class Job : public JobBase, public TQCustomEvent { -// Q_OBJECT +// TQ_OBJECT // friend class ThreadManager; //access to m_thread friend class ThreadManager::Thread; //access to m_aborted @@ -384,7 +384,7 @@ public: class DependentJob : public Job { -// Q_OBJECT +// TQ_OBJECT // public: DependentJob( TQObject *dependent, const char *name ); diff --git a/amarok/src/tooltip.cpp b/amarok/src/tooltip.cpp index 572fdc66..99a02cac 100644 --- a/amarok/src/tooltip.cpp +++ b/amarok/src/tooltip.cpp @@ -72,7 +72,7 @@ int Amarok::ToolTip::s_hack = 0; void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *parent ) //static { if( !s_manager ) - s_manager = new Amarok::ToolTip::Manager( TQT_TQOBJECT(tqApp) ); + s_manager = new Amarok::ToolTip::Manager( tqApp ); new ToolTip( client, parent ); } @@ -123,7 +123,7 @@ Amarok::ToolTip::ToolTip( ToolTipClient *client, TQWidget *parent ) { s_tooltips.append( this ); 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() diff --git a/amarok/src/tooltip.h b/amarok/src/tooltip.h index 3a79f496..0e2952d3 100644 --- a/amarok/src/tooltip.h +++ b/amarok/src/tooltip.h @@ -36,7 +36,7 @@ public: class ToolTip: public TQFrame, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/trackpickerdialog.cpp b/amarok/src/trackpickerdialog.cpp index 7b3bf4b9..4daf2dc1 100644 --- a/amarok/src/trackpickerdialog.cpp +++ b/amarok/src/trackpickerdialog.cpp @@ -78,7 +78,7 @@ TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList m_base->trackList->setSelected(m_base->trackList->firstChild(), true); // m_base->trackList->triggerUpdate(); 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 ) ) ); } diff --git a/amarok/src/trackpickerdialog.h b/amarok/src/trackpickerdialog.h index e5fb687a..918dd851 100644 --- a/amarok/src/trackpickerdialog.h +++ b/amarok/src/trackpickerdialog.h @@ -29,7 +29,7 @@ class TrackPickerDialogBase; class TrackPickerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT signals: diff --git a/amarok/src/tracktooltip.cpp b/amarok/src/tracktooltip.cpp index 08cae102..754a28e3 100644 --- a/amarok/src/tracktooltip.cpp +++ b/amarok/src/tracktooltip.cpp @@ -40,21 +40,21 @@ TrackToolTip *TrackToolTip::instance() TrackToolTip::TrackToolTip(): m_haspos( false ) { - connect( CollectionDB::instance(), TQT_SIGNAL( coverChanged( const TQString &, const TQString & ) ), - this, TQT_SLOT( slotCoverChanged( const TQString &, const TQString & ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( imageFetched( const TQString & ) ), - this, TQT_SLOT( slotImageChanged( const TQString & ) ) ); - connect( Playlist::instance(), TQT_SIGNAL( columnsChanged() ), this, TQT_SLOT( slotUpdate() ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( scoreChanged( const TQString&, float ) ), - this, TQT_SLOT( slotUpdate( const TQString& ) ) ); - connect( CollectionDB::instance(), TQT_SIGNAL( ratingChanged( const TQString&, int ) ), - this, TQT_SLOT( slotUpdate( const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( coverChanged( const TQString &, const TQString & ) ), + this, TQ_SLOT( slotCoverChanged( const TQString &, const TQString & ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( imageFetched( const TQString & ) ), + this, TQ_SLOT( slotImageChanged( const TQString & ) ) ); + connect( Playlist::instance(), TQ_SIGNAL( columnsChanged() ), this, TQ_SLOT( slotUpdate() ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( scoreChanged( const TQString&, float ) ), + this, TQ_SLOT( slotUpdate( const TQString& ) ) ); + connect( CollectionDB::instance(), TQ_SIGNAL( ratingChanged( const TQString&, int ) ), + this, TQ_SLOT( slotUpdate( const TQString& ) ) ); // Only connect this once -- m_tags exists for the lifetime of this instance - connect( &m_tags.moodbar(), TQT_SIGNAL( jobEvent( int ) ), - TQT_SLOT( slotMoodbarEvent() ) ); + connect( &m_tags.moodbar(), TQ_SIGNAL( jobEvent( int ) ), + TQ_SLOT( slotMoodbarEvent() ) ); // This is so the moodbar can be re-rendered when AlterMood is changed - connect( App::instance(), TQT_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), - TQT_SLOT( slotMoodbarEvent() ) ); + connect( App::instance(), TQ_SIGNAL( moodbarPrefs( bool, bool, int, bool ) ), + TQ_SLOT( slotMoodbarEvent() ) ); clear(); } diff --git a/amarok/src/tracktooltip.h b/amarok/src/tracktooltip.h index 62543313..d5fd2707 100644 --- a/amarok/src/tracktooltip.h +++ b/amarok/src/tracktooltip.h @@ -25,7 +25,7 @@ class TQWidget; class TrackToolTip: public TQObject, public Amarok::ToolTipClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp index 499fa0a2..f766e6a8 100644 --- a/amarok/src/transferdialog.cpp +++ b/amarok/src/transferdialog.cpp @@ -42,7 +42,7 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) TQString transferDir = mdev->getTransferDir(); - TQGroupBox *location = new TQGroupBox( 1, Qt::Vertical, i18n( "Music Location" ), vbox ); + TQGroupBox *location = new TQGroupBox( 1, TQt::Vertical, i18n( "Music Location" ), vbox ); new TQLabel( i18n( "Your music will be transferred to:\n%1" ) .arg( transferDir ), location ); @@ -57,7 +57,7 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) "a variety of ways. Each grouping will create\n" "directories based upon the specified criteria.\n"), vbox ); - TQGroupBox *sorting = new TQGroupBox( 6, Qt::Vertical, i18n( "Groupings" ), vbox ); + TQGroupBox *sorting = new TQGroupBox( 6, TQt::Vertical, i18n( "Groupings" ), vbox ); m_label1 = new TQLabel( i18n( "Select first grouping:\n" ), sorting ); m_sort1 = new KComboBox( sorting ); m_label2 = new TQLabel( i18n( "Select second grouping:\n" ), sorting ); @@ -89,8 +89,8 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) m_label3->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_sort2, TQT_SIGNAL( activated(int) ), TQT_SLOT( sort2_activated(int)) ); + connect( m_sort1, TQ_SIGNAL( activated(int) ), TQ_SLOT( sort1_activated(int)) ); + connect( m_sort2, TQ_SIGNAL( activated(int) ), TQ_SLOT( sort2_activated(int)) ); TQVBox *vbox3 = new TQVBox( vbox ); TQSpacerItem *spacer2 = new TQSpacerItem( 0, 25 ); @@ -98,12 +98,12 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) if( vlayout2 ) vlayout2->addItem( spacer2 ); - TQGroupBox *options = new TQGroupBox( 6, Qt::Vertical, i18n( "Options" ), vbox ); + TQGroupBox *options = new TQGroupBox( 6, TQt::Vertical, i18n( "Options" ), vbox ); TQCheckBox *convertSpaces = new TQCheckBox( i18n( "Convert spaces to underscores" ), options ); 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 diff --git a/amarok/src/transferdialog.h b/amarok/src/transferdialog.h index a789d121..d265f6f5 100644 --- a/amarok/src/transferdialog.h +++ b/amarok/src/transferdialog.h @@ -28,7 +28,7 @@ class TransferDialog; */ class LIBAMAROK_EXPORT TransferDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/amarok/src/xmlloader.h b/amarok/src/xmlloader.h index 75bdf386..5bd11b62 100644 --- a/amarok/src/xmlloader.h +++ b/amarok/src/xmlloader.h @@ -49,7 +49,7 @@ typedef TQValueList< TQPair<TQString, TQString> > XmlAttributeList; class MetaBundle::XmlLoader: public TQObject, public TQXmlDefaultHandler { - Q_OBJECT + TQ_OBJECT public: /** Posted when a MetaBundle has been loaded. */ diff --git a/amarok/src/xmlloader_p.h b/amarok/src/xmlloader_p.h index 5c14f2fc..72fd5e27 100644 --- a/amarok/src/xmlloader_p.h +++ b/amarok/src/xmlloader_p.h @@ -25,7 +25,7 @@ class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT TQObject *m_target; TQXmlInputSource *m_source; @@ -44,8 +44,8 @@ class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread { { XmlLoader loader; - connect( &loader, TQT_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), - this, TQT_SLOT( bundleLoaded( const MetaBundle&, const XmlAttributeList& ) ) ); + connect( &loader, TQ_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), + this, TQ_SLOT( bundleLoaded( const MetaBundle&, const XmlAttributeList& ) ) ); bool success = loader.load( m_source ); if( !success ) TQApplication::postEvent( m_target, new BundleLoadedEvent( loader.m_lastError ) ); @@ -57,7 +57,7 @@ class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread class MetaBundle::XmlLoader::SimpleLoader: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -66,8 +66,8 @@ public: SimpleLoader( TQXmlInputSource *source, bool *ok ) { XmlLoader loader; - connect( &loader, TQT_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), - this, TQT_SLOT( bundleLoaded( const MetaBundle&, const XmlAttributeList& ) ) ); + connect( &loader, TQ_SIGNAL( newBundle( const MetaBundle&, const XmlAttributeList& ) ), + this, TQ_SLOT( bundleLoaded( const MetaBundle&, const XmlAttributeList& ) ) ); const bool success = loader.load( source ); if( ok ) (*ok) = success; diff --git a/amarok/src/xspfplaylist.cpp b/amarok/src/xspfplaylist.cpp index c1d00daa..f690da8d 100644 --- a/amarok/src/xspfplaylist.cpp +++ b/amarok/src/xspfplaylist.cpp @@ -84,7 +84,7 @@ XSPFPlaylist::image() TQDateTime XSPFPlaylist::date() { - return TQDateTime::fromString( documentElement().namedItem( "date" ).firstChild().nodeValue(), Qt::ISODate ); + return TQDateTime::fromString( documentElement().namedItem( "date" ).firstChild().nodeValue(), TQt::ISODate ); } KURL |