diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-09 18:25:42 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-09 18:57:45 +0900 |
commit | 9b054308cef27a642eaa6e9a86db215151468e0b (patch) | |
tree | ab3b17b523e0ae3334541665a4625b99a42a76b1 /src/gui/editors/segment | |
parent | 217eb15dfed1b38303754b8cab53d77d749f22b9 (diff) | |
download | rosegarden-9b054308cef27a642eaa6e9a86db215151468e0b.tar.gz rosegarden-9b054308cef27a642eaa6e9a86db215151468e0b.zip |
Remove various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/gui/editors/segment')
-rw-r--r-- | src/gui/editors/segment/ControlEditorDialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/segment/MarkerEditor.cpp | 8 | ||||
-rw-r--r-- | src/gui/editors/segment/TrackButtons.cpp | 18 | ||||
-rw-r--r-- | src/gui/editors/segment/TrackLabel.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/segment/TriggerSegmentManager.cpp | 12 | ||||
-rw-r--r-- | src/gui/editors/segment/segmentcanvas/CompositionView.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/segment/segmentcanvas/SegmentTool.cpp | 2 |
7 files changed, 23 insertions, 23 deletions
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp index 7a37027..f910299 100644 --- a/src/gui/editors/segment/ControlEditorDialog.cpp +++ b/src/gui/editors/segment/ControlEditorDialog.cpp @@ -335,7 +335,7 @@ ControlEditorDialog::slotClose() void ControlEditorDialog::setupActions() { - TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), + TDEAction* close = KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection()); diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp index a0b6f3c..058d030 100644 --- a/src/gui/editors/segment/MarkerEditor.cpp +++ b/src/gui/editors/segment/MarkerEditor.cpp @@ -365,7 +365,7 @@ MarkerEditor::slotClose() void MarkerEditor::setupActions() { - TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), + TDEAction* close = KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection()); @@ -394,7 +394,7 @@ MarkerEditor::setupActions() TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png"); TQIconSet icon(pixmap); - action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this, TQT_SLOT(slotMusicalTime()), actionCollection(), "time_musical"); action->setExclusiveGroup("timeMode"); @@ -404,7 +404,7 @@ MarkerEditor::setupActions() pixmap.load(pixmapDir + "/toolbar/time-real.png"); icon = TQIconSet(pixmap); - action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Real Times"), icon, 0, this, TQT_SLOT(slotRealTime()), actionCollection(), "time_real"); action->setExclusiveGroup("timeMode"); @@ -414,7 +414,7 @@ MarkerEditor::setupActions() pixmap.load(pixmapDir + "/toolbar/time-raw.png"); icon = TQIconSet(pixmap); - action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this, TQT_SLOT(slotRawTime()), actionCollection(), "time_raw"); action->setExclusiveGroup("timeMode"); diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp index 2aef6e7..98bbb62 100644 --- a/src/gui/editors/segment/TrackButtons.cpp +++ b/src/gui/editors/segment/TrackButtons.cpp @@ -76,10 +76,10 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc, : TQFrame(parent, name, f), m_doc(doc), m_layout(new TQVBoxLayout(this)), - m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), - m_muteSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), - m_clickedSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), - m_instListSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), + m_recordSigMapper(new TQSignalMapper(this)), + m_muteSigMapper(new TQSignalMapper(this)), + m_clickedSigMapper(new TQSignalMapper(this)), + m_instListSigMapper(new TQSignalMapper(this)), m_tracks(doc->getComposition().getNbTracks()), m_offset(4), m_cellSize(trackCellHeight), @@ -192,7 +192,7 @@ TrackButtons::populateButtons() // reset track tokens m_trackLabels[i]->setId(track->getId()); - setButtonMapping(TQT_TQOBJECT(m_trackLabels[i]), track->getId()); + setButtonMapping(m_trackLabels[i], track->getId()); m_trackLabels[i]->setPosition(i); } @@ -357,7 +357,7 @@ TrackButtons::slotUpdateTracks() // RG_DEBUG << "TrackButtons::slotUpdateTracks - set button mapping at pos " // << i << " to track id " << track->getId() << endl; - setButtonMapping(TQT_TQOBJECT(m_trackLabels[i]), track->getId()); + setButtonMapping(m_trackLabels[i], track->getId()); } } m_tracks = newNbTracks; @@ -1070,8 +1070,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId) m_recordSigMapper, TQT_SLOT(map())); connect(mute, TQT_SIGNAL(stateChanged(bool)), m_muteSigMapper, TQT_SLOT(map())); - m_recordSigMapper->setMapping(TQT_TQOBJECT(record), track->getPosition()); - m_muteSigMapper->setMapping(TQT_TQOBJECT(mute), track->getPosition()); + m_recordSigMapper->setMapping(record, track->getPosition()); + m_muteSigMapper->setMapping(mute, track->getPosition()); // Store the KLedButton // @@ -1109,7 +1109,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId) m_trackLabels.push_back(trackLabel); // Connect it - setButtonMapping(TQT_TQOBJECT(trackLabel), trackId); + setButtonMapping(trackLabel, trackId); connect(trackLabel, TQT_SIGNAL(changeToInstrumentList()), m_instListSigMapper, TQT_SLOT(map())); diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp index 108fb7e..123d91a 100644 --- a/src/gui/editors/segment/TrackLabel.cpp +++ b/src/gui/editors/segment/TrackLabel.cpp @@ -184,7 +184,7 @@ TrackLabel::mouseDoubleClickEvent(TQMouseEvent *e) bool ok = false; - TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this)); // empty is OK + TQRegExpValidator validator(TQRegExp(".*"), this); // empty is OK TQString newText = KLineEditDlg::getText(i18n("Change track name"), i18n("Enter new track name"), diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp index 74f581e..cb343d9 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.cpp +++ b/src/gui/editors/segment/TriggerSegmentManager.cpp @@ -373,12 +373,12 @@ TriggerSegmentManager::slotClose() void TriggerSegmentManager::setupActions() { - TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), + TDEAction* close = KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection()); m_closeButton->setText(close->text()); - connect(m_closeButton, TQT_SIGNAL(released()), TQT_TQOBJECT(this), TQT_SLOT(slotClose())); + connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose())); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); @@ -395,7 +395,7 @@ TriggerSegmentManager::setupActions() actionCollection(), KStdAction::stdName(KStdAction::Redo)); - new TDEAction(i18n("Pa&ste as New Triggered Segment"), CTRL + SHIFT + Key_V, TQT_TQOBJECT(this), + new TDEAction(i18n("Pa&ste as New Triggered Segment"), CTRL + SHIFT + Key_V, this, TQT_SLOT(slotPasteAsNew()), actionCollection(), "paste_to_trigger_segment"); @@ -407,7 +407,7 @@ TriggerSegmentManager::setupActions() TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png"); TQIconSet icon(pixmap); - action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this, TQT_SLOT(slotMusicalTime()), actionCollection(), "time_musical"); action->setExclusiveGroup("timeMode"); @@ -417,7 +417,7 @@ TriggerSegmentManager::setupActions() pixmap.load(pixmapDir + "/toolbar/time-real.png"); icon = TQIconSet(pixmap); - action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Real Times"), icon, 0, this, TQT_SLOT(slotRealTime()), actionCollection(), "time_real"); action->setExclusiveGroup("timeMode"); @@ -427,7 +427,7 @@ TriggerSegmentManager::setupActions() pixmap.load(pixmapDir + "/toolbar/time-raw.png"); icon = TQIconSet(pixmap); - action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this, TQT_SLOT(slotRawTime()), actionCollection(), "time_raw"); action->setExclusiveGroup("timeMode"); diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp index 3d09344..445fc33 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp @@ -189,7 +189,7 @@ CompositionView::CompositionView(RosegardenGUIDoc* doc, } if (doc) { - doc->getAudioPreviewThread().setEmptyQueueListener(TQT_TQOBJECT(this)); + doc->getAudioPreviewThread().setEmptyQueueListener(this); } m_segmentsDrawBuffer.setOptimization(TQPixmap::BestOptim); diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp index 5e309a7..2172abb 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp @@ -40,7 +40,7 @@ namespace Rosegarden { SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc) - : BaseTool("segment_tool_menu", dynamic_cast<TDEMainWindow*>(doc->parent())->factory(), TQT_TQOBJECT(canvas)), + : BaseTool("segment_tool_menu", dynamic_cast<TDEMainWindow*>(doc->parent())->factory(), canvas), m_canvas(canvas), m_doc(doc), m_changeMade(false) |