1 files changed, 12 insertions, 12 deletions

diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp
index 7a88820e..73080389 100644
--- a/amarok/src/engine/helix/helix-configdialog.cpp
+++ b/amarok/src/engine/helix/helix-configdialog.cpp
@@ -12,12 +12,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqscrollview.h>
 #include <tqspinbox.h>
 #include <tqtooltip.h>
-#include <textedit.h>
-#include <textview.h>
+#include <tqtextedit.h>
+#include <tqtextview.h>
 #include <tqfileinfo.h>
 #include <tqcheckbox.h>
 
@@ -53,7 +53,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
          , m_valueChanged( false )
          , m_stringValue( defaultvalue )
 {
-    TQGridLayout *grid = (TQGridLayout*)parent->layout();
+    TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
 
     m_w = new KLineEdit( m_stringValue, parent );
     connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) );
@@ -62,7 +62,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
     TQToolTip::add( (TQWidget *) m_w, "<qt>" + tooltip );
 
     TQLabel* d = new TQLabel( description + ':', parent );
-    d->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+    d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
 
     grid->addWidget( (TQWidget *) m_w, row, 1 );
     grid->addWidget( d, row, 0 );
@@ -79,7 +79,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
    , m_valueChanged( false )
    , m_stringValue( defaultvalue )
 {
-    TQGridLayout *grid = (TQGridLayout*)parent->layout();
+    TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
 
     m_key = str;
 
@@ -90,7 +90,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
     TQToolTip::add( m_w, "<qt>" + tooltip );
 
     TQLabel* d = new TQLabel( description + ':', parent );
-    d->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+    d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
 
     grid->addWidget( m_w, row, 1 );
     grid->addWidget( d, row, 0 );
@@ -110,7 +110,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
                                     HelixEngine *engine )
    : deviceComboBox(0), checkBox_outputDevice(0), lineEdit_outputDevice(0), m_changed(false), m_engine(engine)
 {
-   TQGridLayout *grid = (TQGridLayout*)parent->layout();
+   TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
 
    deviceComboBox = new KComboBox( false, parent, "deviceComboBox" );
    deviceComboBox->insertItem("oss");  // I believe these are not subject to translation (they don't seem to be in xine,
@@ -119,7 +119,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
 #endif
    deviceComboBox->setCurrentItem(HelixConfig::outputplugin());
    TQLabel* op = new TQLabel( i18n("Output plugin:"), parent );
-   op->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+   op->tqsetAlignment( 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& )) );
@@ -128,7 +128,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
    ++row;
 
    checkBox_outputDevice = new TQCheckBox( parent, "checkBox_outputDevice" );
-   checkBox_outputDevice->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) );
+   checkBox_outputDevice->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) );
    grid->addWidget( checkBox_outputDevice, row, 0 );
    checkBox_outputDevice->setText( i18n( "Device:" ) );
 
@@ -276,7 +276,7 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi
     grid->setColStretch( 1, 1 );
 
     if( sv )
-       sv->setMinimumWidth( grid->sizeHint().width() + 20 );
+       sv->setMinimumWidth( grid->tqsizeHint().width() + 20 );
 
     engine->m_coredir = HelixConfig::coreDirectory();
     m_core = new HelixConfigEntry( parent, engine->m_coredir,
@@ -349,7 +349,7 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi
 
     TQTextEdit *le = new TQTextEdit( parent );
     if( sv )
-       sv->setMinimumWidth( le->sizeHint().width() );
+       sv->setMinimumWidth( le->tqsizeHint().width() );
 
     grid = new TQGridLayout( parent, /*rows*/1, /*cols*/1, /*margin*/2, /*spacing*/1 );
     grid->addMultiCellWidget( le, 0, 1, 0, 1, 0 );