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/widgets/PluginControl.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/gui/widgets/PluginControl.cpp')

diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp
index 59c6880..0c998f3 100644
--- a/src/gui/widgets/PluginControl.cpp
+++ b/src/gui/widgets/PluginControl.cpp
@@ -33,7 +33,7 @@
 #include <tqfont.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqwidget.h>
@@ -44,7 +44,7 @@ namespace Rosegarden
 {
 
 PluginControl::PluginControl(TQWidget *parent,
-                             TQGridLayout *layout,
+                             TQGridLayout *tqlayout,
                              ControlType type,
                              PluginPort *port,
                              AudioPluginManager *aPM,
@@ -53,7 +53,7 @@ PluginControl::PluginControl(TQWidget *parent,
                              bool showBounds,
                              bool hidden):
         TQObject(parent),
-        m_layout(layout),
+        m_tqlayout(tqlayout),
         m_type(type),
         m_port(port),
         m_pluginManager(aPM),
@@ -63,7 +63,7 @@ PluginControl::PluginControl(TQWidget *parent,
     plainFont.setPointSize((plainFont.pointSize() * 9 ) / 10);
 
     TQLabel *controlTitle =
-        new TQLabel(TQString("%1    ").arg(strtoqstr(port->getName())), parent);
+        new TQLabel(TQString("%1    ").tqarg(strtoqstr(port->getName())), parent);
     controlTitle->setFont(plainFont);
 
     if (type == Rotary) {
@@ -121,9 +121,9 @@ PluginControl::PluginControl(TQWidget *parent,
         TQLabel *low;
         if (port->getDisplayHint() &
             (PluginPort::Integer | PluginPort::Toggled)) {
-            low = new TQLabel(TQString("%1").arg(int(displayLower)), parent);
+            low = new TQLabel(TQString("%1").tqarg(int(displayLower)), parent);
         } else {
-            low = new TQLabel(TQString("%1").arg(displayLower), parent);
+            low = new TQLabel(TQString("%1").tqarg(displayLower), parent);
         }
         low->setFont(plainFont);
 
@@ -154,9 +154,9 @@ PluginControl::PluginControl(TQWidget *parent,
         TQLabel *upp;
         if (port->getDisplayHint() &
             (PluginPort::Integer | PluginPort::Toggled)) {
-            upp = new TQLabel(TQString("%1").arg(int(displayUpper)), parent);
+            upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), parent);
         } else {
-            upp = new TQLabel(TQString("%1").arg(displayUpper), parent);
+            upp = new TQLabel(TQString("%1").tqarg(displayUpper), parent);
         }
         upp->setFont(plainFont);
 
@@ -165,8 +165,8 @@ PluginControl::PluginControl(TQWidget *parent,
         if (!hidden) {
             controlTitle->show();
             item = new TQWidgetItem(controlTitle);
-            item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
-            m_layout->addItem(item);
+            item->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom);
+            m_tqlayout->addItem(item);
         } else {
             controlTitle->hide();
         }
@@ -174,8 +174,8 @@ PluginControl::PluginControl(TQWidget *parent,
         if (showBounds && !hidden) {
             low->show();
             item = new TQWidgetItem(low);
-            item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
-            m_layout->addItem(item);
+            item->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom);
+            m_tqlayout->addItem(item);
         } else {
             low->hide();
         }
@@ -183,8 +183,8 @@ PluginControl::PluginControl(TQWidget *parent,
         if (!hidden) {
             m_dial->show();
             item = new TQWidgetItem(m_dial);
-            item->setAlignment(TQt::AlignCenter);
-            m_layout->addItem(item);
+            item->tqsetAlignment(TQt::AlignCenter);
+            m_tqlayout->addItem(item);
         } else {
             m_dial->hide();
         }
@@ -192,8 +192,8 @@ PluginControl::PluginControl(TQWidget *parent,
         if (showBounds && !hidden) {
             upp->show();
             item = new TQWidgetItem(upp);
-            item->setAlignment(TQt::AlignLeft | TQt::AlignBottom);
-            m_layout->addItem(item);
+            item->tqsetAlignment(TQt::AlignLeft | TQt::AlignBottom);
+            m_tqlayout->addItem(item);
         } else {
             upp->hide();
         }
-- 
cgit v1.2.1