diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:35 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:35 -0600 |
commit | 6ca08e7a881c0c97f338e0085f75af04ec08ad04 (patch) | |
tree | 5462bef0f060df1c19e3fcb98250e5cfa24edc11 /src/gui/editors/notation/NotationStrings.cpp | |
parent | 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a (diff) | |
download | rosegarden-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/notation/NotationStrings.cpp')
-rw-r--r-- | src/gui/editors/notation/NotationStrings.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp index 9bbc6e6..e4cae98 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").arg(dots).arg(s); + return i18n("%1-dotted-%2").tqarg(dots).tqarg(s); else - return i18n("%1-dotted %2").arg(dots).arg(s); + return i18n("%1-dotted %2").tqarg(dots).tqarg(s); } else { if (hyphenate) - return i18n("dotted-%1").arg(s); + return i18n("dotted-%1").tqarg(s); else - return i18n("dotted %1").arg(s); + return i18n("dotted %1").tqarg(s); } } else { if (dots > 1) { if (hyphenate) - return TQString("%1-dotted-%2").arg(dots).arg(s); + return TQString("%1-dotted-%2").tqarg(dots).tqarg(s); else - return TQString("%1-dotted %2").arg(dots).arg(s); + return TQString("%1-dotted %2").tqarg(dots).tqarg(s); } else { if (hyphenate) - return TQString("dotted-%1").arg(s); + return TQString("dotted-%1").tqarg(s); else - return TQString("dotted %1").arg(s); + return TQString("dotted %1").tqarg(s); } } } @@ -93,11 +93,11 @@ NotationStrings::getNoteName(Note note, bool plural, bool triplet) }; if (plural && triplet) { - 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 + 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 } else if (plural) { return addDots(pluralnames[type], dots, false, true); } else if (triplet) { - return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true); + return addDots(i18n("%1 triplet").tqarg(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").arg(names[type]), dots, false, false); + return addDots(TQString("%1 triplets").tqarg(names[type]), dots, false, false); } else if (plural) { return addDots(pluralnames[type], dots, false, false); } else if (triplet) { - return addDots(TQString("%1 triplet").arg(names[type]), dots, false, false); + return addDots(TQString("%1 triplet").tqarg(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").arg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form + return addDots(i18n("%1 triplets").tqarg(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").arg(names[type]), dots, false, true); + return addDots(i18n("%1 triplet").tqarg(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").arg(wholeNote / duration); + return TQString("1/%1").tqarg(wholeNote / duration); } else if ((duration / wholeNote) * wholeNote == duration) { - return TQString("%1/1").arg(duration / wholeNote); + return TQString("%1/1").tqarg(duration / wholeNote); } else { - return i18n("%1 ticks").arg(duration); + return i18n("%1 ticks").tqarg(duration); plural = false; } |