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/dialogs/TransportDialog.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/gui/dialogs/TransportDialog.cpp') diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp index a63beac..68c42a7 100644 --- a/src/gui/dialogs/TransportDialog.cpp +++ b/src/gui/dialogs/TransportDialog.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -206,10 +206,10 @@ TransportDialog::TransportDialog(TQWidget *parent, pal.setColor(TQColorGroup::Foreground, TQColor(192, 216, 255)); m_transport->TempoDisplay->setPalette(pal); - m_transport->TempoDisplay->setAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); + m_transport->TempoDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); m_transport->TimeSigDisplay->setPalette(pal); - m_transport->TimeSigDisplay->setAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); + m_transport->TimeSigDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); TQFont localFont(m_transport->OutDisplay->font() ); localFont.setFamily( "lucida" ); @@ -344,7 +344,7 @@ TransportDialog::loadPixmaps() TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); for (int i = 0; i < 10; i++) { - fileName = TQString("%1/transport/led-%2.xpm").arg(pixmapDir).arg(i); + fileName = TQString("%1/transport/led-%2.xpm").tqarg(pixmapDir).tqarg(i); if (!m_lcdList[i].load(fileName)) { std::cerr << "TransportDialog - failed to load pixmap \"" << fileName.ascii() << "\"" << std::endl; @@ -353,7 +353,7 @@ TransportDialog::loadPixmaps() // Load the "negative" sign pixmap // - fileName = TQString("%1/transport/led--.xpm").arg(pixmapDir); + fileName = TQString("%1/transport/led--.xpm").tqarg(pixmapDir); m_lcdNegative.load(fileName); } @@ -479,7 +479,7 @@ TransportDialog::displayTime() case FrameMode: m_clearMetronomeTimer->stop(); - m_transport->TimeDisplayLabel->setText(TQString("%1").arg(m_sampleRate)); + m_transport->TimeDisplayLabel->setText(TQString("%1").tqarg(m_sampleRate)); m_transport->TimeDisplayLabel->show(); break; } @@ -917,7 +917,7 @@ TransportDialog::setMidiInLabel(const MappedEvent *mE) MidiPitchLabel mPL(mE->getPitch()); m_transport->InDisplay->setText (mPL.getTQString() + - TQString(" %1").arg(mE->getVelocity())); + TQString(" %1").tqarg(mE->getVelocity())); } break; @@ -977,7 +977,7 @@ TransportDialog::setMidiOutLabel(const MappedEvent *mE) MidiPitchLabel mPL(mE->getPitch()); m_transport->OutDisplay->setText (mPL.getTQString() + - TQString(" %1").arg(mE->getVelocity())); + TQString(" %1").tqarg(mE->getVelocity())); } break; @@ -1133,8 +1133,8 @@ TransportDialog::slotSetBackground(TQColor c) /* this is a bit more thorough, but too slow and flickery: - const TQObjectList *children = m_transport->LCDBoxFrame->children(); - TQObjectListIt it(*children); + const TQObjectList *tqchildren = m_transport->LCDBoxFrame->tqchildren(); + TQObjectListIt it(*tqchildren); TQObject *obj; while ((obj = it.current()) != 0) { -- cgit v1.2.1