summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation/NotationStrings.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:40:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:40:46 -0600
commit97f1c43c867725d49f3943a68ef08d7e71767e99 (patch)
treeece35be847c1fcc581a6db7b3d9fc6aa497590af /src/gui/editors/notation/NotationStrings.cpp
parentef13416bfc43e51ef4e20919e0fab81ae05e0fe2 (diff)
downloadrosegarden-97f1c43c867725d49f3943a68ef08d7e71767e99.tar.gz
rosegarden-97f1c43c867725d49f3943a68ef08d7e71767e99.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/gui/editors/notation/NotationStrings.cpp')
-rw-r--r--src/gui/editors/notation/NotationStrings.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index e4cae98..9bbc6e6 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -49,26 +49,26 @@ NotationStrings::addDots(TQString s, int dots,
if (internationalize) {
if (dots > 1) {
if (hyphenate)
- return i18n("%1-dotted-%2").tqarg(dots).tqarg(s);
+ return i18n("%1-dotted-%2").arg(dots).arg(s);
else
- return i18n("%1-dotted %2").tqarg(dots).tqarg(s);
+ return i18n("%1-dotted %2").arg(dots).arg(s);
} else {
if (hyphenate)
- return i18n("dotted-%1").tqarg(s);
+ return i18n("dotted-%1").arg(s);
else
- return i18n("dotted %1").tqarg(s);
+ return i18n("dotted %1").arg(s);
}
} else {
if (dots > 1) {
if (hyphenate)
- return TQString("%1-dotted-%2").tqarg(dots).tqarg(s);
+ return TQString("%1-dotted-%2").arg(dots).arg(s);
else
- return TQString("%1-dotted %2").tqarg(dots).tqarg(s);
+ return TQString("%1-dotted %2").arg(dots).arg(s);
} else {
if (hyphenate)
- return TQString("dotted-%1").tqarg(s);
+ return TQString("dotted-%1").arg(s);
else
- return TQString("dotted %1").tqarg(s);
+ return TQString("dotted %1").arg(s);
}
}
}
@@ -93,11 +93,11 @@ NotationStrings::getNoteName(Note note, bool plural, bool triplet)
};
if (plural && triplet) {
- return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form
+ return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form
} else if (plural) {
return addDots(pluralnames[type], dots, false, true);
} else if (triplet) {
- return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true);
+ return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
} else {
return addDots(names[type], dots, false, true);
}
@@ -123,11 +123,11 @@ NotationStrings::getAmericanName(Note note, bool plural, bool triplet)
};
if (plural && triplet) {
- return addDots(TQString("%1 triplets").tqarg(names[type]), dots, false, false);
+ return addDots(TQString("%1 triplets").arg(names[type]), dots, false, false);
} else if (plural) {
return addDots(pluralnames[type], dots, false, false);
} else if (triplet) {
- return addDots(TQString("%1 triplet").tqarg(names[type]), dots, false, false);
+ return addDots(TQString("%1 triplet").arg(names[type]), dots, false, false);
} else {
return addDots(names[type], dots, false, false);
}
@@ -151,11 +151,11 @@ NotationStrings::getShortNoteName(Note note, bool plural, bool triplet)
};
if (plural && triplet) {
- return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
+ return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
} else if (plural) {
return addDots(pluralnames[type], dots, false, true);
} else if (triplet) {
- return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true);
+ return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
} else {
return addDots(names[type], dots, false, true);
}
@@ -271,11 +271,11 @@ NotationStrings::makeNoteMenuLabel(timeT duration,
timeT wholeNote = Note(Note::Semibreve).getDuration();
if ((wholeNote / duration) * duration == wholeNote) {
- return TQString("1/%1").tqarg(wholeNote / duration);
+ return TQString("1/%1").arg(wholeNote / duration);
} else if ((duration / wholeNote) * wholeNote == duration) {
- return TQString("%1/1").tqarg(duration / wholeNote);
+ return TQString("%1/1").arg(duration / wholeNote);
} else {
- return i18n("%1 ticks").tqarg(duration);
+ return i18n("%1 ticks").arg(duration);
plural = false;
}