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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.
---
 src/gui/studio/AudioMixerWindow.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/gui/studio/AudioMixerWindow.cpp')

diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index cb0ab64..6dced2b 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -24,7 +24,7 @@
 
 
 #include "AudioMixerWindow.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 
 #include "AudioPlugin.h"
@@ -68,7 +68,7 @@
 #include <tqiconset.h>
 #include <tqlabel.h>
 #include <tqobject.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
@@ -184,7 +184,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
             new KRadioAction(i18n("1 Input", "%n Inputs", i),
                              0, TQT_TQOBJECT(this),
                              TQT_SLOT(slotSetInputCountFromAction()), actionCollection(),
-                             TQString("inputs_%1").arg(i).ascii());
+                             TQString("inputs_%1").tqarg(i).ascii());
         action->setExclusiveGroup("inputs");
         if (i == int(m_studio->getRecordIns().size()))
             action->setChecked(true);
@@ -203,7 +203,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
                  (i18n("1 Submaster", "%n Submasters", i),
                   0, TQT_TQOBJECT(this),
                   TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
-                  TQString("submasters_%1").arg(i).ascii());
+                  TQString("submasters_%1").tqarg(i).ascii());
         action->setExclusiveGroup("submasters");
         if (i == int(m_studio->getBusses().size()) - 1)
             action->setChecked(true);
@@ -268,8 +268,8 @@ AudioMixerWindow::populate()
     BussList busses = m_studio->getBusses();
 
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
-    m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
-    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));
+    m_monoPixmap.load(TQString("%1/misc/mono.xpm").tqarg(pixmapDir));
+    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir));
 
     // Total cols: is 2 for each fader, submaster or master, plus 1
     // for each spacer.
@@ -397,11 +397,11 @@ AudioMixerWindow::populate()
         TQLabel *idLabel;
         TQString idString;
         if ((*i)->getType() == Instrument::Audio) {
-            idString = i18n("Audio %1").arg((*i)->getId() -
+            idString = i18n("Audio %1").tqarg((*i)->getId() -
                                             AudioInstrumentBase + 1);
             idLabel = new TQLabel(idString, m_mainBox, "audioIdLabel");
         } else {
-            idString = i18n("Synth %1").arg((*i)->getId() -
+            idString = i18n("Synth %1").tqarg((*i)->getId() -
                                             SoftSynthInstrumentBase + 1);
             idLabel = new TQLabel(idString, m_mainBox, "synthIdLabel");
         }
@@ -525,7 +525,7 @@ AudioMixerWindow::populate()
                     this, TQT_SLOT(slotSelectPlugin()));
         }
 
-        TQLabel *idLabel = new TQLabel(i18n("Sub %1").arg(count), m_mainBox, "subMaster");
+        TQLabel *idLabel = new TQLabel(i18n("Sub %1").tqarg(count), m_mainBox, "subMaster");
         idLabel->setFont(boldFont);
 
         //	mainLayout->addWidget(idLabel, 2, col, TQt::AlignCenter);
@@ -1322,7 +1322,7 @@ AudioMixerWindow::updateMonitorMeters(SequencerMapper *mapper)
     // only show monitor levels when quiescent or when recording (as
     // record levels)
     if (m_document->getSequenceManager() &&
-            m_document->getSequenceManager()->getTransportStatus() == PLAYING) {
+            m_document->getSequenceManager()->getTransporttqStatus() == PLAYING) {
         return ;
     }
 
@@ -1714,7 +1714,7 @@ AudioMixerWindow::slotToggleUnassignedFaders()
 void
 AudioMixerWindow::toggleNamedWidgets(bool show, const char* const name)
 {
-    TQLayoutIterator it = m_mainBox->layout()->iterator();
+    TQLayoutIterator it = m_mainBox->tqlayout()->iterator();
     TQLayoutItem *child;
     while ( (child = it.current()) != 0 ) {
         TQWidget * widget = child->widget();
-- 
cgit v1.2.1