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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 25 insertions, 25 deletions

diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp
index 46bb75e..022f0ca 100644
--- a/src/gui/widgets/Fader.cpp
+++ b/src/gui/widgets/Fader.cpp
@@ -73,7 +73,7 @@ Fader::Fader(AudioLevel::FaderType type,
         m_sliderMax = width() - m_sliderMin;
     }
 
-    m_outlineColour = colorGroup().mid();
+    m_outlineColour = tqcolorGroup().mid();
 
     calculateGroovePixmap();
     setFader(0.0);
@@ -110,7 +110,7 @@ Fader::Fader(int min, int max, int deflt,
         m_sliderMax = width() - m_sliderMin;
     }
 
-    m_outlineColour = colorGroup().mid();
+    m_outlineColour = tqcolorGroup().mid();
 
     calculateGroovePixmap();
     setFader(deflt);
@@ -141,7 +141,7 @@ Fader::Fader(int min, int max, int deflt,
         m_sliderMax = width() - m_sliderMin;
     }
 
-    m_outlineColour = colorGroup().mid();
+    m_outlineColour = tqcolorGroup().mid();
 
     calculateGroovePixmap();
     setFader(deflt);
@@ -397,17 +397,17 @@ Fader::showFloatText()
     TQString text;
 
     if (m_integral) {
-        text = TQString("%1").arg(int(m_value));
+        text = TQString("%1").tqarg(int(m_value));
     } else if (m_value == AudioLevel::DB_FLOOR) {
         text = "Off";
     } else {
         float v = fabs(m_value);
         text = TQString("%1%2.%3%4%5 dB")
-               .arg(m_value < 0 ? '-' : '+')
-               .arg(int(v))
-               .arg(int(v * 10) % 10)
-               .arg(int(v * 100) % 10)
-               .arg(int(v * 1000) % 10);
+               .tqarg(m_value < 0 ? '-' : '+')
+               .tqarg(int(v))
+               .tqarg(int(v * 10) % 10)
+               .tqarg(int(v * 100) % 10)
+               .tqarg(int(v * 1000) % 10);
     }
 
     m_float->setText(text);
@@ -447,9 +447,9 @@ Fader::calculateGroovePixmap()
 
     delete map;
     map = new TQPixmap(width(), height());
-    map->fill(colorGroup().background());
+    map->fill(tqcolorGroup().background());
     TQPainter paint(map);
-    paint.setBrush(colorGroup().background());
+    paint.setBrush(tqcolorGroup().background());
 
     if (m_vertical) {
 
@@ -464,9 +464,9 @@ Fader::calculateGroovePixmap()
                 if (position >= 0 &&
                         position < m_sliderMax - m_sliderMin) {
                     if (dB == 0)
-                        paint.setPen(colorGroup().dark());
+                        paint.setPen(tqcolorGroup().dark());
                     else
-                        paint.setPen(colorGroup().midlight());
+                        paint.setPen(tqcolorGroup().midlight());
                     paint.drawLine(1, (m_sliderMax - position),
                                    width() - 2, (m_sliderMax - position));
                 }
@@ -477,8 +477,8 @@ Fader::calculateGroovePixmap()
             }
         }
 
-        paint.setPen(colorGroup().dark());
-        paint.setBrush(colorGroup().mid());
+        paint.setPen(tqcolorGroup().dark());
+        paint.setBrush(tqcolorGroup().mid());
         paint.drawRect(width() / 2 - 3, height() - m_sliderMax,
                        6, m_sliderMax - m_sliderMin);
         paint.end();
@@ -511,48 +511,48 @@ Fader::calculateButtonPixmap()
             buttonWidth = width() - 2;
 
         map = new TQPixmap(buttonWidth, buttonHeight);
-        map->fill(colorGroup().background());
+        map->fill(tqcolorGroup().background());
 
         int x = 0;
         int y = 0;
 
         TQPainter paint(map);
 
-        paint.setPen(colorGroup().light());
+        paint.setPen(tqcolorGroup().light());
         paint.drawLine(x + 1, y, x + buttonWidth - 2, y);
         paint.drawLine(x, y + 1, x, y + buttonHeight - 2);
 
-        paint.setPen(colorGroup().midlight());
+        paint.setPen(tqcolorGroup().midlight());
         paint.drawLine(x + 1, y + 1, x + buttonWidth - 2, y + 1);
         paint.drawLine(x + 1, y + 1, x + 1, y + buttonHeight - 2);
 
-        paint.setPen(colorGroup().mid());
+        paint.setPen(tqcolorGroup().mid());
         paint.drawLine(x + 2, y + buttonHeight - 2, x + buttonWidth - 2,
                        y + buttonHeight - 2);
         paint.drawLine(x + buttonWidth - 2, y + 2, x + buttonWidth - 2,
                        y + buttonHeight - 2);
 
-        paint.setPen(colorGroup().dark());
+        paint.setPen(tqcolorGroup().dark());
         paint.drawLine(x + 1, y + buttonHeight - 1, x + buttonWidth - 2,
                        y + buttonHeight - 1);
         paint.drawLine(x + buttonWidth - 1, y + 1, x + buttonWidth - 1,
                        y + buttonHeight - 2);
 
-        paint.setPen(colorGroup().shadow());
+        paint.setPen(tqcolorGroup().shadow());
         paint.drawLine(x + 1, y + buttonHeight / 2, x + buttonWidth - 2,
                        y + buttonHeight / 2);
 
-        paint.setPen(colorGroup().mid());
+        paint.setPen(tqcolorGroup().mid());
         paint.drawLine(x + 1, y + buttonHeight / 2 - 1, x + buttonWidth - 2,
                        y + buttonHeight / 2 - 1);
         paint.drawPoint(x, y + buttonHeight / 2);
 
-        paint.setPen(colorGroup().light());
+        paint.setPen(tqcolorGroup().light());
         paint.drawLine(x + 1, y + buttonHeight / 2 + 1, x + buttonWidth - 2,
                        y + buttonHeight / 2 + 1);
 
-        paint.setPen(colorGroup().button());
-        paint.setBrush(colorGroup().button());
+        paint.setPen(tqcolorGroup().button());
+        paint.setBrush(tqcolorGroup().button());
         paint.drawRect(x + 2, y + 2, buttonWidth - 4, buttonHeight / 2 - 4);
         paint.drawRect(x + 2, y + buttonHeight / 2 + 2,
                        buttonWidth - 4, buttonHeight / 2 - 4);