summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/tempo
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:57:35 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:57:35 -0600
commit6ca08e7a881c0c97f338e0085f75af04ec08ad04 (patch)
tree5462bef0f060df1c19e3fcb98250e5cfa24edc11 /src/gui/editors/tempo
parent4faf11eccc5f08d2aa0540157d6eff80b7cdb02a (diff)
downloadrosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.tar.gz
rosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.
Diffstat (limited to 'src/gui/editors/tempo')
-rw-r--r--src/gui/editors/tempo/TempoView.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index ff3b1ec..7629632 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -58,7 +58,7 @@
#include <tqptrlist.h>
#include <tqsize.h>
#include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcanvas.h>
#include <kstatusbar.h>
@@ -218,7 +218,7 @@ TempoView::applyLayout(int /*staffNo*/)
new TempoListItem(comp, TempoListItem::TimeSignature,
sig.first, i, m_list, timeString,
i18n("Time Signature "),
- TQString("%1/%2 ").arg(sig.second.getNumerator()).
+ TQString("%1/%2 ").tqarg(sig.second.getNumerator()).
arg(sig.second.getDenominator()),
properties);
}
@@ -243,7 +243,7 @@ TempoView::applyLayout(int /*staffNo*/)
if (sig.getBeatDuration() ==
Note(Note::Crotchet).getDuration()) {
desc = i18n("%1.%2%3").
- arg(qpmUnits).arg(qpmTenths).arg(qpmHundredths);
+ tqarg(qpmUnits).tqarg(qpmTenths).tqarg(qpmHundredths);
} else {
float bpm = (qpm *
Note(Note::Crotchet).getDuration()) /
@@ -253,8 +253,8 @@ TempoView::applyLayout(int /*staffNo*/)
int bpmHundredths = int((bpm - bpmUnits - bpmTenths / 10.0) * 100 + 0.001);
desc = i18n("%1.%2%3 qpm (%4.%5%6 bpm) ").
- arg(qpmUnits).arg(qpmTenths).arg(qpmHundredths).
- arg(bpmUnits).arg(bpmTenths).arg(bpmHundredths);
+ tqarg(qpmUnits).tqarg(qpmTenths).tqarg(qpmHundredths).
+ tqarg(bpmUnits).tqarg(bpmTenths).tqarg(bpmHundredths);
}
TQString timeString = makeTimeString(tempo.first, timeMode);
@@ -354,27 +354,27 @@ TempoView::makeTimeString(timeT time, int timeMode)
(time, bar, beat, fraction, remainder);
++bar;
return TQString("%1%2%3-%4%5-%6%7-%8%9 ")
- .arg(bar / 100)
- .arg((bar % 100) / 10)
- .arg(bar % 10)
- .arg(beat / 10)
- .arg(beat % 10)
- .arg(fraction / 10)
- .arg(fraction % 10)
- .arg(remainder / 10)
- .arg(remainder % 10);
+ .tqarg(bar / 100)
+ .tqarg((bar % 100) / 10)
+ .tqarg(bar % 10)
+ .tqarg(beat / 10)
+ .tqarg(beat % 10)
+ .tqarg(fraction / 10)
+ .tqarg(fraction % 10)
+ .tqarg(remainder / 10)
+ .tqarg(remainder % 10);
}
case 1: // real time
{
RealTime rt =
getDocument()->getComposition().getElapsedRealTime(time);
- // return TQString("%1 ").arg(rt.toString().c_str());
- return TQString("%1 ").arg(rt.toText().c_str());
+ // return TQString("%1 ").tqarg(rt.toString().c_str());
+ return TQString("%1 ").tqarg(rt.toText().c_str());
}
default:
- return TQString("%1 ").arg(time);
+ return TQString("%1 ").tqarg(time);
}
}
@@ -832,7 +832,7 @@ void
TempoView::updateViewCaption()
{
setCaption(i18n("%1 - Tempo and Time Signature Editor")
- .arg(getDocument()->getTitle()));
+ .tqarg(getDocument()->getTitle()));
}
}