From 97f1c43c867725d49f3943a68ef08d7e71767e99 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:40:46 -0600 Subject: Remove additional unneeded tq method conversions --- src/gui/widgets/AudioFaderBox.cpp | 4 ++-- src/gui/widgets/AudioRouteMenu.cpp | 10 +++++----- src/gui/widgets/DiatonicPitchChooser.cpp | 8 ++++---- src/gui/widgets/Fader.cpp | 12 ++++++------ src/gui/widgets/PluginControl.cpp | 10 +++++----- src/gui/widgets/QuantizeParameters.cpp | 8 ++++---- src/gui/widgets/Rotary.cpp | 14 +++++++------- src/gui/widgets/ScrollBox.cpp | 10 +++++----- src/gui/widgets/TextFloat.cpp | 2 +- src/gui/widgets/TimeWidget.cpp | 30 +++++++++++++++--------------- src/gui/widgets/VUMeter.cpp | 16 ++++++++-------- src/gui/widgets/VUMeter.h | 4 ++-- 12 files changed, 64 insertions(+), 64 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp index 4c8e76c..7410c88 100644 --- a/src/gui/widgets/AudioFaderBox.cpp +++ b/src/gui/widgets/AudioFaderBox.cpp @@ -116,8 +116,8 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent, m_fader->setOutlineColour(GUIPalette::getColour(GUIPalette::PlaybackFaderOutline)); TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); - m_monoPixmap.load(TQString("%1/misc/mono.xpm").tqarg(pixmapDir)); - m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir)); + m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir)); + m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir)); m_pan = new Rotary(this, -100.0, 100.0, 1.0, 5.0, 0.0, 22, Rotary::NoTicks, false, true); diff --git a/src/gui/widgets/AudioRouteMenu.cpp b/src/gui/widgets/AudioRouteMenu.cpp index a2f6985..89cd416 100644 --- a/src/gui/widgets/AudioRouteMenu.cpp +++ b/src/gui/widgets/AudioRouteMenu.cpp @@ -231,24 +231,24 @@ AudioRouteMenu::getEntryText(int entry) if (stereo) { if (entry < recordIns) { - return i18n("In %1").tqarg(entry + 1); + return i18n("In %1").arg(entry + 1); } else if (entry == recordIns) { return i18n("Master"); } else { - return i18n("Sub %1").tqarg(entry - recordIns); + return i18n("Sub %1").arg(entry - recordIns); } } else { int channel = entry % 2; entry /= 2; if (entry < recordIns) { return (channel ? i18n("In %1 R") : - i18n("In %1 L")).tqarg(entry + 1); + i18n("In %1 L")).arg(entry + 1); } else if (entry == recordIns) { return (channel ? i18n("Master R") : i18n("Master L")); } else { return (channel ? i18n("Sub %1 R") : - i18n("Sub %1 L")).tqarg(entry - recordIns); + i18n("Sub %1 L")).arg(entry - recordIns); } } break; @@ -258,7 +258,7 @@ AudioRouteMenu::getEntryText(int entry) if (entry == 0) return i18n("Master"); else - return i18n("Sub %1").tqarg(entry); + return i18n("Sub %1").arg(entry); } return TQString(); diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp index c1a800a..539a8fb 100644 --- a/src/gui/widgets/DiatonicPitchChooser.cpp +++ b/src/gui/widgets/DiatonicPitchChooser.cpp @@ -87,7 +87,7 @@ DiatonicPitchChooser::DiatonicPitchChooser(TQString title, m_accidental->insertItem(i18n("double sharp")); m_accidental->setCurrentItem(2); // default: natural - m_pitchLabel = new TQLabel(TQString("%1").tqarg(getPitch()), hbox); + m_pitchLabel = new TQLabel(TQString("%1").arg(getPitch()), hbox); m_pitchLabel->setMinimumWidth(40); @@ -157,7 +157,7 @@ DiatonicPitchChooser::slotSetPitch(int pitch) m_accidental->setCurrentItem(pitchChange + 2); - m_pitchLabel->setText(TQString("%1").tqarg(pitch)); + m_pitchLabel->setText(TQString("%1").arg(pitch)); update(); } @@ -199,7 +199,7 @@ DiatonicPitchChooser::setLabelsIfNeeded() //{ m_pitchDragLabel->slotSetPitch(getPitch(), m_octave->currentItem(), m_step->currentItem()); //} - m_pitchLabel->setText(TQString("%1").tqarg(getPitch())); + m_pitchLabel->setText(TQString("%1").arg(getPitch())); } void @@ -217,7 +217,7 @@ DiatonicPitchChooser::slotSetNote(int pitch, int octave, int step) m_accidental->setCurrentItem(pitchOffset + 2); //MidiPitchLabel pl(p); - m_pitchLabel->setText(TQString("%1").tqarg(pitch)); + m_pitchLabel->setText(TQString("%1").arg(pitch)); update(); } diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp index 915cf6e..46bb75e 100644 --- a/src/gui/widgets/Fader.cpp +++ b/src/gui/widgets/Fader.cpp @@ -397,17 +397,17 @@ Fader::showFloatText() TQString text; if (m_integral) { - text = TQString("%1").tqarg(int(m_value)); + text = TQString("%1").arg(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") - .tqarg(m_value < 0 ? '-' : '+') - .tqarg(int(v)) - .tqarg(int(v * 10) % 10) - .tqarg(int(v * 100) % 10) - .tqarg(int(v * 1000) % 10); + .arg(m_value < 0 ? '-' : '+') + .arg(int(v)) + .arg(int(v * 10) % 10) + .arg(int(v * 100) % 10) + .arg(int(v * 1000) % 10); } m_float->setText(text); diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp index e1982e3..2a66a8b 100644 --- a/src/gui/widgets/PluginControl.cpp +++ b/src/gui/widgets/PluginControl.cpp @@ -63,7 +63,7 @@ PluginControl::PluginControl(TQWidget *parent, plainFont.setPointSize((plainFont.pointSize() * 9 ) / 10); TQLabel *controlTitle = - new TQLabel(TQString("%1 ").tqarg(strtoqstr(port->getName())), parent); + new TQLabel(TQString("%1 ").arg(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").tqarg(int(displayLower)), parent); + low = new TQLabel(TQString("%1").arg(int(displayLower)), parent); } else { - low = new TQLabel(TQString("%1").tqarg(displayLower), parent); + low = new TQLabel(TQString("%1").arg(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").tqarg(int(displayUpper)), parent); + upp = new TQLabel(TQString("%1").arg(int(displayUpper)), parent); } else { - upp = new TQLabel(TQString("%1").tqarg(displayUpper), parent); + upp = new TQLabel(TQString("%1").arg(displayUpper), parent); } upp->setFont(plainFont); diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp index e04d9ba..ff4841c 100644 --- a/src/gui/widgets/QuantizeParameters.cpp +++ b/src/gui/widgets/QuantizeParameters.cpp @@ -286,8 +286,8 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent, m_gridUnitCombo->insertItem(pmap, label); m_notationUnitCombo->insertItem(pmap, label); } else { - m_gridUnitCombo->insertItem(noMap, TQString("%1").tqarg(time)); - m_notationUnitCombo->insertItem(noMap, TQString("%1").tqarg(time)); + m_gridUnitCombo->insertItem(noMap, TQString("%1").arg(time)); + m_notationUnitCombo->insertItem(noMap, TQString("%1").arg(time)); } if (m_standardQuantizations[i] == defaultUnit) { @@ -298,14 +298,14 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent, } for (int i = -100; i <= 200; i += 10) { - m_swingCombo->insertItem(i == 0 ? i18n("None") : TQString("%1%").tqarg(i)); + m_swingCombo->insertItem(i == 0 ? i18n("None") : TQString("%1%").arg(i)); if (i == defaultSwing) m_swingCombo->setCurrentItem(m_swingCombo->count() - 1); } for (int i = 10; i <= 100; i += 10) { m_iterativeCombo->insertItem(i == 100 ? i18n("Full quantize") : - TQString("%1%").tqarg(i)); + TQString("%1%").arg(i)); if (i == defaultIterate) m_iterativeCombo->setCurrentItem(m_iterativeCombo->count() - 1); } diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp index 6327d4a..e417fd9 100644 --- a/src/gui/widgets/Rotary.cpp +++ b/src/gui/widgets/Rotary.cpp @@ -133,7 +133,7 @@ void Rotary::setKnobColour(const TQColor &colour) { m_knobColour = colour; - tqrepaint(); + repaint(); } void @@ -398,9 +398,9 @@ Rotary::mousePressEvent(TQMouseEvent *e) _float->reparent(this); _float->move(totalPos + TQPoint(width() + 2, -height() / 2)); if (m_logarithmic) { - _float->setText(TQString("%1").tqarg(powf(10, m_position))); + _float->setText(TQString("%1").arg(powf(10, m_position))); } else { - _float->setText(TQString("%1").tqarg(m_position)); + _float->setText(TQString("%1").arg(m_position)); } _float->show(); @@ -498,9 +498,9 @@ Rotary::mouseMoveEvent(TQMouseEvent *e) // draw on the float text if (m_logarithmic) { - _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition))); + _float->setText(TQString("%1").arg(powf(10, m_snapPosition))); } else { - _float->setText(TQString("%1").tqarg(m_snapPosition)); + _float->setText(TQString("%1").arg(m_snapPosition)); } } } @@ -527,9 +527,9 @@ Rotary::wheelEvent(TQWheelEvent *e) // draw on the float text if (m_logarithmic) { - _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition))); + _float->setText(TQString("%1").arg(powf(10, m_snapPosition))); } else { - _float->setText(TQString("%1").tqarg(m_snapPosition)); + _float->setText(TQString("%1").arg(m_snapPosition)); } // Reposition - we need to sum the relative positions up to the diff --git a/src/gui/widgets/ScrollBox.cpp b/src/gui/widgets/ScrollBox.cpp index 66ecc21..7deb0e0 100644 --- a/src/gui/widgets/ScrollBox.cpp +++ b/src/gui/widgets/ScrollBox.cpp @@ -123,31 +123,31 @@ void ScrollBox::setPageSize(const TQSize& s) setFixedWidth(width); } - tqrepaint(); + repaint(); } void ScrollBox::setViewSize(const TQSize& s) { m_viewsize = s; - tqrepaint(); + repaint(); } void ScrollBox::setViewPos(const TQPoint& pos) { m_viewpos = pos; - tqrepaint(); + repaint(); } void ScrollBox::setViewX(int x) { m_viewpos = TQPoint(x, m_viewpos.y()); - tqrepaint(); + repaint(); } void ScrollBox::setViewY(int y) { m_viewpos = TQPoint(m_viewpos.x(), y); - tqrepaint(); + repaint(); } void ScrollBox::setThumbnail(TQPixmap img) diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp index d3cc9d5..218fe5d 100644 --- a/src/gui/widgets/TextFloat.cpp +++ b/src/gui/widgets/TextFloat.cpp @@ -106,7 +106,7 @@ void TextFloat::setText(const TQString &text) { m_text = text; - tqrepaint(); + repaint(); } } diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp index 3a2a024..a949ed1 100644 --- a/src/gui/widgets/TimeWidget.cpp +++ b/src/gui/widgets/TimeWidget.cpp @@ -161,7 +161,7 @@ TimeWidget::init(bool editable) tqlayout->addWidget(m_timeT, 0, 5); } else { m_timeT = 0; - TQLineEdit *le = new TQLineEdit(TQString("%1").tqarg(m_time), frame); + TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame); le->setReadOnly(true); tqlayout->addWidget(le, 0, 5); } @@ -184,7 +184,7 @@ TimeWidget::init(bool editable) tqlayout->addWidget(new TQLabel(i18n("units"), frame), 0, 2); } else { m_timeT = 0; - TQLineEdit *le = new TQLineEdit(TQString("%1").tqarg(m_time), frame); + TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame); le->setReadOnly(true); tqlayout->addWidget(le, 0, 2); } @@ -227,7 +227,7 @@ TimeWidget::init(bool editable) tqlayout->addWidget(m_beatLabel, 1, 3); } - label = new TQLabel(i18n("%1:").tqarg(NotationStrings::getShortNoteName + label = new TQLabel(i18n("%1:").arg(NotationStrings::getShortNoteName (Note (Note::Shortest), true)), frame); @@ -383,7 +383,7 @@ TimeWidget::populate() } m_bar->setValue(bars); } else { - m_barLabel->setText(TQString("%1").tqarg(bars)); + m_barLabel->setText(TQString("%1").arg(bars)); } if (m_beat) { @@ -391,7 +391,7 @@ TimeWidget::populate() m_beat->setMaxValue(timeSig.getBeatsPerBar() - 1); m_beat->setValue(beats); } else { - m_beatLabel->setText(TQString("%1").tqarg(beats)); + m_beatLabel->setText(TQString("%1").arg(beats)); } if (m_fraction) { @@ -401,10 +401,10 @@ TimeWidget::populate() getDuration() - 1); m_fraction->setValue(hemidemis); } else { - m_fractionLabel->setText(TQString("%1").tqarg(hemidemis)); + m_fractionLabel->setText(TQString("%1").arg(hemidemis)); } - m_timeSig->setText(i18n("(%1/%2 time)").tqarg(timeSig.getNumerator()). + m_timeSig->setText(i18n("(%1/%2 time)").arg(timeSig.getNumerator()). arg(timeSig.getDenominator())); timeT endTime = m_startTime + m_time; @@ -422,7 +422,7 @@ TimeWidget::populate() } m_sec->setValue(rt.sec); } else { - m_secLabel->setText(TQString("%1").tqarg(rt.sec)); + m_secLabel->setText(TQString("%1").arg(rt.sec)); } if (m_msec) { @@ -430,7 +430,7 @@ TimeWidget::populate() m_msec->setMaxValue(999); m_msec->setValue(rt.msec()); } else { - m_msecLabel->setText(TQString("%1").tqarg(rt.msec())); + m_msecLabel->setText(TQString("%1").arg(rt.msec())); } bool change = (m_composition->getTempoChangeNumberAt(endTime) != @@ -507,7 +507,7 @@ TimeWidget::populate() } m_bar->setValue(bar + 1); } else { - m_barLabel->setText(TQString("%1").tqarg(bar + 1)); + m_barLabel->setText(TQString("%1").arg(bar + 1)); } if (m_beat) { @@ -515,7 +515,7 @@ TimeWidget::populate() m_beat->setMaxValue(timeSig.getBeatsPerBar()); m_beat->setValue(beat); } else { - m_beatLabel->setText(TQString("%1").tqarg(beat)); + m_beatLabel->setText(TQString("%1").arg(beat)); } if (m_fraction) { @@ -525,10 +525,10 @@ TimeWidget::populate() getDuration() - 1); m_fraction->setValue(hemidemis); } else { - m_fractionLabel->setText(TQString("%1").tqarg(hemidemis)); + m_fractionLabel->setText(TQString("%1").arg(hemidemis)); } - m_timeSig->setText(i18n("(%1/%2 time)").tqarg(timeSig.getNumerator()). + m_timeSig->setText(i18n("(%1/%2 time)").arg(timeSig.getNumerator()). arg(timeSig.getDenominator())); RealTime rt = m_composition->getElapsedRealTime(m_time); @@ -543,7 +543,7 @@ TimeWidget::populate() } m_sec->setValue(rt.sec); } else { - m_secLabel->setText(TQString("%1").tqarg(rt.sec)); + m_secLabel->setText(TQString("%1").arg(rt.sec)); } if (m_msec) { @@ -551,7 +551,7 @@ TimeWidget::populate() m_msec->setMaxValue(999); m_msec->setValue(rt.msec()); } else { - m_msecLabel->setText(TQString("%1").tqarg(rt.msec())); + m_msecLabel->setText(TQString("%1").arg(rt.msec())); } } diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp index ee9aacc..1f7a1c4 100644 --- a/src/gui/widgets/VUMeter.cpp +++ b/src/gui/widgets/VUMeter.cpp @@ -46,13 +46,13 @@ VUMeter::VUMeter(TQWidget *parent, bool hasRecord, int width, int height, - VUAlignment tqalignment, + VUAlignment alignment, const char *name): TQLabel(parent, name), m_originalHeight(height), m_active(true), m_type(type), - m_tqalignment(tqalignment), + m_alignment(alignment), 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_tqalignment == Vertical) + if (m_alignment == Vertical) m_maxLevel = height; else m_maxLevel = width; @@ -381,7 +381,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel, int medium = m_velocityColour->getMediumKnee(), loud = m_velocityColour->getLoudKnee(); - if (m_tqalignment == Vertical) { + if (m_alignment == 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_tqalignment == Vertical) { + if (m_alignment == 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_tqalignment == Vertical) { + if (m_alignment == 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_tqalignment == VUMeter::Vertical) { + if (m_alignment == 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_tqalignment == VUMeter::Vertical) { + if (m_alignment == VUMeter::Vertical) { int y = height() - (m_levelLeft * height()) / m_maxLevel; drawColouredBar(paint, 0, 0, y, width(), height()); diff --git a/src/gui/widgets/VUMeter.h b/src/gui/widgets/VUMeter.h index 53c90b3..c004b7e 100644 --- a/src/gui/widgets/VUMeter.h +++ b/src/gui/widgets/VUMeter.h @@ -89,7 +89,7 @@ protected: bool hasRecord = false, int width = 0, int height = 0, - VUAlignment tqalignment = Horizontal, + VUAlignment alignment = Horizontal, const char *name = 0); ~VUMeter(); @@ -115,7 +115,7 @@ private: int x, int y, int w, int h); VUMeterType m_type; - VUAlignment m_tqalignment; + VUAlignment m_alignment; TQColor m_background; short m_maxLevel; -- cgit v1.2.1