2 files changed, 18 insertions, 18 deletions
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 6f2183f..e84bec3 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -1,6 +1,6 @@
 #include "cmodule.h"
 #include "lyrics.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstringlist.h>
 #include <tqlabel.h>
 #include <kmessagebox.h>
@@ -47,23 +47,23 @@ const char *const DEFAULT_TQUERY =
 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 */
-  TQVBoxLayout *vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  TQHBoxLayout *htqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
-  vtqlayout->setStretchFactor( htqlayout, 1 );
+  TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+  vlayout->setStretchFactor( hlayout, 1 );
 
   // Search box
-  TQVBoxLayout *boxtqlayout = new TQVBoxLayout( htqlayout, KDialog::spacingHint() );
-  boxtqlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
+  TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() );
+  boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
   providersBox = new KListBox( this, "providersBox" );
-  boxtqlayout->addWidget(providersBox);
+  boxlayout->addWidget(providersBox);
 
   boxButtons = new KButtonBox( this,Qt::Vertical );
   boxButtons->addButton( i18n( "New Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( newSearch() ) );
   boxButtons->addButton( i18n( "Delete Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( delSearch() ) );
   boxButtons->addButton( i18n( "Move Up" ), TQT_TQOBJECT(this), TQT_SLOT( moveUpSearch() ) );
   boxButtons->addButton( i18n( "Move Down" ), TQT_TQOBJECT(this), TQT_SLOT( moveDownSearch() ) );
-  boxButtons->tqlayout();
-  boxtqlayout->addWidget( boxButtons );
+  boxButtons->layout();
+  boxlayout->addWidget( boxButtons );
 
   // Edit box
   TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this );
@@ -76,8 +76,8 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
   /* 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.*/
   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->tqsetAlignment(TQt::WordBreak);
-  htqlayout->addWidget( propBox, 1 );
+  textLabel->setAlignment(TQt::WordBreak);
+  hlayout->addWidget( propBox, 1 );
 
   /* Signal/slots */
   nameEdit->setEnabled( false );
@@ -88,7 +88,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
 
 
 
-  vtqlayout->addStretch();
+  vlayout->addStretch();
   reopen();
   save();
 }
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index cbf6b63..30d7703 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -59,7 +59,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
   connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
   connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
 
-  /* tqStatus bar */
+  /* Status bar */
   statusBar()->insertItem(i18n("Ready"), 0, 1);
   statusBar()->setItemAlignment(0, TQt::AlignLeft);
 
@@ -122,7 +122,7 @@ void Lyrics::loadedURL()
   if ( !napp->player()->current() )
     return;
   statusBar()->changeItem(i18n("Loaded"), 0);
-  setCaption(i18n("Lyrics: %1").tqarg(napp->player()->current().property("title")));
+  setCaption(i18n("Lyrics: %1").arg(napp->player()->current().property("title")));
   if (!htmlpart->url().url().isEmpty() && napp->player()->current() && !napp->player()->current().property("Lyrics::URL").isEmpty()) {
     kdDebug(90020) << "Setting URL for (loaded)" << napp->player()->current().title() << endl;
     napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url());
@@ -196,7 +196,7 @@ void Lyrics::viewLyrics(int index)
     pos = props_regexp.search(url);
   }
 	TQString title(napp->player()->current().property("title"));
-  setCaption(i18n("Loading Lyrics for %1").tqarg(title));
+  setCaption(i18n("Loading Lyrics for %1").arg(title));
 	// Check if we have a music playing
 	if (napp->player()->current()) {
   	htmlpart->begin();
@@ -207,7 +207,7 @@ void Lyrics::viewLyrics(int index)
       "<TR><TD BGCOLOR=\"#707671\"><strong>Title</strong></TD><TD>%1</TD></TR>"
       "<TR><TD BGCOLOR=\"#707671\"><strong>Author</strong></TD><TD>%2</TD></TR>"
       "<TR><TD BGCOLOR=\"#707671\"><strong>Album</strong></TD><TD>%3</TD></TR>"
-    "</TABLE>").tqarg( napp->player()->current().property( "title" ) ).tqarg( napp->player()->current().property( "author" ) ).tqarg( napp->player()->current().property( "album" ) ) );
+    "</TABLE>").arg( napp->player()->current().property( "title" ) ).arg( napp->player()->current().property( "author" ) ).arg( napp->player()->current().property( "album" ) ) );
     KURL _url;
     /* Check if we should use the store url or the query one */
     if (napp->player()->current().property("Lyrics::URL").isEmpty()) {
@@ -218,7 +218,7 @@ void Lyrics::viewLyrics(int index)
       attach_act->setChecked(false);
       site_act->setEnabled(true);
       actionCollection()->action("search_label")->setEnabled(true);
-      htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
+      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(TQRegExp("%20"), "+"));
@@ -226,7 +226,7 @@ void Lyrics::viewLyrics(int index)
       attach_act->setChecked(true);
       site_act->setEnabled(false);
       actionCollection()->action("search_label")->setEnabled(false);
-      htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
+      htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).arg( _url.prettyURL() ).arg( _url.url() ) );
     }
     htmlpart->write( "</BODY></HTML>" );
     htmlpart->end();