Finish TQt4 porting of Amarok

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1228394 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 17 insertions, 17 deletions

diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp
index 2b3805ab..e14cc281 100644
--- a/amarok/src/equalizersetup.cpp
+++ b/amarok/src/equalizersetup.cpp
@@ -73,7 +73,7 @@ EqualizerSetup::EqualizerSetup()
     new TQLabel( i18n("Presets:"), presetBox );
 
     m_presetCombo = new KComboBox( presetBox );
-    m_presetCombo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+    m_presetCombo->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
 
     TQPushButton* presetAdd = new TQPushButton( presetBox );
     presetAdd->setIconSet( SmallIconSet( Amarok::icon( "add_playlist" ) ) );
@@ -96,9 +96,9 @@ EqualizerSetup::EqualizerSetup()
     m_groupBoxSliders->setInsideMargin( KDialog::marginHint() );
     connect( m_groupBoxSliders, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setEqualizerEnabled( bool ) ) );
 
-    // Helper widget for layouting inside the groupbox
+    // Helper widget for tqlayouting inside the groupbox
     TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders );
-    slidersLayoutWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    slidersLayoutWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     TQGridLayout* slidersGridLayout = new TQGridLayout( slidersLayoutWidget, 1, 1, 0, KDialog::spacingHint() );
     // END GroupBox
 
@@ -108,17 +108,17 @@ EqualizerSetup::EqualizerSetup()
     m_slider_preamp->setTickmarks( TQSlider::Right );
     m_slider_preamp->setTickInterval( 100 );
     connect( m_slider_preamp, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( setEqualizerParameters() ) );
-    slidersGridLayout->addMultiCellWidget(m_slider_preamp, 0, 0, 0, 1, Qt::AlignHCenter );
+    slidersGridLayout->addMultiCellWidget(m_slider_preamp, 0, 0, 0, 1, TQt::AlignHCenter );
 
     TQLabel* preampLabel = new TQLabel( i18n("Pre-amp"), slidersLayoutWidget );
-    slidersGridLayout->addMultiCellWidget(preampLabel, 1, 1 , 0, 1, Qt::AlignHCenter );
+    slidersGridLayout->addMultiCellWidget(preampLabel, 1, 1 , 0, 1, TQt::AlignHCenter );
     // END
 
     // BEGIN Band Sliders
     const char *bandLabels[] = { "30", "60", "125", "250", "500", "1k", "2k", "4k", "8k", "16k" };
 
     int minWidth = 0;
-    TQFontMetrics fm = fontMetrics(); //apparently it's an expensive call
+    TQFontMetrics fm = fontMetrics(); //aptqparently it's an expensive call
     for ( int i = 0; i < 10; i++ ) {
          int w = fm.width( bandLabels[i] );
          if ( w > minWidth )
@@ -132,8 +132,8 @@ EqualizerSetup::EqualizerSetup()
         slider->setMinValue( -100 );
         slider->setMaxValue( +100 );
         slider->setMinimumWidth( minWidth );
-        slidersGridLayout->addMultiCellWidget(slider, 0, 0, 2 * i + 2, 2 * i + 3, Qt::AlignHCenter );
-        slidersGridLayout->addMultiCellWidget(label, 1, 1, 2 * i + 2, 2 * i + 3, Qt::AlignHCenter );
+        slidersGridLayout->addMultiCellWidget(slider, 0, 0, 2 * i + 2, 2 * i + 3, TQt::AlignHCenter );
+        slidersGridLayout->addMultiCellWidget(label, 1, 1, 2 * i + 2, 2 * i + 3, TQt::AlignHCenter );
         m_bandSliders.append( slider );
 
         connect( slider, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( setEqualizerParameters() ) );
@@ -149,12 +149,12 @@ EqualizerSetup::EqualizerSetup()
     TQLabel* graphLabel1 = new TQLabel("+20 db", graphVBox);
     TQLabel* graphLabel2 = new TQLabel("0 db", graphVBox);
     TQLabel* graphLabel3 = new TQLabel("-20 db", graphVBox);
-    graphLabel1->setAlignment( Qt::AlignRight | Qt::AlignTop );
-    graphLabel2->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
-    graphLabel3->setAlignment( Qt::AlignRight | Qt::AlignBottom );
+    graphLabel1->tqsetAlignment( TQt::AlignRight | TQt::AlignTop );
+    graphLabel2->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter );
+    graphLabel3->tqsetAlignment( TQt::AlignRight | TQt::AlignBottom );
 
     m_equalizerGraph = new EqualizerGraph( graphGBox );
-    m_equalizerGraph->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+    m_equalizerGraph->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
     // END Graph Widget
 
     // Fill the combobox
@@ -213,10 +213,10 @@ EqualizerSetup::setPreset( TQString name )
 }
 
 /////////////////////////////////////////////////////////////////////////////////////
-// EQUALIZER PRESETS
+// ETQUALIZER PRESETS
 /////////////////////////////////////////////////////////////////////////////////////
 
-QString
+TQString
 EqualizerSetup::presetsCache() const
 {
     // returns the playlists stats cache file
@@ -341,7 +341,7 @@ EqualizerSetup::editPresets()
         TQString newTitle = currentTitle;
 
         // Check if the selected item was renamed
-        if ( presets.find( currentTitle ) == presets.end() || currentGains != presets[ currentTitle ] ) {
+        if ( presets.tqfind( currentTitle ) == presets.end() || currentGains != presets[ currentTitle ] ) {
 
             // Find the new name
             TQMap< TQString, TQValueList<int> >::Iterator end = presets.end();
@@ -369,8 +369,8 @@ EqualizerSetup::addPreset()
 
     if (ok) {
         // Check if the new preset title exists
-        if ( m_presets.find( title ) != m_presets.end() ) {
-            int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) );
+        if ( m_presets.tqfind( title ) != m_presets.end() ) {
+            int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) );
 
             if ( button != KMessageBox::Yes )
                 return;