Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp
index 62b7128..2aa89e9 100644
--- a/src/gui/widgets/VUMeter.cpp
+++ b/src/gui/widgets/VUMeter.cpp
@@ -29,7 +29,7 @@
 #include "base/AudioLevel.h"
 #include "gui/general/GUIPalette.h"
 #include "gui/rulers/VelocityColour.h"
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
@@ -46,13 +46,13 @@ VUMeter::VUMeter(TQWidget *parent,
                  bool hasRecord,
                  int width,
                  int height,
-                 VUAlignment alignment,
+                 VUAlignment tqalignment,
                  const char *name):
         TQLabel(parent, name),
         m_originalHeight(height),
         m_active(true),
         m_type(type),
-        m_alignment(alignment),
+        m_tqalignment(tqalignment),
         m_levelLeft(0),
         m_recordLevelLeft(0),
         m_peakLevelLeft(0),
@@ -121,7 +121,7 @@ VUMeter::VUMeter(TQWidget *parent,
     setMinimumSize(width, m_originalHeight);
     setMaximumSize(width, m_originalHeight);
 
-    if (m_alignment == Vertical)
+    if (m_tqalignment == Vertical)
         m_maxLevel = height;
     else
         m_maxLevel = width;
@@ -336,7 +336,7 @@ VUMeter::paintEvent(TQPaintEvent *e)
 
         drawMeterLevel(&paint);
 
-        paint.setPen(colorGroup().background());
+        paint.setPen(tqcolorGroup().background());
         paint.drawPoint(0, 0);
         paint.drawPoint(width() - 1, 0);
         paint.drawPoint(0, height() - 1);
@@ -381,7 +381,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
         int medium = m_velocityColour->getMediumKnee(),
                      loud = m_velocityColour->getLoudKnee();
 
-        if (m_alignment == Vertical) {
+        if (m_tqalignment == Vertical) {
             if (h > loud) {
                 paint->setPen(m_velocityColour->getLoudColour());
                 paint->setBrush(TQBrush(m_velocityColour->getLoudColour(),
@@ -397,7 +397,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
             }
         }
 
-        if (m_alignment == Vertical) {
+        if (m_tqalignment == Vertical) {
             if (h > medium) {
                 paint->setPen(m_velocityColour->getMediumColour());
                 paint->setBrush(TQBrush(m_velocityColour->getMediumColour(),
@@ -415,7 +415,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
             }
         }
 
-        if (m_alignment == Vertical) {
+        if (m_tqalignment == Vertical) {
             paint->setPen(m_velocityColour->getQuietColour());
             paint->setBrush(TQBrush(m_velocityColour->getQuietColour(),
                                    style));
@@ -458,7 +458,7 @@ VUMeter::drawMeterLevel(TQPainter* paint)
                  loud = m_velocityColour->getLoudKnee();
 
     if (m_stereo) {
-        if (m_alignment == VUMeter::Vertical) {
+        if (m_tqalignment == VUMeter::Vertical) {
             int hW = width() / 2;
 
             int midWidth = 1;
@@ -561,7 +561,7 @@ VUMeter::drawMeterLevel(TQPainter* paint)
     } else {
         // Paint a vertical meter according to type
         //
-        if (m_alignment == VUMeter::Vertical) {
+        if (m_tqalignment == VUMeter::Vertical) {
             int y = height() - (m_levelLeft * height()) / m_maxLevel;
             drawColouredBar(paint, 0, 0, y, width(), height());