Trinity Qt initial conversion

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

6 files changed, 86 insertions, 86 deletions

diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 2501ebb..efc2d77 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -1,11 +1,11 @@
 #include "cmodule.h"
 #include "lyrics.h"
-#include <qlayout.h>
-#include <qstringlist.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqstringlist.h>
+#include <tqlabel.h>
 #include <kmessagebox.h>
-#include <qvgroupbox.h>
-#include <qgrid.h>
+#include <tqvgroupbox.h>
+#include <tqgrid.h>
 #include <klistbox.h>
 #include <klineedit.h>
 #include <kbuttonbox.h>
@@ -44,47 +44,47 @@ const char *const DEFAULT_QUERY =
   "http://everything2.com/index.pl?node=$(author),"
   "http://www.letssingit.com/cgi-exe/am.cgi?a=search&p=1&s=$(title)&l=song";
 
-LyricsCModule::LyricsCModule(QObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) {
+LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) {
   /* Thanks to the kde-usability guys for the help designing this dialog!
    * help to simon edwards of KGuardGod, for a big help designing it */
-  QVBoxLayout *vlayout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  QHBoxLayout *hlayout = new QHBoxLayout(vlayout, KDialog::spacingHint());
+  TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
   vlayout->setStretchFactor( hlayout, 1 );
 
   // Search box
-  QVBoxLayout *boxlayout = new QVBoxLayout( hlayout, KDialog::spacingHint() );
-  boxlayout->addWidget( new QLabel( i18n("Search providers:" ), this ) );
+  TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() );
+  boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
   providersBox = new KListBox( this, "providersBox" );
   boxlayout->addWidget(providersBox);
 
   boxButtons = new KButtonBox( this, Vertical );
-  boxButtons->addButton( i18n( "New Search Provider" ), this, SLOT( newSearch() ) );
-  boxButtons->addButton( i18n( "Delete Search Provider" ), this, SLOT( delSearch() ) );
-  boxButtons->addButton( i18n( "Move Up" ), this, SLOT( moveUpSearch() ) );
-  boxButtons->addButton( i18n( "Move Down" ), this, SLOT( moveDownSearch() ) );
+  boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) );
+  boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) );
+  boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) );
+  boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) );
   boxButtons->layout();
   boxlayout->addWidget( boxButtons );
 
   // Edit box
-  QGroupBox *propBox = new QVGroupBox( i18n("Search Provider Properties" ), this );
-  QGrid *editGrid = new QGrid(2, propBox );
+  TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this );
+  TQGrid *editGrid = new TQGrid(2, propBox );
   editGrid->setSpacing(  propBox->insideSpacing() );
-  new QLabel( i18n( "Name:" ), editGrid );
+  new TQLabel( i18n( "Name:" ), editGrid );
   nameEdit = new KLineEdit( editGrid );
-  new QLabel( i18n( "Query:" ), editGrid );
+  new TQLabel( i18n( "Query:" ), editGrid );
   queryEdit = new KLineEdit( editGrid );
   /* ATTENTION to translators:
    * The property names can't be translated. This means that $(author) must be kept as $(author), $(title) as $(title), etc, or it won't work.*/
-  QLabel *textLabel = new QLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel");
+  TQLabel *textLabel = new TQLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel");
   textLabel->setAlignment(Qt::WordBreak);
   hlayout->addWidget( propBox, 1 );
 
   /* Signal/slots */
   nameEdit->setEnabled( false );
   queryEdit->setEnabled( false );
-  connect( providersBox, SIGNAL( highlighted( QListBoxItem * ) ), this, SLOT( selected( QListBoxItem * ) ) );
-  connect( nameEdit, SIGNAL( textChanged( const QString &) ), this, SLOT( nameChanged( const QString & ) ) );
-  connect( queryEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( queryChanged( const QString & ) ) );
+  connect( providersBox, TQT_SIGNAL( highlighted( TQListBoxItem * ) ), this, TQT_SLOT( selected( TQListBoxItem * ) ) );
+  connect( nameEdit, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( nameChanged( const TQString & ) ) );
+  connect( queryEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( queryChanged( const TQString & ) ) );
 
 
 
