1 files changed, 16 insertions, 16 deletions

diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp
index 614045cc..ec85dd26 100644
--- a/amarok/src/actionclasses.cpp
+++ b/amarok/src/actionclasses.cpp
@@ -87,7 +87,7 @@ MenuAction::plug( TQWidget *w, int index )
         //TODO create menu on demand
         //TODO create menu above and aligned within window
         //TODO make the arrow point upwards!
-        bar->insertButton( TQString::null, id, true, i18n( "Menu" ), index );
+        bar->insertButton( TQString(), id, true, i18n( "Menu" ), index );
         bar->alignItemRight( id );
 
         KToolBarButton* button = bar->getButton( id );
@@ -120,7 +120,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, TQT_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_ETQUALIZER );
     safePlug( ac, "script_manager", this );
     safePlug( ac, "statistics", this );
 
@@ -131,7 +131,7 @@ Menu::Menu()
     insertItem( SmallIconSet( Amarok::icon( "rescan" ) ), i18n("&Rescan Collection"), ID_RESCAN_COLLECTION );
     setItemEnabled( ID_RESCAN_COLLECTION, !ThreadManager::instance()->isJobPending( "CollectionScanner" ) );
 
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
     insertSeparator();
 
     safePlug( ac, KStdAction::name(KStdAction::ShowMenubar), this );
@@ -169,12 +169,12 @@ Menu::instance()
 }
 
 KPopupMenu*
-Menu::helpMenu( TQWidget *parent ) //STATIC
+Menu::helpMenu( TQWidget *tqparent ) //STATIC
 {
     extern KAboutData aboutData;
 
     if ( s_helpMenu == 0 )
-        s_helpMenu = new KHelpMenu( parent, &aboutData, Amarok::actionCollection() );
+        s_helpMenu = new KHelpMenu( tqparent, &aboutData, Amarok::actionCollection() );
 
     return s_helpMenu->menu();
 }
@@ -182,7 +182,7 @@ Menu::helpMenu( TQWidget *parent ) //STATIC
 void
 Menu::slotAboutToShow()
 {
-    setItemEnabled( ID_CONFIGURE_EQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) );
+    setItemEnabled( ID_CONFIGURE_ETQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) );
     setItemEnabled( ID_CONF_DECODER, EngineController::hasEngineProperty( "HasConfigure" ) );
 }
 
@@ -288,8 +288,8 @@ AnalyzerAction::plug( TQWidget *w, int index )
 }
 
 
-AnalyzerContainer::AnalyzerContainer( TQWidget *parent )
-        : TQWidget( parent, "AnalyzerContainer" )
+AnalyzerContainer::AnalyzerContainer( TQWidget *tqparent )
+        : TQWidget( tqparent, "AnalyzerContainer" )
         , m_child( 0 )
 {
     TQToolTip::add( this, i18n( "Click for more analyzers" ) );
@@ -421,7 +421,7 @@ TQString SelectAction::currentText() const {
 VolumeAction::VolumeAction( KActionCollection *ac )
         : KAction( i18n( "Volume" ), 0, ac, "toolbar_volume" )
         , EngineObserver( EngineController::instance() )
-        , m_slider( 0 ) //is QGuardedPtr
+        , m_slider( 0 ) //is TQGuardedPtr
 {}
 
 int
@@ -434,7 +434,7 @@ VolumeAction::plug( TQWidget *w, int index )
     m_slider = new Amarok::VolumeSlider( w, Amarok::VOLUME_MAX );
     m_slider->setName( "ToolBarVolume" );
     m_slider->setValue( AmarokConfig::masterVolume() );
-    m_slider->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Ignored );
+    m_slider->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Ignored );
 
     TQToolTip::add( m_slider, i18n( "Volume control" ) );
 
@@ -521,7 +521,7 @@ BurnMenuAction::plug( TQWidget *w, int index )
         addContainer( bar, id );
         connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) );
 
-        bar->insertButton( TQString::null, id, true, i18n( "Burn" ), index );
+        bar->insertButton( TQString(), id, true, i18n( "Burn" ), index );
 
         KToolBarButton* button = bar->getButton( id );
         button->setPopup( Amarok::BurnMenu::instance() );
@@ -589,7 +589,7 @@ StopAction::plug( TQWidget *w, int index )
         addContainer( bar, id );
         connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) );
 
-        bar->insertButton( TQString::null, id, TQT_SIGNAL( clicked() ), EngineController::instance(), TQT_SLOT( stop() ),
+        bar->insertButton( TQString(), id, TQT_SIGNAL( clicked() ), EngineController::instance(), TQT_SLOT( stop() ),
                            true, i18n( "Stop" ), index );
 
         KToolBarButton* button = bar->getButton( id );
@@ -608,7 +608,7 @@ StopMenu::StopMenu()
     insertTitle( i18n( "Stop" ) );
     insertItem( i18n("Now"), NOW );
     insertItem( i18n("After Current Track"), AFTER_TRACK );
-    insertItem( i18n("After Queue"), AFTER_QUEUE );
+    insertItem( i18n("After Queue"), AFTER_TQUEUE );
 
     connect( this, TQT_SIGNAL( aboutToShow() ),  TQT_SLOT( slotAboutToShow() ) );
     connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) );
@@ -631,8 +631,8 @@ StopMenu::slotAboutToShow()
     setItemEnabled( AFTER_TRACK, EngineController::engine()->loaded() );
     setItemChecked( AFTER_TRACK, pl->stopAfterMode() == Playlist::StopAfterCurrent );
 
-    setItemEnabled( AFTER_QUEUE, pl->nextTracks().count() );
-    setItemChecked( AFTER_QUEUE, pl->stopAfterMode() == Playlist::StopAfterQueue );
+    setItemEnabled( AFTER_TQUEUE, pl->nextTracks().count() );
+    setItemChecked( AFTER_TQUEUE, pl->stopAfterMode() == Playlist::StopAfterQueue );
 }
 
 void
@@ -653,7 +653,7 @@ StopMenu::slotActivated( int index )
                                 ? Playlist::DoNotStop
                                 : Playlist::StopAfterCurrent );
             break;
-        case AFTER_QUEUE:
+        case AFTER_TQUEUE:
             pl->setStopAfterMode( mode == Playlist::StopAfterQueue
                                 ? Playlist::DoNotStop
                                 : Playlist::StopAfterQueue );