Fix FTBFS

1 files changed, 34 insertions, 34 deletions

diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 0a471d5..bd553ee 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -1527,7 +1527,7 @@ void NotationView::setupActions()
         KToggleAction *fontAction =
             new KToggleAction
             (fontTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeFontFromAction()),
-             actionCollection(), "note_font_" + fontTQName);
+             actionCollection(), TQString("note_font_" + fontTQName).ascii());
 
         fontAction->setChecked(*i == m_fontName);
         fontActionMenu->insert(fontAction);
@@ -1559,7 +1559,7 @@ void NotationView::setupActions()
             new KToggleAction
             (TQString("%1%").tqarg(*i), 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotChangeSpacingFromAction()),
-             actionCollection(), TQString("spacing_%1").tqarg(*i));
+             actionCollection(), TQString("spacing_%1").tqarg(*i).ascii());
 
         spacingAction->setExclusiveGroup("spacing");
         spacingAction->setChecked(*i == defaultSpacing);
@@ -1585,7 +1585,7 @@ void NotationView::setupActions()
             new KToggleAction
             (name, 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotChangeProportionFromAction()),
-             actionCollection(), TQString("proportion_%1").tqarg(*i));
+             actionCollection(), TQString("proportion_%1").tqarg(*i).ascii());
 
         proportionAction->setExclusiveGroup("proportion");
         proportionAction->setChecked(*i == defaultProportion);
@@ -1608,7 +1608,7 @@ void NotationView::setupActions()
         KAction *styleAction =
             new KAction
             (styleTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetStyleFromAction()),
-             actionCollection(), "style_" + styleTQName);
+             actionCollection(), TQString("style_" + styleTQName).ascii());
 
         styleActionMenu->insert(styleAction);
     }
@@ -1622,17 +1622,17 @@ void NotationView::setupActions()
 
     new KAction
     (i18n("Insert Rest"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRest()),
-     actionCollection(), TQString("insert_rest"));
+     actionCollection(), TQString("insert_rest").ascii());
 
     new KAction
     (i18n("Switch from Note to Rest"), Key_T, TQT_TQOBJECT(this),
      TQT_SLOT(slotSwitchFromNoteToRest()),
-     actionCollection(), TQString("switch_from_note_to_rest"));
+     actionCollection(), TQString("switch_from_note_to_rest").ascii());
 
     new KAction
     (i18n("Switch from Rest to Note"), Key_Y, TQT_TQOBJECT(this),
      TQT_SLOT(slotSwitchFromRestToNote()),
-     actionCollection(), TQString("switch_from_rest_to_note"));
+     actionCollection(), TQString("switch_from_rest_to_note").ascii());
 
 
     // setup Notes menu & toolbar
@@ -1646,14 +1646,14 @@ void NotationView::setupActions()
 
         icon = TQIconSet
                (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
-                                             (noteActionData.pixmapName)));
+                                             (noteActionData.pixmapName.ascii())));
         noteAction = new KRadioAction(noteActionData.title,
                                       icon,
                                       noteActionData.keycode,
                                       TQT_TQOBJECT(this),
                                       TQT_SLOT(slotNoteAction()),
                                       actionCollection(),
-                                      noteActionData.actionName);
+                                      noteActionData.actionName.ascii());
         noteAction->setExclusiveGroup("notes");
 
         if (noteActionData.noteType == Note::Crotchet &&
@@ -1671,7 +1671,7 @@ void NotationView::setupActions()
 
         icon = TQIconSet
                (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
-                                             (data.pixmapName)));
+                                             (data.pixmapName.ascii())));
 
         KAction *action = new KAction(data.title,
                                       icon,
@@ -1679,7 +1679,7 @@ void NotationView::setupActions()
                                       TQT_TQOBJECT(this),
                                       TQT_SLOT(slotNoteChangeAction()),
                                       actionCollection(),
-                                      data.actionName);
+                                      data.actionName.ascii());
     }
 
     //
