summaryrefslogtreecommitdiffstats
path: root/src/commands/segment
diff options
context:
space:
mode:
Diffstat (limited to 'src/commands/segment')
-rw-r--r--src/commands/segment/AudioSegmentSplitCommand.cpp2
-rw-r--r--src/commands/segment/SegmentChangePlayableRangeCommand.cpp4
-rw-r--r--src/commands/segment/SegmentChangeQuantizationCommand.cpp4
-rw-r--r--src/commands/segment/SegmentChangeQuantizationCommand.h4
-rw-r--r--src/commands/segment/SegmentChangeTransposeCommand.cpp4
-rw-r--r--src/commands/segment/SegmentQuickCopyCommand.h4
-rw-r--r--src/commands/segment/SegmentSplitCommand.cpp6
7 files changed, 14 insertions, 14 deletions
diff --git a/src/commands/segment/AudioSegmentSplitCommand.cpp b/src/commands/segment/AudioSegmentSplitCommand.cpp
index 6657b7b..2f547db 100644
--- a/src/commands/segment/AudioSegmentSplitCommand.cpp
+++ b/src/commands/segment/AudioSegmentSplitCommand.cpp
@@ -101,7 +101,7 @@ AudioSegmentSplitCommand::execute()
m_segmentLabel = m_segment->getLabel();
TQString newLabel = strtoqstr(m_segmentLabel);
if (!newLabel.endsWith(i18n(" (split)"))) {
- newLabel = i18n("%1 (split)").arg(newLabel);
+ newLabel = i18n("%1 (split)").tqarg(newLabel);
}
m_segment->setLabel(qstrtostr(newLabel));
m_newSegment->setLabel(m_segment->getLabel());
diff --git a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
index 026e9e1..7590c78 100644
--- a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
+++ b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
@@ -63,14 +63,14 @@ SegmentChangePlayableRangeCommand::unexecute()
m_segment->setHighestPlayable(m_oldHighestPlayableNote);
}
-QString
+TQString
SegmentChangePlayableRangeCommand::getGlobalName(int low, int high)
{
bool unit = false; // fake code to allow trunk/ to compile!
if (!unit) {
return "Undo change playable range";
} else {
- return TQString("Change playable range to %1-%2").arg(low, high);
+ return TQString("Change playable range to %1-%2").tqarg(low, high);
}
}
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.cpp b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
index e26c235..ceb021e 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.cpp
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
@@ -100,7 +100,7 @@ SegmentChangeQuantizationCommand::addSegment(Segment *s)
m_records.push_back(rec);
}
-QString
+TQString
SegmentChangeQuantizationCommand::getGlobalName(timeT unit)
{
if (!unit) {
@@ -108,7 +108,7 @@ SegmentChangeQuantizationCommand::getGlobalName(timeT unit)
} else {
timeT error = 0;
TQString label = NotationStrings::makeNoteMenuLabel(unit, true, error);
- return TQString("Quantize to %1").arg(label);
+ return TQString("Quantize to %1").tqarg(label);
}
}
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.h b/src/commands/segment/SegmentChangeQuantizationCommand.h
index 6c69728..032773e 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.h
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.h
@@ -23,8 +23,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef _RG_SEGMENTCHANGEQUANTIZATIONCOMMAND_H_
-#define _RG_SEGMENTCHANGEQUANTIZATIONCOMMAND_H_
+#ifndef _RG_SEGMENTCHANGETQUANTIZATIONCOMMAND_H_
+#define _RG_SEGMENTCHANGETQUANTIZATIONCOMMAND_H_
#include <kcommand.h>
#include <tqstring.h>
diff --git a/src/commands/segment/SegmentChangeTransposeCommand.cpp b/src/commands/segment/SegmentChangeTransposeCommand.cpp
index e7a8697..828f759 100644
--- a/src/commands/segment/SegmentChangeTransposeCommand.cpp
+++ b/src/commands/segment/SegmentChangeTransposeCommand.cpp
@@ -59,13 +59,13 @@ SegmentChangeTransposeCommand::unexecute()
m_segment->setTranspose(m_oldUnit);
}
-QString
+TQString
SegmentChangeTransposeCommand::getGlobalName(int unit)
{
if (!unit) {
return "Undo change transposition";
} else {
- return TQString("Change transposition to %1").arg(unit);
+ return TQString("Change transposition to %1").tqarg(unit);
}
}
diff --git a/src/commands/segment/SegmentQuickCopyCommand.h b/src/commands/segment/SegmentQuickCopyCommand.h
index 7e97781..b078f8f 100644
--- a/src/commands/segment/SegmentQuickCopyCommand.h
+++ b/src/commands/segment/SegmentQuickCopyCommand.h
@@ -23,8 +23,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef _RG_SEGMENQUICKCOPYCOMMAND_H_
-#define _RG_SEGMENQUICKCOPYCOMMAND_H_
+#ifndef _RG_SEGMENTQUICKCOPYCOMMAND_H_
+#define _RG_SEGMENTQUICKCOPYCOMMAND_H_
#include <kcommand.h>
#include <tqstring.h>
diff --git a/src/commands/segment/SegmentSplitCommand.cpp b/src/commands/segment/SegmentSplitCommand.cpp
index 9fbcdf6..9d4b1af 100644
--- a/src/commands/segment/SegmentSplitCommand.cpp
+++ b/src/commands/segment/SegmentSplitCommand.cpp
@@ -133,10 +133,10 @@ SegmentSplitCommand::execute()
m_segmentLabel = m_segment->getLabel();
TQString newLabel = strtoqstr(m_segmentLabel);
if (!newLabel.endsWith(i18n(" (split)"))) {
- newLabel = i18n("%1 (split)").arg(newLabel);
+ newLabel = i18n("%1 (split)").tqarg(newLabel);
}
- m_newSegmentA->setLabel(newLabel);
- m_newSegmentB->setLabel(newLabel);
+ m_newSegmentA->setLabel(newLabel.ascii());
+ m_newSegmentB->setLabel(newLabel.ascii());
m_newSegmentB->setColourIndex(m_segment->getColourIndex());
m_newSegmentB->setTranspose(m_segment->getTranspose());