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

This reverts commit f97c8a56e217f04e08776ccf8021721b7d919b7d.
---
 src/kmplayervdr.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/kmplayervdr.cpp')

diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index 9e603da..702c8f4 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -20,7 +20,7 @@
 #include <math.h>
 #include <unistd.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqmap.h>
 #include <tqtimer.h>
@@ -78,8 +78,8 @@ static const char * strXVScale = "XV Scale";
 KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidget * parent, KMPlayer::PartBase * player)
  : TQFrame (parent), m_player (player) {
     //KURLRequester * v4ldevice;
-    TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 2);
-    TQGridLayout *gridlayout = new TQGridLayout (1, 2);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
+    TQGridLayout *gridtqlayout = new TQGridLayout (1, 2);
     xv_port = new KListView (this);
     xv_port->addColumn (TQString());
     xv_port->header()->hide ();
@@ -90,19 +90,19 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidg
     vitem->setOpen (true);
     TQWhatsThis::add (xv_port, i18n ("Port base of the X Video extension.\nIf left to default (0), the first available port will be used. However if you have multiple XVideo instances, you might have to provide the port to use here.\nSee the output from 'xvinfo' for more information"));
     TQLabel * label = new TQLabel (i18n ("Communication port:"), this);
-    gridlayout->addWidget (label, 0, 0);
+    gridtqlayout->addWidget (label, 0, 0);
     tcp_port = new TQLineEdit ("", this);
     TQWhatsThis::add (tcp_port, i18n ("Communication port with VDR. Default is port 2001.\nIf you use another port, with the '-p' option of 'vdr', you must set it here too."));
-    gridlayout->addWidget (tcp_port, 0, 1);
-    layout->addWidget (xv_port);
-    layout->addLayout (gridlayout);
+    gridtqlayout->addWidget (tcp_port, 0, 1);
+    tqlayout->addWidget (xv_port);
+    tqlayout->addLayout (gridtqlayout);
     scale = new TQButtonGroup (2, Qt::Vertical, i18n ("Scale"), this);
     new TQRadioButton (i18n ("4:3"), scale);
     new TQRadioButton (i18n ("16:9"), scale);
     TQWhatsThis::add (scale, i18n ("Aspects to use when viewing VDR"));
     scale->setButton (0);
-    layout->addWidget (scale);
-    layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    tqlayout->addWidget (scale);
+    tqlayout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::~KMPlayerPrefSourcePageVDR () {}
@@ -218,7 +218,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::playCurrent () {
 
 KDE_NO_EXPORT void KMPlayerVDRSource::processStopped () {
     if (m_socket->state () == TQSocket::Connected) {
-        queueCommand (TQString ("VOLU %1\n").arg (m_stored_volume).ascii ());
+        queueCommand (TQString ("VOLU %1\n").tqarg (m_stored_volume).ascii ());
         queueCommand ("QUIT\n");
     }
 }
@@ -309,7 +309,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::toggleConnected () {
 }
 
 KDE_NO_EXPORT void KMPlayerVDRSource::volumeChanged (int val) {
-    queueCommand (TQString ("VOLU %1\n").arg (int (sqrt (255 * 255 * val / 100))).ascii ());
+    queueCommand (TQString ("VOLU %1\n").tqarg (int (sqrt (255 * 255 * val / 100))).ascii ());
 }
 
 static struct ReadBuf {
@@ -380,7 +380,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::readyRead () {
                 if (p > 0)
                     line.truncate (p);
                 TQString channel_name = line.mid (4);
-                m_document->appendChild (new KMPlayer::GenericMrl (m_document, TQString ("kmplayer://vdrsource/%1").arg(channel_name), channel_name));
+                m_document->appendChild (new KMPlayer::GenericMrl (m_document, TQString ("kmplayer://vdrsource/%1").tqarg(channel_name), channel_name));
                 if (cmd_done) {
                     m_player->updateTree ();
                     if (!m_request_jump.isEmpty ()) {
-- 
cgit v1.2.1