From f59dfa08651a47f21d004e8e4cb5020b8035287e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:25 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.
---
 juk/systemtray.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'juk/systemtray.cpp')

diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 429ca388..ad1eb7c8 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -31,8 +31,8 @@
 #include <tqtooltip.h>
 #include <tqpainter.h>
 #include <tqvaluevector.h>
-#include <stylesheet.h>
-#include <palette.h>
+#include <tqstylesheet.h>
+#include <tqpalette.h>
 
 #include <netwm.h>
 
@@ -370,7 +370,7 @@ void SystemTray::createPopup()
 
     for(unsigned i = 0; i < m_labels.capacity(); ++i) {
         m_labels[i] = new FlickerFreeLabel(" ", infoBox);
-        m_labels[i]->setAlignment(AlignRight | AlignVCenter);
+        m_labels[i]->tqsetAlignment(AlignRight | AlignVCenter);
     }
 
     // We don't want an autodelete popup.  There are times when it will need
@@ -385,7 +385,7 @@ void SystemTray::createPopup()
     int labelCount = 0;
 
     TQString title = TQStyleSheet::escape(playingInfo->title());
-    m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").arg(title));
+    m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").tqarg(title));
 
     if(!playingInfo->artist().isEmpty())
         m_labels[labelCount++]->setText(playingInfo->artist());
@@ -393,8 +393,8 @@ void SystemTray::createPopup()
     if(!playingInfo->album().isEmpty()) {
         TQString album = TQStyleSheet::escape(playingInfo->album());
         TQString s = playingInfo->year() > 0
-            ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").arg(album).arg(playingInfo->year())
-            : TQString("<qt><nobr>%1</nobr></qt>").arg(album);
+            ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").tqarg(album).tqarg(playingInfo->year())
+            : TQString("<qt><nobr>%1</nobr></qt>").tqarg(album);
         m_labels[labelCount++]->setText(s);
     }
 
@@ -531,8 +531,8 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover)
         TQString html = i18n("%1 is Cover Art, %2 is the playing track, %3 is the appname",
                             "<center><table cellspacing=\"2\"><tr><td valign=\"middle\">%1</td>"
                             "<td valign=\"middle\">%2</td></tr></table><em>%3</em></center>");
-        html = html.arg("<img valign=\"middle\" src=\"tipCover\"");
-        html = html.arg(TQString("<nobr>%1</nobr>").arg(tip), i18n("JuK"));
+        html = html.tqarg("<img valign=\"middle\" src=\"tipCover\"");
+        html = html.tqarg(TQString("<nobr>%1</nobr>").tqarg(tip), i18n("JuK"));
 
         TQToolTip::add(this, html);
     }
-- 
cgit v1.2.1