diff --git a/amarok/src/Options1.ui.h b/amarok/src/Options1.ui.h
index e4f8e723..72f2a30b 100644
--- a/amarok/src/Options1.ui.h
+++ b/amarok/src/Options1.ui.h
@@ -47,7 +47,7 @@ void Options1::init()
kComboBox_browser->insertStringList( browsers );
kLineEdit_customBrowser->setText( AmarokConfig::externalBrowser() );
- int index = browsers.findIndex( AmarokConfig::externalBrowser() );
+ int index = browsers.tqfindIndex( AmarokConfig::externalBrowser() );
if( index >= 0 )
kComboBox_browser->setCurrentItem( index );
else if( AmarokConfig::externalBrowser() ==
diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui
index ba39801a..ec244783 100644
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@@ -737,9 +737,9 @@
styleComboBox
- activated(const QString&)
+ activated(const TQString&)
Options2
- styleComboBox_activated(const QString&)
+ styleComboBox_activated(const TQString&)
@@ -749,7 +749,7 @@
installPushButton_clicked()
retrievePushButton_clicked()
uninstallPushButton_clicked()
- styleComboBox_activated( const QString & s )
+ styleComboBox_activated( const TQString & s )
updateStyleComboBox()
diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui
index cc7fc38b..c5782df5 100644
--- a/amarok/src/Options5.ui
+++ b/amarok/src/Options5.ui
@@ -520,8 +520,8 @@
init()
- hideEvent( QHideEvent * )
- showEvent( QShowEvent * )
+ hideEvent( TQHideEvent * )
+ showEvent( TQShowEvent * )
diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui
index 7f245e56..66524775 100644
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@@ -283,16 +283,16 @@
kcfg_ScrobblerUsername
- textChanged(const QString&)
+ textChanged(const TQString&)
Options8
- updateServices(const QString&)
+ updateServices(const TQString&)
Options8.ui.h
- updateServices( const QString & s )
+ updateServices( const TQString & s )
diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui
index 4cf16752..3ab4cc92 100644
--- a/amarok/src/firstrunwizard.ui
+++ b/amarok/src/firstrunwizard.ui
@@ -282,11 +282,11 @@
invokeHandbook()
- openLink( const QString & s )
+ openLink( const TQString & s )
init()
- showPage( QWidget * w )
+ showPage( TQWidget * w )
writeCollectionConfig()
interface()
diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
index 7bc1bc2d..8a305909 100644
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@@ -405,9 +405,9 @@
m_songLocationBox
- textChanged(const QString&)
+ textChanged(const TQString&)
GenericMediaDeviceConfigDialog
- updatePreviewLabel(const QString&)
+ updatePreviewLabel(const TQString&)
m_asciiCheck
@@ -445,12 +445,12 @@
removeSupportedButtonClicked()
supportedListBoxDoubleClicked( TQListBoxItem * item )
updatePreviewLabel()
- updatePreviewLabel( const QString & format )
+ updatePreviewLabel( const TQString & format )
- updateConfigDialogLists( const QStringList & supportedFileTypes )
- buildDestination( const QString & format, const MetaBundle & mb )
- cleanPath( const QString & component )
+ updateConfigDialogLists( const TQStringList & supportedFileTypes )
+ buildDestination( const TQString & format, const MetaBundle & mb )
+ cleanPath( const TQString & component )
setDevice( GenericMediaDevice * device )
buildFormatTip()
init()
diff --git a/amarok/src/medium.h b/amarok/src/medium.h
index 34c3251b..850b24a4 100644
--- a/amarok/src/medium.h
+++ b/amarok/src/medium.h
@@ -28,7 +28,7 @@
class LIBAMAROK_EXPORT Medium
{
public:
- typedef TQValueList List;
+ typedef TQValueList List;
static const uint AUTODETECTED = 0;
static const uint ID = 1;
diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui
index f63b6b1f..c094a216 100644
--- a/amarok/src/organizecollectiondialog.ui
+++ b/amarok/src/organizecollectiondialog.ui
@@ -488,15 +488,15 @@
formatEdit
- textChanged(const QString&)
+ textChanged(const TQString&)
organizeCollectionDialog
- preview(const QString&)
+ preview(const TQString&)
organizeCollectionDialog
- updatePreview( const QString & )
+ updatePreview( const TQString & )
previewText
- setText(const QString&)
+ setText(const TQString&)
customschemeCheck
@@ -548,15 +548,15 @@
regexpEdit
- textChanged(const QString&)
+ textChanged(const TQString&)
organizeCollectionDialog
- update(const QString&)
+ update(const TQString&)
replaceEdit
- textChanged(const QString&)
+ textChanged(const TQString&)
organizeCollectionDialog
- update(const QString&)
+ update(const TQString&)
@@ -569,20 +569,20 @@
bool detailed;
- updatePreview( const QString & )
+ updatePreview( const TQString & )
- preview( const QString & format )
+ preview( const TQString & format )
update( int dummy )
- update( const QString & dummy )
+ update( const TQString & dummy )
slotDetails()
- buildDestination( const QString & format, const MetaBundle & mb )
+ buildDestination( const TQString & format, const MetaBundle & mb )
buildFormatTip()
buildFormatString()
setPreviewBundle( const MetaBundle & bundle )
- cleanPath( const QString & component )
+ cleanPath( const TQString & component )
init()
diff --git a/amarok/src/organizecollectiondialog.ui.h b/amarok/src/organizecollectiondialog.ui.h
index 10f51617..7cc46f2d 100644
--- a/amarok/src/organizecollectiondialog.ui.h
+++ b/amarok/src/organizecollectiondialog.ui.h
@@ -202,8 +202,8 @@ void OrganizeCollectionDialog::slotDetails()
}
if( dynamic_cast(tqparent()) ) {
- static_cast(tqparent())->adjustSize();
- static_cast(tqparent())->updateGeometry();
+ TQT_TQWIDGET(tqparent())->adjustSize();
+ TQT_TQWIDGET(tqparent())->updateGeometry();
}
}
diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui
index eaac3d73..2241f093 100644
--- a/amarok/src/tagguesserconfigdialog.ui
+++ b/amarok/src/tagguesserconfigdialog.ui
@@ -195,7 +195,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
slotCurrentChanged( TQListViewItem * item )
accept()
reject()
- slotRenameItem( TQListViewItem * item, const QPoint &, int c )
+ slotRenameItem( TQListViewItem * item, const TQPoint &, int c )
slotMoveUpClicked()
slotMoveDownClicked()
slotAddClicked()