diff options
Diffstat (limited to 'src/gui/editors/notation/NotationView.cpp')
| -rw-r--r-- | src/gui/editors/notation/NotationView.cpp | 980 |
1 files changed, 487 insertions, 493 deletions
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index b3db080..4d16fb7 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -346,9 +346,9 @@ public: NotationView::NotationView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *parent, + TQWidget *tqparent, bool showProgressive) : - EditView(doc, segments, 2, parent, "notationview"), + EditView(doc, segments, 2, tqparent, "notationview"), m_properties(getViewLocalPropertyPrefix()), m_selectionCounter(0), m_insertModeLabel(0), @@ -372,10 +372,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_pageMode(LinedStaff::LinearMode), m_leftGutter(20), m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)), - m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory, - m_properties, this)), - m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory, - m_properties, this)), + m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory, + m_properties, TQT_TQOBJECT(this))), + m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory, + m_properties, TQT_TQOBJECT(this))), m_chordNameRuler(0), m_tempoRuler(0), m_rawNoteRuler(0), @@ -409,7 +409,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // Initialise the display-related defaults that will be needed - // by both the actions and the layout toolbar + // by both the actions and the tqlayout toolbar m_config->setGroup(NotationViewConfigGroup); @@ -435,15 +435,15 @@ NotationView::NotationView(RosegardenGUIDoc *doc, NoteFontFactory::getDefaultSize(m_fontName)); int defaultSpacing = m_config->readNumEntry("spacing", 100); - m_hlayout->setSpacing(defaultSpacing); + m_htqlayout->setSpacing(defaultSpacing); int defaultProportion = m_config->readNumEntry("proportion", 60); - m_hlayout->setProportion(defaultProportion); + m_htqlayout->setProportion(defaultProportion); delete m_notePixmapFactory; m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize); - m_hlayout->setNotePixmapFactory(m_notePixmapFactory); - m_vlayout->setNotePixmapFactory(m_notePixmapFactory); + m_htqlayout->setNotePixmapFactory(m_notePixmapFactory); + m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory); setupActions(); // setupAddControlRulerMenu(); - too early for notation, moved to end of ctor. @@ -452,7 +452,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, setBackgroundMode(PaletteBase); - TQCanvas *tCanvas = new TQCanvas(this); + TQCanvas *tCanvas = new TQCanvas(TQT_TQOBJECT(this)); tCanvas->resize(width() * 2, height() * 2); setCanvasView(new NotationCanvasView(*this, tCanvas, getCentralWidget())); @@ -460,19 +460,19 @@ NotationView::NotationView(RosegardenGUIDoc *doc, updateViewCaption(); m_chordNameRuler = new ChordNameRuler - (m_hlayout, doc, segments, m_leftGutter, 20, getCentralWidget()); + (m_htqlayout, doc, segments, m_leftGutter, 20, getCentralWidget()); addRuler(m_chordNameRuler); if (showProgressive) m_chordNameRuler->show(); m_tempoRuler = new TempoRuler - (m_hlayout, doc, this, m_leftGutter, 24, false, getCentralWidget()); + (m_htqlayout, doc, this, m_leftGutter, 24, false, getCentralWidget()); addRuler(m_tempoRuler); m_tempoRuler->hide(); static_cast<TempoRuler *>(m_tempoRuler)->connectSignals(); m_rawNoteRuler = new RawNoteRuler - (m_hlayout, segments[0], m_leftGutter, 20, getCentralWidget()); + (m_htqlayout, segments[0], m_leftGutter, 20, getCentralWidget()); addRuler(m_rawNoteRuler); m_rawNoteRuler->show(); @@ -484,7 +484,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, readOptions(); - setBottomStandardRuler(new StandardRuler(getDocument(), m_hlayout, m_leftGutter, 25, + setBottomStandardRuler(new StandardRuler(getDocument(), m_htqlayout, m_leftGutter, 25, true, getBottomWidget())); for (unsigned int i = 0; i < segments.size(); ++i) @@ -506,7 +506,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_canvasView->setLeftFixedWidget(m_headersGroupView); // Add a close button just above the track headers. - // The grid layout is only here to maintain the button in a + // The grid tqlayout is only here to maintain the button in a // right place m_headersTopFrame = new TQFrame(getCentralWidget()); TQGridLayout * headersTopGrid @@ -516,13 +516,13 @@ NotationView::NotationView(RosegardenGUIDoc *doc, TQPushButton * hideHeadersButton = new TQPushButton(m_headersTopFrame); headersTopGrid->addWidget(hideHeadersButton, 1, 1, - Qt::AlignRight | Qt::AlignBottom); + TQt::AlignRight | TQt::AlignBottom); hideHeadersButton->setIconSet(TQIconSet(pixmap)); hideHeadersButton->setFlat(true); TQToolTip::add(hideHeadersButton, i18n("Close track headers")); headersTopGrid->setMargin(4); setTopStandardRuler(new StandardRuler(getDocument(), - m_hlayout, m_leftGutter, 25, + m_htqlayout, m_leftGutter, 25, false, getCentralWidget()), m_headersTopFrame); m_topStandardRuler->getLoopRuler()->setBackgroundColor @@ -544,7 +544,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // - // layout + // tqlayout // ProgressDialog* progressDlg = 0; @@ -571,21 +571,21 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_staffs[0]->setCurrent(true); m_config->setGroup(NotationViewConfigGroup); - int layoutMode = m_config->readNumEntry("layoutmode", 0); + int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0); try { LinedStaff::PageMode mode = LinedStaff::LinearMode; - if (layoutMode == 1) + if (tqlayoutMode == 1) mode = LinedStaff::ContinuousPageMode; - else if (layoutMode == 2) + else if (tqlayoutMode == 2) mode = LinedStaff::MultiPageMode; setPageMode(mode); for (unsigned int i = 0; i < m_staffs.size(); ++i) { - m_staffs[i]->getSegment().getRefreshStatus + m_staffs[i]->getSegment().getRefreshtqStatus (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false); } @@ -594,7 +594,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, } catch (ProgressReporter::Cancelled c) { // when cancelled, m_ok is false -- checked by calling method - NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl; + NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl; } NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl; @@ -676,10 +676,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc, this, TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int))); TQObject::connect - (getCanvasView(), TQT_SIGNAL(zoomIn()), this, TQT_SLOT(slotZoomIn())); + (getCanvasView(), TQT_SIGNAL(zoomIn()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn())); TQObject::connect - (getCanvasView(), TQT_SIGNAL(zoomOut()), this, TQT_SLOT(slotZoomOut())); + (getCanvasView(), TQT_SIGNAL(zoomOut()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut())); TQObject::connect (m_pannerDialog->scrollbox(), TQT_SIGNAL(valueChanged(const TQPoint &)), @@ -754,24 +754,24 @@ NotationView::NotationView(RosegardenGUIDoc *doc, slotSetInsertCursorPosition(0); slotSetPointerPosition(doc->getComposition().getPosition()); setCurrentSelection(0, false, true); - slotUpdateInsertModeStatus(); - m_chordNameRuler->repaint(); - m_tempoRuler->repaint(); - m_rawNoteRuler->repaint(); + slotUpdateInsertModetqStatus(); + m_chordNameRuler->tqrepaint(); + m_tempoRuler->tqrepaint(); + m_rawNoteRuler->tqrepaint(); m_inhibitRefresh = false; // slotCheckRendered(0, getCanvasView()->visibleWidth()); - // getCanvasView()->repaintContents(); + // getCanvasView()->tqrepaintContents(); updateView(); TQObject::connect (this, TQT_SIGNAL(renderComplete()), getCanvasView(), TQT_SLOT(slotRenderComplete())); - if (parent) + if (tqparent) { const TrackButtons * trackLabels = - ((RosegardenGUIView*)parent)->getTrackEditor()->getTrackButtons(); + ((RosegardenGUIView*)tqparent)->getTrackEditor()->getTrackButtons(); TQObject::connect (trackLabels, TQT_SIGNAL(nameChanged()), this, TQT_SLOT(slotUpdateStaffName())); @@ -796,7 +796,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, NotationView::NotationView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *parent, + TQWidget *tqparent, NotationView *referenceView) : EditView(doc, segments, 1, 0, "printview"), m_properties(getViewLocalPropertyPrefix()), @@ -817,10 +817,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_pageMode(LinedStaff::LinearMode), m_leftGutter(0), m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)), - m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory, - m_properties, this)), - m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory, - m_properties, this)), + m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory, + m_properties, TQT_TQOBJECT(this))), + m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory, + m_properties, TQT_TQOBJECT(this))), m_chordNameRuler(0), m_tempoRuler(0), m_rawNoteRuler(0), @@ -850,7 +850,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // Initialise the display-related defaults that will be needed - // by both the actions and the layout toolbar + // by both the actions and the tqlayout toolbar m_config->setGroup(NotationViewConfigGroup); @@ -871,25 +871,25 @@ NotationView::NotationView(RosegardenGUIDoc *doc, if (referenceView) { - m_hlayout->setSpacing(referenceView->m_hlayout->getSpacing()); - m_hlayout->setProportion(referenceView->m_hlayout->getProportion()); + m_htqlayout->setSpacing(referenceView->m_htqlayout->getSpacing()); + m_htqlayout->setProportion(referenceView->m_htqlayout->getProportion()); } else { int defaultSpacing = m_config->readNumEntry("spacing", 100); - m_hlayout->setSpacing(defaultSpacing); + m_htqlayout->setSpacing(defaultSpacing); int defaultProportion = m_config->readNumEntry("proportion", 60); - m_hlayout->setProportion(defaultProportion); + m_htqlayout->setProportion(defaultProportion); } delete m_notePixmapFactory; m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize); - m_hlayout->setNotePixmapFactory(m_notePixmapFactory); - m_vlayout->setNotePixmapFactory(m_notePixmapFactory); + m_htqlayout->setNotePixmapFactory(m_notePixmapFactory); + m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory); setBackgroundMode(PaletteBase); m_config->setGroup(NotationViewConfigGroup); - TQCanvas *tCanvas = new TQCanvas(this); + TQCanvas *tCanvas = new TQCanvas(TQT_TQOBJECT(this)); tCanvas->resize(width() * 2, height() * 2); //!!! setCanvasView(new NotationCanvasView(*this, tCanvas, getCentralWidget())); @@ -907,7 +907,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, ProgressDialog* progressDlg = 0; - if (parent) + if (tqparent) { ProgressDialog::processEvents(); @@ -915,7 +915,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, NOTATION_DEBUG << "NotationView : setting up progress dialog" << endl; progressDlg = new ProgressDialog(i18n("Preparing to print..."), - 100, parent); + 100, tqparent); progressDlg->setAutoClose(false); progressDlg->setAutoReset(true); progressDlg->setMinimumDuration(1000); @@ -930,7 +930,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, setPageMode(LinedStaff::MultiPageMode); // also positions and renders the staffs! for (unsigned int i = 0; i < m_staffs.size(); ++i) { - m_staffs[i]->getSegment().getRefreshStatus + m_staffs[i]->getSegment().getRefreshtqStatus (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false); } @@ -939,7 +939,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, } catch (ProgressReporter::Cancelled c) { // when cancelled, m_ok is false -- checked by calling method - NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl; + NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl; } NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl; @@ -1223,7 +1223,7 @@ void NotationView::positionStaffs() } } - m_hlayout->setPageWidth(pageWidth - leftMargin * 2); + m_htqlayout->setPageWidth(pageWidth - leftMargin * 2); int topGutter = 0; @@ -1341,7 +1341,7 @@ void NotationView::positionPages() haveBackground = true; } // we're happy to ignore errors from this one: - deskBackground.load(TQString("%1/misc/bg-desktop.xpm").arg(pixmapDir)); + deskBackground.load(TQString("%1/misc/bg-desktop.xpm").tqarg(pixmapDir)); } int pageWidth = getPageWidth(); @@ -1365,15 +1365,15 @@ void NotationView::positionPages() if (m_pageMode != LinedStaff::MultiPageMode) { if (haveBackground) { - canvas()->setBackgroundPixmap(background); - getCanvasView()->setBackgroundMode(Qt::FixedPixmap); + canvas()->tqsetBackgroundPixmap(background); + getCanvasView()->setBackgroundMode(TQt::FixedPixmap); getCanvasView()->setPaletteBackgroundPixmap(background); getCanvasView()->setErasePixmap(background); } } else { if (haveBackground) { - canvas()->setBackgroundPixmap(deskBackground); - getCanvasView()->setBackgroundMode(Qt::FixedPixmap); + canvas()->tqsetBackgroundPixmap(deskBackground); + getCanvasView()->setBackgroundMode(TQt::FixedPixmap); getCanvasView()->setPaletteBackgroundPixmap(background); getCanvasView()->setErasePixmap(background); } @@ -1389,7 +1389,7 @@ void NotationView::positionPages() int w = pageWidth - leftMargin / 2; int h = pageHeight; - TQString str = TQString("%1").arg(page + 1); + TQString str = TQString("%1").tqarg(page + 1); TQCanvasText *text = new TQCanvasText(str, pageNumberFont, canvas()); text->setX(m_leftGutter + pageWidth * page + pageWidth - pageNumberMetrics.width(str) - leftMargin); text->setY(y + h - pageNumberMetrics.descent() - topMargin); @@ -1399,8 +1399,8 @@ void NotationView::positionPages() TQCanvasRectangle *rect = new TQCanvasRectangle(x, y, w, h, canvas()); if (haveBackground) - rect->setBrush(TQBrush(Qt::white, background)); - rect->setPen(Qt::black); + rect->setBrush(TQBrush(TQt::white, background)); + rect->setPen(TQt::black); rect->setZ( -1000); rect->show(); m_pages.push_back(rect); @@ -1458,7 +1458,7 @@ void NotationView::readOptions() setOneToolbar("show_clefs_toolbar", "Clefs Toolbar"); setOneToolbar("show_group_toolbar", "Group Toolbar"); setOneToolbar("show_marks_toolbar", "Marks Toolbar"); - setOneToolbar("show_layout_toolbar", "Layout Toolbar"); + setOneToolbar("show_tqlayout_toolbar", "Layout Toolbar"); setOneToolbar("show_transport_toolbar", "Transport Toolbar"); setOneToolbar("show_accidentals_toolbar", "Accidentals Toolbar"); setOneToolbar("show_meta_toolbar", "Meta Toolbar"); @@ -1482,26 +1482,26 @@ void NotationView::readOptions() opt = m_config->readBoolEntry("Show Annotations", true); m_annotationsVisible = opt; getToggleAction("show_annotations")->setChecked(opt); - slotUpdateAnnotationsStatus(); + slotUpdateAnnotationstqStatus(); // slotToggleAnnotations(); opt = m_config->readBoolEntry("Show LilyPond Directives", true); m_lilyPondDirectivesVisible = opt; getToggleAction("show_lilypond_directives")->setChecked(opt); - slotUpdateLilyPondDirectivesStatus(); + slotUpdateLilyPondDirectivestqStatus(); } void NotationView::setupActions() { - KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); - KStdAction::printPreview(this, TQT_SLOT(slotFilePrintPreview()), + KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrintPreview()), actionCollection()); - new KAction(i18n("Print &with LilyPond..."), 0, 0, this, + new KAction(i18n("Print &with LilyPond..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrintLilyPond()), actionCollection(), "file_print_lilypond"); - new KAction(i18n("Preview with Lil&yPond..."), 0, 0, this, + new KAction(i18n("Preview with Lil&yPond..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPreviewLilyPond()), actionCollection(), "file_preview_lilypond"); @@ -1513,7 +1513,7 @@ void NotationView::setupActions() // View menu stuff KActionMenu *fontActionMenu = - new KActionMenu(i18n("Note &Font"), this, "note_font_actionmenu"); + new KActionMenu(i18n("Note &Font"), TQT_TQOBJECT(this), "note_font_actionmenu"); std::set <std::string> fs(NoteFontFactory::getFontNames()); @@ -1522,12 +1522,12 @@ void NotationView::setupActions() for (std::vector<std::string>::iterator i = f.begin(); i != f.end(); ++i) { - TQString fontQName(strtoqstr(*i)); + TQString fontTQName(strtoqstr(*i)); KToggleAction *fontAction = new KToggleAction - (fontQName, 0, this, TQT_SLOT(slotChangeFontFromAction()), - actionCollection(), "note_font_" + fontQName); + (fontTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeFontFromAction()), + actionCollection(), "note_font_" + fontTQName); fontAction->setChecked(*i == m_fontName); fontActionMenu->insert(fontAction); @@ -1536,20 +1536,20 @@ void NotationView::setupActions() actionCollection()->insert(fontActionMenu); m_fontSizeActionMenu = - new KActionMenu(i18n("Si&ze"), this, "note_font_size_actionmenu"); + new KActionMenu(i18n("Si&ze"), TQT_TQOBJECT(this), "note_font_size_actionmenu"); setupFontSizeMenu(); actionCollection()->insert(m_fontSizeActionMenu); m_showHeadersMenuEntry - = new KAction(i18n("Show Track Headers"), 0, this, + = new KAction(i18n("Show Track Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHeadersGroup()), actionCollection(), "show_track_headers"); KActionMenu *spacingActionMenu = - new KActionMenu(i18n("S&pacing"), this, "stretch_actionmenu"); + new KActionMenu(i18n("S&pacing"), TQT_TQOBJECT(this), "stretch_actionmenu"); - int defaultSpacing = m_hlayout->getSpacing(); + int defaultSpacing = m_htqlayout->getSpacing(); std::vector<int> spacings = NotationHLayout::getAvailableSpacings(); for (std::vector<int>::iterator i = spacings.begin(); @@ -1557,9 +1557,9 @@ void NotationView::setupActions() KToggleAction *spacingAction = new KToggleAction - (TQString("%1%").arg(*i), 0, this, + (TQString("%1%").tqarg(*i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeSpacingFromAction()), - actionCollection(), TQString("spacing_%1").arg(*i)); + actionCollection(), TQString("spacing_%1").tqarg(*i)); spacingAction->setExclusiveGroup("spacing"); spacingAction->setChecked(*i == defaultSpacing); @@ -1569,23 +1569,23 @@ void NotationView::setupActions() actionCollection()->insert(spacingActionMenu); KActionMenu *proportionActionMenu = - new KActionMenu(i18n("Du&ration Factor"), this, "proportion_actionmenu"); + new KActionMenu(i18n("Du&ration Factor"), TQT_TQOBJECT(this), "proportion_actionmenu"); - int defaultProportion = m_hlayout->getProportion(); + int defaultProportion = m_htqlayout->getProportion(); std::vector<int> proportions = NotationHLayout::getAvailableProportions(); for (std::vector<int>::iterator i = proportions.begin(); i != proportions.end(); ++i) { - TQString name = TQString("%1%").arg(*i); + TQString name = TQString("%1%").tqarg(*i); if (*i == 0) name = i18n("None"); KToggleAction *proportionAction = new KToggleAction - (name, 0, this, + (name, 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeProportionFromAction()), - actionCollection(), TQString("proportion_%1").arg(*i)); + actionCollection(), TQString("proportion_%1").tqarg(*i)); proportionAction->setExclusiveGroup("proportion"); proportionAction->setChecked(*i == defaultProportion); @@ -1595,7 +1595,7 @@ void NotationView::setupActions() actionCollection()->insert(proportionActionMenu); KActionMenu *styleActionMenu = - new KActionMenu(i18n("Note &Style"), this, "note_style_actionmenu"); + new KActionMenu(i18n("Note &Style"), TQT_TQOBJECT(this), "note_style_actionmenu"); std::vector<NoteStyleName> styles (NoteStyleFactory::getAvailableStyleNames()); @@ -1603,12 +1603,12 @@ void NotationView::setupActions() for (std::vector<NoteStyleName>::iterator i = styles.begin(); i != styles.end(); ++i) { - TQString styleQName(strtoqstr(*i)); + TQString styleTQName(strtoqstr(*i)); KAction *styleAction = new KAction - (styleQName, 0, this, TQT_SLOT(slotSetStyleFromAction()), - actionCollection(), "style_" + styleQName); + (styleTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetStyleFromAction()), + actionCollection(), "style_" + styleTQName); styleActionMenu->insert(styleAction); } @@ -1616,21 +1616,21 @@ void NotationView::setupActions() actionCollection()->insert(styleActionMenu); KActionMenu *ornamentActionMenu = - new KActionMenu(i18n("Use Ornament"), this, "ornament_actionmenu"); + new KActionMenu(i18n("Use Ornament"), TQT_TQOBJECT(this), "ornament_actionmenu"); new KAction - (i18n("Insert Rest"), Key_P, this, TQT_SLOT(slotInsertRest()), + (i18n("Insert Rest"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRest()), actionCollection(), TQString("insert_rest")); new KAction - (i18n("Switch from Note to Rest"), Key_T, this, + (i18n("Switch from Note to Rest"), Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotSwitchFromNoteToRest()), actionCollection(), TQString("switch_from_note_to_rest")); new KAction - (i18n("Switch from Rest to Note"), Key_Y, this, + (i18n("Switch from Rest to Note"), Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotSwitchFromRestToNote()), actionCollection(), TQString("switch_from_rest_to_note")); @@ -1644,13 +1644,13 @@ void NotationView::setupActions() NoteActionData noteActionData = **actionDataIter; - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap (noteActionData.pixmapName))); noteAction = new KRadioAction(noteActionData.title, icon, noteActionData.keycode, - this, + TQT_TQOBJECT(this), TQT_SLOT(slotNoteAction()), actionCollection(), noteActionData.actionName); @@ -1669,14 +1669,14 @@ void NotationView::setupActions() NoteChangeActionData data = **actionDataIter; - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap (data.pixmapName))); KAction *action = new KAction(data.title, icon, data.keycode, - this, + TQT_TQOBJECT(this), TQT_SLOT(slotNoteChangeAction()), actionCollection(), data.actionName); @@ -1699,9 +1699,9 @@ void NotationView::setupActions() for (unsigned int i = 0; i < sizeof(actionsAccidental) / sizeof(actionsAccidental[0]); ++i) { - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap (actionsAccidental[i][3]))); - noteAction = new KRadioAction(actionsAccidental[i][0], icon, 0, this, + noteAction = new KRadioAction(actionsAccidental[i][0], icon, 0, TQT_TQOBJECT(this), actionsAccidental[i][1], actionCollection(), actionsAccidental[i][2]); noteAction->setExclusiveGroup("accidentals"); @@ -1713,48 +1713,48 @@ void NotationView::setupActions() // // Treble - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble"))); - noteAction = new KRadioAction(i18n("&Treble Clef"), icon, 0, this, + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble"))); + noteAction = new KRadioAction(i18n("&Treble Clef"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotTrebleClef()), actionCollection(), "treble_clef"); noteAction->setExclusiveGroup("notes"); // Alto - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto"))); - noteAction = new KRadioAction(i18n("&Alto Clef"), icon, 0, this, + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto"))); + noteAction = new KRadioAction(i18n("&Alto Clef"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotAltoClef()), actionCollection(), "alto_clef"); noteAction->setExclusiveGroup("notes"); // Tenor - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor"))); - noteAction = new KRadioAction(i18n("Te&nor Clef"), icon, 0, this, + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor"))); + noteAction = new KRadioAction(i18n("Te&nor Clef"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotTenorClef()), actionCollection(), "tenor_clef"); noteAction->setExclusiveGroup("notes"); // Bass - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass"))); - noteAction = new KRadioAction(i18n("&Bass Clef"), icon, 0, this, + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass"))); + noteAction = new KRadioAction(i18n("&Bass Clef"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotBassClef()), actionCollection(), "bass_clef"); noteAction->setExclusiveGroup("notes"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("text"))); - noteAction = new KRadioAction(i18n("&Text"), icon, Key_F8, this, + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("text"))); + noteAction = new KRadioAction(i18n("&Text"), icon, Key_F8, TQT_TQOBJECT(this), TQT_SLOT(slotText()), actionCollection(), "text"); noteAction->setExclusiveGroup("notes"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord"))); - noteAction = new KRadioAction(i18n("&Guitar Chord"), icon, Key_F9, this, + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord"))); + noteAction = new KRadioAction(i18n("&Guitar Chord"), icon, Key_F9, TQT_TQOBJECT(this), TQT_SLOT(slotGuitarChord()), actionCollection(), "guitarchord"); noteAction->setExclusiveGroup("notes"); - /* icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond"))); - noteAction = new KRadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, this, + /* icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond"))); + noteAction = new KRadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondDirective()), actionCollection(), "lilypond_directive"); noteAction->setExclusiveGroup("notes"); */ @@ -1764,420 +1764,420 @@ void NotationView::setupActions() // Edition tools (eraser, selector...) // noteAction = new KRadioAction(i18n("&Erase"), "eraser", Key_F4, - this, TQT_SLOT(slotEraseSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); noteAction->setExclusiveGroup("notes"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("select"))); + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("select"))); noteAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, - this, TQT_SLOT(slotSelectSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); noteAction->setExclusiveGroup("notes"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step"))); - new KToggleAction(i18n("Ste&p Recording"), icon, 0, this, + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step"))); + new KToggleAction(i18n("Ste&p Recording"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleStepByStep()), actionCollection(), "toggle_step_by_step"); // Edit menu - new KAction(i18n("Select from Sta&rt"), 0, this, + new KAction(i18n("Select from Sta&rt"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditSelectFromStart()), actionCollection(), "select_from_start"); - new KAction(i18n("Select to &End"), 0, this, + new KAction(i18n("Select to &End"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditSelectToEnd()), actionCollection(), "select_to_end"); - new KAction(i18n("Select Whole St&aff"), Key_A + CTRL, this, + new KAction(i18n("Select Whole St&aff"), Key_A + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotEditSelectWholeStaff()), actionCollection(), "select_whole_staff"); - new KAction(i18n("C&ut and Close"), CTRL + SHIFT + Key_X, this, + new KAction(i18n("C&ut and Close"), CTRL + SHIFT + Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotEditCutAndClose()), actionCollection(), "cut_and_close"); - new KAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, this, + new KAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotEditGeneralPaste()), actionCollection(), "general_paste"); - new KAction(i18n("De&lete"), Key_Delete, this, + new KAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(), "delete"); - new KAction(i18n("Move to Staff Above"), 0, this, + new KAction(i18n("Move to Staff Above"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveEventsUpStaff()), actionCollection(), "move_events_up_staff"); - new KAction(i18n("Move to Staff Below"), 0, this, + new KAction(i18n("Move to Staff Below"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveEventsDownStaff()), actionCollection(), "move_events_down_staff"); // // Settings menu // - int layoutMode = m_config->readNumEntry("layoutmode", 0); + int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0); TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); - TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm"); + TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-tqlayout.xpm"); icon = TQIconSet(pixmap); KRadioAction *linearModeAction = new KRadioAction - (i18n("&Linear Layout"), icon, 0, this, TQT_SLOT(slotLinearMode()), + (i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()), actionCollection(), "linear_mode"); - linearModeAction->setExclusiveGroup("layoutMode"); - if (layoutMode == 0) + linearModeAction->setExclusiveGroup("tqlayoutMode"); + if (tqlayoutMode == 0) linearModeAction->setChecked(true); pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm"); icon = TQIconSet(pixmap); KRadioAction *continuousPageModeAction = new KRadioAction - (i18n("&Continuous Page Layout"), icon, 0, this, TQT_SLOT(slotContinuousPageMode()), + (i18n("&Continuous Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinuousPageMode()), actionCollection(), "continuous_page_mode"); - continuousPageModeAction->setExclusiveGroup("layoutMode"); - if (layoutMode == 1) + continuousPageModeAction->setExclusiveGroup("tqlayoutMode"); + if (tqlayoutMode == 1) continuousPageModeAction->setChecked(true); pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm"); icon = TQIconSet(pixmap); KRadioAction *multiPageModeAction = new KRadioAction - (i18n("&Multiple Page Layout"), icon, 0, this, TQT_SLOT(slotMultiPageMode()), + (i18n("&Multiple Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMultiPageMode()), actionCollection(), "multi_page_mode"); - multiPageModeAction->setExclusiveGroup("layoutMode"); - if (layoutMode == 2) + multiPageModeAction->setExclusiveGroup("tqlayoutMode"); + if (tqlayoutMode == 2) multiPageModeAction->setChecked(true); - new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, this, + new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleChordsRuler()), actionCollection(), "show_chords_ruler"); - new KToggleAction(i18n("Show Ra&w Note Ruler"), 0, this, + new KToggleAction(i18n("Show Ra&w Note Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleRawNoteRuler()), actionCollection(), "show_raw_note_ruler"); - new KToggleAction(i18n("Show &Tempo Ruler"), 0, this, + new KToggleAction(i18n("Show &Tempo Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); - new KToggleAction(i18n("Show &Annotations"), 0, this, + new KToggleAction(i18n("Show &Annotations"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAnnotations()), actionCollection(), "show_annotations"); - new KToggleAction(i18n("Show Lily&Pond Directives"), 0, this, + new KToggleAction(i18n("Show Lily&Pond Directives"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLilyPondDirectives()), actionCollection(), "show_lilypond_directives"); - new KAction(i18n("Open L&yric Editor"), 0, this, TQT_SLOT(slotEditLyrics()), + new KAction(i18n("Open L&yric Editor"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditLyrics()), actionCollection(), "lyric_editor"); // // Group menu // - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-beam"))); - new KAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, this, + new KAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupBeam()), actionCollection(), "beam"); - new KAction(AutoBeamCommand::getGlobalName(), 0, this, + new KAction(AutoBeamCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupAutoBeam()), actionCollection(), "auto_beam"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-unbeam"))); - new KAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, this, + new KAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupBreak()), actionCollection(), "break_group"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-simple-tuplet"))); - new KAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, this, + new KAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupSimpleTuplet()), actionCollection(), "simple_tuplet"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-tuplet"))); - new KAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, this, + new KAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupGeneralTuplet()), actionCollection(), "tuplet"); - new KAction(UnTupletCommand::getGlobalName(), 0, this, + new KAction(UnTupletCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupUnTuplet()), actionCollection(), "break_tuplets"); - icon = TQIconSet(NotePixmapFactory::toQPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("triplet"))); (new KToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G, - this, TQT_SLOT(slotUpdateInsertModeStatus()), + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()), actionCollection(), "triplet_mode"))-> setChecked(false); - icon = TQIconSet(NotePixmapFactory::toQPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("chord"))); (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, - this, TQT_SLOT(slotUpdateInsertModeStatus()), + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()), actionCollection(), "chord_mode"))-> setChecked(false); - icon = TQIconSet(NotePixmapFactory::toQPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("group-grace"))); (new KToggleAction(i18n("Grace Insert Mode"), icon, 0, - this, TQT_SLOT(slotUpdateInsertModeStatus()), + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()), actionCollection(), "grace_mode"))-> setChecked(false); /*!!! - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-grace"))); - new KAction(GraceCommand::getGlobalName(), icon, 0, this, + new KAction(GraceCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupGrace()), actionCollection(), "grace"); - new KAction(UnGraceCommand::getGlobalName(), 0, this, + new KAction(UnGraceCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupUnGrace()), actionCollection(), "ungrace"); */ - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-slur"))); new KAction(AddIndicationCommand::getGlobalName - (Indication::Slur), icon, Key_ParenRight, this, + (Indication::Slur), icon, Key_ParenRight, TQT_TQOBJECT(this), TQT_SLOT(slotGroupSlur()), actionCollection(), "slur"); new KAction(AddIndicationCommand::getGlobalName - (Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, this, + (Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupPhrasingSlur()), actionCollection(), "phrasing_slur"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-glissando"))); new KAction(AddIndicationCommand::getGlobalName - (Indication::Glissando), icon, 0, this, + (Indication::Glissando), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupGlissando()), actionCollection(), "glissando"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-crescendo"))); new KAction(AddIndicationCommand::getGlobalName - (Indication::Crescendo), icon, Key_Less, this, + (Indication::Crescendo), icon, Key_Less, TQT_TQOBJECT(this), TQT_SLOT(slotGroupCrescendo()), actionCollection(), "crescendo"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-decrescendo"))); new KAction(AddIndicationCommand::getGlobalName - (Indication::Decrescendo), icon, Key_Greater, this, + (Indication::Decrescendo), icon, Key_Greater, TQT_TQOBJECT(this), TQT_SLOT(slotGroupDecrescendo()), actionCollection(), "decrescendo"); new KAction(AddIndicationCommand::getGlobalName - (Indication::QuindicesimaUp), 0, 0, this, + (Indication::QuindicesimaUp), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupOctave2Up()), actionCollection(), "octave_2up"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-ottava"))); new KAction(AddIndicationCommand::getGlobalName - (Indication::OttavaUp), icon, 0, this, + (Indication::OttavaUp), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupOctaveUp()), actionCollection(), "octave_up"); new KAction(AddIndicationCommand::getGlobalName - (Indication::OttavaDown), 0, 0, this, + (Indication::OttavaDown), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupOctaveDown()), actionCollection(), "octave_down"); new KAction(AddIndicationCommand::getGlobalName - (Indication::QuindicesimaDown), 0, 0, this, + (Indication::QuindicesimaDown), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupOctave2Down()), actionCollection(), "octave_2down"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-chord"))); - new KAction(MakeChordCommand::getGlobalName(), icon, 0, this, + new KAction(MakeChordCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupMakeChord()), actionCollection(), "make_chord"); // setup Transforms menu - new KAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, this, + new KAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsNormalizeRests()), actionCollection(), "normalize_rests"); - new KAction(CollapseRestsCommand::getGlobalName(), 0, this, + new KAction(CollapseRestsCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsCollapseRests()), actionCollection(), "collapse_rests_aggressively"); - new KAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, this, + new KAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(), "collapse_notes"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transforms-tie"))); - new KAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, this, + new KAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsTieNotes()), actionCollection(), "tie_notes"); - new KAction(UntieNotesCommand::getGlobalName(), 0, this, + new KAction(UntieNotesCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsUntieNotes()), actionCollection(), "untie_notes"); - new KAction(MakeNotesViableCommand::getGlobalName(), 0, this, + new KAction(MakeNotesViableCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsMakeNotesViable()), actionCollection(), "make_notes_viable"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transforms-decounterpoint"))); - new KAction(DeCounterpointCommand::getGlobalName(), icon, 0, this, + new KAction(DeCounterpointCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsDeCounterpoint()), actionCollection(), "de_counterpoint"); new KAction(ChangeStemsCommand::getGlobalName(true), - 0, Key_PageUp + CTRL, this, + 0, Key_PageUp + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsStemsUp()), actionCollection(), "stems_up"); new KAction(ChangeStemsCommand::getGlobalName(false), - 0, Key_PageDown + CTRL, this, + 0, Key_PageDown + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsStemsDown()), actionCollection(), "stems_down"); - new KAction(RestoreStemsCommand::getGlobalName(), 0, this, + new KAction(RestoreStemsCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRestoreStems()), actionCollection(), "restore_stems"); new KAction(ChangeSlurPositionCommand::getGlobalName(true), - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsSlursAbove()), actionCollection(), "slurs_above"); new KAction(ChangeSlurPositionCommand::getGlobalName(false), - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsSlursBelow()), actionCollection(), "slurs_below"); - new KAction(RestoreSlursCommand::getGlobalName(), 0, this, + new KAction(RestoreSlursCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRestoreSlurs()), actionCollection(), "restore_slurs"); new KAction(ChangeTiePositionCommand::getGlobalName(true), - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsTiesAbove()), actionCollection(), "ties_above"); new KAction(ChangeTiePositionCommand::getGlobalName(false), - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsTiesBelow()), actionCollection(), "ties_below"); - new KAction(RestoreTiesCommand::getGlobalName(), 0, this, + new KAction(RestoreTiesCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRestoreTies()), actionCollection(), "restore_ties"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-doubleflat"))); new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::DoubleFlat), - icon, 0, this, + icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellDoubleFlat()), actionCollection(), "respell_doubleflat"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-flat"))); new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Flat), - icon, 0, this, + icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellFlat()), actionCollection(), "respell_flat"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-natural"))); new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Natural), - icon, 0, this, + icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellNatural()), actionCollection(), "respell_natural"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-sharp"))); new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Sharp), - icon, 0, this, + icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellSharp()), actionCollection(), "respell_sharp"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-doublesharp"))); new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::DoubleSharp), - icon, 0, this, + icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellDoubleSharp()), actionCollection(), "respell_doublesharp"); new KAction(RespellCommand::getGlobalName (RespellCommand::Up, Accidentals::NoAccidental), - Key_Up + CTRL + SHIFT, this, + Key_Up + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotRespellUp()), actionCollection(), "respell_up"); new KAction(RespellCommand::getGlobalName (RespellCommand::Down, Accidentals::NoAccidental), - Key_Down + CTRL + SHIFT, this, + Key_Down + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotRespellDown()), actionCollection(), "respell_down"); new KAction(RespellCommand::getGlobalName (RespellCommand::Restore, Accidentals::NoAccidental), - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellRestore()), actionCollection(), "respell_restore"); new KAction(MakeAccidentalsCautionaryCommand::getGlobalName(true), - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowCautionary()), actionCollection(), "show_cautionary"); new KAction(MakeAccidentalsCautionaryCommand::getGlobalName(false), - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancelCautionary()), actionCollection(), "cancel_cautionary"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("quantize"))); - new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this, + new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsQuantize()), actionCollection(), "quantize"); new KAction(FixNotationQuantizeCommand::getGlobalName(), 0, - this, TQT_SLOT(slotTransformsFixQuantization()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotTransformsFixQuantization()), actionCollection(), "fix_quantization"); new KAction(RemoveNotationQuantizeCommand::getGlobalName(), 0, - this, TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(), "remove_quantization"); new KAction(InterpretCommand::getGlobalName(), 0, - this, TQT_SLOT(slotTransformsInterpret()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotTransformsInterpret()), actionCollection(), "interpret"); - new KAction(i18n("&Dump selected events to stderr"), 0, this, + new KAction(i18n("&Dump selected events to stderr"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump"); for (MarkActionDataMap::Iterator i = m_markActionDataMap->begin(); @@ -2185,75 +2185,75 @@ void NotationView::setupActions() const MarkActionData &markActionData = **i; - icon = TQIconSet(NotePixmapFactory::toQPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeMarkMenuPixmap(markActionData.mark))); new KAction(markActionData.title, icon, markActionData.keycode, - this, + TQT_TQOBJECT(this), TQT_SLOT(slotAddMark()), actionCollection(), markActionData.actionName); } - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("text-mark"))); - new KAction(AddTextMarkCommand::getGlobalName(), icon, 0, this, + new KAction(AddTextMarkCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddTextMark()), actionCollection(), "add_text_mark"); - new KAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, this, + new KAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_0"); - new KAction(AddFingeringMarkCommand::getGlobalName("1"), 0, Key_1 + ALT, this, + new KAction(AddFingeringMarkCommand::getGlobalName("1"), 0, Key_1 + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_1"); - new KAction(AddFingeringMarkCommand::getGlobalName("2"), 0, Key_2 + ALT, this, + new KAction(AddFingeringMarkCommand::getGlobalName("2"), 0, Key_2 + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_2"); - new KAction(AddFingeringMarkCommand::getGlobalName("3"), 0, Key_3 + ALT, this, + new KAction(AddFingeringMarkCommand::getGlobalName("3"), 0, Key_3 + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_3"); - new KAction(AddFingeringMarkCommand::getGlobalName("4"), 0, Key_4 + ALT, this, + new KAction(AddFingeringMarkCommand::getGlobalName("4"), 0, Key_4 + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_4"); - new KAction(AddFingeringMarkCommand::getGlobalName("5"), 0, Key_5 + ALT, this, + new KAction(AddFingeringMarkCommand::getGlobalName("5"), 0, Key_5 + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_5"); - new KAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, this, + new KAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_plus"); - new KAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, this, + new KAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMark()), actionCollection(), "add_fingering_mark"); - new KAction(RemoveMarksCommand::getGlobalName(), 0, this, + new KAction(RemoveMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarksRemoveMarks()), actionCollection(), "remove_marks"); - new KAction(RemoveFingeringMarksCommand::getGlobalName(), 0, this, + new KAction(RemoveFingeringMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarksRemoveFingeringMarks()), actionCollection(), "remove_fingering_marks"); - new KAction(i18n("Ma&ke Ornament..."), 0, this, + new KAction(i18n("Ma&ke Ornament..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMakeOrnament()), actionCollection(), "make_ornament"); - new KAction(i18n("Trigger &Ornament..."), 0, this, + new KAction(i18n("Trigger &Ornament..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUseOrnament()), actionCollection(), "use_ornament"); - new KAction(i18n("Remove Ornament..."), 0, this, + new KAction(i18n("Remove Ornament..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveOrnament()), actionCollection(), "remove_ornament"); @@ -2261,32 +2261,32 @@ void NotationView::setupActions() i18n("&None"), "&1", "&2", "&3", "&4", "&5" }; for (int i = 0; i <= 5; ++i) { - new KAction(slashTitles[i], 0, this, + new KAction(slashTitles[i], 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSlashes()), actionCollection(), - TQString("slashes_%1").arg(i)); + TQString("slashes_%1").tqarg(i)); } - new KAction(ClefInsertionCommand::getGlobalName(), 0, this, + new KAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAddClef()), actionCollection(), "add_clef"); - new KAction(KeyInsertionCommand::getGlobalName(), 0, this, + new KAction(KeyInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAddKeySignature()), actionCollection(), "add_key_signature"); - new KAction(SustainInsertionCommand::getGlobalName(true), 0, this, + new KAction(SustainInsertionCommand::getGlobalName(true), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAddSustainDown()), actionCollection(), "add_sustain_down"); - new KAction(SustainInsertionCommand::getGlobalName(false), 0, this, + new KAction(SustainInsertionCommand::getGlobalName(false), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAddSustainUp()), actionCollection(), "add_sustain_up"); - new KAction(TransposeCommand::getDiatonicGlobalName(false), 0, this, + new KAction(TransposeCommand::getDiatonicGlobalName(false), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTranspose()), actionCollection(), "transpose_segment"); - new KAction(i18n("Convert Notation For..."), 0, this, + new KAction(i18n("Convert Notation For..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditSwitchPreset()), actionCollection(), "switch_preset"); @@ -2304,7 +2304,7 @@ void NotationView::setupActions() "palette-marks" }, { i18n("Show &Group Toolbar"), "1slotToggleGroupToolBar()", "show_group_toolbar", "palette-group" }, - { i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_layout_toolbar", + { i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_tqlayout_toolbar", "palette-font" }, { i18n("Show Trans&port Toolbar"), "1slotToggleTransportToolBar()", "show_transport_toolbar", "palette-transport" }, @@ -2315,200 +2315,200 @@ void NotationView::setupActions() for (unsigned int i = 0; i < sizeof(actionsToolbars) / sizeof(actionsToolbars[0]); ++i) { - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3]))); + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3]))); new KToggleAction(actionsToolbars[i][0], icon, 0, - this, actionsToolbars[i][1], + TQT_TQOBJECT(this), actionsToolbars[i][1], actionCollection(), actionsToolbars[i][2]); } - new KAction(i18n("Cursor &Back"), 0, Key_Left, this, + new KAction(i18n("Cursor &Back"), 0, Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotStepBackward()), actionCollection(), "cursor_back"); - new KAction(i18n("Cursor &Forward"), 0, Key_Right, this, + new KAction(i18n("Cursor &Forward"), 0, Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotStepForward()), actionCollection(), "cursor_forward"); - new KAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, this, + new KAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotJumpBackward()), actionCollection(), "cursor_back_bar"); - new KAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, this, + new KAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotJumpForward()), actionCollection(), "cursor_forward_bar"); - new KAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, this, + new KAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotExtendSelectionBackward()), actionCollection(), "extend_selection_backward"); - new KAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, this, + new KAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotExtendSelectionForward()), actionCollection(), "extend_selection_forward"); - new KAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, this, + new KAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotExtendSelectionBackwardBar()), actionCollection(), "extend_selection_backward_bar"); - new KAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, this, + new KAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotExtendSelectionForwardBar()), actionCollection(), "extend_selection_forward_bar"); /*!!! not here yet - new KAction(i18n("Move Selection Left"), Key_Minus, this, + new KAction(i18n("Move Selection Left"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotMoveSelectionLeft()), actionCollection(), "move_selection_left"); */ new KAction(i18n("Cursor to St&art"), 0, /* #1025717: conflicting meanings for ctrl+a - dupe with Select All - Key_A + CTRL, */ this, + Key_A + CTRL, */ TQT_TQOBJECT(this), TQT_SLOT(slotJumpToStart()), actionCollection(), "cursor_start"); - new KAction(i18n("Cursor to &End"), 0, Key_E + CTRL, this, + new KAction(i18n("Cursor to &End"), 0, Key_E + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToEnd()), actionCollection(), "cursor_end"); - new KAction(i18n("Cursor &Up Staff"), 0, Key_Up + SHIFT, this, + new KAction(i18n("Cursor &Up Staff"), 0, Key_Up + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotCurrentStaffUp()), actionCollection(), "cursor_up_staff"); - new KAction(i18n("Cursor &Down Staff"), 0, Key_Down + SHIFT, this, + new KAction(i18n("Cursor &Down Staff"), 0, Key_Down + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotCurrentStaffDown()), actionCollection(), "cursor_down_staff"); - new KAction(i18n("Cursor Pre&vious Segment"), 0, Key_Prior + ALT, this, + new KAction(i18n("Cursor Pre&vious Segment"), 0, Key_Prior + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotCurrentSegmentPrior()), actionCollection(), "cursor_prior_segment"); - new KAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, this, + new KAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotCurrentSegmentNext()), actionCollection(), "cursor_next_segment"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-cursor-to-pointer"))); - new KAction(i18n("Cursor to &Playback Pointer"), icon, 0, this, + new KAction(i18n("Cursor to &Playback Pointer"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(), "cursor_to_playback_pointer"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-play"))); - KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, this, + KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), TQT_SIGNAL(play()), actionCollection(), "play"); // Alternative shortcut for Play KShortcut playShortcut = play->shortcut(); playShortcut.append( KKey(Key_Return + CTRL) ); play->setShortcut(playShortcut); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-stop"))); - new KAction(i18n("&Stop"), icon, Key_Insert, this, + new KAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), TQT_SIGNAL(stop()), actionCollection(), "stop"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind"))); - new KAction(i18n("Re&wind"), icon, Key_End, this, + new KAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlayback()), actionCollection(), "playback_pointer_back_bar"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd"))); - new KAction(i18n("&Fast Forward"), icon, Key_PageDown, this, + new KAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlayback()), actionCollection(), "playback_pointer_forward_bar"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind-end"))); - new KAction(i18n("Rewind to &Beginning"), icon, 0, this, + new KAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(), "playback_pointer_start"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd-end"))); - new KAction(i18n("Fast Forward to &End"), icon, 0, this, + new KAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(), "playback_pointer_end"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-pointer-to-cursor"))); - new KAction(i18n("Playback Pointer to &Cursor"), icon, 0, this, + new KAction(i18n("Playback Pointer to &Cursor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(), "playback_pointer_to_cursor"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-solo"))); - new KToggleAction(i18n("&Solo"), icon, 0, this, + new KToggleAction(i18n("&Solo"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSolo()), actionCollection(), "toggle_solo"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-tracking"))); - (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this, + (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(m_playTracking); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-panic"))); - new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this, + new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), TQT_SIGNAL(panic()), actionCollection(), "panic"); - new KAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, this, + new KAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotPreviewSelection()), actionCollection(), "preview_selection"); - new KAction(i18n("Clear L&oop"), Key_Colon + CTRL, this, + new KAction(i18n("Clear L&oop"), Key_Colon + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotClearLoop()), actionCollection(), "clear_loop"); - new KAction(i18n("Clear Selection"), Key_Escape, this, + new KAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), actionCollection(), "clear_selection"); // TQString pixmapDir = // KGlobal::dirs()->findResource("appdata", "pixmaps/"); // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); - new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, this, + new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotFilterSelection()), actionCollection(), "filter_selection"); - new KAction(i18n("Push &Left"), 0, this, + new KAction(i18n("Push &Left"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionLeft()), actionCollection(), "fine_position_left"); - new KAction(i18n("Push &Right"), 0, this, + new KAction(i18n("Push &Right"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionRight()), actionCollection(), "fine_position_right"); - new KAction(i18n("Push &Up"), 0, this, + new KAction(i18n("Push &Up"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionUp()), actionCollection(), "fine_position_up"); - new KAction(i18n("Push &Down"), 0, this, + new KAction(i18n("Push &Down"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionDown()), actionCollection(), "fine_position_down"); - new KAction(i18n("&Restore Positions"), 0, this, + new KAction(i18n("&Restore Positions"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionRestore()), actionCollection(), "fine_position_restore"); - new KAction(i18n("Make &Invisible"), 0, this, + new KAction(i18n("Make &Invisible"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMakeInvisible()), actionCollection(), "make_invisible"); - new KAction(i18n("Make &Visible"), 0, this, + new KAction(i18n("Make &Visible"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMakeVisible()), actionCollection(), "make_visible"); - new KAction(i18n("Toggle Dot"), Key_Period, this, + new KAction(i18n("Toggle Dot"), Key_Period, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDot()), actionCollection(), "toggle_dot"); - new KAction(i18n("Add Dot"), Key_Period + CTRL, this, + new KAction(i18n("Add Dot"), Key_Period + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotAddDot()), actionCollection(), "add_dot"); - new KAction(i18n("Add Dot"), Key_Period + CTRL + ALT, this, + new KAction(i18n("Add Dot"), Key_Period + CTRL + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotAddDotNotationOnly()), actionCollection(), "add_notation_dot"); @@ -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").arg(sizes[i])); + (TQString("note_font_size_%1").tqarg(sizes[i])); m_fontSizeActionMenu->remove (action); @@ -2560,7 +2560,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName) for (unsigned int i = 0; i < sizes.size(); ++i) { - TQString actionName = TQString("note_font_size_%1").arg(sizes[i]); + TQString actionName = TQString("note_font_size_%1").tqarg(sizes[i]); KToggleAction *sizeAction = dynamic_cast<KToggleAction *> (actionCollection()->action(actionName)); @@ -2568,7 +2568,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName) if (!sizeAction) { sizeAction = new KToggleAction(i18n("1 pixel", "%n pixels", sizes[i]), - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeFontSizeFromAction()), actionCollection(), actionName); } @@ -2607,21 +2607,21 @@ bool NotationView::isCurrentStaff(int i) void NotationView::initLayoutToolbar() { - KToolBar *layoutToolbar = toolBar("Layout Toolbar"); + KToolBar *tqlayoutToolbar = toolBar("Layout Toolbar"); - if (!layoutToolbar) { + if (!tqlayoutToolbar) { std::cerr - << "NotationView::initLayoutToolbar() : layout toolbar not found" + << "NotationView::initLayoutToolbar() : tqlayout toolbar not found" << std::endl; return ; } - new TQLabel(i18n(" Font: "), layoutToolbar, "font label"); + new TQLabel(i18n(" Font: "), tqlayoutToolbar, "font label"); // // font combo // - m_fontCombo = new KComboBox(layoutToolbar); + m_fontCombo = new KComboBox(tqlayoutToolbar); m_fontCombo->setEditable(false); std::set @@ -2633,10 +2633,10 @@ void NotationView::initLayoutToolbar() for (std::vector<std::string>::iterator i = f.begin(); i != f.end(); ++i) { - TQString fontQName(strtoqstr(*i)); + TQString fontTQName(strtoqstr(*i)); - m_fontCombo->insertItem(fontQName); - if (fontQName.lower() == strtoqstr(m_fontName).lower()) { + m_fontCombo->insertItem(fontTQName); + if (fontTQName.lower() == strtoqstr(m_fontName).lower()) { m_fontCombo->setCurrentItem(m_fontCombo->count() - 1); foundFont = true; } @@ -2652,7 +2652,7 @@ void NotationView::initLayoutToolbar() connect(m_fontCombo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotChangeFont(const TQString &))); - new TQLabel(i18n(" Size: "), layoutToolbar, "size label"); + new TQLabel(i18n(" Size: "), tqlayoutToolbar, "size label"); TQString value; @@ -2660,7 +2660,7 @@ void NotationView::initLayoutToolbar() // font size combo // std::vector<int> sizes = NoteFontFactory::getScreenSizes(m_fontName); - m_fontSizeCombo = new KComboBox(layoutToolbar, "font size combo"); + m_fontSizeCombo = new KComboBox(tqlayoutToolbar, "font size combo"); for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) { @@ -2674,15 +2674,15 @@ void NotationView::initLayoutToolbar() connect(m_fontSizeCombo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotChangeFontSizeFromStringValue(const TQString&))); - new TQLabel(i18n(" Spacing: "), layoutToolbar, "spacing label"); + new TQLabel(i18n(" Spacing: "), tqlayoutToolbar, "spacing label"); // // spacing combo // - int defaultSpacing = m_hlayout->getSpacing(); + int defaultSpacing = m_htqlayout->getSpacing(); std::vector<int> spacings = NotationHLayout::getAvailableSpacings(); - m_spacingCombo = new KComboBox(layoutToolbar, "spacing combo"); + m_spacingCombo = new KComboBox(tqlayoutToolbar, "spacing combo"); for (std::vector<int>::iterator i = spacings.begin(); i != spacings.end(); ++i) { value.setNum(*i); @@ -2786,17 +2786,17 @@ NotationView::setPageMode(LinedStaff::PageMode pageMode) int topMargin = 0, leftMargin = 0; getPageMargins(leftMargin, topMargin); - m_hlayout->setPageMode(pageMode != LinedStaff::LinearMode); - m_hlayout->setPageWidth(pageWidth - leftMargin * 2); + m_htqlayout->setPageMode(pageMode != LinedStaff::LinearMode); + m_htqlayout->setPageWidth(pageWidth - leftMargin * 2); - NOTATION_DEBUG << "NotationView::setPageMode: set layout's page width to " + NOTATION_DEBUG << "NotationView::setPageMode: set tqlayout's page width to " << (pageWidth - leftMargin * 2) << endl; positionStaffs(); - bool layoutApplied = applyLayout(); - if (!layoutApplied) - KMessageBox::sorry(0, "Couldn't apply layout"); + bool tqlayoutApplied = applyLayout(); + if (!tqlayoutApplied) + KMessageBox::sorry(0, "Couldn't apply tqlayout"); else { for (unsigned int i = 0; i < m_staffs.size(); ++i) { m_staffs[i]->markChanged(); @@ -2894,7 +2894,7 @@ void NotationView::scrollToTime(timeT t) { - double notationViewLayoutCoord = m_hlayout->getXForTime(t); + double notationViewLayoutCoord = m_htqlayout->getXForTime(t); // Doesn't appear to matter which staff we use //!!! actually it probably does matter, if they don't have the same extents @@ -2912,7 +2912,7 @@ NotationView::scrollToTime(timeT t) RulerScale* NotationView::getHLayout() { - return m_hlayout; + return m_htqlayout; } void @@ -2948,8 +2948,8 @@ NotationView::paintEvent(TQPaintEvent *e) getPageMargins(leftMargin, topMargin); if (m_pageMode == LinedStaff::ContinuousPageMode) { - // relayout if the window width changes significantly in continuous page mode - int diff = int(getPageWidth() - leftMargin * 2 - m_hlayout->getPageWidth()); + // retqlayout if the window width changes significantly in continuous page mode + int diff = int(getPageWidth() - leftMargin * 2 - m_htqlayout->getPageWidth()); if (diff < -10 || diff > 10) { setPageMode(m_pageMode); refreshSegment(0, 0, 0); @@ -2990,15 +2990,15 @@ NotationView::paintEvent(TQPaintEvent *e) } } - slotSetOperationNameAndStatus(i18n(" Ready.")); + slotSetOperationNameAndtqStatus(i18n(" Ready.")); } bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime) { - slotSetOperationNameAndStatus(i18n("Laying out score...")); + slotSetOperationNameAndtqStatus(i18n("Laying out score...")); ProgressDialog::processEvents(); - m_hlayout->setStaffCount(m_staffs.size()); + m_htqlayout->setStaffCount(m_staffs.size()); Profiler profiler("NotationView::applyLayout"); unsigned int i; @@ -3008,20 +3008,20 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime) if (staffNo >= 0 && (int)i != staffNo) continue; - slotSetOperationNameAndStatus(i18n("Laying out staff %1...").arg(i + 1)); + slotSetOperationNameAndtqStatus(i18n("Laying out staff %1...").tqarg(i + 1)); ProgressDialog::processEvents(); - m_hlayout->resetStaff(*m_staffs[i], startTime, endTime); - m_vlayout->resetStaff(*m_staffs[i], startTime, endTime); - m_hlayout->scanStaff(*m_staffs[i], startTime, endTime); - m_vlayout->scanStaff(*m_staffs[i], startTime, endTime); + m_htqlayout->resetStaff(*m_staffs[i], startTime, endTime); + m_vtqlayout->resetStaff(*m_staffs[i], startTime, endTime); + m_htqlayout->scanStaff(*m_staffs[i], startTime, endTime); + m_vtqlayout->scanStaff(*m_staffs[i], startTime, endTime); } - slotSetOperationNameAndStatus(i18n("Reconciling staffs...")); + slotSetOperationNameAndtqStatus(i18n("Reconciling staffs...")); ProgressDialog::processEvents(); - m_hlayout->finishLayout(startTime, endTime); - m_vlayout->finishLayout(startTime, endTime); + m_htqlayout->finishLayout(startTime, endTime); + m_vtqlayout->finishLayout(startTime, endTime); // find the last finishing staff for future use @@ -3083,7 +3083,7 @@ void NotationView::setCurrentSelectedNote(const char *pixmapName, setTool(inserter); m_currentNotePixmap->setPixmap - (NotePixmapFactory::toQPixmap + (NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap(pixmapName, true))); emit changeCurrentNote(rest, n); @@ -3147,7 +3147,7 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview, i != s->getSegmentEvents().end(); ++i) { if (oldSelection && oldSelection->getSegment() == s->getSegment() - && oldSelection->contains(*i)) + && oldSelection->tqcontains(*i)) continue; foundNewEvent = true; @@ -3194,8 +3194,8 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview, getLinedStaff(segment)->positionElements(std::min(startA, startB), std::max(endA, endB)); } else { - // mark refresh status and then request a repaint - segment.getRefreshStatus + // mark refresh status and then request a tqrepaint + segment.getRefreshtqStatus (m_segmentsRefreshStatusIds [getLinedStaff(segment)->getId()]). push(std::min(startA, startB), std::max(endA, endB)); @@ -3211,14 +3211,14 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview, getLinedStaff(s->getSegment())->positionElements(startB, endB); } else { - // mark refresh status and then request a repaint + // mark refresh status and then request a tqrepaint - oldSelection->getSegment().getRefreshStatus + oldSelection->getSegment().getRefreshtqStatus (m_segmentsRefreshStatusIds [getLinedStaff(oldSelection->getSegment())->getId()]). push(startA, endA); - s->getSegment().getRefreshStatus + s->getSegment().getRefreshtqStatus (m_segmentsRefreshStatusIds [getLinedStaff(s->getSegment())->getId()]). push(startB, endB); @@ -3329,12 +3329,12 @@ void NotationView::playNote(Segment &s, int pitch, int velocity) StudioControl::sendMappedEvent(mE); } -void NotationView::showPreviewNote(int staffNo, double layoutX, +void NotationView::showPreviewNote(int staffNo, double tqlayoutX, int pitch, int height, const Note ¬e, bool grace, int velocity) { - m_staffs[staffNo]->showPreviewNote(layoutX, height, note, grace); + m_staffs[staffNo]->showPreviewNote(tqlayoutX, height, note, grace); playNote(m_staffs[staffNo]->getSegment(), pitch, velocity); } @@ -3349,10 +3349,10 @@ void NotationView::setNotePixmapFactory(NotePixmapFactory* f) { delete m_notePixmapFactory; m_notePixmapFactory = f; - if (m_hlayout) - m_hlayout->setNotePixmapFactory(m_notePixmapFactory); - if (m_vlayout) - m_vlayout->setNotePixmapFactory(m_notePixmapFactory); + if (m_htqlayout) + m_htqlayout->setNotePixmapFactory(m_notePixmapFactory); + if (m_vtqlayout) + m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory); } Segment * @@ -3446,10 +3446,10 @@ NotationView::getInsertionTime(Clef &clef, // the segment but the staff has a more efficient lookup LinedStaff *staff = m_staffs[m_currentStaff]; - double layoutX = staff->getLayoutXOfInsertCursor(); - if (layoutX < 0) layoutX = 0; + double tqlayoutX = staff->getLayoutXOfInsertCursor(); + if (tqlayoutX < 0) tqlayoutX = 0; Event *clefEvt = 0, *keyEvt = 0; - (void)staff->getElementUnderLayoutX(layoutX, clefEvt, keyEvt); + (void)staff->getElementUnderLayoutX(tqlayoutX, clefEvt, keyEvt); if (clefEvt) clef = Clef(*clefEvt); else clef = Clef(); @@ -3469,7 +3469,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const LinedStaff::LinedStaffCoords coords = s->getLayoutCoordsForCanvasCoords(x, y); - timeT t = m_hlayout->getTimeForX(coords.first); + timeT t = m_htqlayout->getTimeForX(coords.first); // In order to find the correct starting and ending bar of the segment, // make infinitesimal shifts (+1 and -1) towards its center. timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[m_currentStaff]->getSegment().getStartTime()+1); @@ -3488,7 +3488,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const LinedStaff::LinedStaffCoords coords = s->getLayoutCoordsForCanvasCoords(x, y); - timeT t = m_hlayout->getTimeForX(coords.first); + timeT t = m_htqlayout->getTimeForX(coords.first); // In order to find the correct starting and ending bar of the segment, // make infinitesimal shifts (+1 and -1) towards its center. timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[i]->getSegment().getStartTime()+1); @@ -3541,7 +3541,7 @@ void NotationView::print(bool previewOnly) if (previewOnly) printer.setPreviewOnly(true); - else if (!printer.setup((TQWidget *)parent())) + else if (!printer.setup((TQWidget *)tqparent())) return ; TQPaintDeviceMetrics pdm(&printer); @@ -3589,8 +3589,8 @@ void NotationView::print(bool previewOnly) LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords (pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height()); - timeT t0 = m_hlayout->getTimeForX(cc0.first); - timeT t1 = m_hlayout->getTimeForX(cc1.first); + timeT t0 = m_htqlayout->getTimeForX(cc0.first); + timeT t1 = m_htqlayout->getTimeForX(cc1.first); m_staffs[i]->setPrintPainter(&printpainter); m_staffs[i]->checkRendered(t0, t1); @@ -3599,7 +3599,7 @@ void NotationView::print(bool previewOnly) // Supplying doublebuffer==true to this method appears to // slow down printing considerably but without it we get // all sorts of horrible artifacts (possibly related to - // mishandling of pixmap masks?) in qt-3.0. Let's permit + // mishandling of pixmap tqmasks?) in qt-3.0. Let's permit // it as a "hidden" option. m_config->setGroup(NotationViewConfigGroup); @@ -3612,13 +3612,7 @@ void NotationView::print(bool previewOnly) if (m_config->readBoolEntry("forcedoublebufferprinting", false)) { getCanvasView()->canvas()->drawArea(pageRect, &printpainter, true); } else { -#if QT_VERSION >= 0x030100 getCanvasView()->canvas()->drawArea(pageRect, &printpainter, false); -#else - - getCanvasView()->canvas()->drawArea(pageRect, &printpainter, true); -#endif - } } @@ -3635,8 +3629,8 @@ void NotationView::print(bool previewOnly) LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords (pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height()); - timeT t0 = m_hlayout->getTimeForX(cc0.first); - timeT t1 = m_hlayout->getTimeForX(cc1.first); + timeT t0 = m_htqlayout->getTimeForX(cc0.first); + timeT t1 = m_htqlayout->getTimeForX(cc1.first); m_staffs[i]->renderPrintable(t0, t1); } @@ -3687,14 +3681,14 @@ NotationView::updateThumbnails(bool complete) int thumbScale = 20; TQPixmap thumbnail(canvas()->width() / thumbScale, canvas()->height() / thumbScale); - thumbnail.fill(Qt::white); + thumbnail.fill(TQt::white); TQPainter thumbPainter(&thumbnail); if (complete) { thumbPainter.scale(1.0 / double(thumbScale), 1.0 / double(thumbScale)); - thumbPainter.setPen(Qt::black); - thumbPainter.setBrush(Qt::white); + thumbPainter.setPen(TQt::black); + thumbPainter.setBrush(TQt::white); /* TQCanvas *canvas = getCanvasView()->canvas(); @@ -3742,7 +3736,7 @@ NotationView::updateThumbnails(bool complete) } else { - thumbPainter.setPen(Qt::black); + thumbPainter.setPen(TQt::black); for (int page = 0; page < maxPageCount; ++page) { @@ -3751,7 +3745,7 @@ NotationView::updateThumbnails(bool complete) int w = pageWidth - leftMargin / 2; int h = pageHeight; - TQString str = TQString("%1").arg(page + 1); + TQString str = TQString("%1").tqarg(page + 1); thumbPainter.drawRect(x / thumbScale, y / thumbScale, w / thumbScale, h / thumbScale); @@ -3815,7 +3809,7 @@ void NotationView::refreshSegment(Segment *segment, } setMenuStates(); - slotSetOperationNameAndStatus(i18n(" Ready.")); + slotSetOperationNameAndtqStatus(i18n(" Ready.")); NOTATION_DEBUG << "*** " << endl; } @@ -3835,12 +3829,12 @@ void NotationView::setMenuStates() NOTATION_DEBUG << "NotationView::setMenuStates: Have selection; it's " << m_currentEventSelection << " covering range from " << m_currentEventSelection->getStartTime() << " to " << m_currentEventSelection->getEndTime() << " (" << m_currentEventSelection->getSegmentEvents().size() << " events)" << endl; stateChanged("have_selection", KXMLGUIClient::StateNoReverse); - if (m_currentEventSelection->contains + if (m_currentEventSelection->tqcontains (Note::EventType)) { stateChanged("have_notes_in_selection", KXMLGUIClient::StateNoReverse); } - if (m_currentEventSelection->contains + if (m_currentEventSelection->tqcontains (Note::EventRestType)) { stateChanged("have_rests_in_selection", KXMLGUIClient::StateNoReverse); @@ -3882,7 +3876,7 @@ void NotationView::readjustCanvasSize() double maxWidth = 0.0; int maxHeight = 0; - slotSetOperationNameAndStatus(i18n("Sizing and allocating canvas...")); + slotSetOperationNameAndtqStatus(i18n("Sizing and allocating canvas...")); ProgressDialog::processEvents(); int progressTotal = m_staffs.size() + 2; @@ -3892,7 +3886,7 @@ void NotationView::readjustCanvasSize() LinedStaff &staff = *m_staffs[i]; - staff.sizeStaff(*m_hlayout); + staff.sizeStaff(*m_htqlayout); UPDATE_PROGRESS(1); if (staff.getTotalWidth() + staff.getX() > maxWidth) { @@ -3950,7 +3944,7 @@ void NotationView::readjustCanvasSize() } } - // Give a correct vertical alignment to track headers + // Give a correct vertical tqalignment to track headers if ((m_pageMode == LinedStaff::LinearMode) && m_showHeadersGroup) { m_headersGroupView->setContentsPos(0, getCanvasView()->contentsY()); } @@ -3958,10 +3952,10 @@ void NotationView::readjustCanvasSize() void NotationView::slotNoteAction() { - const TQObject* sigSender = sender(); + const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); NoteActionDataMap::Iterator noteAct = - m_noteActionDataMap->find(sigSender->name()); + m_noteActionDataMap->tqfind(sigSender->name()); if (noteAct != m_noteActionDataMap->end()) { m_lastNoteAction = sigSender->name(); @@ -3989,11 +3983,11 @@ void NotationView::slotLastNoteAction() void NotationView::slotAddMark() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); if (!m_currentEventSelection) return ; - MarkActionDataMap::Iterator i = m_markActionDataMap->find(s->name()); + MarkActionDataMap::Iterator i = m_markActionDataMap->tqfind(s->name()); if (i != m_markActionDataMap->end()) { addCommandToHistory(new AddMarkCommand @@ -4003,10 +3997,10 @@ void NotationView::slotAddMark() void NotationView::slotNoteChangeAction() { - const TQObject* sigSender = sender(); + const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); NoteChangeActionDataMap::Iterator noteAct = - m_noteChangeActionDataMap->find(sigSender->name()); + m_noteChangeActionDataMap->tqfind(sigSender->name()); if (noteAct != m_noteChangeActionDataMap->end()) { slotSetNoteDurations((**noteAct).noteType, (**noteAct).notationOnly); @@ -4038,7 +4032,7 @@ void NotationView::initActionDataMaps() (NotationStrings::getReferenceName(Note(type, dots), rest == 1)); TQString shortName(refName); - shortName.replace(TQRegExp("-"), "_"); + shortName.tqreplace(TQRegExp("-"), "_"); TQString titleName (NotationStrings::getNoteName(Note(type, dots))); @@ -4047,7 +4041,7 @@ void NotationView::initActionDataMaps() titleName.right(titleName.length() - 1); if (rest) { - titleName.replace(TQRegExp(i18n("note")), i18n("rest")); + titleName.tqreplace(TQRegExp(i18n("note")), i18n("rest")); } int keycode = keys[type - Note::Shortest]; @@ -4073,8 +4067,8 @@ void NotationView::initActionDataMaps() (NotationStrings::getReferenceName(Note(type, 0), false)); TQString shortName(TQString("change_%1%2") - .arg(notationOnly ? "notation_" : "").arg(refName)); - shortName.replace(TQRegExp("-"), "_"); + .tqarg(notationOnly ? "notation_" : "").tqarg(refName)); + shortName.tqreplace(TQRegExp("-"), "_"); TQString titleName (NotationStrings::getNoteName(Note(type, 0))); @@ -4101,7 +4095,7 @@ void NotationView::initActionDataMaps() Mark mark = marks[i]; TQString markName(strtoqstr(mark)); - TQString actionName = TQString("add_%1").arg(markName); + TQString actionName = TQString("add_%1").tqarg(markName); m_markActionDataMap->insert (actionName, new MarkActionData @@ -4116,10 +4110,10 @@ void NotationView::setupProgress(KProgress* bar) if (bar) { NOTATION_DEBUG << "NotationView::setupProgress(bar)\n"; - connect(m_hlayout, TQT_SIGNAL(setProgress(int)), + connect(m_htqlayout, TQT_SIGNAL(setProgress(int)), bar, TQT_SLOT(setValue(int))); - connect(m_hlayout, TQT_SIGNAL(incrementProgress(int)), + connect(m_htqlayout, TQT_SIGNAL(incrementProgress(int)), bar, TQT_SLOT(advance(int))); connect(this, TQT_SIGNAL(setProgress(int)), @@ -4148,11 +4142,11 @@ void NotationView::setupProgress(ProgressDialog* dialog) setupProgress(dialog->progressBar()); connect(dialog, TQT_SIGNAL(cancelClicked()), - m_hlayout, TQT_SLOT(slotCancel())); + m_htqlayout, TQT_SLOT(slotCancel())); for (unsigned int i = 0; i < m_staffs.size(); ++i) { connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)), - this, TQT_SLOT(slotSetOperationNameAndStatus(TQString))); + this, TQT_SLOT(slotSetOperationNameAndtqStatus(TQString))); connect(dialog, TQT_SIGNAL(cancelClicked()), m_staffs[i], TQT_SLOT(slotCancel())); @@ -4165,10 +4159,10 @@ void NotationView::setupProgress(ProgressDialog* dialog) } -void NotationView::slotSetOperationNameAndStatus(TQString name) +void NotationView::slotSetOperationNameAndtqStatus(TQString name) { emit setOperationName(name); - statusBar()->changeItem(TQString(" %1").arg(name), + statusBar()->changeItem(TQString(" %1").tqarg(name), KTmpStatusMsg::getDefaultId()); } @@ -4176,7 +4170,7 @@ void NotationView::disconnectProgress() { NOTATION_DEBUG << "NotationView::disconnectProgress()" << endl; - m_hlayout->disconnect(); + m_htqlayout->disconnect(); disconnect(TQT_SIGNAL(setProgress(int))); disconnect(TQT_SIGNAL(incrementProgress(int))); disconnect(TQT_SIGNAL(setOperationName(TQString))); @@ -4209,18 +4203,18 @@ void NotationView::updateViewCaption() trackPosition = track->getPosition(); // std::cout << std::endl << std::endl << std::endl << "DEBUG TITLE BAR: " << getDocument()->getTitle() << std::endl << std::endl << std::endl; setCaption(i18n("%1 - Segment Track #%2 - Notation") - .arg(getDocument()->getTitle()) - .arg(trackPosition + 1)); + .tqarg(getDocument()->getTitle()) + .tqarg(trackPosition + 1)); } else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) { setCaption(i18n("%1 - All Segments - Notation") - .arg(getDocument()->getTitle())); + .tqarg(getDocument()->getTitle())); } else { setCaption(i18n("%1 - Segment - Notation", "%1 - %n Segments - Notation", m_segments.size()) - .arg(getDocument()->getTitle())); + .tqarg(getDocument()->getTitle())); } } @@ -4236,7 +4230,7 @@ NotationView::MarkActionDataMap* NotationView::m_markActionDataMap = 0; void -NotationView::slotUpdateInsertModeStatus() +NotationView::slotUpdateInsertModetqStatus() { TQString tripletMessage = i18n("Triplet"); TQString chordMessage = i18n("Chord"); @@ -4244,22 +4238,22 @@ NotationView::slotUpdateInsertModeStatus() TQString message; if (isInTripletMode()) { - message = i18n("%1 %2").arg(message).arg(tripletMessage); + message = i18n("%1 %2").tqarg(message).tqarg(tripletMessage); } if (isInChordMode()) { - message = i18n("%1 %2").arg(message).arg(chordMessage); + message = i18n("%1 %2").tqarg(message).tqarg(chordMessage); } if (isInGraceMode()) { - message = i18n("%1 %2").arg(message).arg(graceMessage); + message = i18n("%1 %2").tqarg(message).tqarg(graceMessage); } m_insertModeLabel->setText(message); } void -NotationView::slotUpdateAnnotationsStatus() +NotationView::slotUpdateAnnotationstqStatus() { if (!areAnnotationsVisible()) { for (int i = 0; i < getStaffCount(); ++i) { @@ -4279,7 +4273,7 @@ NotationView::slotUpdateAnnotationsStatus() } void -NotationView::slotUpdateLilyPondDirectivesStatus() +NotationView::slotUpdateLilyPondDirectivestqStatus() { if (!areLilyPondDirectivesVisible()) { for (int i = 0; i < getStaffCount(); ++i) { @@ -4312,7 +4306,7 @@ NotationView::slotChangeSpacingFromStringValue(const TQString& spacingT) void NotationView::slotChangeSpacingFromAction() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); TQString name = s->name(); if (name.left(8) == "spacing_") { @@ -4323,22 +4317,22 @@ NotationView::slotChangeSpacingFromAction() } else { KMessageBox::sorry - (this, i18n("Unknown spacing action %1").arg(name)); + (this, i18n("Unknown spacing action %1").tqarg(name)); } } void NotationView::slotChangeSpacing(int spacing) { - if (m_hlayout->getSpacing() == spacing) + if (m_htqlayout->getSpacing() == spacing) return ; - m_hlayout->setSpacing(spacing); + m_htqlayout->setSpacing(spacing); // m_spacingSlider->setSize(spacing); KToggleAction *action = dynamic_cast<KToggleAction *> - (actionCollection()->action(TQString("spacing_%1").arg(spacing))); + (actionCollection()->action(TQString("spacing_%1").tqarg(spacing))); if (action) action->setChecked(true); else { @@ -4363,7 +4357,7 @@ NotationView::slotChangeSpacing(int spacing) void NotationView::slotChangeProportionFromIndex(int n) { - std::vector<int> proportions = m_hlayout->getAvailableProportions(); + std::vector<int> proportions = m_htqlayout->getAvailableProportions(); if (n >= (int)proportions.size()) n = proportions.size() - 1; slotChangeProportion(proportions[n]); @@ -4372,7 +4366,7 @@ NotationView::slotChangeProportionFromIndex(int n) void NotationView::slotChangeProportionFromAction() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); TQString name = s->name(); if (name.left(11) == "proportion_") { @@ -4381,22 +4375,22 @@ NotationView::slotChangeProportionFromAction() } else { KMessageBox::sorry - (this, i18n("Unknown proportion action %1").arg(name)); + (this, i18n("Unknown proportion action %1").tqarg(name)); } } void NotationView::slotChangeProportion(int proportion) { - if (m_hlayout->getProportion() == proportion) + if (m_htqlayout->getProportion() == proportion) return ; - m_hlayout->setProportion(proportion); + m_htqlayout->setProportion(proportion); // m_proportionSlider->setSize(proportion); KToggleAction *action = dynamic_cast<KToggleAction *> - (actionCollection()->action(TQString("proportion_%1").arg(proportion))); + (actionCollection()->action(TQString("proportion_%1").tqarg(proportion))); if (action) action->setChecked(true); else { @@ -4421,21 +4415,21 @@ NotationView::slotChangeProportion(int proportion) void NotationView::slotChangeFontFromAction() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); TQString name = s->name(); if (name.left(10) == "note_font_") { name = name.right(name.length() - 10); slotChangeFont(name); } else { KMessageBox::sorry - (this, i18n("Unknown font action %1").arg(name)); + (this, i18n("Unknown font action %1").tqarg(name)); } } void NotationView::slotChangeFontSizeFromAction() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); TQString name = s->name(); if (name.left(15) == "note_font_size_") { @@ -4446,11 +4440,11 @@ NotationView::slotChangeFontSizeFromAction() slotChangeFont(m_fontName, size); else { KMessageBox::sorry - (this, i18n("Unknown font size %1").arg(name)); + (this, i18n("Unknown font size %1").tqarg(name)); } } else { KMessageBox::sorry - (this, i18n("Unknown font size action %1").arg(name)); + (this, i18n("Unknown font size action %1").tqarg(name)); } } @@ -4587,7 +4581,7 @@ NotationView::slotChangeFont(std::string newName, int newSize) int topMargin = 0, leftMargin = 0; getPageMargins(leftMargin, topMargin); - m_hlayout->setPageWidth(pageWidth - leftMargin * 2); + m_htqlayout->setPageWidth(pageWidth - leftMargin * 2); } for (unsigned int i = 0; i < m_staffs.size(); ++i) { @@ -4598,9 +4592,9 @@ NotationView::slotChangeFont(std::string newName, int newSize) positionStaffs(); - bool layoutApplied = applyLayout(); - if (!layoutApplied) - KMessageBox::sorry(0, "Couldn't apply layout"); + bool tqlayoutApplied = applyLayout(); + if (!tqlayoutApplied) + KMessageBox::sorry(0, "Couldn't apply tqlayout"); else { for (unsigned int i = 0; i < m_staffs.size(); ++i) { m_staffs[i]->markChanged(); @@ -4619,7 +4613,7 @@ NotationView::slotFilePrint() SetWaitCursor waitCursor; NotationView printingView(getDocument(), m_segments, - (TQWidget *)parent(), this); + (TQWidget *)tqparent(), this); if (!printingView.isOK()) { NOTATION_DEBUG << "Print : operation cancelled\n"; @@ -4636,7 +4630,7 @@ NotationView::slotFilePrintPreview() SetWaitCursor waitCursor; NotationView printingView(getDocument(), m_segments, - (TQWidget *)parent(), this); + (TQWidget *)tqparent(), this); if (!printingView.isOK()) { NOTATION_DEBUG << "Print preview : operation cancelled\n"; @@ -4651,7 +4645,7 @@ std::map<KProcess *, KTempFile *> NotationView::m_lilyTempFileMap; void NotationView::slotPrintLilyPond() { KTmpStatusMsg msg(i18n("Printing LilyPond file..."), this); - KTempFile *file = new KTempFile(TQString::null, ".ly"); + KTempFile *file = new KTempFile(TQString(), ".ly"); file->setAutoDelete(true); if (!file->name()) { // CurrentProgressDialog::freeze(); @@ -4675,7 +4669,7 @@ void NotationView::slotPrintLilyPond() void NotationView::slotPreviewLilyPond() { KTmpStatusMsg msg(i18n("Previewing LilyPond file..."), this); - KTempFile *file = new KTempFile(TQString::null, ".ly"); + KTempFile *file = new KTempFile(TQString(), ".ly"); file->setAutoDelete(true); if (!file->name()) { // CurrentProgressDialog::freeze(); @@ -5363,7 +5357,7 @@ void NotationView::slotAddIndication(std::string type, TQString desc) setSingleSelectedEvent(m_currentEventSelection->getSegment(), command->getLastInsertedEvent()); } else { - KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").arg(desc)); // TODO PLURAL - how many 'indications' ? + KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").tqarg(desc)); // TODO PLURAL - how many 'indications' ? delete command; } } @@ -5565,7 +5559,7 @@ void NotationView::slotTransformsRemoveQuantization() void NotationView::slotSetStyleFromAction() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); TQString name = s->name(); if (!m_currentEventSelection) @@ -5574,7 +5568,7 @@ void NotationView::slotSetStyleFromAction() if (name.left(6) == "style_") { name = name.right(name.length() - 6); - KTmpStatusMsg msg(i18n("Changing to %1 style...").arg(name), + KTmpStatusMsg msg(i18n("Changing to %1 style...").tqarg(name), this); addCommandToHistory(new ChangeStyleCommand @@ -5582,13 +5576,13 @@ void NotationView::slotSetStyleFromAction() *m_currentEventSelection)); } else { KMessageBox::sorry - (this, i18n("Unknown style action %1").arg(name)); + (this, i18n("Unknown style action %1").tqarg(name)); } } void NotationView::slotInsertNoteFromAction() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); TQString name = s->name(); Segment &segment = m_staffs[m_currentStaff]->getSegment(); @@ -5614,7 +5608,7 @@ void NotationView::slotInsertNoteFromAction() } catch (...) { KMessageBox::sorry - (this, i18n("Unknown note insert action %1").arg(name)); + (this, i18n("Unknown note insert action %1").tqarg(name)); return ; } @@ -5664,7 +5658,7 @@ void NotationView::slotSwitchFromRestToNote() Note note(restInserter->getCurrentNote()); TQString actionName = NotationStrings::getReferenceName(note, false); - actionName = actionName.replace("-", "_"); + actionName = actionName.tqreplace("-", "_"); KRadioAction *action = dynamic_cast<KRadioAction *> (actionCollection()->action(actionName)); @@ -5699,7 +5693,7 @@ void NotationView::slotSwitchFromNoteToRest() Note note(noteInserter->getCurrentNote()); TQString actionName = NotationStrings::getReferenceName(note, true); - actionName = actionName.replace("-", "_"); + actionName = actionName.tqreplace("-", "_"); KRadioAction *action = dynamic_cast<KRadioAction *> (actionCollection()->action(actionName)); @@ -5915,7 +5909,7 @@ void NotationView::slotAddDotNotationOnly() void NotationView::slotAddSlashes() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); if (!m_currentEventSelection) return ; @@ -5956,7 +5950,7 @@ void NotationView::slotMarksAddFingeringMark() void NotationView::slotMarksAddFingeringMarkFromAction() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); TQString name = s->name(); if (name.left(14) == "add_fingering_") { @@ -6033,9 +6027,9 @@ NotationView::slotMakeOrnament() TQString name; int barNo = segment.getComposition()->getBarNumber(absTime); if (track) { - name = TQString(i18n("Ornament track %1 bar %2").arg(track->getPosition() + 1).arg(barNo + 1)); + name = TQString(i18n("Ornament track %1 bar %2").tqarg(track->getPosition() + 1).tqarg(barNo + 1)); } else { - name = TQString(i18n("Ornament bar %1").arg(barNo + 1)); + name = TQString(i18n("Ornament bar %1").tqarg(barNo + 1)); } MakeOrnamentDialog dialog(this, name, basePitch); @@ -6061,7 +6055,7 @@ NotationView::slotMakeOrnament() style->getName(), getDocument()->getComposition().getNextTriggerSegmentId(), true, - BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH, + BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH, Marks::NoMark)); //!!! addCommandToHistory(command); @@ -6266,7 +6260,7 @@ void NotationView::slotEditSwitchPreset() // wrong, or just mildly wrong, but I'm betting somebody will tell me // about it if this was inappropriate Track *track = comp.getTrackById(selectedTrack); - track->setPresetLabel(dialog.getName()); + track->setPresetLabel(dialog.getName().ascii()); track->setClef(dialog.getClef()); track->setTranspose(dialog.getTranspose()); track->setLowestPlayable(dialog.getLowRange()); @@ -6444,22 +6438,22 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll) for (unsigned int i = 0; i < m_staffs.size(); ++i) { - double layoutX = m_hlayout->getXForTimeByEvent(time); + double tqlayoutX = m_htqlayout->getXForTimeByEvent(time); Segment &seg = m_staffs[i]->getSegment(); bool good = true; - if (barNo >= m_hlayout->getLastVisibleBarOnStaff(*m_staffs[i])) { + if (barNo >= m_htqlayout->getLastVisibleBarOnStaff(*m_staffs[i])) { if (seg.isRepeating() && time < seg.getRepeatEndTime()) { timeT mappedTime = seg.getStartTime() + ((time - seg.getStartTime()) % (seg.getEndMarkerTime() - seg.getStartTime())); - layoutX = m_hlayout->getXForTimeByEvent(mappedTime); + tqlayoutX = m_htqlayout->getXForTimeByEvent(mappedTime); } else { good = false; } - } else if (barNo < m_hlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) { + } else if (barNo < m_htqlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) { good = false; } @@ -6469,7 +6463,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll) } else { - m_staffs[i]->setPointerPosition(layoutX); + m_staffs[i]->setPointerPosition(tqlayoutX); int cy; m_staffs[i]->getPointerPosition(cx, cy); @@ -6542,7 +6536,7 @@ NotationView::slotSetCurrentStaff(int staffNo) m_chordNameRuler->setCurrentSegment(segment); m_rawNoteRuler->setCurrentSegment(segment); - m_rawNoteRuler->repaint(); + m_rawNoteRuler->tqrepaint(); setControlRulersCurrentSegment(); updateView(); @@ -6756,7 +6750,7 @@ NotationView::doDeferredCursorMove() t == segment.getEndTime() || t == segment.getBarStartForTime(t)) { - staff->setInsertCursorPosition(*m_hlayout, t); + staff->setInsertCursorPosition(*m_htqlayout, t); if (type == CursorMoveAndMakeVisible) { double cx; @@ -6898,7 +6892,7 @@ void NotationView::slotDoubleFlat() void NotationView::slotTrebleClef() { m_currentNotePixmap->setPixmap - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble"))); + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble"))); setTool(m_toolBox->getTool(ClefInserter::ToolName)); dynamic_cast<ClefInserter*>(m_tool)->setClef(Clef::Treble); @@ -6908,7 +6902,7 @@ void NotationView::slotTrebleClef() void NotationView::slotAltoClef() { m_currentNotePixmap->setPixmap - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto"))); + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto"))); setTool(m_toolBox->getTool(ClefInserter::ToolName)); dynamic_cast<ClefInserter*>(m_tool)->setClef(Clef::Alto); @@ -6918,7 +6912,7 @@ void NotationView::slotAltoClef() void NotationView::slotTenorClef() { m_currentNotePixmap->setPixmap - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor"))); + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor"))); setTool(m_toolBox->getTool(ClefInserter::ToolName)); dynamic_cast<ClefInserter*>(m_tool)->setClef(Clef::Tenor); @@ -6928,7 +6922,7 @@ void NotationView::slotTenorClef() void NotationView::slotBassClef() { m_currentNotePixmap->setPixmap - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass"))); + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass"))); setTool(m_toolBox->getTool(ClefInserter::ToolName)); dynamic_cast<ClefInserter*>(m_tool)->setClef(Clef::Bass); @@ -6938,7 +6932,7 @@ void NotationView::slotBassClef() void NotationView::slotText() { m_currentNotePixmap->setPixmap - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("text"))); + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("text"))); setTool(m_toolBox->getTool(TextInserter::ToolName)); setMenuStates(); } @@ -6946,7 +6940,7 @@ void NotationView::slotText() void NotationView::slotGuitarChord() { m_currentNotePixmap->setPixmap - (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord"))); + (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord"))); setTool(m_toolBox->getTool(GuitarChordInserter::ToolName)); setMenuStates(); } @@ -6982,21 +6976,21 @@ void NotationView::slotMultiPageMode() void NotationView::slotToggleChordsRuler() { - if (m_hlayout->isPageMode()) + if (m_htqlayout->isPageMode()) return ; toggleWidget(m_chordNameRuler, "show_chords_ruler"); } void NotationView::slotToggleRawNoteRuler() { - if (m_hlayout->isPageMode()) + if (m_htqlayout->isPageMode()) return ; toggleWidget(m_rawNoteRuler, "show_raw_note_ruler"); } void NotationView::slotToggleTempoRuler() { - if (m_hlayout->isPageMode()) + if (m_htqlayout->isPageMode()) return ; toggleWidget(m_tempoRuler, "show_tempo_ruler"); } @@ -7004,7 +6998,7 @@ void NotationView::slotToggleTempoRuler() void NotationView::slotToggleAnnotations() { m_annotationsVisible = !m_annotationsVisible; - slotUpdateAnnotationsStatus(); + slotUpdateAnnotationstqStatus(); //!!! use refresh mechanism refreshSegment(0, 0, 0); } @@ -7012,7 +7006,7 @@ void NotationView::slotToggleAnnotations() void NotationView::slotToggleLilyPondDirectives() { m_lilyPondDirectivesVisible = !m_lilyPondDirectivesVisible; - slotUpdateLilyPondDirectivesStatus(); + slotUpdateLilyPondDirectivestqStatus(); //!!! use refresh mechanism refreshSegment(0, 0, 0); } @@ -7101,7 +7095,7 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it) getTrackById(staff->getSegment().getTrack())->getLabel(); bool ok = false; - TQRegExpValidator validator(TQRegExp(".*"), this); // empty is OK + TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this)); // empty is OK TQString newText = KLineEditDlg::getText(TQString("Change staff name"), TQString("Enter new staff name"), @@ -7119,10 +7113,10 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it) emit staffLabelChanged(staff->getSegment().getTrack(), newText); } - } else if (dynamic_cast<QCanvasTimeSigSprite *>(it)) { + } else if (dynamic_cast<TQCanvasTimeSigSprite *>(it)) { - double layoutX = (dynamic_cast<QCanvasTimeSigSprite *>(it))->getLayoutX(); - emit editTimeSignature(m_hlayout->getTimeForX(layoutX)); + double tqlayoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX(); + emit editTimeSignature(m_htqlayout->getTimeForX(tqlayoutX)); } } @@ -7200,17 +7194,17 @@ NotationView::slotHoveredOverAbsoluteTimeChanged(unsigned int time) // TQString message; // TQString format("%ld (%ld.%03lds)"); - // format = i18n("Time: %1").arg(format); + // format = i18n("Time: %1").tqarg(format); // message.sprintf(format, t, rt.sec, ms); TQString message = i18n("Time: %1 (%2.%3s)") - .arg(TQString("%1-%2-%3-%4") - .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0')) - .arg(TQString("%1").arg(beat).rightJustify(2, '0')) - .arg(TQString("%1").arg(fraction).rightJustify(2, '0')) - .arg(TQString("%1").arg(remainder).rightJustify(2, '0'))) - .arg(rt.sec) - .arg(TQString("%1").arg(ms).rightJustify(3, '0')); + .tqarg(TQString("%1-%2-%3-%4") + .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0')) + .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0')) + .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0')) + .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0'))) + .tqarg(rt.sec) + .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0')); m_hoveredOverAbsoluteTime->setText(message); } @@ -7367,7 +7361,7 @@ NotationView::slotToggleStepByStep() return ; } if (action->isChecked()) { // after toggling, that is - emit stepByStepTargetRequested(this); + emit stepByStepTargetRequested(TQT_TQOBJECT(this)); } else { emit stepByStepTargetRequested(0); } @@ -7382,7 +7376,7 @@ NotationView::slotStepByStepTargetRequested(TQObject *obj) NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl; return ; } - action->setChecked(obj == this); + action->setChecked(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this)); } void @@ -7402,8 +7396,8 @@ NotationView::slotCheckRendered(double cx0, double cx1) LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords (cx1, staff->getTotalHeight() + staff->getY()); - timeT t0 = m_hlayout->getTimeForX(cc0.first); - timeT t1 = m_hlayout->getTimeForX(cc1.first); + timeT t0 = m_htqlayout->getTimeForX(cc0.first); + timeT t1 = m_htqlayout->getTimeForX(cc1.first); if (dynamic_cast<NotationStaff *>(staff)->checkRendered(t0, t1)) { something = true; //!!! |