1 files changed, 19 insertions, 19 deletions

diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index e553127e..8e14f1e9 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -20,7 +20,7 @@
 #include <kio/netaccess.h>
 
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqevent.h>
 #include <tqdragobject.h>
 #include <tqimage.h>
@@ -58,9 +58,9 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c
 
     CollectionList::instance()->addObserver(&m_observer);
 
-    layout()->setMargin(5);
-    layout()->setSpacing(3);
-    setFixedHeight(imageSize + 2 + layout()->margin() * 2);
+    tqlayout()->setMargin(5);
+    tqlayout()->setSpacing(3);
+    setFixedHeight(imageSize + 2 + tqlayout()->margin() * 2);
 
     setStretchFactor(new CoverItem(this), 0);
     setStretchFactor(new TrackItem(this), 2);
@@ -109,7 +109,7 @@ CoverItem::CoverItem(NowPlaying *parent) :
     TQLabel(parent, "CoverItem"),
     NowPlayingItem(parent)
 {
-    setFixedHeight(parent->height() - parent->layout()->margin() * 2);
+    setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
     setFrameStyle(Box | Plain);
     setLineWidth(1);
     setMargin(1);
@@ -218,17 +218,17 @@ TrackItem::TrackItem(NowPlaying *parent) :
     TQWidget(parent, "TrackItem"),
     NowPlayingItem(parent)
 {
-    setFixedHeight(parent->height() - parent->layout()->margin() * 2);
-    setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+    setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
+    tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
 
     m_label = new LinkLabel(this);
     m_label->setLinkUnderline(false);
 
-    layout->addStretch();
-    layout->addWidget(m_label);
-    layout->addStretch();
+    tqlayout->addStretch();
+    tqlayout->addWidget(m_label);
+    tqlayout->addStretch();
 
     connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this,
             TQT_SLOT(slotOpenLink(const TQString &)));
@@ -270,13 +270,13 @@ void TrackItem::slotUpdate()
         "<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>";
 
     if(NowPlayingItem::parent()->collection()->showMoreActive())
-        format.append(TQString(" (<a href=\"clear\">%1</a>)").arg(i18n("back to playlist")));
+        format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist")));
 
     format.append("</font>");
 
     do {
-        m_label->setText(format.arg(size).arg(title).arg(size - 2)
-                         .arg(artist).arg(separator).arg(album));
+        m_label->setText(format.tqarg(size).tqarg(title).tqarg(size - 2)
+                         .tqarg(artist).tqarg(separator).tqarg(album));
         --size;
     } while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0);
 
@@ -291,10 +291,10 @@ HistoryItem::HistoryItem(NowPlaying *parent) :
     LinkLabel(parent, "HistoryItem"),
     NowPlayingItem(parent)
 {
-    setFixedHeight(parent->height() - parent->layout()->margin() * 2);
-    setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+    setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
+    tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
     setLinkUnderline(false);
-    setText(TQString("<b>%1</b>").arg(i18n("History")));
+    setText(TQString("<b>%1</b>").tqarg(i18n("History")));
 
     m_timer = new TQTimer(this);
     connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying()));
@@ -309,14 +309,14 @@ void HistoryItem::update(const FileHandle &file)
         m_history.remove(m_history.fromLast());
 
     TQString format = "<br /><a href=\"%1\"><font size=\"-1\">%2</font></a>";
-    TQString current = TQString("<b>%1</b>").arg(i18n("History"));
+    TQString current = TQString("<b>%1</b>").tqarg(i18n("History"));
     TQString previous;
 
     for(TQValueList<Item>::ConstIterator it = m_history.begin();
         it != m_history.end(); ++it)
     {
         previous = current;
-        current.append(format.arg((*it).anchor).arg(TQStyleSheet::escape((*it).file.tag()->title())));
+        current.append(format.tqarg((*it).anchor).tqarg(TQStyleSheet::escape((*it).file.tag()->title())));
         setText(current);
         if(heightForWidth(width()) > imageSize) {
             setText(previous);