@@ -1700,10 +1700,10 @@ void NotationView::setupActions()
             i < sizeof(actionsAccidental) / sizeof(actionsAccidental[0]); ++i) {
 
         icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
-                        (actionsAccidental[i][3])));
+                        (actionsAccidental[i][3].ascii())));
         noteAction = new KRadioAction(actionsAccidental[i][0], icon, 0, TQT_TQOBJECT(this),
-                                      actionsAccidental[i][1],
-                                      actionCollection(), actionsAccidental[i][2]);
+                                      actionsAccidental[i][1].ascii(),
+                                      actionCollection(), actionsAccidental[i][2].ascii());
         noteAction->setExclusiveGroup("accidentals");
     }
 
@@ -2194,7 +2194,7 @@ void NotationView::setupActions()
                     TQT_TQOBJECT(this),
                     TQT_SLOT(slotAddMark()),
                     actionCollection(),
-                    markActionData.actionName);
+                    markActionData.actionName.ascii());
     }
 
     icon = TQIconSet
@@ -2263,7 +2263,7 @@ void NotationView::setupActions()
     for (int i = 0; i <= 5; ++i) {
         new KAction(slashTitles[i], 0, TQT_TQOBJECT(this),
                     TQT_SLOT(slotAddSlashes()), actionCollection(),
-                    TQString("slashes_%1").tqarg(i));
+                    TQString("slashes_%1").tqarg(i).ascii());
     }
 
     new KAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
