diff options
| author | Timothy Pearson <[email protected]> | 2011-11-26 17:42:48 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-11-26 17:42:48 -0600 |
| commit | 4b3c5dd929ea78ca3b6f656a63d70b10d2f43885 (patch) | |
| tree | 995c0d3e35794c1bb1029d6b7eacdd80827807bd /src/gui/configuration | |
| parent | 1461610fb35bb0fcee490f274ea84b8ebfeb1566 (diff) | |
| download | rosegarden-4b3c5dd929ea78ca3b6f656a63d70b10d2f43885.tar.gz rosegarden-4b3c5dd929ea78ca3b6f656a63d70b10d2f43885.zip | |
Fix FTBFS
Diffstat (limited to 'src/gui/configuration')
| -rw-r--r-- | src/gui/configuration/AudioConfigurationPage.cpp | 2 | ||||
| -rw-r--r-- | src/gui/configuration/NotationConfigurationPage.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp index e7d6128..90403b7 100644 --- a/src/gui/configuration/AudioConfigurationPage.cpp +++ b/src/gui/configuration/AudioConfigurationPage.cpp @@ -119,7 +119,7 @@ AudioConfigurationPage::AudioConfigurationPage( TQString defaultAudioEditor = getBestAvailableAudioEditor(); - std::cerr << "defaultAudioEditor = " << defaultAudioEditor << std::endl; + std::cerr << "defaultAudioEditor = " << defaultAudioEditor.ascii() << std::endl; TQString externalAudioEditor = m_cfg->readEntry("externalaudioeditor", defaultAudioEditor); diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp index e132a25..4296773 100644 --- a/src/gui/configuration/NotationConfigurationPage.cpp +++ b/src/gui/configuration/NotationConfigurationPage.cpp @@ -592,7 +592,7 @@ NotationConfigurationPage::slotViewButtonPressed() (void)viewer->exec(); // no return value } } catch (Exception f) { - KMessageBox::error(0, i18n(strtoqstr(f.getMessage()))); + KMessageBox::error(0, i18n(strtoqstr(f.getMessage()).ascii())); } #endif } @@ -656,21 +656,21 @@ NotationConfigurationPage::slotFontComboChanged(int index) NoteFont *noteFont = NoteFontFactory::getFont (fontStr, NoteFontFactory::getDefaultSize(fontStr)); const NoteFontMap &map(noteFont->getNoteFontMap()); - m_fontOriginLabel->setText(i18n(strtoqstr(map.getOrigin()))); - m_fontCopyrightLabel->setText(i18n(strtoqstr(map.getCopyright()))); - m_fontMappedByLabel->setText(i18n(strtoqstr(map.getMappedBy()))); + m_fontOriginLabel->setText(i18n(strtoqstr(map.getOrigin()).ascii())); + m_fontCopyrightLabel->setText(i18n(strtoqstr(map.getCopyright()).ascii())); + m_fontMappedByLabel->setText(i18n(strtoqstr(map.getMappedBy()).ascii())); if (map.isSmooth()) { m_fontTypeLabel->setText( - i18n("%1 (smooth)").tqarg(i18n(strtoqstr(map.getType())))); + i18n("%1 (smooth)").tqarg(i18n(strtoqstr(map.getType()).ascii()))); } else { m_fontTypeLabel->setText( - i18n("%1 (jaggy)").tqarg(i18n(strtoqstr(map.getType())))); + i18n("%1 (jaggy)").tqarg(i18n(strtoqstr(map.getType()).ascii()))); } if (m_viewButton) { m_viewButton->setEnabled(map.getSystemFontNames().count() > 0); } } catch (Exception f) { - KMessageBox::error(0, i18n(strtoqstr(f.getMessage()))); + KMessageBox::error(0, i18n(strtoqstr(f.getMessage()).ascii())); } } |