summaryrefslogtreecommitdiffstats
path: root/src/gui/general
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/general')
-rw-r--r--src/gui/general/EditTool.cpp2
-rw-r--r--src/gui/general/EditView.cpp70
-rw-r--r--src/gui/general/EditViewBase.cpp32
3 files changed, 52 insertions, 52 deletions
diff --git a/src/gui/general/EditTool.cpp b/src/gui/general/EditTool.cpp
index 3aa9086..26437ba 100644
--- a/src/gui/general/EditTool.cpp
+++ b/src/gui/general/EditTool.cpp
@@ -39,7 +39,7 @@ namespace Rosegarden
{
EditTool::EditTool(const TQString& menuName, EditView* view)
- : BaseTool(menuName, view->factory(), TQT_TQOBJECT(view)),
+ : BaseTool(menuName, view->factory(), view),
m_parentView(view)
{}
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index 42481e6..c9b01f0 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -726,82 +726,82 @@ EditView::setupActions()
TQIconSet icon = TQIconSet(pixmap);
new TDEAction(AddTempoChangeCommand::getGlobalName(),
icon, 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAddTempo()),
+ this, TQT_SLOT(slotAddTempo()),
actionCollection(), "add_tempo");
pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png");
icon = TQIconSet(pixmap);
new TDEAction(AddTimeSignatureCommand::getGlobalName(),
icon, 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAddTimeSignature()),
+ this, TQT_SLOT(slotAddTimeSignature()),
actionCollection(), "add_time_signature");
//
// Transforms
//
- new TDEAction(i18n("&Halve Durations"), Key_H + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Halve Durations"), Key_H + CTRL, this,
TQT_SLOT(slotHalveDurations()), actionCollection(),
"halve_durations");
- new TDEAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, this,
TQT_SLOT(slotDoubleDurations()), actionCollection(),
"double_durations");
- new TDEAction(RescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(RescaleCommand::getGlobalName(), 0, this,
TQT_SLOT(slotRescale()), actionCollection(),
"rescale");
new TDEAction(TransposeCommand::getGlobalName(1), 0,
- Key_Up, TQT_TQOBJECT(this),
+ Key_Up, this,
TQT_SLOT(slotTransposeUp()), actionCollection(),
"transpose_up");
new TDEAction(TransposeCommand::getGlobalName(12), 0,
- Key_Up + CTRL, TQT_TQOBJECT(this),
+ Key_Up + CTRL, this,
TQT_SLOT(slotTransposeUpOctave()), actionCollection(),
"transpose_up_octave");
new TDEAction(TransposeCommand::getGlobalName( -1), 0,
- Key_Down, TQT_TQOBJECT(this),
+ Key_Down, this,
TQT_SLOT(slotTransposeDown()), actionCollection(),
"transpose_down");
new TDEAction(TransposeCommand::getGlobalName( -12), 0,
- Key_Down + CTRL, TQT_TQOBJECT(this),
+ Key_Down + CTRL, this,
TQT_SLOT(slotTransposeDownOctave()), actionCollection(),
"transpose_down_octave");
- new TDEAction(TransposeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this),
+ new TDEAction(TransposeCommand::getGlobalName(0), 0, this,
TQT_SLOT(slotTranspose()), actionCollection(),
"general_transpose");
- new TDEAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, TQT_TQOBJECT(this),
+ new TDEAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, this,
TQT_SLOT(slotDiatonicTranspose()), actionCollection(),
"general_diatonic_transpose");
- new TDEAction(InvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this),
+ new TDEAction(InvertCommand::getGlobalName(0), 0, this,
TQT_SLOT(slotInvert()), actionCollection(),
"invert");
- new TDEAction(RetrogradeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this),
+ new TDEAction(RetrogradeCommand::getGlobalName(0), 0, this,
TQT_SLOT(slotRetrograde()), actionCollection(),
"retrograde");
- new TDEAction(RetrogradeInvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this),
+ new TDEAction(RetrogradeInvertCommand::getGlobalName(0), 0, this,
TQT_SLOT(slotRetrogradeInvert()), actionCollection(),
"retrograde_invert");
- new TDEAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Jog &Left"), Key_Left + ALT, this,
TQT_SLOT(slotJogLeft()), actionCollection(),
"jog_left");
- new TDEAction(i18n("Jog &Right"), Key_Right + ALT, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Jog &Right"), Key_Right + ALT, this,
TQT_SLOT(slotJogRight()), actionCollection(),
"jog_right");
// Control rulers
//
- new TDEAction(i18n("Show Velocity Property Ruler"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Show Velocity Property Ruler"), 0, this,
TQT_SLOT(slotShowVelocityControlRuler()), actionCollection(),
"show_velocity_control_ruler");
@@ -820,37 +820,37 @@ EditView::setupActions()
//
// Control Ruler context menu
//
- new TDEAction(i18n("Insert item"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Insert item"), 0, this,
TQT_SLOT(slotInsertControlRulerItem()), actionCollection(),
"insert_control_ruler_item");
// This was on Key_Delete, but that conflicts with existing Delete commands
// on individual edit views
- new TDEAction(i18n("Erase selected items"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Erase selected items"), 0, this,
TQT_SLOT(slotEraseControlRulerItem()), actionCollection(),
"erase_control_ruler_item");
- new TDEAction(i18n("Clear ruler"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Clear ruler"), 0, this,
TQT_SLOT(slotClearControlRulerItem()), actionCollection(),
"clear_control_ruler_item");
- new TDEAction(i18n("Insert line of controllers"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Insert line of controllers"), 0, this,
TQT_SLOT(slotStartControlLineItem()), actionCollection(),
"start_control_line_item");
- new TDEAction(i18n("Flip forward"), Key_BracketRight, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Flip forward"), Key_BracketRight, this,
TQT_SLOT(slotFlipForwards()), actionCollection(),
"flip_control_events_forward");
- new TDEAction(i18n("Flip backwards"), Key_BracketLeft, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Flip backwards"), Key_BracketLeft, this,
TQT_SLOT(slotFlipBackwards()), actionCollection(),
"flip_control_events_back");
- new TDEAction(i18n("Draw property line"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Draw property line"), 0, this,
TQT_SLOT(slotDrawPropertyLine()), actionCollection(),
"draw_property_line");
- new TDEAction(i18n("Select all property values"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Select all property values"), 0, this,
TQT_SLOT(slotSelectAllProperties()), actionCollection(),
"select_all_properties");
}
@@ -1080,18 +1080,18 @@ EditView::createInsertPitchActionMenu()
};
TDEActionMenu *insertPitchActionMenu =
- new TDEActionMenu(i18n("&Insert Note"), TQT_TQOBJECT(this), "insert_note_actionmenu");
+ new TDEActionMenu(i18n("&Insert Note"), this, "insert_note_actionmenu");
for (int octave = 0; octave <= 2; ++octave) {
TDEActionMenu *menu = insertPitchActionMenu;
if (octave == 1) {
- menu = new TDEActionMenu(i18n("&Upper Octave"), TQT_TQOBJECT(this),
+ menu = new TDEActionMenu(i18n("&Upper Octave"), this,
"insert_note_actionmenu_upper_octave");
- insertPitchActionMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
+ insertPitchActionMenu->insert(new TDEActionSeparator(this));
insertPitchActionMenu->insert(menu);
} else if (octave == 2) {
- menu = new TDEActionMenu(i18n("&Lower Octave"), TQT_TQOBJECT(this),
+ menu = new TDEActionMenu(i18n("&Lower Octave"), this,
"insert_note_actionmenu_lower_octave");
insertPitchActionMenu->insert(menu);
}
@@ -1114,7 +1114,7 @@ EditView::createInsertPitchActionMenu()
new TDEAction
(flat.arg(notePitchNames[i]),
CTRL + SHIFT + notePitchKeys[octave][i],
- TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+ this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
@@ -1124,7 +1124,7 @@ EditView::createInsertPitchActionMenu()
new TDEAction
(notePitchNames[i],
notePitchKeys[octave][i],
- TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+ this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
@@ -1137,14 +1137,14 @@ EditView::createInsertPitchActionMenu()
new TDEAction
(sharp.arg(notePitchNames[i]),
SHIFT + notePitchKeys[octave][i],
- TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+ this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
}
if (i < 6)
- menu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
+ menu->insert(new TDEActionSeparator(this));
}
}
@@ -1672,7 +1672,7 @@ ControlRuler* EditView::findRuler(const ControlParameter& controller, int &index
PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyName)
{
- TQCanvas* controlRulerCanvas = new TQCanvas(TQT_TQOBJECT(this));
+ TQCanvas* controlRulerCanvas = new TQCanvas(this);
TQSize viewSize = getViewSize();
controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size
@@ -1690,7 +1690,7 @@ PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyNa
ControllerEventsRuler* EditView::makeControllerEventRuler(const ControlParameter *controller)
{
- TQCanvas* controlRulerCanvas = new TQCanvas(TQT_TQOBJECT(this));
+ TQCanvas* controlRulerCanvas = new TQCanvas(this);
TQSize viewSize = getViewSize();
controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size
// TQCanvas* controlRulerCanvas = ControlRulerCanvasRepository::getCanvas(getCurrentSegment(), controller,
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 4c1e150..59bd2f6 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -156,33 +156,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
// Actions all edit views will have
- KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolBar()),
+ KStdAction::showToolbar(this, TQT_SLOT(slotToggleToolBar()),
actionCollection(), "options_show_toolbar");
- KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()),
+ KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()),
actionCollection(), "options_show_statusbar");
- KStdAction::preferences(TQT_TQOBJECT(this),
+ KStdAction::preferences(this,
TQT_SLOT(slotConfigure()),
actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(this),
+ KStdAction::keyBindings(this,
TQT_SLOT(slotEditKeys()),
actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this),
+ KStdAction::configureToolbars(this,
TQT_SLOT(slotEditToolbars()),
actionCollection());
// File menu
- KStdAction::save (TQT_TQOBJECT(this), TQT_SIGNAL(saveFile()), actionCollection());
- KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotCloseWindow()), actionCollection());
+ KStdAction::save (this, TQT_SIGNAL(saveFile()), actionCollection());
+ KStdAction::close(this, TQT_SLOT(slotCloseWindow()), actionCollection());
if (haveClipboard) {
- KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
- KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
- KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
+ KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection());
+ KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
+ KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
}
new TDEToolBarPopupAction(i18n("Und&o"),
@@ -201,33 +201,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png");
TQIconSet icon = TQIconSet(pixmap);
- new TDEAction(i18n("Open in Matri&x Editor"), icon, 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Open in Matri&x Editor"), icon, 0, this,
TQT_SLOT(slotOpenInMatrix()), actionCollection(),
"open_in_matrix");
pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png");
icon = TQIconSet(pixmap);
- new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, this,
TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
"open_in_percussion_matrix");
pixmap.load(pixmapDir + "/toolbar/notation.png");
icon = TQIconSet(pixmap);
- new TDEAction(i18n("Open in &Notation Editor"), icon, 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Open in &Notation Editor"), icon, 0, this,
TQT_SLOT(slotOpenInNotation()), actionCollection(),
"open_in_notation");
pixmap.load(pixmapDir + "/toolbar/eventlist.png");
icon = TQIconSet(pixmap);
- new TDEAction(i18n("Open in &Event List Editor"), icon, 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Open in &Event List Editor"), icon, 0, this,
TQT_SLOT(slotOpenInEventList()), actionCollection(),
"open_in_event_list");
- new TDEAction(i18n("Set Segment Start Time..."), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Set Segment Start Time..."), 0, this,
TQT_SLOT(slotSetSegmentStartTime()), actionCollection(),
"set_segment_start");
- new TDEAction(i18n("Set Segment Duration..."), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Set Segment Duration..."), 0, this,
TQT_SLOT(slotSetSegmentDuration()), actionCollection(),
"set_segment_duration");
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 08:19:01 +0000