From 6ca08e7a881c0c97f338e0085f75af04ec08ad04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson 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/Rotary.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/gui/widgets/Rotary.cpp') diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp index 2173a26..c700e54 100644 --- a/src/gui/widgets/Rotary.cpp +++ b/src/gui/widgets/Rotary.cpp @@ -31,12 +31,12 @@ #include "TextFloat.h" #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -133,7 +133,7 @@ void Rotary::setKnobColour(const TQColor &colour) { m_knobColour = colour; - repaint(); + tqrepaint(); } void @@ -223,7 +223,7 @@ Rotary::paintEvent(TQPaintEvent *) paint.setBrush(TQBrush::NoBrush); - pen.setColor(colorGroup().dark()); + pen.setColor(tqcolorGroup().dark()); pen.setWidth(scale); paint.setPen(pen); @@ -253,7 +253,7 @@ Rotary::paintEvent(TQPaintEvent *) paint.setPen(pen); int shadowAngle = -720; - c = colorGroup().dark(); + c = tqcolorGroup().dark(); for (int arc = 120; arc < 2880; arc += 240) { pen.setColor(c); paint.setPen(pen); @@ -263,7 +263,7 @@ Rotary::paintEvent(TQPaintEvent *) } shadowAngle = 2160; - c = colorGroup().dark(); + c = tqcolorGroup().dark(); for (int arc = 120; arc < 2880; arc += 240) { pen.setColor(c); paint.setPen(pen); @@ -289,7 +289,7 @@ Rotary::paintEvent(TQPaintEvent *) double y = hyp + len * cos(angle); pen.setWidth(scale * 2); - pen.setColor(colorGroup().dark()); + pen.setColor(tqcolorGroup().dark()); paint.setPen(pen); paint.drawLine(int(x0), int(y0), int(x), int(y)); @@ -391,16 +391,16 @@ Rotary::mousePressEvent(TQMouseEvent *e) emit valueChanged(m_snapPosition); } - TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0)); + TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0)); if (!_float) _float = new TextFloat(this); _float->reparent(this); _float->move(totalPos + TQPoint(width() + 2, -height() / 2)); if (m_logarithmic) { - _float->setText(TQString("%1").arg(powf(10, m_position))); + _float->setText(TQString("%1").tqarg(powf(10, m_position))); } else { - _float->setText(TQString("%1").arg(m_position)); + _float->setText(TQString("%1").tqarg(m_position)); } _float->show(); @@ -498,9 +498,9 @@ Rotary::mouseMoveEvent(TQMouseEvent *e) // draw on the float text if (m_logarithmic) { - _float->setText(TQString("%1").arg(powf(10, m_snapPosition))); + _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition))); } else { - _float->setText(TQString("%1").arg(m_snapPosition)); + _float->setText(TQString("%1").tqarg(m_snapPosition)); } } } @@ -527,15 +527,15 @@ Rotary::wheelEvent(TQWheelEvent *e) // draw on the float text if (m_logarithmic) { - _float->setText(TQString("%1").arg(powf(10, m_snapPosition))); + _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition))); } else { - _float->setText(TQString("%1").arg(m_snapPosition)); + _float->setText(TQString("%1").tqarg(m_snapPosition)); } // Reposition - we need to sum the relative positions up to the // topLevel or dialog to please move(). Move just top/right of the rotary // - TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0)); + TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0)); _float->reparent(this); _float->move(totalPos + TQPoint(width() + 2, -height() / 2)); _float->show(); -- cgit v1.2.3