@@ -2315,11 +2315,11 @@ void NotationView::setupActions()
     for (unsigned int i = 0;
             i < sizeof(actionsToolbars) / sizeof(actionsToolbars[0]); ++i) {
 
-        icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3])));
+        icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3].ascii())));
 
         new KToggleAction(actionsToolbars[i][0], icon, 0,
-                          TQT_TQOBJECT(this), actionsToolbars[i][1],
-                          actionCollection(), actionsToolbars[i][2]);
+                          TQT_TQOBJECT(this), actionsToolbars[i][1].ascii(),
+                          actionCollection(), actionsToolbars[i][2].ascii());
     }
 
     new KAction(i18n("Cursor &Back"), 0, Key_Left, TQT_TQOBJECT(this),
@@ -2546,7 +2546,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
         for (unsigned int i = 0; i < sizes.size(); ++i) {
             KAction *action =
                 actionCollection()->action
-                (TQString("note_font_size_%1").tqarg(sizes[i]));
+                (TQString("note_font_size_%1").tqarg(sizes[i]).ascii());
             m_fontSizeActionMenu->remove
             (action);
 
@@ -2563,14 +2563,14 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
         TQString actionName = TQString("note_font_size_%1").tqarg(sizes[i]);
 
         KToggleAction *sizeAction = dynamic_cast<KToggleAction *>
-                                    (actionCollection()->action(actionName));
+                                    (actionCollection()->action(actionName.ascii()));
 
         if (!sizeAction) {
             sizeAction =
                 new KToggleAction(i18n("1 pixel", "%n pixels", sizes[i]),
                                   0, TQT_TQOBJECT(this),
                                   TQT_SLOT(slotChangeFontSizeFromAction()),
-                                  actionCollection(), actionName);
+                                  actionCollection(), actionName.ascii());
         }
 
         sizeAction->setChecked(sizes[i] == m_fontSize);
@@ -3091,7 +3091,7 @@ void NotationView::setCurrentSelectedNote(const char *pixmapName,
 
 void NotationView::setCurrentSelectedNote(const NoteActionData &noteAction)
 {
-    setCurrentSelectedNote(noteAction.pixmapName,
+    setCurrentSelectedNote(noteAction.pixmapName.ascii(),
                            noteAction.rest,
                            noteAction.noteType,
                            noteAction.dots);
@@ -3969,7 +3969,7 @@ void NotationView::slotNoteAction()
 
 void NotationView::slotLastNoteAction()
 {
-    KAction *action = actionCollection()->action(m_lastNoteAction);
+    KAction *action = actionCollection()->action(m_lastNoteAction.ascii());
     if (!action)
         action = actionCollection()->action("crotchet");
 
@@ -3977,7 +3977,7 @@ void NotationView::slotLastNoteAction()
         action->activate();
     } else {
         std::cerr << "NotationView::slotNoteAction() : couldn't find action named '"
-        << m_lastNoteAction << "' or 'crotchet'\n";
+        << m_lastNoteAction.ascii() << "' or 'crotchet'\n";
     }
 }
 
@@ -4332,7 +4332,7 @@ NotationView::slotChangeSpacing(int spacing)
     //     m_spacingSlider->setSize(spacing);
 
     KToggleAction *action = dynamic_cast<KToggleAction *>
-                            (actionCollection()->action(TQString("spacing_%1").tqarg(spacing)));
+                            (actionCollection()->action(TQString("spacing_%1").tqarg(spacing).ascii()));
     if (action)
         action->setChecked(true);
     else {
@@ -4390,7 +4390,7 @@ NotationView::slotChangeProportion(int proportion)
     //    m_proportionSlider->setSize(proportion);
 
     KToggleAction *action = dynamic_cast<KToggleAction *>
-                            (actionCollection()->action(TQString("proportion_%1").tqarg(proportion)));
+                            (actionCollection()->action(TQString("proportion_%1").tqarg(proportion).ascii()));
     if (action)
         action->setChecked(true);
     else {
@@ -4544,7 +4544,7 @@ NotationView::slotChangeFont(std::string newName, int newSize)
         if (thisOne)
             m_fontCombo->setCurrentItem(i);
         KToggleAction *action = dynamic_cast<KToggleAction *>
-                                (actionCollection()->action("note_font_" + strtoqstr(f[i])));
+                                (actionCollection()->action(TQString("note_font_" + strtoqstr(f[i])).ascii()));
         NOTATION_DEBUG << "inspecting " << f[i] << (action ? ", have action" : ", no action") << endl;
         if (action)
             action->setChecked(thisOne);
@@ -4869,7 +4869,7 @@ void NotationView::slotEditGeneralPaste()
             KMessageBox::detailedError
                 (this,
                  i18n("Couldn't paste at this point."),
-                 i18n(RESTRICTED_PASTE_FAILED_DESCRIPTION));
+                 i18n(RESTRICTED_PASTE_FAILED_DESCRIPTION.ascii()));
         } else {
             addCommandToHistory(command);
             setCurrentSelection(new EventSelection
@@ -5146,7 +5146,7 @@ void NotationView::slotToggleTransportToolBar()
 
 void NotationView::toggleNamedToolBar(const TQString& toolBarName, bool* force)
 {
-    KToolBar *namedToolBar = toolBar(toolBarName);
+    KToolBar *namedToolBar = toolBar(toolBarName.ascii());
 
     if (!namedToolBar) {
         NOTATION_DEBUG << "NotationView::toggleNamedToolBar() : toolBar "
@@ -5661,11 +5661,11 @@ void NotationView::slotSwitchFromRestToNote()
     actionName = actionName.replace("-", "_");
 
     KRadioAction *action = dynamic_cast<KRadioAction *>
-        (actionCollection()->action(actionName));
+        (actionCollection()->action(actionName.ascii()));
 
     if (!action) {
         std::cerr << "WARNING: Failed to find note action \""
-                  << actionName << "\"" << std::endl;
+                  << actionName.ascii() << "\"" << std::endl;
     } else {
         action->activate();
     }
@@ -5696,11 +5696,11 @@ void NotationView::slotSwitchFromNoteToRest()
     actionName = actionName.replace("-", "_");
 
     KRadioAction *action = dynamic_cast<KRadioAction *>
-        (actionCollection()->action(actionName));
+        (actionCollection()->action(actionName.ascii()));
 
     if (!action) {
         std::cerr << "WARNING: Failed to find rest action \""
-                  << actionName << "\"" << std::endl;
+                  << actionName.ascii() << "\"" << std::endl;
     } else {
         action->activate();
     }