@@ -93,7 +93,7 @@ LyricsCModule::LyricsCModule(QObject *_parent) : CModule(i18n("Lyrics"), i18n("C
   save();
 }
 
-void LyricsCModule::newSearch(QString name, QString query) {
+void LyricsCModule::newSearch(TQString name, TQString query) {
   kdDebug(90020) << "New search" << endl;
   SearchProvider s = { name, query };
   mProviders.push_back( s );
@@ -105,7 +105,7 @@ void LyricsCModule::newSearch(QString name, QString query) {
 //X     providersBox->setCurrentItem( 0 );
 }
 
-void LyricsCModule::selected( QListBoxItem *i ) {
+void LyricsCModule::selected( TQListBoxItem *i ) {
   kdDebug(90020) << "selected" << endl;
   int index = providersBox->index( i );
   if ( index < 0 )
@@ -123,7 +123,7 @@ void LyricsCModule::delSearch() {
     return;
   }
   int index = providersBox->currentItem();
-  QValueVector<SearchProvider>::iterator it;
+  TQValueVector<SearchProvider>::iterator it;
   for ( it = mProviders.begin(); ( *it ).name != mProviders[ index ].name || ( *it ).url != mProviders[ index ].url; ++it );
   mProviders.erase( it );
   providersBox->removeItem( index );
@@ -134,8 +134,8 @@ void LyricsCModule::moveUpSearch() {
   if ( providersBox->currentItem() <= 0 )
     return;
   int index = providersBox->currentItem();
-  QString name = mProviders[ index ].name;
-  QString url = mProviders[ index ].url;
+  TQString name = mProviders[ index ].name;
+  TQString url = mProviders[ index ].url;
   mProviders[ index ].name = mProviders[ index-1 ].name;
   mProviders[ index ].url = mProviders[ index-1 ].url;
   mProviders[ index-1 ].name = name;
@@ -149,8 +149,8 @@ void LyricsCModule::moveDownSearch() {
   if ( static_cast<unsigned int>( providersBox->currentItem() ) >= providersBox->count()-1 )
     return;
   int index = providersBox->currentItem();
-  QString name = mProviders[ index ].name;
-  QString url = mProviders[ index ].url;
+  TQString name = mProviders[ index ].name;
+  TQString url = mProviders[ index ].url;
   mProviders[ index ].name = mProviders[ index+1 ].name;
   mProviders[ index ].url = mProviders[ index+1 ].url;
   mProviders[ index+1 ].name = name;
@@ -160,7 +160,7 @@ void LyricsCModule::moveDownSearch() {
   providersBox->setSelected( index+1, true );
 }
 
-void LyricsCModule::nameChanged( const QString &name ) {
+void LyricsCModule::nameChanged( const TQString &name ) {
   kdDebug(90020) << "name changed" << endl;
   if ( providersBox->currentItem() < 0 )
     return;
@@ -169,7 +169,7 @@ void LyricsCModule::nameChanged( const QString &name ) {
     providersBox->changeItem( name, providersBox->currentItem() );
 }
 
-void LyricsCModule::queryChanged( const QString &query ) {
+void LyricsCModule::queryChanged( const TQString &query ) {
   kdDebug(90020) << "query changed" << endl;
   if ( providersBox->currentItem() < 0 )
     return;
@@ -180,8 +180,8 @@ void LyricsCModule::queryChanged( const QString &query ) {
 void LyricsCModule::save() {
   KConfig *conf = KGlobal::config();
   conf->setGroup( "Lyrics" );
-  QStringList queryList, nameList;
-  QValueVector<SearchProvider>::iterator it;
+  TQStringList queryList, nameList;
+  TQValueVector<SearchProvider>::iterator it;
   for ( it = mProviders.begin(); it != mProviders.end(); ++it ) {
     kdDebug(90020) << "query:" << ( *it ).url << endl;
     queryList += ( *it ).url;
@@ -196,7 +196,7 @@ void LyricsCModule::save() {
 }
 
 void LyricsCModule::reopen() {
-  QStringList queryList, nameList;
+  TQStringList queryList, nameList;
   KConfig *conf = KGlobal::config();
   mProviders.clear();
   providersBox->clear();
@@ -205,10 +205,10 @@ void LyricsCModule::reopen() {
   queryList = conf->readListEntry( "queryList" );
   nameList = conf->readListEntry( "nameList" );
   if ( queryList.count() == 0 && nameList.count() == 0 ) {
-    queryList = QStringList::split( ",", DEFAULT_QUERY );
-    nameList = QStringList::split( ",", DEFAULT_NAME );
+    queryList = TQStringList::split( ",", DEFAULT_QUERY );
+    nameList = TQStringList::split( ",", DEFAULT_NAME );
   }
-  QStringList::Iterator queryIt, nameIt;
+  TQStringList::Iterator queryIt, nameIt;
   for ( queryIt = queryList.begin(), nameIt = nameList.begin(); queryIt != queryList.end() && nameIt != nameList.end(); ++queryIt, ++nameIt ) {
     kdDebug(90020) << "Read:" << *queryIt << " and " << *nameIt << endl;
     newSearch( *nameIt, *queryIt );
diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h
index dbb2da7..a7fdc08 100644
--- a/noatun-plugins/lyrics/cmodule.h
+++ b/noatun-plugins/lyrics/cmodule.h
@@ -2,7 +2,7 @@
 #define _LYRICSCMODULE_H_
 
 #include <noatun/pref.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
 #include <klocale.h>
 
 class KLineEdit;
@@ -10,30 +10,30 @@ class KListBox;
 class KButtonBox;
 
 struct SearchProvider {
-  QString name;
-  QString url;
+  TQString name;
+  TQString url;
 };
 
 class LyricsCModule : public CModule {
   Q_OBJECT
   public:
-    LyricsCModule(QObject *_parent);
+    LyricsCModule(TQObject *_parent);
   public slots:
     virtual void save(void);
     virtual void reopen(void);
-    void newSearch(QString name = i18n( "New Search Provider" ), QString query = "");
+    void newSearch(TQString name = i18n( "New Search Provider" ), TQString query = "");
     void delSearch();
     void moveUpSearch();
     void moveDownSearch();
-    void selected( QListBoxItem *i );
-    void nameChanged( const QString &name );
-    void queryChanged( const QString &query );
+    void selected( TQListBoxItem *i );
+    void nameChanged( const TQString &name );
+    void queryChanged( const TQString &query );
   protected:
     KListBox *providersBox;
     KButtonBox *boxButtons;
     KLineEdit *nameEdit;
     KLineEdit *queryEdit;
-    QValueVector<SearchProvider> mProviders;
+    TQValueVector<SearchProvider> mProviders;
 };
 
 
diff --git a/noatun-plugins/lyrics/historymanager.cpp b/noatun-plugins/lyrics/historymanager.cpp
index 1524d7b..629466d 100644
--- a/noatun-plugins/lyrics/historymanager.cpp
+++ b/noatun-plugins/lyrics/historymanager.cpp
@@ -4,7 +4,7 @@
 *** TODO: Add more complex support (like in Konqueror)
           Maybe use Konqueror's History Manager */
 
-HistoryManager::HistoryManager(QObject *parent) : QObject(parent) {
+HistoryManager::HistoryManager(TQObject *parent) : TQObject(parent) {
 }
 
 HistoryManager::~HistoryManager() {
diff --git a/noatun-plugins/lyrics/historymanager.h b/noatun-plugins/lyrics/historymanager.h
index d2fdb29..910e463 100644
--- a/noatun-plugins/lyrics/historymanager.h
+++ b/noatun-plugins/lyrics/historymanager.h
@@ -2,13 +2,13 @@
 #define _HISTORY_MANAGER_H
 
 #include <kurl.h>
-#include <qvaluestack.h>
-#include <qobject.h>
+#include <tqvaluestack.h>
+#include <tqobject.h>
 
-class HistoryManager : public QObject {
+class HistoryManager : public TQObject {
   Q_OBJECT
   public:
-    HistoryManager(QObject *parent = NULL);
+    HistoryManager(TQObject *parent = NULL);
     ~HistoryManager();
     KURL back();
     KURL forward();
@@ -20,8 +20,8 @@ class HistoryManager : public QObject {
   signals:
     void uiChanged(int, bool);
   protected:
-    QValueStack<KURL> back_stack;
-    QValueStack<KURL> forward_stack;
+    TQValueStack<KURL> back_stack;
+    TQValueStack<KURL> forward_stack;
     KURL currentURL;
 };
   
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 611db9c..1c7a05b 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -5,7 +5,7 @@
 #include <khtmlview.h>
 #include <kstdaction.h>
 #include <kstatusbar.h>
-#include <qregexp.h>
+#include <tqregexp.h>
 #include "lyrics.h"
 #include <noatun/player.h>
 #include <kdebug.h>
@@ -27,25 +27,25 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
 {
   lyrics = this;
   /* Create default actions */
-  (void)KStdAction::close(this, SLOT(close()), actionCollection());
-  ( void )KStdAction::goTo( this, SLOT( goTo() ), actionCollection(), "go_web_goTo" );
-  //(void)KStdAction::print(this, SLOT(print()), actionCollection());
-  //(void)KStdAction::printPreview(this, SLOT(printPreview()), actionCollection());
-  //(void)KStdAction::mail(this, SLOT(mail()), actionCollection());
-  //(void)KStdAction::find(this, SLOT(find()), actionCollection());
+  (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection());
+  ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" );
+  //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection());
+  //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection());
+  //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection());
+  //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection());
   follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow");
-  KStdAction::redisplay(this, SLOT(viewLyrics()), actionCollection());
+  KStdAction::redisplay(this, TQT_SLOT(viewLyrics()), actionCollection());
   attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url");
-  connect(attach_act, SIGNAL(toggled(bool)), this, SLOT(attach(bool)));
-  back_act = KStdAction::back(this, SLOT(back()), actionCollection());
+  connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool)));
+  back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection());
   back_act->setEnabled(false);
-  forward_act = KStdAction::forward(this, SLOT(forward()), actionCollection());
+  forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection());
   forward_act->setEnabled(false);
-  new KWidgetAction( new QLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label");
-  site_act = new KSelectAction(i18n("&Search Provider"), 0, this, SLOT(viewLyrics()), actionCollection(), "search_provider");
+  new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label");
+  site_act = new KSelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
 
   /* Add entry to menu */
-  menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, SLOT(viewLyrics()));
+  menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics()));
 
   /* Create history manager and htmlpart */
   history = new HistoryManager(this);
@@ -53,11 +53,11 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
 	//htmlpart->view()->setMinimumSize(350, 420);
 
   /* Connect signals/slots */
-	connect( htmlpart->browserExtension(), SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, SLOT(openURLRequest( const KURL &, const KParts::URLArgs & )));
-  connect( htmlpart, SIGNAL(started(KIO::Job *)), this, SLOT(loadingURL(KIO::Job *)) );
-  connect( htmlpart, SIGNAL(completed()), this, SLOT(loadedURL()) );
-  connect( history, SIGNAL(uiChanged(int, bool)), this, SLOT(changeUI(int, bool)) );
-  connect( napp->player(), SIGNAL(newSong()), this, SLOT(newSong()) );
+	connect( htmlpart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & )));
+  connect( htmlpart, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(loadingURL(KIO::Job *)) );
+  connect( htmlpart, TQT_SIGNAL(completed()), this, TQT_SLOT(loadedURL()) );
+  connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
+  connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
 
   /* Status bar */
   statusBar()->insertItem(i18n("Ready"), 0, 1);
@@ -79,14 +79,14 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
 
 void Lyrics::goTo() {
   bool sel = false;
-  QString url = KLineEditDlg::getText( i18n( "Please enter the URL you want to go to:" ), htmlpart->url().prettyURL(), &sel, this );
+  TQString url = KLineEditDlg::getText( i18n( "Please enter the URL you want to go to:" ), htmlpart->url().prettyURL(), &sel, this );
   if ( !url.isEmpty() && sel )
     go( KURL( url ) );
 }
 
-void Lyrics::setProviders( QValueVector<SearchProvider> &sites ) {
+void Lyrics::setProviders( TQValueVector<SearchProvider> &sites ) {
   mSites = sites;
-  QStringList sitesName;
+  TQStringList sitesName;
   for (unsigned int i = 0; i < mSites.size(); ++i) {
     sitesName += mSites[i].name;
   }
@@ -98,7 +98,7 @@ void Lyrics::attach(bool a) {
   if ( !napp->player()->current() )
     return;
   if (a) {
-    KMessageBox::information(this, i18n("Choosing this option, the current URL will be attached to the current file. This way, if you try to view the lyrics of this file later, you won't have to search for it again. This information can be stored between sessions, as long as your playlist stores metadata about the multimedia items (almost all the playlists do). If you want to be able to search for other lyrics for this music, you must select this option again to clear the stored URL."), QString::null, "lyrics::attach_info");
+    KMessageBox::information(this, i18n("Choosing this option, the current URL will be attached to the current file. This way, if you try to view the lyrics of this file later, you won't have to search for it again. This information can be stored between sessions, as long as your playlist stores metadata about the multimedia items (almost all the playlists do). If you want to be able to search for other lyrics for this music, you must select this option again to clear the stored URL."), TQString::null, "lyrics::attach_info");
     kdDebug(90020) << "Setting URL for (attach)" << napp->player()->current().title() << endl;
     napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url());
     site_act->setEnabled(false);
@@ -181,21 +181,21 @@ void Lyrics::viewLyrics(int index)
     return;
   }
 //X <small>(if the above information is incorrect, the search may not find the correct music. If that's the case, use a tag editor to fix it. Hint: Use the luckytag plugin from the kdeaddons module to try to guess title, author and album from the song filename)</small><br>
-  QString url, name;
+  TQString url, name;
   if (index < 0)
     index = site_act->currentItem();
   if ( index < 0 )
     return;
   url = mSites[index].url;
   name = mSites[index].name;
-  QRegExp props_regexp("\\$\\((\\w+)\\)");
+  TQRegExp props_regexp("\\$\\((\\w+)\\)");
   int pos = props_regexp.search(url);
   while (pos >= 0) {
-    QString property = props_regexp.cap(1);
+    TQString property = props_regexp.cap(1);
     url.replace(pos, props_regexp.matchedLength(), napp->player()->current().property(property));
     pos = props_regexp.search(url);
   }
-	QString title(napp->player()->current().property("title"));
+	TQString title(napp->player()->current().property("title"));
   setCaption(i18n("Loading Lyrics for %1").arg(title));
 	// Check if we have a music playing
 	if (napp->player()->current()) {
@@ -213,7 +213,7 @@ void Lyrics::viewLyrics(int index)
     if (napp->player()->current().property("Lyrics::URL").isEmpty()) {
       /* Use the query one */
       _url = url;
-      _url.setQuery(_url.query().replace(QRegExp("%20"), "+"));
+      _url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
       kdDebug(90020) << "I'm using the query url" << endl;
       attach_act->setChecked(false);
       site_act->setEnabled(true);
@@ -221,7 +221,7 @@ void Lyrics::viewLyrics(int index)
       htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) );
     } else {
       _url = napp->player()->current().property("Lyrics::URL");
-      _url.setQuery(_url.query().replace(QRegExp("%20"), "+"));
+      _url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
       kdDebug(90020) << "I'm using the stored url" << endl;
       attach_act->setChecked(true);
       site_act->setEnabled(false);
@@ -232,7 +232,7 @@ void Lyrics::viewLyrics(int index)
     htmlpart->end();
   	go(_url);
   	this->show();
-    KMessageBox::information( this, i18n( "In order to find the lyrics for the current song, this plugin uses the properties stored with each song, such as its title, author and album. These properties are usually retrieved by a tag reader, but in some cases they may not be present or be incorrect. In that case, the Lyrics plugin will not be able to find the lyrics until these properties are fixed (you can fix them using the tag editor).\nHint: The lucky tag plugin, present in the kdeaddons module, can try to guess properties such as title and author from the filename of a song. Enabling it may increase the probability of finding lyrics." ), QString::null, "Lyrics::usage_info" );
+    KMessageBox::information( this, i18n( "In order to find the lyrics for the current song, this plugin uses the properties stored with each song, such as its title, author and album. These properties are usually retrieved by a tag reader, but in some cases they may not be present or be incorrect. In that case, the Lyrics plugin will not be able to find the lyrics until these properties are fixed (you can fix them using the tag editor).\nHint: The lucky tag plugin, present in the kdeaddons module, can try to guess properties such as title and author from the filename of a song. Enabling it may increase the probability of finding lyrics." ), TQString::null, "Lyrics::usage_info" );
     active = true;
   }
 }
diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h
index 9454604..362c7a4 100644
--- a/noatun-plugins/lyrics/lyrics.h
+++ b/noatun-plugins/lyrics/lyrics.h
@@ -5,7 +5,7 @@
 #include <noatun/player.h>
 #include <noatun/app.h>
 #include <kmainwindow.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
 #include <khtml_part.h>
 #include <kaction.h>
 #include "cmodule.h"
@@ -19,7 +19,7 @@ public:
   Lyrics();
   ~Lyrics();
   void go(const KURL &);
-  void setProviders( QValueVector<SearchProvider> &sites );
+  void setProviders( TQValueVector<SearchProvider> &sites );
 
 public slots:
   void viewLyrics(int index = -1);
@@ -45,7 +45,7 @@ private:
   KToggleAction *attach_act;
   KSelectAction *site_act;
 	KHTMLPart *htmlpart;
-  QValueVector<SearchProvider> mSites;
+  TQValueVector<SearchProvider> mSites;
   HistoryManager *history;
   bool active;