diff options
Diffstat (limited to 'src/gui/dialogs/IntervalDialog.cpp')
| -rw-r--r-- | src/gui/dialogs/IntervalDialog.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp index 0535e8e..b942f8e 100644 --- a/src/gui/dialogs/IntervalDialog.cpp +++ b/src/gui/dialogs/IntervalDialog.cpp @@ -24,7 +24,7 @@ #include "IntervalDialog.h" -#include <tqlayout.h> +#include <layout.h> #include <iostream> #include <klocale.h> @@ -61,12 +61,12 @@ IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTran intervalChromatic = 0; intervalDiatonic = 0; - //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").tqarg(intervalChromatic), hBox); - //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").tqarg(intervalDiatonic / 7), hBox); - //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").tqarg(intervalDiatonic % 7), hBox); + //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").arg(intervalChromatic), hBox); + //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").arg(intervalDiatonic / 7), hBox); + //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").arg(intervalDiatonic % 7), hBox); m_intervalLabel = new TQLabel( i18n("a perfect unison"), vBox); - m_intervalLabel->tqsetAlignment(TQt::AlignCenter); + m_intervalLabel->setAlignment(TQt::AlignCenter); TQFont font(m_intervalLabel->font()); font.setItalic(true); m_intervalLabel->setFont(font); @@ -205,7 +205,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) else if (deviation == 0) textIntervalDeviated += i18n("a perfect"); else - textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation); + textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation); break; // Then the major/minor: case 1: // second @@ -233,7 +233,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) else if (deviation == 0) textIntervalDeviated += i18n("a perfect"); else - textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation); + textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation); break; default: textIntervalDeviated += i18n("an (unknown)"); @@ -245,35 +245,35 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) // "1 octave and a diminished octave" is better than // "2 octaves and a diminished unison" if (octaves > 0) { - textInterval += i18n("%1 octave").tqarg(textIntervalDeviated); + textInterval += i18n("%1 octave").arg(textIntervalDeviated); octaves--; } else if (octaves < 0) { - textInterval += i18n("%1 octave").tqarg(textIntervalDeviated); + textInterval += i18n("%1 octave").arg(textIntervalDeviated); octaves++; } else { - textInterval += i18n("%1 unison").tqarg(textIntervalDeviated); + textInterval += i18n("%1 unison").arg(textIntervalDeviated); } break; case 1: - textInterval += i18n("%1 second").tqarg(textIntervalDeviated); + textInterval += i18n("%1 second").arg(textIntervalDeviated); break; case 2: - textInterval += i18n("%1 third").tqarg(textIntervalDeviated); + textInterval += i18n("%1 third").arg(textIntervalDeviated); break; case 3: - textInterval += i18n("%1 fourth").tqarg(textIntervalDeviated); + textInterval += i18n("%1 fourth").arg(textIntervalDeviated); break; case 4: - textInterval += i18n("%1 fifth").tqarg(textIntervalDeviated); + textInterval += i18n("%1 fifth").arg(textIntervalDeviated); break; case 5: - textInterval += i18n("%1 sixth").tqarg(textIntervalDeviated); + textInterval += i18n("%1 sixth").arg(textIntervalDeviated); break; case 6: - textInterval += i18n("%1 seventh").tqarg(textIntervalDeviated); + textInterval += i18n("%1 seventh").arg(textIntervalDeviated); break; default: - textInterval += i18n("%1").tqarg(textIntervalDeviated); + textInterval += i18n("%1").arg(textIntervalDeviated); } } @@ -285,14 +285,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) if (showStep) { return i18n("up 1 octave and %1", "up %n octaves and %1", - octaves).tqarg(textInterval); + octaves).arg(textInterval); } else { return i18n("up 1 octave", "up %n octaves", octaves); } } else { - return i18n("up %1").tqarg(textInterval); + return i18n("up %1").arg(textInterval); } } else @@ -301,14 +301,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) if (showStep) { return i18n("down 1 octave and %1", "down %n octaves and %1", - octaves).tqarg(textInterval); + octaves).arg(textInterval); } else { return i18n("down 1 octave", "down %n octaves", octaves); } } else { - return i18n("down %1").tqarg(textInterval); + return i18n("down %1").arg(textInterval); } } } else { |