Rename obsolete tq methods to standard names

1 files changed, 10 insertions, 10 deletions

diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 1cd1ebff..568a8d59 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -58,9 +58,9 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c
 
     CollectionList::instance()->addObserver(&m_observer);
 
-    tqlayout()->setMargin(5);
-    tqlayout()->setSpacing(3);
-    setFixedHeight(imageSize + 2 + tqlayout()->margin() * 2);
+    layout()->setMargin(5);
+    layout()->setSpacing(3);
+    setFixedHeight(imageSize + 2 + layout()->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->tqlayout()->margin() * 2);
+    setFixedHeight(parent->height() - parent->layout()->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->tqlayout()->margin() * 2);
+    setFixedHeight(parent->height() - parent->layout()->margin() * 2);
     setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
 
     m_label = new LinkLabel(this);
     m_label->setLinkUnderline(false);
 
-    tqlayout->addStretch();
-    tqlayout->addWidget(m_label);
-    tqlayout->addStretch();
+    layout->addStretch();
+    layout->addWidget(m_label);
+    layout->addStretch();
 
     connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this,
             TQT_SLOT(slotOpenLink(const TQString &)));
@@ -291,7 +291,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) :
     LinkLabel(parent, "HistoryItem"),
     NowPlayingItem(parent)
 {
-    setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
+    setFixedHeight(parent->height() - parent->layout()->margin() * 2);
     setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
     setLinkUnderline(false);
     setText(TQString("<b>%1</b>").arg(i18n("History")));