diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:05:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:05:43 -0600 |
| commit | fb3718a55f355cd22f9eb9fa4e89cd3b84b8c9ca (patch) | |
| tree | 5785d2ccbdfbe2f44d02fec75b4a51f5079a4b62 | |
| parent | acf699af8244896500e654cccdc8aae7e5b545db (diff) | |
| download | rosegarden-fb3718a55f355cd22f9eb9fa4e89cd3b84b8c9ca.tar.gz rosegarden-fb3718a55f355cd22f9eb9fa4e89cd3b84b8c9ca.zip | |
Rename a number of classes to enhance compatibility with KDE4
81 files changed, 932 insertions, 932 deletions
diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp index 7e529fb..a4957be 100644 --- a/src/document/MultiViewCommandHistory.cpp +++ b/src/document/MultiViewCommandHistory.cpp @@ -65,14 +65,14 @@ MultiViewCommandHistory::clear() } void -MultiViewCommandHistory::attachView(KActionCollection *collection) +MultiViewCommandHistory::attachView(TDEActionCollection *collection) { if (m_views.find(collection) != m_views.end()) return ; RG_DEBUG << "MultiViewCommandHistory::attachView() : setting up undo/redo actions\n"; - KToolBarPopupAction *undo = dynamic_cast<KToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Undo))); + TDEToolBarPopupAction *undo = dynamic_cast<TDEToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Undo))); if (undo) { connect(undo, TQT_SIGNAL(activated()), @@ -91,7 +91,7 @@ MultiViewCommandHistory::attachView(KActionCollection *collection) TQT_SLOT(slotUndoActivated(int))); } - KToolBarPopupAction *redo = dynamic_cast<KToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Redo))); + TDEToolBarPopupAction *redo = dynamic_cast<TDEToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Redo))); if (redo) { @@ -117,7 +117,7 @@ MultiViewCommandHistory::attachView(KActionCollection *collection) } void -MultiViewCommandHistory::detachView(KActionCollection *collection) +MultiViewCommandHistory::detachView(TDEActionCollection *collection) { ViewSet::iterator i = m_views.find(collection); if (i != m_views.end()) @@ -307,7 +307,7 @@ MultiViewCommandHistory::updateButton(bool undo, { for (ViewSet::iterator i = m_views.begin(); i != m_views.end(); ++i) { - KAction *action = (*i)->action(name.ascii()); + TDEAction *action = (*i)->action(name.ascii()); if (!action) continue; TQString text; @@ -340,12 +340,12 @@ MultiViewCommandHistory::updateMenu(bool undo, { for (ViewSet::iterator i = m_views.begin(); i != m_views.end(); ++i) { - KAction *action = (*i)->action(name.ascii()); + TDEAction *action = (*i)->action(name.ascii()); if (!action) continue; - KToolBarPopupAction *popupAction = - dynamic_cast<KToolBarPopupAction *>(action); + TDEToolBarPopupAction *popupAction = + dynamic_cast<TDEToolBarPopupAction *>(action); if (!popupAction) continue; diff --git a/src/document/MultiViewCommandHistory.h b/src/document/MultiViewCommandHistory.h index 0febb10..71194b9 100644 --- a/src/document/MultiViewCommandHistory.h +++ b/src/document/MultiViewCommandHistory.h @@ -33,7 +33,7 @@ class TQString; class KCommand; -class KActionCollection; +class TDEActionCollection; namespace Rosegarden @@ -64,8 +64,8 @@ public: void clear(); - void attachView(KActionCollection *collection); - void detachView(KActionCollection *collection); + void attachView(TDEActionCollection *collection); + void detachView(TDEActionCollection *collection); void addCommand(KCommand *command, bool execute = true); @@ -126,7 +126,7 @@ signals: private: //--------------- Data members --------------------------------- - typedef std::set<KActionCollection *> ViewSet; + typedef std::set<TDEActionCollection *> ViewSet; ViewSet m_views; typedef std::stack<KCommand *> CommandStack; diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp index 10add69..b160f45 100644 --- a/src/gui/application/RosegardenApplication.cpp +++ b/src/gui/application/RosegardenApplication.cpp @@ -110,7 +110,7 @@ void RosegardenApplication::sfxLoadExited(TDEProcess *proc) void RosegardenApplication::slotSetStatusMessage(TQString msg) { - KMainWindow* mainWindow = dynamic_cast<KMainWindow*>(mainWidget()); + TDEMainWindow* mainWindow = dynamic_cast<TDEMainWindow*>(mainWidget()); if (mainWindow) { if (msg.isEmpty()) msg = KTmpStatusMsg::getDefaultMsg(); diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index 9afa803..6bb154a 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -553,82 +553,82 @@ void RosegardenGUIApp::setupActions() KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); KStdAction::printPreview (TQT_TQOBJECT(this), TQT_SLOT(slotFilePrintPreview()), actionCollection()); - new KAction(i18n("Import Rosegarden &Project file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Import Rosegarden &Project file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportProject()), actionCollection(), "file_import_project"); - new KAction(i18n("Import &MIDI file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Import &MIDI file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportMIDI()), actionCollection(), "file_import_midi"); - new KAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportRG21()), actionCollection(), "file_import_rg21"); - new KAction(i18n("Import &Hydrogen file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Import &Hydrogen file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportHydrogen()), actionCollection(), "file_import_hydrogen"); - new KAction(i18n("Merge &File..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Merge &File..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMerge()), actionCollection(), "file_merge"); - new KAction(i18n("Merge &MIDI file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Merge &MIDI file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeMIDI()), actionCollection(), "file_merge_midi"); - new KAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeRG21()), actionCollection(), "file_merge_rg21"); - new KAction(i18n("Merge &Hydrogen file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Merge &Hydrogen file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeHydrogen()), actionCollection(), "file_merge_hydrogen"); - new KAction(i18n("Export Rosegarden &Project file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export Rosegarden &Project file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportProject()), actionCollection(), "file_export_project"); - new KAction(i18n("Export &MIDI file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export &MIDI file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportMIDI()), actionCollection(), "file_export_midi"); - new KAction(i18n("Export &LilyPond file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export &LilyPond file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportLilyPond()), actionCollection(), "file_export_lilypond"); - new KAction(i18n("Export Music&XML file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export Music&XML file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportMusicXml()), actionCollection(), "file_export_musicxml"); - new KAction(i18n("Export &Csound score file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export &Csound score file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportCsound()), actionCollection(), "file_export_csound"); - new KAction(i18n("Export M&up file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export M&up file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportMup()), actionCollection(), "file_export_mup"); - new KAction(i18n("Print &with LilyPond..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPreviewLilyPond()), actionCollection(), "file_preview_lilypond"); - new KAction(i18n("Play&list"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Play&list"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayList()), actionCollection(), "file_show_playlist"); KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); // help menu - new KAction(i18n("Rosegarden &Tutorial"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Rosegarden &Tutorial"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotTutorial()), actionCollection(), "tutorial"); - new KAction(i18n("&Bug Reporting Guidelines"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Bug Reporting Guidelines"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotBugGuidelines()), actionCollection(), "guidelines"); @@ -642,15 +642,15 @@ void RosegardenGUIApp::setupActions() // slots later on, when the current document is set up - see // MultiViewCommandHistory::attachView // - new KToolBarPopupAction(i18n("Und&o"), + new TDEToolBarPopupAction(i18n("Und&o"), "undo", - KStdAccel::shortcut(KStdAccel::Undo), + TDEStdAccel::shortcut(TDEStdAccel::Undo), actionCollection(), KStdAction::stdName(KStdAction::Undo)); - new KToolBarPopupAction(i18n("Re&do"), + new TDEToolBarPopupAction(i18n("Re&do"), "redo", - KStdAccel::shortcut(KStdAccel::Redo), + TDEStdAccel::shortcut(TDEStdAccel::Redo), actionCollection(), KStdAction::stdName(KStdAction::Redo)); ///// @@ -662,61 +662,61 @@ void RosegardenGUIApp::setupActions() m_viewToolBar = KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolBar()), actionCollection(), "show_stock_toolbar"); - m_viewToolsToolBar = new KToggleAction(i18n("Show T&ools Toolbar"), 0, TQT_TQOBJECT(this), + m_viewToolsToolBar = new TDEToggleAction(i18n("Show T&ools Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolsToolBar()), actionCollection(), "show_tools_toolbar"); - m_viewTracksToolBar = new KToggleAction(i18n("Show Trac&ks Toolbar"), 0, TQT_TQOBJECT(this), + m_viewTracksToolBar = new TDEToggleAction(i18n("Show Trac&ks Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTracksToolBar()), actionCollection(), "show_tracks_toolbar"); - m_viewEditorsToolBar = new KToggleAction(i18n("Show &Editors Toolbar"), 0, TQT_TQOBJECT(this), + m_viewEditorsToolBar = new TDEToggleAction(i18n("Show &Editors Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleEditorsToolBar()), actionCollection(), "show_editors_toolbar"); - m_viewTransportToolBar = new KToggleAction(i18n("Show Trans&port Toolbar"), 0, TQT_TQOBJECT(this), + m_viewTransportToolBar = new TDEToggleAction(i18n("Show Trans&port Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTransportToolBar()), actionCollection(), "show_transport_toolbar"); - m_viewZoomToolBar = new KToggleAction(i18n("Show &Zoom Toolbar"), 0, TQT_TQOBJECT(this), + m_viewZoomToolBar = new TDEToggleAction(i18n("Show &Zoom Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleZoomToolBar()), actionCollection(), "show_zoom_toolbar"); m_viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()), actionCollection(), "show_status_bar"); - m_viewTransport = new KToggleAction(i18n("Show Tra&nsport"), Key_T, TQT_TQOBJECT(this), + m_viewTransport = new TDEToggleAction(i18n("Show Tra&nsport"), Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTransport()), actionCollection(), "show_transport"); - m_viewTrackLabels = new KToggleAction(i18n("Show Track &Labels"), 0, TQT_TQOBJECT(this), + m_viewTrackLabels = new TDEToggleAction(i18n("Show Track &Labels"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrackLabels()), actionCollection(), "show_tracklabels"); - m_viewRulers = new KToggleAction(i18n("Show Playback Position R&uler"), 0, TQT_TQOBJECT(this), + m_viewRulers = new TDEToggleAction(i18n("Show Playback Position R&uler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleRulers()), actionCollection(), "show_rulers"); - m_viewTempoRuler = new KToggleAction(i18n("Show Te&mpo Ruler"), 0, TQT_TQOBJECT(this), + m_viewTempoRuler = new TDEToggleAction(i18n("Show Te&mpo Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); - m_viewChordNameRuler = new KToggleAction(i18n("Show Cho&rd Name Ruler"), 0, TQT_TQOBJECT(this), + m_viewChordNameRuler = new TDEToggleAction(i18n("Show Cho&rd Name Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleChordNameRuler()), actionCollection(), "show_chord_name_ruler"); - m_viewPreviews = new KToggleAction(i18n("Show Segment Pre&views"), 0, TQT_TQOBJECT(this), + m_viewPreviews = new TDEToggleAction(i18n("Show Segment Pre&views"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePreviews()), actionCollection(), "show_previews"); - new KAction(i18n("Show Special &Parameters"), Key_P, TQT_TQOBJECT(this), + new TDEAction(i18n("Show Special &Parameters"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotDockParametersBack()), actionCollection(), "show_inst_segment_parameters"); @@ -741,7 +741,7 @@ void RosegardenGUIApp::setupActions() TQT_SLOT(slotEditToolbars()), actionCollection()); - KRadioAction *action = 0; + TDERadioAction *action = 0; // Create the select icon // @@ -750,110 +750,110 @@ void RosegardenGUIApp::setupActions() TQIconSet icon = TQIconSet(pixmap); // TODO : add some shortcuts here - action = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, + action = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotPointerSelected()), actionCollection(), "select"); action->setExclusiveGroup("segmenttools"); - action = new KRadioAction(i18n("&Draw"), "pencil", Key_F3, + action = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3, TQT_TQOBJECT(this), TQT_SLOT(slotDrawSelected()), actionCollection(), "draw"); action->setExclusiveGroup("segmenttools"); - action = new KRadioAction(i18n("&Erase"), "eraser", Key_F4, + action = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); action->setExclusiveGroup("segmenttools"); - action = new KRadioAction(i18n("&Move"), "move", Key_F5, + action = new TDERadioAction(i18n("&Move"), "move", Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Resize"), icon, Key_F6, + action = new TDERadioAction(i18n("&Resize"), icon, Key_F6, TQT_TQOBJECT(this), TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/split.xpm"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Split"), icon, Key_F7, + action = new TDERadioAction(i18n("&Split"), icon, Key_F7, TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelected()), actionCollection(), "split"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/join.xpm"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Join"), icon, 0, + action = new TDERadioAction(i18n("&Join"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotJoinSelected()), actionCollection(), "join"); action->setExclusiveGroup("segmenttools"); - new KAction(i18n("&Harmonize"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Harmonize"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHarmonizeSelection()), actionCollection(), "harmonize_selection"); pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png"); icon = TQIconSet(pixmap); - new KAction(AddTimeSignatureCommand::getGlobalName(), + new TDEAction(AddTimeSignatureCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTimeSignature()), actionCollection(), "add_time_signature"); - new KAction(i18n("Open Tempo and Time Signature Editor"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTempos()), actionCollection(), "edit_tempos"); // // Edit menu // - new KAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotCutRange()), actionCollection(), "cut_range"); - new KAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotCopyRange()), actionCollection(), "copy_range"); - new KAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotPasteRange()), actionCollection(), "paste_range"); /* - new KAction(i18n("Delete Range"), Key_Delete + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Delete Range"), Key_Delete + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteRange()), actionCollection(), "delete_range"); */ - new KAction(i18n("Insert Range..."), Key_Insert + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Insert Range..."), Key_Insert + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRange()), actionCollection(), "insert_range"); - new KAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this), + new TDEAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteSelectedSegments()), actionCollection(), "delete"); - new KAction(i18n("Select &All Segments"), Key_A + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Select &All Segments"), Key_A + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection(), "select_all"); pixmap.load(pixmapDir + "/toolbar/event-insert-tempo.png"); icon = TQIconSet(pixmap); - new KAction(AddTempoChangeCommand::getGlobalName(), + new TDEAction(AddTempoChangeCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTempo()), actionCollection(), "add_tempo"); - new KAction(ChangeCompositionLengthCommand::getGlobalName(), + new TDEAction(ChangeCompositionLengthCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeCompositionLength()), actionCollection(), "change_composition_length"); - new KAction(i18n("Edit Mar&kers..."), Key_K + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Edit Mar&kers..."), Key_K + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkers()), actionCollection(), "edit_markers"); - new KAction(i18n("Edit Document P&roperties..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Edit Document P&roperties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditDocumentProperties()), actionCollection(), "edit_doc_properties"); @@ -861,120 +861,120 @@ void RosegardenGUIApp::setupActions() // // Segments menu // - new KAction(i18n("Open in &Default Editor"), Key_Return, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Default Editor"), Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), actionCollection(), "edit_default"); pixmap.load(pixmapDir + "/toolbar/matrix.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in Matri&x Editor"), icon, Key_M, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in Matri&x Editor"), icon, Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotEditInMatrix()), actionCollection(), "edit_matrix"); pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotEditInPercussionMatrix()), actionCollection(), "edit_percussion_matrix"); pixmap.load(pixmapDir + "/toolbar/notation.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Notation Editor"), icon, Key_N, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Notation Editor"), icon, Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotEditAsNotation()), actionCollection(), "edit_notation"); pixmap.load(pixmapDir + "/toolbar/eventlist.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Event List Editor"), icon, Key_E, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Event List Editor"), icon, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEditInEventList()), actionCollection(), "edit_event_list"); pixmap.load(pixmapDir + "/toolbar/quantize.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Quantize..."), icon, Key_Equal, TQT_TQOBJECT(this), + new TDEAction(i18n("&Quantize..."), icon, Key_Equal, TQT_TQOBJECT(this), TQT_SLOT(slotQuantizeSelection()), actionCollection(), "quantize_selection"); - new KAction(SegmentLabelCommand::getGlobalName(), + new TDEAction(SegmentLabelCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRelabelSegments()), actionCollection(), "relabel_segment"); - new KAction(SegmentTransposeCommand::getGlobalName(), + new TDEAction(SegmentTransposeCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeSegments()), actionCollection(), "transpose"); - new KAction(i18n("Repeat Last Quantize"), Key_Plus, TQT_TQOBJECT(this), + new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotRepeatQuantizeSelection()), actionCollection(), "repeat_quantize"); - new KAction(SegmentRescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(SegmentRescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRescaleSelection()), actionCollection(), "rescale"); - new KAction(SegmentAutoSplitCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(SegmentAutoSplitCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSplitSelection()), actionCollection(), "auto_split"); - new KAction(SegmentSplitByPitchCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(SegmentSplitByPitchCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelectionByPitch()), actionCollection(), "split_by_pitch"); - new KAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelectionByRecordedSrc()), actionCollection(), "split_by_recording"); - new KAction(i18n("Split at Time..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Split at Time..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelectionAtTime()), actionCollection(), "split_at_time"); - new KAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotJogLeft()), actionCollection(), "jog_left"); - new KAction(i18n("Jog &Right"), Key_Right + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Jog &Right"), Key_Right + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotJogRight()), actionCollection(), "jog_right"); - new KAction(i18n("Set Start Time..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Start Time..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSegmentStartTimes()), actionCollection(), "set_segment_start"); - new KAction(i18n("Set Duration..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Duration..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSegmentDurations()), actionCollection(), "set_segment_duration"); - new KAction(SegmentJoinCommand::getGlobalName(), + new TDEAction(SegmentJoinCommand::getGlobalName(), Key_J + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotJoinSegments()), actionCollection(), "join_segments"); - new KAction(i18n("Turn Re&peats into Copies"), + new TDEAction(i18n("Turn Re&peats into Copies"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRepeatingSegments()), actionCollection(), "repeats_to_real_copies"); - new KAction(i18n("Manage Tri&ggered Segments"), 0, + new TDEAction(i18n("Manage Tri&ggered Segments"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotManageTriggerSegments()), actionCollection(), "manage_trigger_segments"); - new KAction(i18n("Set Tempos from &Beat Segment"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Tempos from &Beat Segment"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrooveQuantize()), actionCollection(), "groove_quantize"); - new KAction(i18n("Set &Tempo to Audio Segment Duration"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set &Tempo to Audio Segment Duration"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTempoToSegmentLength()), actionCollection(), "set_tempo_to_segment_length"); pixmap.load(pixmapDir + "/toolbar/manage-audio-segments.xpm"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage A&udio Files"), icon, + new TDEAction(i18n("Manage A&udio Files"), icon, Key_U + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotAudioManager()), actionCollection(), "audio_manager"); - m_viewSegmentLabels = new KToggleAction(i18n("Show Segment Labels"), 0, TQT_TQOBJECT(this), + m_viewSegmentLabels = new TDEToggleAction(i18n("Show Segment Labels"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSegmentLabels()), actionCollection(), "show_segment_labels"); @@ -983,65 +983,65 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/add_tracks.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Add &Track"), icon, CTRL + Key_T, + new TDEAction(i18n("Add &Track"), icon, CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotAddTrack()), actionCollection(), "add_track"); - new KAction(i18n("&Add Tracks..."), 0, + new TDEAction(i18n("&Add Tracks..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddTracks()), actionCollection(), "add_tracks"); pixmap.load(pixmapDir + "/toolbar/delete_track.png"); icon = TQIconSet(pixmap); - new KAction(i18n("D&elete Track"), icon, CTRL + Key_D, + new TDEAction(i18n("D&elete Track"), icon, CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteTrack()), actionCollection(), "delete_track"); pixmap.load(pixmapDir + "/toolbar/move_track_down.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down, + new TDEAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotMoveTrackDown()), actionCollection(), "move_track_down"); pixmap.load(pixmapDir + "/toolbar/move_track_up.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up, + new TDEAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotMoveTrackUp()), actionCollection(), "move_track_up"); - new KAction(i18n("Select &Next Track"), + new TDEAction(i18n("Select &Next Track"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotTrackDown()), actionCollection(), "select_next_track"); - new KAction(i18n("Select &Previous Track"), + new TDEAction(i18n("Select &Previous Track"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotTrackUp()), actionCollection(), "select_previous_track"); - new KAction(i18n("Mute or Unmute Track"), + new TDEAction(i18n("Mute or Unmute Track"), Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotToggleMutedCurrentTrack()), actionCollection(), "toggle_mute_track"); - new KAction(i18n("Arm or Un-arm Track for Record"), + new TDEAction(i18n("Arm or Un-arm Track for Record"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotToggleRecordCurrentTrack()), actionCollection(), "toggle_arm_track"); pixmap.load(pixmapDir + "/toolbar/mute-all.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Mute all Tracks"), icon, 0, + new TDEAction(i18n("&Mute all Tracks"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMuteAllTracks()), actionCollection(), "mute_all_tracks"); pixmap.load(pixmapDir + "/toolbar/un-mute-all.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Unmute all Tracks"), icon, 0, + new TDEAction(i18n("&Unmute all Tracks"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnmuteAllTracks()), actionCollection(), "unmute_all_tracks"); - new KAction(i18n("&Remap Instruments..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Remap Instruments..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemapInstruments()), actionCollection(), "remap_instruments"); @@ -1050,78 +1050,78 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/mixer.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Audio Mixer"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Audio Mixer"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAudioMixer()), actionCollection(), "audio_mixer"); pixmap.load(pixmapDir + "/toolbar/midimixer.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Midi Mi&xer"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Midi Mi&xer"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenMidiMixer()), actionCollection(), "midi_mixer"); pixmap.load(pixmapDir + "/toolbar/manage-midi-devices.xpm"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage MIDI &Devices"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Manage MIDI &Devices"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotManageMIDIDevices()), actionCollection(), "manage_devices"); pixmap.load(pixmapDir + "/toolbar/manage-synth-plugins.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage S&ynth Plugins"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Manage S&ynth Plugins"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotManageSynths()), actionCollection(), "manage_synths"); - new KAction(i18n("Modify MIDI &Filters"), "filter", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Modify MIDI &Filters"), "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotModifyMIDIFilters()), actionCollection(), "modify_midi_filters"); - m_enableMIDIrouting = new KToggleAction(i18n("MIDI Thru Routing"), 0, TQT_TQOBJECT(this), + m_enableMIDIrouting = new TDEToggleAction(i18n("MIDI Thru Routing"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableMIDIThruRouting()), actionCollection(), "enable_midi_routing"); pixmap.load(pixmapDir + "/toolbar/time-musical.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage &Metronome"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Manage &Metronome"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotManageMetronome()), actionCollection(), "manage_metronome"); - new KAction(i18n("&Save Current Document as Default Studio"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Save Current Document as Default Studio"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveDefaultStudio()), actionCollection(), "save_default_studio"); - new KAction(i18n("&Import Default Studio"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Import Default Studio"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportDefaultStudio()), actionCollection(), "load_default_studio"); - new KAction(i18n("Im&port Studio from File..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Im&port Studio from File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportStudio()), actionCollection(), "load_studio"); - new KAction(i18n("&Reset MIDI Network"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Reset MIDI Network"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetMidiNetwork()), actionCollection(), "reset_midi_network"); - m_setQuickMarkerAction = new KAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, TQT_TQOBJECT(this), + m_setQuickMarkerAction = new TDEAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotSetQuickMarker()), actionCollection(), "set_quick_marker"); - m_jumpToQuickMarkerAction = new KAction(i18n("Jump to Quick Marker"), 0, Key_1, TQT_TQOBJECT(this), + m_jumpToQuickMarkerAction = new TDEAction(i18n("Jump to Quick Marker"), 0, Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToQuickMarker()), actionCollection(), "jump_to_quick_marker"); // // Marker Ruler popup menu // -// new KAction(i18n("Insert Marker"), 0, 0, TQT_TQOBJECT(this), +// new TDEAction(i18n("Insert Marker"), 0, 0, TQT_TQOBJECT(this), // TQT_SLOT(slotInsertMarkerHere()), actionCollection(), // "insert_marker_here"); // -// new KAction(i18n("Insert Marker at Playback Position"), 0, 0, TQT_TQOBJECT(this), +// new TDEAction(i18n("Insert Marker at Playback Position"), 0, 0, TQT_TQOBJECT(this), // TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(), // "insert_marker_at_pointer"); // -// new KAction(i18n("Delete Marker"), 0, 0, TQT_TQOBJECT(this), +// new TDEAction(i18n("Delete Marker"), 0, 0, TQT_TQOBJECT(this), // TQT_SLOT(slotDeleteMarker()), actionCollection(), // "delete_marker"); @@ -1139,25 +1139,25 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/transport-play.png"); icon = TQIconSet(pixmap); - m_playTransport = new KAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), + m_playTransport = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), actionCollection(), "play"); // Alternative shortcut for Play - KShortcut playShortcut = m_playTransport->shortcut(); + TDEShortcut playShortcut = m_playTransport->shortcut(); playShortcut.append( KKey(Key_Return + CTRL) ); m_playTransport->setShortcut(playShortcut); m_playTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-stop.png"); icon = TQIconSet(pixmap); - m_stopTransport = new KAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), + m_stopTransport = new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop"); m_stopTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-ffwd.png"); icon = TQIconSet(pixmap); - m_ffwdTransport = new KAction(i18n("&Fast Forward"), icon, Key_PageDown, + m_ffwdTransport = new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotFastforward()), actionCollection(), "fast_forward"); @@ -1165,52 +1165,52 @@ void RosegardenGUIApp::setupActions() pixmap.load(pixmapDir + "/toolbar/transport-rewind.png"); icon = TQIconSet(pixmap); - m_rewindTransport = new KAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), + m_rewindTransport = new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), TQT_SLOT(slotRewind()), actionCollection(), "rewind"); m_rewindTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-record.png"); icon = TQIconSet(pixmap); - m_recordTransport = new KAction(i18n("P&unch in Record"), icon, Key_Space, TQT_TQOBJECT(this), + m_recordTransport = new TDEAction(i18n("P&unch in Record"), icon, Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotToggleRecord()), actionCollection(), "recordtoggle"); m_recordTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-record.png"); icon = TQIconSet(pixmap); - m_recordTransport = new KAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), + m_recordTransport = new TDEAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRecord()), actionCollection(), "record"); m_recordTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-rewind-end.png"); icon = TQIconSet(pixmap); - m_rewindEndTransport = new KAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), + m_rewindEndTransport = new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRewindToBeginning()), actionCollection(), "rewindtobeginning"); m_rewindEndTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-ffwd-end.png"); icon = TQIconSet(pixmap); - m_ffwdEndTransport = new KAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), + m_ffwdEndTransport = new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastForwardToEnd()), actionCollection(), "fastforwardtoend"); m_ffwdEndTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-tracking.png"); icon = TQIconSet(pixmap); - (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(true); pixmap.load(pixmapDir + "/toolbar/transport-panic.png"); icon = TQIconSet(pixmap); - new KAction( i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotPanic()), + new TDEAction( i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotPanic()), actionCollection(), "panic"); // DEBUG FACILITY - new KAction(i18n("Segment Debug Dump "), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Segment Debug Dump "), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump_segments"); @@ -1273,7 +1273,7 @@ void RosegardenGUIApp::setRewFFwdToAutoRepeat() void RosegardenGUIApp::initZoomToolbar() { - KToolBar *zoomToolbar = toolBar("Zoom Toolbar"); + TDEToolBar *zoomToolbar = toolBar("Zoom Toolbar"); if (!zoomToolbar) { RG_DEBUG << "RosegardenGUIApp::initZoomToolbar() : " << "zoom toolbar not found" << endl; @@ -1481,7 +1481,7 @@ void RosegardenGUIApp::initView() m_view->slotSelectTrackSegments(comp.getSelectedTrack()); // play tracking on in the editor by default: turn off if need be - KToggleAction *trackingAction = dynamic_cast<KToggleAction *> + TDEToggleAction *trackingAction = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_tracking")); if (trackingAction && !trackingAction->isChecked()) { m_view->getTrackEditor()->slotToggleTracking(); @@ -1873,7 +1873,7 @@ void RosegardenGUIApp::slotSaveOptions() m_fileRecent->saveEntries(kapp->config()); - // saveMainWindowSettings(kapp->config(), RosegardenGUIApp::MainWindowConfigGroup); - no need to, done by KMainWindow + // saveMainWindowSettings(kapp->config(), RosegardenGUIApp::MainWindowConfigGroup); - no need to, done by TDEMainWindow kapp->config()->sync(); } @@ -2053,7 +2053,7 @@ void RosegardenGUIApp::showEvent(TQShowEvent* e) RG_DEBUG << "RosegardenGUIApp::showEvent()\n"; getTransport()->raise(); - KMainWindow::showEvent(e); + TDEMainWindow::showEvent(e); } bool RosegardenGUIApp::queryClose() @@ -2443,7 +2443,7 @@ void RosegardenGUIApp::slotQuit() // close the first window, the list makes the next one the first again. // This ensures that queryClose() is called on each window to ask for closing - KMainWindow* w; + TDEMainWindow* w; if (memberList) { for (w = memberList->first(); w != 0; w = memberList->next()) { @@ -3193,7 +3193,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent) void RosegardenGUIApp::slotToggleSegmentLabels() { - KToggleAction* act = dynamic_cast<KToggleAction*>(actionCollection()->action("show_segment_labels")); + TDEToggleAction* act = dynamic_cast<TDEToggleAction*>(actionCollection()->action("show_segment_labels")); if (act) { m_view->slotShowSegmentLabels(act->isChecked()); } @@ -6119,8 +6119,8 @@ RosegardenGUIApp::setCursor(const TQCursor& cursor) // toolbars... // - TQPtrListIterator<KToolBar> tbIter = toolBarIterator(); - KToolBar* tb = 0; + TQPtrListIterator<TDEToolBar> tbIter = toolBarIterator(); + TDEToolBar* tb = 0; while ((tb = tbIter.current()) != 0) { tb->setCursor(cursor); ++tbIter; diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig index 4a009d2..23215a9 100644 --- a/src/gui/application/RosegardenGUIApp.cpp.orig +++ b/src/gui/application/RosegardenGUIApp.cpp.orig @@ -553,82 +553,82 @@ void RosegardenGUIApp::setupActions() KStdAction::print (this, TQT_SLOT(slotFilePrint()), actionCollection()); KStdAction::printPreview (this, TQT_SLOT(slotFilePrintPreview()), actionCollection()); - new KAction(i18n("Import Rosegarden &Project file..."), 0, 0, this, + new TDEAction(i18n("Import Rosegarden &Project file..."), 0, 0, this, TQT_SLOT(slotImportProject()), actionCollection(), "file_import_project"); - new KAction(i18n("Import &MIDI file..."), 0, 0, this, + new TDEAction(i18n("Import &MIDI file..."), 0, 0, this, TQT_SLOT(slotImportMIDI()), actionCollection(), "file_import_midi"); - new KAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, this, + new TDEAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, this, TQT_SLOT(slotImportRG21()), actionCollection(), "file_import_rg21"); - new KAction(i18n("Import &Hydrogen file..."), 0, 0, this, + new TDEAction(i18n("Import &Hydrogen file..."), 0, 0, this, TQT_SLOT(slotImportHydrogen()), actionCollection(), "file_import_hydrogen"); - new KAction(i18n("Merge &File..."), 0, 0, this, + new TDEAction(i18n("Merge &File..."), 0, 0, this, TQT_SLOT(slotMerge()), actionCollection(), "file_merge"); - new KAction(i18n("Merge &MIDI file..."), 0, 0, this, + new TDEAction(i18n("Merge &MIDI file..."), 0, 0, this, TQT_SLOT(slotMergeMIDI()), actionCollection(), "file_merge_midi"); - new KAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, this, + new TDEAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, this, TQT_SLOT(slotMergeRG21()), actionCollection(), "file_merge_rg21"); - new KAction(i18n("Merge &Hydrogen file..."), 0, 0, this, + new TDEAction(i18n("Merge &Hydrogen file..."), 0, 0, this, TQT_SLOT(slotMergeHydrogen()), actionCollection(), "file_merge_hydrogen"); - new KAction(i18n("Export Rosegarden &Project file..."), 0, 0, this, + new TDEAction(i18n("Export Rosegarden &Project file..."), 0, 0, this, TQT_SLOT(slotExportProject()), actionCollection(), "file_export_project"); - new KAction(i18n("Export &MIDI file..."), 0, 0, this, + new TDEAction(i18n("Export &MIDI file..."), 0, 0, this, TQT_SLOT(slotExportMIDI()), actionCollection(), "file_export_midi"); - new KAction(i18n("Export &LilyPond file..."), 0, 0, this, + new TDEAction(i18n("Export &LilyPond file..."), 0, 0, this, TQT_SLOT(slotExportLilyPond()), actionCollection(), "file_export_lilypond"); - new KAction(i18n("Export Music&XML file..."), 0, 0, this, + new TDEAction(i18n("Export Music&XML file..."), 0, 0, this, TQT_SLOT(slotExportMusicXml()), actionCollection(), "file_export_musicxml"); - new KAction(i18n("Export &Csound score file..."), 0, 0, this, + new TDEAction(i18n("Export &Csound score file..."), 0, 0, this, TQT_SLOT(slotExportCsound()), actionCollection(), "file_export_csound"); - new KAction(i18n("Export M&up file..."), 0, 0, this, + new TDEAction(i18n("Export M&up file..."), 0, 0, this, TQT_SLOT(slotExportMup()), actionCollection(), "file_export_mup"); - new KAction(i18n("Print &with LilyPond..."), 0, 0, this, + new TDEAction(i18n("Print &with LilyPond..."), 0, 0, this, TQT_SLOT(slotPrintLilyPond()), actionCollection(), "file_print_lilypond"); - new KAction(i18n("Preview with Lil&yPond..."), 0, 0, this, + new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, this, TQT_SLOT(slotPreviewLilyPond()), actionCollection(), "file_preview_lilypond"); - new KAction(i18n("Play&list"), 0, 0, this, + new TDEAction(i18n("Play&list"), 0, 0, this, TQT_SLOT(slotPlayList()), actionCollection(), "file_show_playlist"); KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection()); // help menu - new KAction(i18n("Rosegarden &Tutorial"), 0, 0, this, + new TDEAction(i18n("Rosegarden &Tutorial"), 0, 0, this, TQT_SLOT(slotTutorial()), actionCollection(), "tutorial"); - new KAction(i18n("&Bug Reporting Guidelines"), 0, 0, this, + new TDEAction(i18n("&Bug Reporting Guidelines"), 0, 0, this, TQT_SLOT(slotBugGuidelines()), actionCollection(), "guidelines"); @@ -642,15 +642,15 @@ void RosegardenGUIApp::setupActions() // slots later on, when the current document is set up - see // MultiViewCommandHistory::attachView // - new KToolBarPopupAction(i18n("Und&o"), + new TDEToolBarPopupAction(i18n("Und&o"), "undo", - KStdAccel::shortcut(KStdAccel::Undo), + TDEStdAccel::shortcut(TDEStdAccel::Undo), actionCollection(), KStdAction::stdName(KStdAction::Undo)); - new KToolBarPopupAction(i18n("Re&do"), + new TDEToolBarPopupAction(i18n("Re&do"), "redo", - KStdAccel::shortcut(KStdAccel::Redo), + TDEStdAccel::shortcut(TDEStdAccel::Redo), actionCollection(), KStdAction::stdName(KStdAction::Redo)); ///// @@ -662,61 +662,61 @@ void RosegardenGUIApp::setupActions() m_viewToolBar = KStdAction::showToolbar (this, TQT_SLOT(slotToggleToolBar()), actionCollection(), "show_stock_toolbar"); - m_viewToolsToolBar = new KToggleAction(i18n("Show T&ools Toolbar"), 0, this, + m_viewToolsToolBar = new TDEToggleAction(i18n("Show T&ools Toolbar"), 0, this, TQT_SLOT(slotToggleToolsToolBar()), actionCollection(), "show_tools_toolbar"); - m_viewTracksToolBar = new KToggleAction(i18n("Show Trac&ks Toolbar"), 0, this, + m_viewTracksToolBar = new TDEToggleAction(i18n("Show Trac&ks Toolbar"), 0, this, TQT_SLOT(slotToggleTracksToolBar()), actionCollection(), "show_tracks_toolbar"); - m_viewEditorsToolBar = new KToggleAction(i18n("Show &Editors Toolbar"), 0, this, + m_viewEditorsToolBar = new TDEToggleAction(i18n("Show &Editors Toolbar"), 0, this, TQT_SLOT(slotToggleEditorsToolBar()), actionCollection(), "show_editors_toolbar"); - m_viewTransportToolBar = new KToggleAction(i18n("Show Trans&port Toolbar"), 0, this, + m_viewTransportToolBar = new TDEToggleAction(i18n("Show Trans&port Toolbar"), 0, this, TQT_SLOT(slotToggleTransportToolBar()), actionCollection(), "show_transport_toolbar"); - m_viewZoomToolBar = new KToggleAction(i18n("Show &Zoom Toolbar"), 0, this, + m_viewZoomToolBar = new TDEToggleAction(i18n("Show &Zoom Toolbar"), 0, this, TQT_SLOT(slotToggleZoomToolBar()), actionCollection(), "show_zoom_toolbar"); m_viewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()), actionCollection(), "show_status_bar"); - m_viewTransport = new KToggleAction(i18n("Show Tra&nsport"), Key_T, this, + m_viewTransport = new TDEToggleAction(i18n("Show Tra&nsport"), Key_T, this, TQT_SLOT(slotToggleTransport()), actionCollection(), "show_transport"); - m_viewTrackLabels = new KToggleAction(i18n("Show Track &Labels"), 0, this, + m_viewTrackLabels = new TDEToggleAction(i18n("Show Track &Labels"), 0, this, TQT_SLOT(slotToggleTrackLabels()), actionCollection(), "show_tracklabels"); - m_viewRulers = new KToggleAction(i18n("Show Playback Position R&uler"), 0, this, + m_viewRulers = new TDEToggleAction(i18n("Show Playback Position R&uler"), 0, this, TQT_SLOT(slotToggleRulers()), actionCollection(), "show_rulers"); - m_viewTempoRuler = new KToggleAction(i18n("Show Te&mpo Ruler"), 0, this, + m_viewTempoRuler = new TDEToggleAction(i18n("Show Te&mpo Ruler"), 0, this, TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); - m_viewChordNameRuler = new KToggleAction(i18n("Show Cho&rd Name Ruler"), 0, this, + m_viewChordNameRuler = new TDEToggleAction(i18n("Show Cho&rd Name Ruler"), 0, this, TQT_SLOT(slotToggleChordNameRuler()), actionCollection(), "show_chord_name_ruler"); - m_viewPreviews = new KToggleAction(i18n("Show Segment Pre&views"), 0, this, + m_viewPreviews = new TDEToggleAction(i18n("Show Segment Pre&views"), 0, this, TQT_SLOT(slotTogglePreviews()), actionCollection(), "show_previews"); - new KAction(i18n("Show Special &Parameters"), Key_P, this, + new TDEAction(i18n("Show Special &Parameters"), Key_P, this, TQT_SLOT(slotDockParametersBack()), actionCollection(), "show_inst_segment_parameters"); @@ -741,7 +741,7 @@ void RosegardenGUIApp::setupActions() TQT_SLOT(slotEditToolbars()), actionCollection()); - KRadioAction *action = 0; + TDERadioAction *action = 0; // Create the select icon // @@ -750,110 +750,110 @@ void RosegardenGUIApp::setupActions() TQIconSet icon = TQIconSet(pixmap); // TODO : add some shortcuts here - action = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, + action = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2, this, TQT_SLOT(slotPointerSelected()), actionCollection(), "select"); action->setExclusiveGroup("segmenttools"); - action = new KRadioAction(i18n("&Draw"), "pencil", Key_F3, + action = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3, this, TQT_SLOT(slotDrawSelected()), actionCollection(), "draw"); action->setExclusiveGroup("segmenttools"); - action = new KRadioAction(i18n("&Erase"), "eraser", Key_F4, + action = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); action->setExclusiveGroup("segmenttools"); - action = new KRadioAction(i18n("&Move"), "move", Key_F5, + action = new TDERadioAction(i18n("&Move"), "move", Key_F5, this, TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Resize"), icon, Key_F6, + action = new TDERadioAction(i18n("&Resize"), icon, Key_F6, this, TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/split.xpm"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Split"), icon, Key_F7, + action = new TDERadioAction(i18n("&Split"), icon, Key_F7, this, TQT_SLOT(slotSplitSelected()), actionCollection(), "split"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/join.xpm"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Join"), icon, 0, + action = new TDERadioAction(i18n("&Join"), icon, 0, this, TQT_SLOT(slotJoinSelected()), actionCollection(), "join"); action->setExclusiveGroup("segmenttools"); - new KAction(i18n("&Harmonize"), 0, this, + new TDEAction(i18n("&Harmonize"), 0, this, TQT_SLOT(slotHarmonizeSelection()), actionCollection(), "harmonize_selection"); pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png"); icon = TQIconSet(pixmap); - new KAction(AddTimeSignatureCommand::getGlobalName(), + new TDEAction(AddTimeSignatureCommand::getGlobalName(), icon, 0, this, TQT_SLOT(slotEditTimeSignature()), actionCollection(), "add_time_signature"); - new KAction(i18n("Open Tempo and Time Signature Editor"), 0, this, + new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, this, TQT_SLOT(slotEditTempos()), actionCollection(), "edit_tempos"); // // Edit menu // - new KAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, this, + new TDEAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, this, TQT_SLOT(slotCutRange()), actionCollection(), "cut_range"); - new KAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, this, + new TDEAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, this, TQT_SLOT(slotCopyRange()), actionCollection(), "copy_range"); - new KAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, this, + new TDEAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, this, TQT_SLOT(slotPasteRange()), actionCollection(), "paste_range"); /* - new KAction(i18n("Delete Range"), Key_Delete + SHIFT, this, + new TDEAction(i18n("Delete Range"), Key_Delete + SHIFT, this, TQT_SLOT(slotDeleteRange()), actionCollection(), "delete_range"); */ - new KAction(i18n("Insert Range..."), Key_Insert + SHIFT, this, + new TDEAction(i18n("Insert Range..."), Key_Insert + SHIFT, this, TQT_SLOT(slotInsertRange()), actionCollection(), "insert_range"); - new KAction(i18n("De&lete"), Key_Delete, this, + new TDEAction(i18n("De&lete"), Key_Delete, this, TQT_SLOT(slotDeleteSelectedSegments()), actionCollection(), "delete"); - new KAction(i18n("Select &All Segments"), Key_A + CTRL, this, + new TDEAction(i18n("Select &All Segments"), Key_A + CTRL, this, TQT_SLOT(slotSelectAll()), actionCollection(), "select_all"); pixmap.load(pixmapDir + "/toolbar/event-insert-tempo.png"); icon = TQIconSet(pixmap); - new KAction(AddTempoChangeCommand::getGlobalName(), + new TDEAction(AddTempoChangeCommand::getGlobalName(), icon, 0, this, TQT_SLOT(slotEditTempo()), actionCollection(), "add_tempo"); - new KAction(ChangeCompositionLengthCommand::getGlobalName(), + new TDEAction(ChangeCompositionLengthCommand::getGlobalName(), 0, this, TQT_SLOT(slotChangeCompositionLength()), actionCollection(), "change_composition_length"); - new KAction(i18n("Edit Mar&kers..."), Key_K + CTRL, this, + new TDEAction(i18n("Edit Mar&kers..."), Key_K + CTRL, this, TQT_SLOT(slotEditMarkers()), actionCollection(), "edit_markers"); - new KAction(i18n("Edit Document P&roperties..."), 0, this, + new TDEAction(i18n("Edit Document P&roperties..."), 0, this, TQT_SLOT(slotEditDocumentProperties()), actionCollection(), "edit_doc_properties"); @@ -861,120 +861,120 @@ void RosegardenGUIApp::setupActions() // // Segments menu // - new KAction(i18n("Open in &Default Editor"), Key_Return, this, + new TDEAction(i18n("Open in &Default Editor"), Key_Return, this, TQT_SLOT(slotEdit()), actionCollection(), "edit_default"); pixmap.load(pixmapDir + "/toolbar/matrix.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in Matri&x Editor"), icon, Key_M, this, + new TDEAction(i18n("Open in Matri&x Editor"), icon, Key_M, this, TQT_SLOT(slotEditInMatrix()), actionCollection(), "edit_matrix"); pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, this, + new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, this, TQT_SLOT(slotEditInPercussionMatrix()), actionCollection(), "edit_percussion_matrix"); pixmap.load(pixmapDir + "/toolbar/notation.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Notation Editor"), icon, Key_N, this, + new TDEAction(i18n("Open in &Notation Editor"), icon, Key_N, this, TQT_SLOT(slotEditAsNotation()), actionCollection(), "edit_notation"); pixmap.load(pixmapDir + "/toolbar/eventlist.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Event List Editor"), icon, Key_E, this, + new TDEAction(i18n("Open in &Event List Editor"), icon, Key_E, this, TQT_SLOT(slotEditInEventList()), actionCollection(), "edit_event_list"); pixmap.load(pixmapDir + "/toolbar/quantize.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Quantize..."), icon, Key_Equal, this, + new TDEAction(i18n("&Quantize..."), icon, Key_Equal, this, TQT_SLOT(slotQuantizeSelection()), actionCollection(), "quantize_selection"); - new KAction(SegmentLabelCommand::getGlobalName(), + new TDEAction(SegmentLabelCommand::getGlobalName(), 0, this, TQT_SLOT(slotRelabelSegments()), actionCollection(), "relabel_segment"); - new KAction(SegmentTransposeCommand::getGlobalName(), + new TDEAction(SegmentTransposeCommand::getGlobalName(), 0, this, TQT_SLOT(slotTransposeSegments()), actionCollection(), "transpose"); - new KAction(i18n("Repeat Last Quantize"), Key_Plus, this, + new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, this, TQT_SLOT(slotRepeatQuantizeSelection()), actionCollection(), "repeat_quantize"); - new KAction(SegmentRescaleCommand::getGlobalName(), 0, this, + new TDEAction(SegmentRescaleCommand::getGlobalName(), 0, this, TQT_SLOT(slotRescaleSelection()), actionCollection(), "rescale"); - new KAction(SegmentAutoSplitCommand::getGlobalName(), 0, this, + new TDEAction(SegmentAutoSplitCommand::getGlobalName(), 0, this, TQT_SLOT(slotAutoSplitSelection()), actionCollection(), "auto_split"); - new KAction(SegmentSplitByPitchCommand::getGlobalName(), 0, this, + new TDEAction(SegmentSplitByPitchCommand::getGlobalName(), 0, this, TQT_SLOT(slotSplitSelectionByPitch()), actionCollection(), "split_by_pitch"); - new KAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, this, + new TDEAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, this, TQT_SLOT(slotSplitSelectionByRecordedSrc()), actionCollection(), "split_by_recording"); - new KAction(i18n("Split at Time..."), 0, this, + new TDEAction(i18n("Split at Time..."), 0, this, TQT_SLOT(slotSplitSelectionAtTime()), actionCollection(), "split_at_time"); - new KAction(i18n("Jog &Left"), Key_Left + ALT, this, + new TDEAction(i18n("Jog &Left"), Key_Left + ALT, this, TQT_SLOT(slotJogLeft()), actionCollection(), "jog_left"); - new KAction(i18n("Jog &Right"), Key_Right + ALT, this, + new TDEAction(i18n("Jog &Right"), Key_Right + ALT, this, TQT_SLOT(slotJogRight()), actionCollection(), "jog_right"); - new KAction(i18n("Set Start Time..."), 0, this, + new TDEAction(i18n("Set Start Time..."), 0, this, TQT_SLOT(slotSetSegmentStartTimes()), actionCollection(), "set_segment_start"); - new KAction(i18n("Set Duration..."), 0, this, + new TDEAction(i18n("Set Duration..."), 0, this, TQT_SLOT(slotSetSegmentDurations()), actionCollection(), "set_segment_duration"); - new KAction(SegmentJoinCommand::getGlobalName(), + new TDEAction(SegmentJoinCommand::getGlobalName(), Key_J + CTRL, this, TQT_SLOT(slotJoinSegments()), actionCollection(), "join_segments"); - new KAction(i18n("Turn Re&peats into Copies"), + new TDEAction(i18n("Turn Re&peats into Copies"), 0, this, TQT_SLOT(slotRepeatingSegments()), actionCollection(), "repeats_to_real_copies"); - new KAction(i18n("Manage Tri&ggered Segments"), 0, + new TDEAction(i18n("Manage Tri&ggered Segments"), 0, this, TQT_SLOT(slotManageTriggerSegments()), actionCollection(), "manage_trigger_segments"); - new KAction(i18n("Set Tempos from &Beat Segment"), 0, this, + new TDEAction(i18n("Set Tempos from &Beat Segment"), 0, this, TQT_SLOT(slotGrooveQuantize()), actionCollection(), "groove_quantize"); - new KAction(i18n("Set &Tempo to Audio Segment Duration"), 0, this, + new TDEAction(i18n("Set &Tempo to Audio Segment Duration"), 0, this, TQT_SLOT(slotTempoToSegmentLength()), actionCollection(), "set_tempo_to_segment_length"); pixmap.load(pixmapDir + "/toolbar/manage-audio-segments.xpm"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage A&udio Files"), icon, + new TDEAction(i18n("Manage A&udio Files"), icon, Key_U + CTRL, this, TQT_SLOT(slotAudioManager()), actionCollection(), "audio_manager"); - m_viewSegmentLabels = new KToggleAction(i18n("Show Segment Labels"), 0, this, + m_viewSegmentLabels = new TDEToggleAction(i18n("Show Segment Labels"), 0, this, TQT_SLOT(slotToggleSegmentLabels()), actionCollection(), "show_segment_labels"); @@ -983,65 +983,65 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/add_tracks.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Add &Track"), icon, CTRL + Key_T, + new TDEAction(i18n("Add &Track"), icon, CTRL + Key_T, this, TQT_SLOT(slotAddTrack()), actionCollection(), "add_track"); - new KAction(i18n("&Add Tracks..."), 0, + new TDEAction(i18n("&Add Tracks..."), 0, this, TQT_SLOT(slotAddTracks()), actionCollection(), "add_tracks"); pixmap.load(pixmapDir + "/toolbar/delete_track.png"); icon = TQIconSet(pixmap); - new KAction(i18n("D&elete Track"), icon, CTRL + Key_D, + new TDEAction(i18n("D&elete Track"), icon, CTRL + Key_D, this, TQT_SLOT(slotDeleteTrack()), actionCollection(), "delete_track"); pixmap.load(pixmapDir + "/toolbar/move_track_down.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down, + new TDEAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down, this, TQT_SLOT(slotMoveTrackDown()), actionCollection(), "move_track_down"); pixmap.load(pixmapDir + "/toolbar/move_track_up.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up, + new TDEAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up, this, TQT_SLOT(slotMoveTrackUp()), actionCollection(), "move_track_up"); - new KAction(i18n("Select &Next Track"), + new TDEAction(i18n("Select &Next Track"), Key_Down, this, TQT_SLOT(slotTrackDown()), actionCollection(), "select_next_track"); - new KAction(i18n("Select &Previous Track"), + new TDEAction(i18n("Select &Previous Track"), Key_Up, this, TQT_SLOT(slotTrackUp()), actionCollection(), "select_previous_track"); - new KAction(i18n("Mute or Unmute Track"), + new TDEAction(i18n("Mute or Unmute Track"), Key_U, this, TQT_SLOT(slotToggleMutedCurrentTrack()), actionCollection(), "toggle_mute_track"); - new KAction(i18n("Arm or Un-arm Track for Record"), + new TDEAction(i18n("Arm or Un-arm Track for Record"), Key_R, this, TQT_SLOT(slotToggleRecordCurrentTrack()), actionCollection(), "toggle_arm_track"); pixmap.load(pixmapDir + "/toolbar/mute-all.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Mute all Tracks"), icon, 0, + new TDEAction(i18n("&Mute all Tracks"), icon, 0, this, TQT_SLOT(slotMuteAllTracks()), actionCollection(), "mute_all_tracks"); pixmap.load(pixmapDir + "/toolbar/un-mute-all.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Unmute all Tracks"), icon, 0, + new TDEAction(i18n("&Unmute all Tracks"), icon, 0, this, TQT_SLOT(slotUnmuteAllTracks()), actionCollection(), "unmute_all_tracks"); - new KAction(i18n("&Remap Instruments..."), 0, this, + new TDEAction(i18n("&Remap Instruments..."), 0, this, TQT_SLOT(slotRemapInstruments()), actionCollection(), "remap_instruments"); @@ -1050,78 +1050,78 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/mixer.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Audio Mixer"), icon, 0, this, + new TDEAction(i18n("&Audio Mixer"), icon, 0, this, TQT_SLOT(slotOpenAudioMixer()), actionCollection(), "audio_mixer"); pixmap.load(pixmapDir + "/toolbar/midimixer.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Midi Mi&xer"), icon, 0, this, + new TDEAction(i18n("Midi Mi&xer"), icon, 0, this, TQT_SLOT(slotOpenMidiMixer()), actionCollection(), "midi_mixer"); pixmap.load(pixmapDir + "/toolbar/manage-midi-devices.xpm"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage MIDI &Devices"), icon, 0, this, + new TDEAction(i18n("Manage MIDI &Devices"), icon, 0, this, TQT_SLOT(slotManageMIDIDevices()), actionCollection(), "manage_devices"); pixmap.load(pixmapDir + "/toolbar/manage-synth-plugins.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage S&ynth Plugins"), icon, 0, this, + new TDEAction(i18n("Manage S&ynth Plugins"), icon, 0, this, TQT_SLOT(slotManageSynths()), actionCollection(), "manage_synths"); - new KAction(i18n("Modify MIDI &Filters"), "filter", 0, this, + new TDEAction(i18n("Modify MIDI &Filters"), "filter", 0, this, TQT_SLOT(slotModifyMIDIFilters()), actionCollection(), "modify_midi_filters"); - m_enableMIDIrouting = new KToggleAction(i18n("MIDI Thru Routing"), 0, this, + m_enableMIDIrouting = new TDEToggleAction(i18n("MIDI Thru Routing"), 0, this, TQT_SLOT(slotEnableMIDIThruRouting()), actionCollection(), "enable_midi_routing"); pixmap.load(pixmapDir + "/toolbar/time-musical.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage &Metronome"), 0, this, + new TDEAction(i18n("Manage &Metronome"), 0, this, TQT_SLOT(slotManageMetronome()), actionCollection(), "manage_metronome"); - new KAction(i18n("&Save Current Document as Default Studio"), 0, this, + new TDEAction(i18n("&Save Current Document as Default Studio"), 0, this, TQT_SLOT(slotSaveDefaultStudio()), actionCollection(), "save_default_studio"); - new KAction(i18n("&Import Default Studio"), 0, this, + new TDEAction(i18n("&Import Default Studio"), 0, this, TQT_SLOT(slotImportDefaultStudio()), actionCollection(), "load_default_studio"); - new KAction(i18n("Im&port Studio from File..."), 0, this, + new TDEAction(i18n("Im&port Studio from File..."), 0, this, TQT_SLOT(slotImportStudio()), actionCollection(), "load_studio"); - new KAction(i18n("&Reset MIDI Network"), 0, this, + new TDEAction(i18n("&Reset MIDI Network"), 0, this, TQT_SLOT(slotResetMidiNetwork()), actionCollection(), "reset_midi_network"); - m_setQuickMarkerAction = new KAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, this, + m_setQuickMarkerAction = new TDEAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, this, TQT_SLOT(slotSetQuickMarker()), actionCollection(), "set_quick_marker"); - m_jumpToQuickMarkerAction = new KAction(i18n("Jump to Quick Marker"), 0, Key_1, this, + m_jumpToQuickMarkerAction = new TDEAction(i18n("Jump to Quick Marker"), 0, Key_1, this, TQT_SLOT(slotJumpToQuickMarker()), actionCollection(), "jump_to_quick_marker"); // // Marker Ruler popup menu // -// new KAction(i18n("Insert Marker"), 0, 0, this, +// new TDEAction(i18n("Insert Marker"), 0, 0, this, // TQT_SLOT(slotInsertMarkerHere()), actionCollection(), // "insert_marker_here"); // -// new KAction(i18n("Insert Marker at Playback Position"), 0, 0, this, +// new TDEAction(i18n("Insert Marker at Playback Position"), 0, 0, this, // TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(), // "insert_marker_at_pointer"); // -// new KAction(i18n("Delete Marker"), 0, 0, this, +// new TDEAction(i18n("Delete Marker"), 0, 0, this, // TQT_SLOT(slotDeleteMarker()), actionCollection(), // "delete_marker"); @@ -1139,25 +1139,25 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/transport-play.png"); icon = TQIconSet(pixmap); - m_playTransport = new KAction(i18n("&Play"), icon, Key_Enter, this, + m_playTransport = new TDEAction(i18n("&Play"), icon, Key_Enter, this, TQT_SLOT(slotPlay()), actionCollection(), "play"); // Alternative shortcut for Play - KShortcut playShortcut = m_playTransport->shortcut(); + TDEShortcut playShortcut = m_playTransport->shortcut(); playShortcut.append( KKey(Key_Return + CTRL) ); m_playTransport->setShortcut(playShortcut); m_playTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-stop.png"); icon = TQIconSet(pixmap); - m_stopTransport = new KAction(i18n("&Stop"), icon, Key_Insert, this, + m_stopTransport = new TDEAction(i18n("&Stop"), icon, Key_Insert, this, TQT_SLOT(slotStop()), actionCollection(), "stop"); m_stopTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-ffwd.png"); icon = TQIconSet(pixmap); - m_ffwdTransport = new KAction(i18n("&Fast Forward"), icon, Key_PageDown, + m_ffwdTransport = new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this, TQT_SLOT(slotFastforward()), actionCollection(), "fast_forward"); @@ -1165,52 +1165,52 @@ void RosegardenGUIApp::setupActions() pixmap.load(pixmapDir + "/toolbar/transport-rewind.png"); icon = TQIconSet(pixmap); - m_rewindTransport = new KAction(i18n("Re&wind"), icon, Key_End, this, + m_rewindTransport = new TDEAction(i18n("Re&wind"), icon, Key_End, this, TQT_SLOT(slotRewind()), actionCollection(), "rewind"); m_rewindTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-record.png"); icon = TQIconSet(pixmap); - m_recordTransport = new KAction(i18n("P&unch in Record"), icon, Key_Space, this, + m_recordTransport = new TDEAction(i18n("P&unch in Record"), icon, Key_Space, this, TQT_SLOT(slotToggleRecord()), actionCollection(), "recordtoggle"); m_recordTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-record.png"); icon = TQIconSet(pixmap); - m_recordTransport = new KAction(i18n("&Record"), icon, 0, this, + m_recordTransport = new TDEAction(i18n("&Record"), icon, 0, this, TQT_SLOT(slotRecord()), actionCollection(), "record"); m_recordTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-rewind-end.png"); icon = TQIconSet(pixmap); - m_rewindEndTransport = new KAction(i18n("Rewind to &Beginning"), icon, 0, this, + m_rewindEndTransport = new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this, TQT_SLOT(slotRewindToBeginning()), actionCollection(), "rewindtobeginning"); m_rewindEndTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-ffwd-end.png"); icon = TQIconSet(pixmap); - m_ffwdEndTransport = new KAction(i18n("Fast Forward to &End"), icon, 0, this, + m_ffwdEndTransport = new TDEAction(i18n("Fast Forward to &End"), icon, 0, this, TQT_SLOT(slotFastForwardToEnd()), actionCollection(), "fastforwardtoend"); m_ffwdEndTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-tracking.png"); icon = TQIconSet(pixmap); - (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this, + (new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this, TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(true); pixmap.load(pixmapDir + "/toolbar/transport-panic.png"); icon = TQIconSet(pixmap); - new KAction( i18n("Panic"), icon, Key_P + CTRL + ALT, this, TQT_SLOT(slotPanic()), + new TDEAction( i18n("Panic"), icon, Key_P + CTRL + ALT, this, TQT_SLOT(slotPanic()), actionCollection(), "panic"); // DEBUG FACILITY - new KAction(i18n("Segment Debug Dump "), 0, this, + new TDEAction(i18n("Segment Debug Dump "), 0, this, TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump_segments"); @@ -1273,7 +1273,7 @@ void RosegardenGUIApp::setRewFFwdToAutoRepeat() void RosegardenGUIApp::initZoomToolbar() { - KToolBar *zoomToolbar = toolBar("Zoom Toolbar"); + TDEToolBar *zoomToolbar = toolBar("Zoom Toolbar"); if (!zoomToolbar) { RG_DEBUG << "RosegardenGUIApp::initZoomToolbar() : " << "zoom toolbar not found" << endl; @@ -1481,7 +1481,7 @@ void RosegardenGUIApp::initView() m_view->slotSelectTrackSegments(comp.getSelectedTrack()); // play tracking on in the editor by default: turn off if need be - KToggleAction *trackingAction = dynamic_cast<KToggleAction *> + TDEToggleAction *trackingAction = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_tracking")); if (trackingAction && !trackingAction->isChecked()) { m_view->getTrackEditor()->slotToggleTracking(); @@ -1873,7 +1873,7 @@ void RosegardenGUIApp::slotSaveOptions() m_fileRecent->saveEntries(kapp->config()); - // saveMainWindowSettings(kapp->config(), RosegardenGUIApp::MainWindowConfigGroup); - no need to, done by KMainWindow + // saveMainWindowSettings(kapp->config(), RosegardenGUIApp::MainWindowConfigGroup); - no need to, done by TDEMainWindow kapp->config()->sync(); } @@ -2053,7 +2053,7 @@ void RosegardenGUIApp::showEvent(TQShowEvent* e) RG_DEBUG << "RosegardenGUIApp::showEvent()\n"; getTransport()->raise(); - KMainWindow::showEvent(e); + TDEMainWindow::showEvent(e); } bool RosegardenGUIApp::queryClose() @@ -2443,7 +2443,7 @@ void RosegardenGUIApp::slotQuit() // close the first window, the list makes the next one the first again. // This ensures that queryClose() is called on each window to ask for closing - KMainWindow* w; + TDEMainWindow* w; if (memberList) { for (w = memberList->first(); w != 0; w = memberList->next()) { @@ -3193,7 +3193,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent) void RosegardenGUIApp::slotToggleSegmentLabels() { - KToggleAction* act = dynamic_cast<KToggleAction*>(actionCollection()->action("show_segment_labels")); + TDEToggleAction* act = dynamic_cast<TDEToggleAction*>(actionCollection()->action("show_segment_labels")); if (act) { m_view->slotShowSegmentLabels(act->isChecked()); } @@ -6119,8 +6119,8 @@ RosegardenGUIApp::setCursor(const TQCursor& cursor) // toolbars... // - TQPtrListIterator<KToolBar> tbIter = toolBarIterator(); - KToolBar* tb = 0; + TQPtrListIterator<TDEToolBar> tbIter = toolBarIterator(); + TDEToolBar* tb = 0; while ((tb = tbIter.current()) != 0) { tb->setCursor(cursor); ++tbIter; diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h index 88a0d3d..ad90bd1 100644 --- a/src/gui/application/RosegardenGUIApp.h +++ b/src/gui/application/RosegardenGUIApp.h @@ -50,11 +50,11 @@ class TQCursor; class TQAccel; class KURL; class KTempFile; -class KToggleAction; -class KRecentFilesAction; +class TDEToggleAction; +class TDERecentFilesAction; class TDEProcess; class TDEConfig; -class KAction; +class TDEAction; namespace Rosegarden @@ -98,11 +98,11 @@ class AudioManagerDialog; * and statusbar. An instance of RosegardenGUIView creates your center view, which is connected * to the window's Doc object. * RosegardenGUIApp reimplements the methods that KTMainWindow provides for main window handling and supports - * full session management as well as keyboard accelerator configuration by using KAccel. + * full session management as well as keyboard accelerator configuration by using TDEAccel. * @see KTMainWindow * @see TDEApplication * @see TDEConfig - * @see KAccel + * @see TDEAccel * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 0.4 code generation @@ -1319,7 +1319,7 @@ public slots: * kxmlguiclient.h just for one typedef. * * Hopefully we'll be able to get rid of this eventually, - * I should slip this in KMainWindow for KDE 4. + * I should slip this in TDEMainWindow for KDE 4. */ void slotStateChanged(TQString, bool noReverse); @@ -1550,7 +1550,7 @@ private: bool m_actionsSetup; - KRecentFilesAction* m_fileRecent; + TDERecentFilesAction* m_fileRecent; /** * view is the main widget which represents your working area. The @@ -1572,33 +1572,33 @@ private: RosegardenGUIDoc* m_doc; /** - * KAction pointers to enable/disable actions - */ - KRecentFilesAction* m_fileOpenRecent; - - KToggleAction* m_viewToolBar; - KToggleAction* m_viewToolsToolBar; - KToggleAction* m_viewTracksToolBar; - KToggleAction* m_viewEditorsToolBar; - KToggleAction* m_viewZoomToolBar; - KToggleAction* m_viewStatusBar; - KToggleAction* m_viewTransport; - KToggleAction* m_viewTransportToolBar; - KToggleAction* m_viewTrackLabels; - KToggleAction* m_viewRulers; - KToggleAction* m_viewTempoRuler; - KToggleAction* m_viewChordNameRuler; - KToggleAction* m_viewPreviews; - KToggleAction* m_viewSegmentLabels; - KToggleAction* m_enableMIDIrouting; - - KAction *m_playTransport; - KAction *m_stopTransport; - KAction *m_rewindTransport; - KAction *m_ffwdTransport; - KAction *m_recordTransport; - KAction *m_rewindEndTransport; - KAction *m_ffwdEndTransport; + * TDEAction pointers to enable/disable actions + */ + TDERecentFilesAction* m_fileOpenRecent; + + TDEToggleAction* m_viewToolBar; + TDEToggleAction* m_viewToolsToolBar; + TDEToggleAction* m_viewTracksToolBar; + TDEToggleAction* m_viewEditorsToolBar; + TDEToggleAction* m_viewZoomToolBar; + TDEToggleAction* m_viewStatusBar; + TDEToggleAction* m_viewTransport; + TDEToggleAction* m_viewTransportToolBar; + TDEToggleAction* m_viewTrackLabels; + TDEToggleAction* m_viewRulers; + TDEToggleAction* m_viewTempoRuler; + TDEToggleAction* m_viewChordNameRuler; + TDEToggleAction* m_viewPreviews; + TDEToggleAction* m_viewSegmentLabels; + TDEToggleAction* m_enableMIDIrouting; + + TDEAction *m_playTransport; + TDEAction *m_stopTransport; + TDEAction *m_rewindTransport; + TDEAction *m_ffwdTransport; + TDEAction *m_recordTransport; + TDEAction *m_rewindEndTransport; + TDEAction *m_ffwdEndTransport; TDEProcess* m_sequencerProcess; bool m_sequencerCheckedIn; @@ -1677,8 +1677,8 @@ private: RosegardenParameterArea *m_parameterArea; - KAction *m_setQuickMarkerAction; - KAction *m_jumpToQuickMarkerAction; + TDEAction *m_setQuickMarkerAction; + TDEAction *m_jumpToQuickMarkerAction; #ifdef HAVE_LIRC LircClient *m_lircClient; diff --git a/src/gui/application/RosegardenIface.cpp b/src/gui/application/RosegardenIface.cpp index 95df1f5..4679e1c 100644 --- a/src/gui/application/RosegardenIface.cpp +++ b/src/gui/application/RosegardenIface.cpp @@ -45,12 +45,12 @@ namespace Rosegarden { -RosegardenIface::RosegardenIface(KMainWindow* mainWindow) +RosegardenIface::RosegardenIface(TDEMainWindow* mainWindow) : DCOPObject(mainWindow->name()), m_dcopActionProxy(0) {} -void RosegardenIface::iFaceDelayedInit(KMainWindow* mainWindow) +void RosegardenIface::iFaceDelayedInit(TDEMainWindow* mainWindow) { m_dcopActionProxy = new KDCOPActionProxy(mainWindow->actionCollection(), this); @@ -65,9 +65,9 @@ DCOPRef RosegardenIface::action(const TQCString &name) QCStringList RosegardenIface::actions() { QCStringList res; - TQValueList<KAction *> lst = m_dcopActionProxy->actions(); - TQValueList<KAction *>::ConstIterator it = lst.begin(); - TQValueList<KAction *>::ConstIterator end = lst.end(); + TQValueList<TDEAction *> lst = m_dcopActionProxy->actions(); + TQValueList<TDEAction *>::ConstIterator it = lst.begin(); + TQValueList<TDEAction *>::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/src/gui/application/RosegardenIface.h b/src/gui/application/RosegardenIface.h index 046033c..430efa3 100644 --- a/src/gui/application/RosegardenIface.h +++ b/src/gui/application/RosegardenIface.h @@ -40,7 +40,7 @@ #include "sound/MappedComposition.h" class TQCString; -class KMainWindow; +class TDEMainWindow; class KDCOPActionProxy; @@ -56,8 +56,8 @@ class RosegardenIface : virtual public DCOPObject K_DCOP public: - RosegardenIface(KMainWindow*); - void iFaceDelayedInit(KMainWindow*); + RosegardenIface(TDEMainWindow*); + void iFaceDelayedInit(TDEMainWindow*); k_dcop: virtual void openFile(TQString file) = 0; diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index ec9f867..89d15f1 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -578,7 +578,7 @@ int main(int argc, char *argv[]) // RESTORE(RosegardenGUIApp); int n = 1; - while (KMainWindow::canBeRestored(n)) { + while (TDEMainWindow::canBeRestored(n)) { // memory leak if more than one can be restored? RG_DEBUG << "Restoring from session - restoring app #" << n << endl; (rosegardengui = new RosegardenGUIApp)->restore(n); diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.h b/src/gui/configuration/DocumentMetaConfigurationPage.h index 4fb6bad..e9a4f04 100644 --- a/src/gui/configuration/DocumentMetaConfigurationPage.h +++ b/src/gui/configuration/DocumentMetaConfigurationPage.h @@ -32,7 +32,7 @@ class TQWidget; -class KListView; +class TDEListView; namespace Rosegarden diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp index 98780b0..9357145 100644 --- a/src/gui/configuration/HeadersConfigurationPage.cpp +++ b/src/gui/configuration/HeadersConfigurationPage.cpp @@ -179,7 +179,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent, TQGridLayout *layoutOtherHeaders = new TQGridLayout(frameOtherHeaders, 2, 2, 10, 5); - m_metadata = new KListView(frameOtherHeaders); + m_metadata = new TDEListView(frameOtherHeaders); m_metadata->addColumn(i18n("Name")); m_metadata->addColumn(i18n("Value")); m_metadata->setFullWidth(true); @@ -202,7 +202,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent, // property names stored in lower case name = name.left(1).upper() + name.right(name.length() - 1); - new KListViewItem(m_metadata, name, + new TDEListViewItem(m_metadata, name, strtoqstr(metadata.get<String>(names[i]))); shown.insert(names[i]); @@ -240,7 +240,7 @@ HeadersConfigurationPage::slotAddNewProperty() ++i; } - new KListViewItem(m_metadata, propertyName, i18n("{undefined}")); + new TDEListViewItem(m_metadata, propertyName, i18n("{undefined}")); } void diff --git a/src/gui/configuration/HeadersConfigurationPage.h b/src/gui/configuration/HeadersConfigurationPage.h index efba157..6237205 100644 --- a/src/gui/configuration/HeadersConfigurationPage.h +++ b/src/gui/configuration/HeadersConfigurationPage.h @@ -31,7 +31,7 @@ class TQVBox; class TQWidget; class TQLineEdit; -class KListView; +class TDEListView; namespace Rosegarden { @@ -72,7 +72,7 @@ protected: TQLineEdit *m_editCopyright; TQLineEdit *m_editTagline; - KListView *m_metadata; + TDEListView *m_metadata; }; diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp index 85625d7..e5cbb32 100644 --- a/src/gui/configuration/NotationConfigurationPage.cpp +++ b/src/gui/configuration/NotationConfigurationPage.cpp @@ -539,7 +539,7 @@ NotationConfigurationPage::NotationConfigurationPage(TDEConfig *cfg, layout->addWidget (new TQLabel(i18n("Text font"), frame), row, 0); - m_textFont = new KFontRequester(frame); + m_textFont = new TDEFontRequester(frame); TQFont textFont = m_cfg->readFontEntry("textfont", &defaultTextFont); m_textFont->setFont(textFont); layout->addMultiCellWidget(m_textFont, row, row, 1, 3); @@ -547,7 +547,7 @@ NotationConfigurationPage::NotationConfigurationPage(TDEConfig *cfg, layout->addWidget (new TQLabel(i18n("Sans-serif font"), frame), row, 0); - m_sansFont = new KFontRequester(frame); + m_sansFont = new TDEFontRequester(frame); TQFont sansFont = m_cfg->readFontEntry("sansfont", &defaultSansFont); m_sansFont->setFont(sansFont); layout->addMultiCellWidget(m_sansFont, row, row, 1, 3); @@ -559,7 +559,7 @@ NotationConfigurationPage::NotationConfigurationPage(TDEConfig *cfg, layout->addWidget (new TQLabel(i18n("Time Signature font"), frame), row, 0); - m_timeSigFont = new KFontRequester(frame); + m_timeSigFont = new TDEFontRequester(frame); TQFont timeSigFont = m_cfg->readFontEntry("timesigfont", &defaultTimeSigFont); m_timeSigFont->setFont(timeSigFont); layout->addMultiCellWidget(m_timeSigFont, row, row, 1, 3); diff --git a/src/gui/configuration/NotationConfigurationPage.h b/src/gui/configuration/NotationConfigurationPage.h index 7dd225d..8ab2b0c 100644 --- a/src/gui/configuration/NotationConfigurationPage.h +++ b/src/gui/configuration/NotationConfigurationPage.h @@ -38,7 +38,7 @@ class TQPushButton; class TQLabel; class TQComboBox; class TQCheckBox; -class KFontRequester; +class TDEFontRequester; class TDEConfig; @@ -79,9 +79,9 @@ protected: TQComboBox *m_singleStaffSize; TQComboBox *m_multiStaffSize; TQComboBox *m_printingSize; - KFontRequester* m_textFont; - KFontRequester* m_sansFont; - KFontRequester* m_timeSigFont; + TDEFontRequester* m_textFont; + TDEFontRequester* m_sansFont; + TDEFontRequester* m_timeSigFont; TQPushButton *m_viewButton; TQLabel *m_fontOriginLabel; TQLabel *m_fontCopyrightLabel; diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp index ce5d518..6cb68bf 100644 --- a/src/gui/dialogs/AudioManagerDialog.cpp +++ b/src/gui/dialogs/AudioManagerDialog.cpp @@ -95,7 +95,7 @@ const char* const AudioManagerDialog::m_listViewLayoutName = "AudioManagerDialog AudioManagerDialog::AudioManagerDialog(TQWidget *parent, RosegardenGUIDoc *doc): - KMainWindow(parent, "audioManagerDialog"), + TDEMainWindow(parent, "audioManagerDialog"), m_doc(doc), m_playingAudioFile(0), m_audioPlayingDialog(0), @@ -129,46 +129,46 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent, TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm")); - new KAction(i18n("&Add Audio File..."), "fileopen", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Add Audio File..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "add_audio"); - new KAction(i18n("&Unload Audio File"), "editdelete", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Unload Audio File"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "remove_audio"); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm")); - new KAction(i18n("&Play Preview"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Play Preview"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayPreview()), actionCollection(), "preview_audio"); /*!!! Not actually implemented -- this never worked right! - new KAction(i18n("Re&label"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Re&label"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_audio"); */ icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/insert_audio_into_track.xpm")); - new KAction(i18n("&Insert into Selected Audio Track"), + new TDEAction(i18n("&Insert into Selected Audio Track"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsert()), actionCollection(), "insert_audio"); - new KAction(i18n("Unload &all Audio Files"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Unload &all Audio Files"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveAll()), actionCollection(), "remove_all_audio"); - new KAction(i18n("Unload all &Unused Audio Files"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Unload all &Unused Audio Files"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveAllUnused()), actionCollection(), "remove_all_unused_audio"); - new KAction(i18n("&Delete Unused Audio Files..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Delete Unused Audio Files..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteUnused()), actionCollection(), "delete_unused_audio"); - new KAction(i18n("&Export Audio File..."), "fileexport", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Export Audio File..."), "fileexport", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportAudio()), actionCollection(), "export_audio"); /* - new KAction(i18n("Distribute Audio on &MIDI"), + new TDEAction(i18n("Distribute Audio on &MIDI"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDistributeOnMidiSegment()), actionCollection(), @@ -1166,7 +1166,7 @@ AudioManagerDialog::closeEvent(TQCloseEvent *e) { RG_DEBUG << "AudioManagerDialog::closeEvent()\n"; emit closing(); - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } void diff --git a/src/gui/dialogs/AudioManagerDialog.h b/src/gui/dialogs/AudioManagerDialog.h index 99ebee3..60e28d1 100644 --- a/src/gui/dialogs/AudioManagerDialog.h +++ b/src/gui/dialogs/AudioManagerDialog.h @@ -40,7 +40,7 @@ class TQDropEvent; class TQCloseEvent; class TQAccel; class KURL; -class KListView; +class TDEListView; class KCommand; @@ -56,7 +56,7 @@ class AudioPlayingDialog; class AudioFile; -class AudioManagerDialog : public KMainWindow +class AudioManagerDialog : public TDEMainWindow { Q_OBJECT @@ -182,7 +182,7 @@ protected: //--------------- Data members --------------------------------- - KListView *m_fileList; + TDEListView *m_fileList; TQLabel *m_wrongSampleRates; RosegardenGUIDoc *m_doc; diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp index b15fe07..2c86a01 100644 --- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp +++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp @@ -48,7 +48,7 @@ UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); new TQLabel(introductoryText, vbox); - m_listView = new KListView(vbox); + m_listView = new TDEListView(vbox); m_listView->addColumn(i18n("File name")); m_listView->addColumn(i18n("File size")); @@ -63,7 +63,7 @@ UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent, fileSize = TQString(" %1 ").arg(info.size()); fileDate = TQString(" %1 ").arg(info.lastModified().toString()); } - TQListViewItem *item = new KListViewItem + TQListViewItem *item = new TDEListViewItem (m_listView, fileName, fileSize, fileDate); } diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp index b804d17..ab32181 100644 --- a/src/gui/editors/eventlist/EventView.cpp +++ b/src/gui/editors/eventlist/EventView.cpp @@ -146,7 +146,7 @@ EventView::EventView(RosegardenGUIDoc *doc, connect(m_filterGroup, TQT_SIGNAL(released(int)), TQT_SLOT(slotModifyFilter(int))); - m_eventList = new KListView(getCentralWidget()); + m_eventList = new TDEListView(getCentralWidget()); m_eventList->setItemsRenameable(true); m_grid->addWidget(m_eventList, 2, 1); @@ -1120,53 +1120,53 @@ EventView::setupActions() TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert.png")); - new KAction(i18n("&Insert Event"), icon, Key_I, TQT_TQOBJECT(this), + new TDEAction(i18n("&Insert Event"), icon, Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(), "insert"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-delete.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Delete Event"), icon, Key_Delete, TQT_TQOBJECT(this), + new TDEAction(i18n("&Delete Event"), icon, Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(), "delete"); pixmap.load(pixmapDir + "/toolbar/event-edit.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Edit Event"), icon, Key_E, TQT_TQOBJECT(this), + new TDEAction(i18n("&Edit Event"), icon, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEditEvent()), actionCollection(), "edit_simple"); pixmap.load(pixmapDir + "/toolbar/event-edit-advanced.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Advanced Event Editor"), icon, Key_A, TQT_TQOBJECT(this), + new TDEAction(i18n("&Advanced Event Editor"), icon, Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotEditEventAdvanced()), actionCollection(), "edit_advanced"); // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); - new KAction(i18n("&Filter Selection"), "filter", Key_F, TQT_TQOBJECT(this), + new TDEAction(i18n("&Filter Selection"), "filter", Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotFilterSelection()), actionCollection(), "filter_selection"); - new KAction(i18n("Select &All"), Key_A + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Select &All"), Key_A + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection(), "select_all"); - new KAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), actionCollection(), "clear_selection"); m_config->setGroup(EventViewConfigGroup); int timeMode = m_config->readNumEntry("timemode", 0); - KRadioAction *action; + TDERadioAction *action; pixmap.load(pixmapDir + "/toolbar/time-musical.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMusicalTime()), actionCollection(), "time_musical"); action->setExclusiveGroup("timeMode"); @@ -1176,7 +1176,7 @@ EventView::setupActions() pixmap.load(pixmapDir + "/toolbar/time-real.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRealTime()), actionCollection(), "time_real"); action->setExclusiveGroup("timeMode"); @@ -1186,7 +1186,7 @@ EventView::setupActions() pixmap.load(pixmapDir + "/toolbar/time-raw.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRawTime()), actionCollection(), "time_raw"); action->setExclusiveGroup("timeMode"); @@ -1194,7 +1194,7 @@ EventView::setupActions() action->setChecked(true); if (m_isTriggerSegment) { - KAction *action = actionCollection()->action("open_in_matrix"); + TDEAction *action = actionCollection()->action("open_in_matrix"); if (action) delete action; action = actionCollection()->action("open_in_notation"); diff --git a/src/gui/editors/eventlist/EventView.h b/src/gui/editors/eventlist/EventView.h index fb25502..a54b30d 100644 --- a/src/gui/editors/eventlist/EventView.h +++ b/src/gui/editors/eventlist/EventView.h @@ -44,7 +44,7 @@ class TQListViewItem; class TQLabel; class TQCheckBox; class TQButtonGroup; -class KListView; +class TDEListView; namespace Rosegarden @@ -175,7 +175,7 @@ protected: TQLabel *m_triggerPitch; TQLabel *m_triggerVelocity; - KListView *m_eventList; + TDEListView *m_eventList; int m_eventFilter; static int m_lastSetEventFilter; diff --git a/src/gui/editors/eventlist/EventViewItem.h b/src/gui/editors/eventlist/EventViewItem.h index b46f8b2..e86544f 100644 --- a/src/gui/editors/eventlist/EventViewItem.h +++ b/src/gui/editors/eventlist/EventViewItem.h @@ -36,20 +36,20 @@ class Event; // EventView specialisation of a TQListViewItem with the // addition of a segment pointer // -class EventViewItem : public KListViewItem +class EventViewItem : public TDEListViewItem { public: EventViewItem(Rosegarden::Segment *segment, Rosegarden::Event *event, - KListView *parent) : - KListViewItem(parent), + TDEListView *parent) : + TDEListViewItem(parent), m_segment(segment), m_event(event) {;} EventViewItem(Rosegarden::Segment *segment, Rosegarden::Event *event, - KListViewItem *parent) : - KListViewItem(parent), + TDEListViewItem *parent) : + TDEListViewItem(parent), m_segment(segment), m_event(event) {;} @@ -63,14 +63,14 @@ public: TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()) : - KListViewItem(parent, label1, label2, label3, label4, + TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), m_segment(segment), m_event(event) {;} EventViewItem(Rosegarden::Segment *segment, Rosegarden::Event *event, - KListViewItem *parent, TQString label1, + TDEListViewItem *parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), @@ -78,7 +78,7 @@ public: TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()) : - KListViewItem(parent, label1, label2, label3, label4, + TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), m_segment(segment), m_event(event) {;} diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp index 7edddfc..7665066 100644 --- a/src/gui/editors/matrix/MatrixEraser.cpp +++ b/src/gui/editors/matrix/MatrixEraser.cpp @@ -51,21 +51,21 @@ MatrixEraser::MatrixEraser(MatrixView* parent) TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Draw Tool"), "pencil", 0, this, + new TDEAction(i18n("Switch to Draw Tool"), "pencil", 0, this, TQT_SLOT(slotDrawSelected()), actionCollection(), "draw"); - new KAction(i18n("Switch to Move Tool"), "move", 0, this, + new TDEAction(i18n("Switch to Move Tool"), "move", 0, this, TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); pixmap.load(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); - new KAction(i18n("Switch to Resize Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Resize Tool"), icon, 0, this, TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp index 4366ab3..d2955fe 100644 --- a/src/gui/editors/matrix/MatrixMover.cpp +++ b/src/gui/editors/matrix/MatrixMover.cpp @@ -64,21 +64,21 @@ MatrixMover::MatrixMover(MatrixView* parent) : TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Draw Tool"), "pencil", 0, this, + new TDEAction(i18n("Switch to Draw Tool"), "pencil", 0, this, TQT_SLOT(slotDrawSelected()), actionCollection(), "draw"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); pixmap.load(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); - new KAction(i18n("Switch to Resize Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Resize Tool"), icon, 0, this, TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp index 18a4822..a6b0a15 100644 --- a/src/gui/editors/matrix/MatrixPainter.cpp +++ b/src/gui/editors/matrix/MatrixPainter.cpp @@ -62,21 +62,21 @@ MatrixPainter::MatrixPainter(MatrixView* parent) TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); - new KAction(i18n("Switch to Move Tool"), "move", 0, this, + new TDEAction(i18n("Switch to Move Tool"), "move", 0, this, TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); pixmap.load(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); - new KAction(i18n("Switch to Resize Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Resize Tool"), icon, 0, this, TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp index 2335cd7..ff7760a 100644 --- a/src/gui/editors/matrix/MatrixResizer.cpp +++ b/src/gui/editors/matrix/MatrixResizer.cpp @@ -60,19 +60,19 @@ MatrixResizer::MatrixResizer(MatrixView* parent) TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Draw Tool"), "pencil", 0, this, + new TDEAction(i18n("Switch to Draw Tool"), "pencil", 0, this, TQT_SLOT(slotDrawSelected()), actionCollection(), "draw"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); - new KAction(i18n("Switch to Move Tool"), "move", 0, this, + new TDEAction(i18n("Switch to Move Tool"), "move", 0, this, TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp index c9c3b32..72060af 100644 --- a/src/gui/editors/matrix/MatrixSelector.cpp +++ b/src/gui/editors/matrix/MatrixSelector.cpp @@ -74,15 +74,15 @@ MatrixSelector::MatrixSelector(MatrixView* view) connect(m_parentView, TQT_SIGNAL(usedSelection()), this, TQT_SLOT(slotHideSelection())); - new KAction(i18n("Switch to Draw Tool"), "pencil", 0, this, + new TDEAction(i18n("Switch to Draw Tool"), "pencil", 0, this, TQT_SLOT(slotDrawSelected()), actionCollection(), "draw"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); - new KAction(i18n("Switch to Move Tool"), "move", 0, this, + new TDEAction(i18n("Switch to Move Tool"), "move", 0, this, TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); @@ -90,7 +90,7 @@ MatrixSelector::MatrixSelector(MatrixView* view) TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm"); TQIconSet icon = TQIconSet(pixmap); - new KAction(i18n("Switch to Resize Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Resize Tool"), icon, 0, this, TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index f7665c9..099ef06 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -633,225 +633,225 @@ void MatrixView::setupActions() // // Edition tools (eraser, selector...) // - KRadioAction* toolAction = 0; + TDERadioAction* toolAction = 0; TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm")); - toolAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, + toolAction = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); toolAction->setExclusiveGroup("tools"); - toolAction = new KRadioAction(i18n("&Draw"), "pencil", Key_F3, + toolAction = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3, TQT_TQOBJECT(this), TQT_SLOT(slotPaintSelected()), actionCollection(), "draw"); toolAction->setExclusiveGroup("tools"); - toolAction = new KRadioAction(i18n("&Erase"), "eraser", Key_F4, + toolAction = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); toolAction->setExclusiveGroup("tools"); - toolAction = new KRadioAction(i18n("&Move"), "move", Key_F5, + toolAction = new TDERadioAction(i18n("&Move"), "move", Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); toolAction->setExclusiveGroup("tools"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); - toolAction = new KRadioAction(i18n("Resi&ze"), icon, Key_F6, + toolAction = new TDERadioAction(i18n("Resi&ze"), icon, Key_F6, TQT_TQOBJECT(this), TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); toolAction->setExclusiveGroup("tools"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("chord"))); - (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, + (new TDEToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "chord_mode"))-> setChecked(false); pixmap.load(pixmapDir + "/toolbar/step_by_step.xpm"); icon = TQIconSet(pixmap); - new KToggleAction(i18n("Ste&p Recording"), icon, 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Ste&p Recording"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleStepByStep()), actionCollection(), "toggle_step_by_step"); pixmap.load(pixmapDir + "/toolbar/quantize.png"); icon = TQIconSet(pixmap); - new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, TQT_TQOBJECT(this), + new TDEAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsQuantize()), actionCollection(), "quantize"); - new KAction(i18n("Repeat Last Quantize"), Key_Plus, TQT_TQOBJECT(this), + new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRepeatQuantize()), actionCollection(), "repeat_quantize"); - new KAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this), + new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(), "collapse_notes"); - new KAction(i18n("&Legato"), Key_Minus, TQT_TQOBJECT(this), + new TDEAction(i18n("&Legato"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsLegato()), actionCollection(), "legatoize"); - new KAction(ChangeVelocityCommand::getGlobalName(10), 0, + new TDEAction(ChangeVelocityCommand::getGlobalName(10), 0, Key_Up + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotVelocityUp()), actionCollection(), "velocity_up"); - new KAction(ChangeVelocityCommand::getGlobalName( -10), 0, + new TDEAction(ChangeVelocityCommand::getGlobalName( -10), 0, Key_Down + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotVelocityDown()), actionCollection(), "velocity_down"); - new KAction(i18n("Set to Current Velocity"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set to Current Velocity"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetVelocitiesToCurrent()), actionCollection(), "set_to_current_velocity"); - new KAction(i18n("Set Event &Velocities..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Event &Velocities..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetVelocities()), actionCollection(), "set_velocities"); - new KAction(i18n("Trigger Se&gment..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Trigger Se&gment..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTriggerSegment()), actionCollection(), "trigger_segment"); - new KAction(i18n("Remove Triggers..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Remove Triggers..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveTriggers()), actionCollection(), "remove_trigger"); - new KAction(i18n("Select &All"), Key_A + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Select &All"), Key_A + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection(), "select_all"); - new KAction(i18n("&Delete"), Key_Delete, TQT_TQOBJECT(this), + new TDEAction(i18n("&Delete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(), "delete"); - new KAction(i18n("Cursor &Back"), 0, Key_Left, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor &Back"), 0, Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotStepBackward()), actionCollection(), "cursor_back"); - new KAction(i18n("Cursor &Forward"), 0, Key_Right, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotExtendSelectionForwardBar()), actionCollection(), "extend_selection_forward_bar"); - new KAction(i18n("Cursor to St&art"), 0, + new TDEAction(i18n("Cursor to St&art"), 0, /* #1025717: conflicting meanings for ctrl+a - dupe with Select All Key_A + CTRL, */ TQT_TQOBJECT(this), TQT_SLOT(slotJumpToStart()), actionCollection(), "cursor_start"); - new KAction(i18n("Cursor to &End"), 0, Key_E + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor to &End"), 0, Key_E + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToEnd()), actionCollection(), "cursor_end"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-cursor-to-pointer"))); - new KAction(i18n("Cursor to &Playback Pointer"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor to &Playback Pointer"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(), "cursor_to_playback_pointer"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-play"))); - KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), + TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), TQT_SIGNAL(play()), actionCollection(), "play"); // Alternative shortcut for Play - KShortcut playShortcut = play->shortcut(); + TDEShortcut playShortcut = play->shortcut(); playShortcut.append( KKey(Key_Return + CTRL) ); play->setShortcut(playShortcut); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-stop"))); - new KAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), + new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), TQT_SIGNAL(stop()), actionCollection(), "stop"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind"))); - new KAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), + new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlayback()), actionCollection(), "playback_pointer_back_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd"))); - new KAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), + new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlayback()), actionCollection(), "playback_pointer_forward_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind-end"))); - new KAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(), "playback_pointer_start"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd-end"))); - new KAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(), "playback_pointer_end"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-pointer-to-cursor"))); - new KAction(i18n("Playback Pointer to &Cursor"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Playback Pointer to &Cursor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(), "playback_pointer_to_cursor"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-solo"))); - new KToggleAction(i18n("&Solo"), icon, 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("&Solo"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSolo()), actionCollection(), "toggle_solo"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-tracking"))); - (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(m_playTracking); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-panic"))); - new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear L&oop"), Key_Colon + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotClearLoop()), actionCollection(), "clear_loop"); - new KAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), actionCollection(), "clear_selection"); // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); - new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotFilterSelection()), actionCollection(), "filter_selection"); @@ -876,16 +876,16 @@ void MatrixView::setupActions() timeT d = m_snapValues[i]; if (d == SnapGrid::NoSnap) { - new KAction(i18n("&No Snap"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&No Snap"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSnapFromAction()), actionCollection(), "snap_none"); } else if (d == SnapGrid::SnapToUnit) { } else if (d == SnapGrid::SnapToBeat) { - new KAction(i18n("Snap to Bea&t"), Key_1, TQT_TQOBJECT(this), + new TDEAction(i18n("Snap to Bea&t"), Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotSetSnapFromAction()), actionCollection(), "snap_beat"); } else if (d == SnapGrid::SnapToBar) { - new KAction(i18n("Snap to &Bar"), Key_5, TQT_TQOBJECT(this), + new TDEAction(i18n("Snap to &Bar"), Key_5, TQT_TQOBJECT(this), TQT_SLOT(slotSetSnapFromAction()), actionCollection(), "snap_bar"); } else { @@ -895,7 +895,7 @@ void MatrixView::setupActions() TQPixmap pixmap = NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeNoteMenuPixmap(d, err)); - KShortcut cut = 0; + TDEShortcut cut = 0; if (d == crotchetDuration / 16) cut = Key_0; else if (d == crotchetDuration / 8) cut = Key_3; else if (d == crotchetDuration / 4) cut = Key_6; @@ -905,7 +905,7 @@ void MatrixView::setupActions() TQString actionName = TQString("snap_%1").arg(int((crotchetDuration * 4) / d)); if (d == (crotchetDuration * 3) / 2) actionName = "snap_3"; - new KAction(i18n("Snap to %1").arg(label), pixmap, cut, TQT_TQOBJECT(this), + new TDEAction(i18n("Snap to %1").arg(label), pixmap, cut, TQT_TQOBJECT(this), TQT_SLOT(slotSetSnapFromAction()), actionCollection(), actionName.ascii()); } @@ -914,16 +914,16 @@ void MatrixView::setupActions() // // Settings menu // - new KAction(i18n("Show Instrument Parameters"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Show Instrument Parameters"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDockParametersBack()), actionCollection(), "show_inst_parameters"); - new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleChordsRuler()), actionCollection(), "show_chords_ruler"); - new KToggleAction(i18n("Show &Tempo Ruler"), 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Show &Tempo Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); @@ -938,7 +938,7 @@ void MatrixView::setupActions() bool MatrixView::isInChordMode() { - return ((KToggleAction *)actionCollection()->action("chord_mode"))-> + return ((TDEToggleAction *)actionCollection()->action("chord_mode"))-> isChecked(); } @@ -2107,7 +2107,7 @@ MatrixView::initActionsToolbar() { MATRIX_DEBUG << "MatrixView::initActionsToolbar" << endl; - KToolBar *actionsToolbar = toolBar("Actions Toolbar"); + TDEToolBar *actionsToolbar = toolBar("Actions Toolbar"); if (!actionsToolbar) { MATRIX_DEBUG << "MatrixView::initActionsToolbar - " @@ -2192,7 +2192,7 @@ MatrixView::initZoomToolbar() { MATRIX_DEBUG << "MatrixView::initZoomToolbar" << endl; - KToolBar *zoomToolbar = toolBar("Zoom Toolbar"); + TDEToolBar *zoomToolbar = toolBar("Zoom Toolbar"); if (!zoomToolbar) { MATRIX_DEBUG << "MatrixView::initZoomToolbar - " @@ -2828,7 +2828,7 @@ MatrixView::slotInsertableNoteEventReceived(int pitch, int velocity, bool noteOn return ; } - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_step_by_step")); if (!action) { MATRIX_DEBUG << "WARNING: No toggle_step_by_step action" << endl; @@ -2914,7 +2914,7 @@ MatrixView::slotInsertableNoteOffReceived(int pitch, int velocity) void MatrixView::slotToggleStepByStep() { - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_step_by_step")); if (!action) { MATRIX_DEBUG << "WARNING: No toggle_step_by_step action" << endl; @@ -2942,7 +2942,7 @@ MatrixView::slotUpdateInsertModeStatus() void MatrixView::slotStepByStepTargetRequested(TQObject *obj) { - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_step_by_step")); if (!action) { MATRIX_DEBUG << "WARNING: No toggle_step_by_step action" << endl; diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp index eba4e7d..097fc5e 100644 --- a/src/gui/editors/notation/ClefInserter.cpp +++ b/src/gui/editors/notation/ClefInserter.cpp @@ -50,18 +50,18 @@ ClefInserter::ClefInserter(NotationView* view) { TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("select"))); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("crotchet"))); - new KAction(i18n("Switch to Inserting Notes"), icon, 0, this, + new TDEAction(i18n("Switch to Inserting Notes"), icon, 0, this, TQT_SLOT(slotNotesSelected()), actionCollection(), "notes"); diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp index 5c44420..b730dd3 100644 --- a/src/gui/editors/notation/GuitarChordInserter.cpp +++ b/src/gui/editors/notation/GuitarChordInserter.cpp @@ -56,11 +56,11 @@ GuitarChordInserter::GuitarChordInserter(NotationView* view) TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("select"))); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); @@ -68,7 +68,7 @@ GuitarChordInserter::GuitarChordInserter(NotationView* view) (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("crotchet"))); - new KAction(i18n("Switch to Inserting Notes"), icon, 0, this, + new TDEAction(i18n("Switch to Inserting Notes"), icon, 0, this, TQT_SLOT(slotNoteSelected()), actionCollection(), "notes"); diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp index c12d87a..198943e 100644 --- a/src/gui/editors/notation/NotationEraser.cpp +++ b/src/gui/editors/notation/NotationEraser.cpp @@ -51,20 +51,20 @@ NotationEraser::NotationEraser(NotationView* view) config->setGroup(NotationViewConfigGroup); m_collapseRest = config->readBoolEntry("collapse", false); - new KToggleAction(i18n("Collapse rests after erase"), 0, this, + new TDEToggleAction(i18n("Collapse rests after erase"), 0, this, TQT_SLOT(slotToggleRestCollapse()), actionCollection(), "toggle_rest_collapse"); TQIconSet icon (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("crotchet"))); - new KAction(i18n("Switch to Insert Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Insert Tool"), icon, 0, this, TQT_SLOT(slotInsertSelected()), actionCollection(), "insert"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("select"))); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp index 26114fe..549b2a5 100644 --- a/src/gui/editors/notation/NotationSelector.cpp +++ b/src/gui/editors/notation/NotationSelector.cpp @@ -80,58 +80,58 @@ NotationSelector::NotationSelector(NotationView* view) TQIconSet icon (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("crotchet"))); - new KToggleAction(i18n("Switch to Insert Tool"), icon, 0, this, + new TDEToggleAction(i18n("Switch to Insert Tool"), icon, 0, this, TQT_SLOT(slotInsertSelected()), actionCollection(), "insert"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); // (this crashed, and it might be superfluous with ^N anyway, so I'm // commenting it out, but leaving it here in case I change my mind about // fooling with it.) (DMM) - // new KAction(i18n("Normalize Rests"), 0, 0, this, + // new TDEAction(i18n("Normalize Rests"), 0, 0, this, // TQT_SLOT(slotCollapseRests()), actionCollection(), // "collapse_rests"); - new KAction(i18n("Collapse Rests"), 0, 0, this, + new TDEAction(i18n("Collapse Rests"), 0, 0, this, TQT_SLOT(slotCollapseRestsHard()), actionCollection(), "collapse_rests_aggressively"); - new KAction(i18n("Respell as Flat"), 0, 0, this, + new TDEAction(i18n("Respell as Flat"), 0, 0, this, TQT_SLOT(slotRespellFlat()), actionCollection(), "respell_flat"); - new KAction(i18n("Respell as Sharp"), 0, 0, this, + new TDEAction(i18n("Respell as Sharp"), 0, 0, this, TQT_SLOT(slotRespellSharp()), actionCollection(), "respell_sharp"); - new KAction(i18n("Respell as Natural"), 0, 0, this, + new TDEAction(i18n("Respell as Natural"), 0, 0, this, TQT_SLOT(slotRespellNatural()), actionCollection(), "respell_natural"); - new KAction(i18n("Collapse Notes"), 0, 0, this, + new TDEAction(i18n("Collapse Notes"), 0, 0, this, TQT_SLOT(slotCollapseNotes()), actionCollection(), "collapse_notes"); - new KAction(i18n("Interpret"), 0, 0, this, + new TDEAction(i18n("Interpret"), 0, 0, this, TQT_SLOT(slotInterpret()), actionCollection(), "interpret"); - new KAction(i18n("Move to Staff Above"), 0, 0, this, + new TDEAction(i18n("Move to Staff Above"), 0, 0, this, TQT_SLOT(slotStaffAbove()), actionCollection(), "move_events_up_staff"); - new KAction(i18n("Move to Staff Below"), 0, 0, this, + new TDEAction(i18n("Move to Staff Below"), 0, 0, this, TQT_SLOT(slotStaffBelow()), actionCollection(), "move_events_down_staff"); - new KAction(i18n("Make Invisible"), 0, 0, this, + new TDEAction(i18n("Make Invisible"), 0, 0, this, TQT_SLOT(slotMakeInvisible()), actionCollection(), "make_invisible"); - new KAction(i18n("Make Visible"), 0, 0, this, + new TDEAction(i18n("Make Visible"), 0, 0, this, TQT_SLOT(slotMakeVisible()), actionCollection(), "make_visible"); diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index 02b8539..f77bb36 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -1435,7 +1435,7 @@ void NotationView::slotSaveOptions() void NotationView::setOneToolbar(const char *actionName, const char *toolbarName) { - KToggleAction *action = getToggleAction(actionName); + TDEToggleAction *action = getToggleAction(actionName); if (!action) { std::cerr << "WARNING: No such action as " << actionName << std::endl; return ; @@ -1497,23 +1497,23 @@ void NotationView::setupActions() KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrintPreview()), actionCollection()); - new KAction(i18n("Print &with LilyPond..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPreviewLilyPond()), actionCollection(), "file_preview_lilypond"); EditViewBase::setupActions("notation.rc"); EditView::setupActions(); - KRadioAction* noteAction = 0; + TDERadioAction* noteAction = 0; // View menu stuff - KActionMenu *fontActionMenu = - new KActionMenu(i18n("Note &Font"), TQT_TQOBJECT(this), "note_font_actionmenu"); + TDEActionMenu *fontActionMenu = + new TDEActionMenu(i18n("Note &Font"), TQT_TQOBJECT(this), "note_font_actionmenu"); std::set <std::string> fs(NoteFontFactory::getFontNames()); @@ -1524,8 +1524,8 @@ void NotationView::setupActions() TQString fontTQName(strtoqstr(*i)); - KToggleAction *fontAction = - new KToggleAction + TDEToggleAction *fontAction = + new TDEToggleAction (fontTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeFontFromAction()), actionCollection(), TQString("note_font_" + fontTQName).ascii()); @@ -1536,18 +1536,18 @@ void NotationView::setupActions() actionCollection()->insert(fontActionMenu); m_fontSizeActionMenu = - new KActionMenu(i18n("Si&ze"), TQT_TQOBJECT(this), "note_font_size_actionmenu"); + new TDEActionMenu(i18n("Si&ze"), TQT_TQOBJECT(this), "note_font_size_actionmenu"); setupFontSizeMenu(); actionCollection()->insert(m_fontSizeActionMenu); m_showHeadersMenuEntry - = new KAction(i18n("Show Track Headers"), 0, TQT_TQOBJECT(this), + = new TDEAction(i18n("Show Track Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHeadersGroup()), actionCollection(), "show_track_headers"); - KActionMenu *spacingActionMenu = - new KActionMenu(i18n("S&pacing"), TQT_TQOBJECT(this), "stretch_actionmenu"); + TDEActionMenu *spacingActionMenu = + new TDEActionMenu(i18n("S&pacing"), TQT_TQOBJECT(this), "stretch_actionmenu"); int defaultSpacing = m_hlayout->getSpacing(); std::vector<int> spacings = NotationHLayout::getAvailableSpacings(); @@ -1555,8 +1555,8 @@ void NotationView::setupActions() for (std::vector<int>::iterator i = spacings.begin(); i != spacings.end(); ++i) { - KToggleAction *spacingAction = - new KToggleAction + TDEToggleAction *spacingAction = + new TDEToggleAction (TQString("%1%").arg(*i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeSpacingFromAction()), actionCollection(), TQString("spacing_%1").arg(*i).ascii()); @@ -1568,8 +1568,8 @@ void NotationView::setupActions() actionCollection()->insert(spacingActionMenu); - KActionMenu *proportionActionMenu = - new KActionMenu(i18n("Du&ration Factor"), TQT_TQOBJECT(this), "proportion_actionmenu"); + TDEActionMenu *proportionActionMenu = + new TDEActionMenu(i18n("Du&ration Factor"), TQT_TQOBJECT(this), "proportion_actionmenu"); int defaultProportion = m_hlayout->getProportion(); std::vector<int> proportions = NotationHLayout::getAvailableProportions(); @@ -1581,8 +1581,8 @@ void NotationView::setupActions() if (*i == 0) name = i18n("None"); - KToggleAction *proportionAction = - new KToggleAction + TDEToggleAction *proportionAction = + new TDEToggleAction (name, 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeProportionFromAction()), actionCollection(), TQString("proportion_%1").arg(*i).ascii()); @@ -1594,8 +1594,8 @@ void NotationView::setupActions() actionCollection()->insert(proportionActionMenu); - KActionMenu *styleActionMenu = - new KActionMenu(i18n("Note &Style"), TQT_TQOBJECT(this), "note_style_actionmenu"); + TDEActionMenu *styleActionMenu = + new TDEActionMenu(i18n("Note &Style"), TQT_TQOBJECT(this), "note_style_actionmenu"); std::vector<NoteStyleName> styles (NoteStyleFactory::getAvailableStyleNames()); @@ -1605,8 +1605,8 @@ void NotationView::setupActions() TQString styleTQName(strtoqstr(*i)); - KAction *styleAction = - new KAction + TDEAction *styleAction = + new TDEAction (styleTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetStyleFromAction()), actionCollection(), TQString("style_" + styleTQName).ascii()); @@ -1615,21 +1615,21 @@ void NotationView::setupActions() actionCollection()->insert(styleActionMenu); - KActionMenu *ornamentActionMenu = - new KActionMenu(i18n("Use Ornament"), TQT_TQOBJECT(this), "ornament_actionmenu"); + TDEActionMenu *ornamentActionMenu = + new TDEActionMenu(i18n("Use Ornament"), TQT_TQOBJECT(this), "ornament_actionmenu"); - new KAction + new TDEAction (i18n("Insert Rest"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRest()), actionCollection(), TQString("insert_rest").ascii()); - new KAction + new TDEAction (i18n("Switch from Note to Rest"), Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotSwitchFromNoteToRest()), actionCollection(), TQString("switch_from_note_to_rest").ascii()); - new KAction + new TDEAction (i18n("Switch from Rest to Note"), Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotSwitchFromRestToNote()), actionCollection(), TQString("switch_from_rest_to_note").ascii()); @@ -1647,7 +1647,7 @@ void NotationView::setupActions() icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap (noteActionData.pixmapName.ascii()))); - noteAction = new KRadioAction(noteActionData.title, + noteAction = new TDERadioAction(noteActionData.title, icon, noteActionData.keycode, TQT_TQOBJECT(this), @@ -1673,7 +1673,7 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap (data.pixmapName.ascii()))); - KAction *action = new KAction(data.title, + TDEAction *action = new TDEAction(data.title, icon, data.keycode, TQT_TQOBJECT(this), @@ -1701,7 +1701,7 @@ void NotationView::setupActions() icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap (actionsAccidental[i][3].ascii()))); - noteAction = new KRadioAction(actionsAccidental[i][0], icon, 0, TQT_TQOBJECT(this), + noteAction = new TDERadioAction(actionsAccidental[i][0], icon, 0, TQT_TQOBJECT(this), actionsAccidental[i][1].ascii(), actionCollection(), actionsAccidental[i][2].ascii()); noteAction->setExclusiveGroup("accidentals"); @@ -1714,47 +1714,47 @@ void NotationView::setupActions() // Treble icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble"))); - noteAction = new KRadioAction(i18n("&Treble Clef"), icon, 0, TQT_TQOBJECT(this), + noteAction = new TDERadioAction(i18n("&Treble Clef"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotTrebleClef()), actionCollection(), "treble_clef"); noteAction->setExclusiveGroup("notes"); // Alto icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto"))); - noteAction = new KRadioAction(i18n("&Alto Clef"), icon, 0, TQT_TQOBJECT(this), + noteAction = new TDERadioAction(i18n("&Alto Clef"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotAltoClef()), actionCollection(), "alto_clef"); noteAction->setExclusiveGroup("notes"); // Tenor icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor"))); - noteAction = new KRadioAction(i18n("Te&nor Clef"), icon, 0, TQT_TQOBJECT(this), + noteAction = new TDERadioAction(i18n("Te&nor Clef"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotTenorClef()), actionCollection(), "tenor_clef"); noteAction->setExclusiveGroup("notes"); // Bass icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass"))); - noteAction = new KRadioAction(i18n("&Bass Clef"), icon, 0, TQT_TQOBJECT(this), + noteAction = new TDERadioAction(i18n("&Bass Clef"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotBassClef()), actionCollection(), "bass_clef"); noteAction->setExclusiveGroup("notes"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("text"))); - noteAction = new KRadioAction(i18n("&Text"), icon, Key_F8, TQT_TQOBJECT(this), + noteAction = new TDERadioAction(i18n("&Text"), icon, Key_F8, TQT_TQOBJECT(this), TQT_SLOT(slotText()), actionCollection(), "text"); noteAction->setExclusiveGroup("notes"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord"))); - noteAction = new KRadioAction(i18n("&Guitar Chord"), icon, Key_F9, TQT_TQOBJECT(this), + noteAction = new TDERadioAction(i18n("&Guitar Chord"), icon, Key_F9, TQT_TQOBJECT(this), TQT_SLOT(slotGuitarChord()), actionCollection(), "guitarchord"); noteAction->setExclusiveGroup("notes"); /* icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond"))); - noteAction = new KRadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, TQT_TQOBJECT(this), + noteAction = new TDERadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondDirective()), actionCollection(), "lilypond_directive"); noteAction->setExclusiveGroup("notes"); */ @@ -1763,53 +1763,53 @@ void NotationView::setupActions() // // Edition tools (eraser, selector...) // - noteAction = new KRadioAction(i18n("&Erase"), "eraser", Key_F4, + noteAction = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); noteAction->setExclusiveGroup("notes"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("select"))); - noteAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, + noteAction = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); noteAction->setExclusiveGroup("notes"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step"))); - new KToggleAction(i18n("Ste&p Recording"), icon, 0, TQT_TQOBJECT(this), + new TDEToggleAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Select from Sta&rt"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditSelectFromStart()), actionCollection(), "select_from_start"); - new KAction(i18n("Select to &End"), 0, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotEditGeneralPaste()), actionCollection(), "general_paste"); - new KAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this), + new TDEAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(), "delete"); - new KAction(i18n("Move to Staff Above"), 0, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Move to Staff Below"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveEventsDownStaff()), actionCollection(), "move_events_down_staff"); @@ -1822,7 +1822,7 @@ void NotationView::setupActions() TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm"); icon = TQIconSet(pixmap); - KRadioAction *linearModeAction = new KRadioAction + TDERadioAction *linearModeAction = new TDERadioAction (i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()), actionCollection(), "linear_mode"); linearModeAction->setExclusiveGroup("layoutMode"); @@ -1831,7 +1831,7 @@ void NotationView::setupActions() pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm"); icon = TQIconSet(pixmap); - KRadioAction *continuousPageModeAction = new KRadioAction + TDERadioAction *continuousPageModeAction = new TDERadioAction (i18n("&Continuous Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinuousPageMode()), actionCollection(), "continuous_page_mode"); continuousPageModeAction->setExclusiveGroup("layoutMode"); @@ -1840,34 +1840,34 @@ void NotationView::setupActions() pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm"); icon = TQIconSet(pixmap); - KRadioAction *multiPageModeAction = new KRadioAction + TDERadioAction *multiPageModeAction = new TDERadioAction (i18n("&Multiple Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMultiPageMode()), actionCollection(), "multi_page_mode"); multiPageModeAction->setExclusiveGroup("layoutMode"); if (layoutMode == 2) multiPageModeAction->setChecked(true); - new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this), + new TDEToggleAction(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, TQT_TQOBJECT(this), + new TDEToggleAction(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, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Show &Tempo Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); - new KToggleAction(i18n("Show &Annotations"), 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Show &Annotations"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAnnotations()), actionCollection(), "show_annotations"); - new KToggleAction(i18n("Show Lily&Pond Directives"), 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Show Lily&Pond Directives"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLilyPondDirectives()), actionCollection(), "show_lilypond_directives"); - new KAction(i18n("Open L&yric Editor"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditLyrics()), + new TDEAction(i18n("Open L&yric Editor"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditLyrics()), actionCollection(), "lyric_editor"); // @@ -1877,53 +1877,53 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-beam"))); - new KAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, TQT_TQOBJECT(this), + new TDEAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupBeam()), actionCollection(), "beam"); - new KAction(AutoBeamCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(AutoBeamCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupAutoBeam()), actionCollection(), "auto_beam"); icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-unbeam"))); - new KAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, TQT_TQOBJECT(this), + new TDEAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupBreak()), actionCollection(), "break_group"); icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-simple-tuplet"))); - new KAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, TQT_TQOBJECT(this), + new TDEAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupSimpleTuplet()), actionCollection(), "simple_tuplet"); icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-tuplet"))); - new KAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, TQT_TQOBJECT(this), + new TDEAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupGeneralTuplet()), actionCollection(), "tuplet"); - new KAction(UnTupletCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(UnTupletCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupUnTuplet()), actionCollection(), "break_tuplets"); icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("triplet"))); - (new KToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G, + (new TDEToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "triplet_mode"))-> setChecked(false); icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("chord"))); - (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, + (new TDEToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "chord_mode"))-> setChecked(false); icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("group-grace"))); - (new KToggleAction(i18n("Grace Insert Mode"), icon, 0, + (new TDEToggleAction(i18n("Grace Insert Mode"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "grace_mode"))-> setChecked(false); @@ -1932,21 +1932,21 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-grace"))); - new KAction(GraceCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), + new TDEAction(GraceCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupGrace()), actionCollection(), "grace"); - new KAction(UnGraceCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(UnGraceCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupUnGrace()), actionCollection(), "ungrace"); */ icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-slur"))); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::Slur), icon, Key_ParenRight, TQT_TQOBJECT(this), TQT_SLOT(slotGroupSlur()), actionCollection(), "slur"); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotGroupPhrasingSlur()), actionCollection(), "phrasing_slur"); @@ -1954,7 +1954,7 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-glissando"))); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::Glissando), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupGlissando()), actionCollection(), "glissando"); @@ -1962,7 +1962,7 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-crescendo"))); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::Crescendo), icon, Key_Less, TQT_TQOBJECT(this), TQT_SLOT(slotGroupCrescendo()), actionCollection(), "crescendo"); @@ -1970,11 +1970,11 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-decrescendo"))); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::Decrescendo), icon, Key_Greater, TQT_TQOBJECT(this), TQT_SLOT(slotGroupDecrescendo()), actionCollection(), "decrescendo"); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::QuindicesimaUp), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupOctave2Up()), actionCollection(), "octave_2up"); @@ -1982,34 +1982,34 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-ottava"))); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::OttavaUp), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupOctaveUp()), actionCollection(), "octave_up"); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::OttavaDown), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupOctaveDown()), actionCollection(), "octave_down"); - new KAction(AddIndicationCommand::getGlobalName + new TDEAction(AddIndicationCommand::getGlobalName (Indication::QuindicesimaDown), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupOctave2Down()), actionCollection(), "octave_2down"); icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-chord"))); - new KAction(MakeChordCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), + new TDEAction(MakeChordCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGroupMakeChord()), actionCollection(), "make_chord"); // setup Transforms menu - new KAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, TQT_TQOBJECT(this), + new TDEAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsNormalizeRests()), actionCollection(), "normalize_rests"); - new KAction(CollapseRestsCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(CollapseRestsCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsCollapseRests()), actionCollection(), "collapse_rests_aggressively"); - new KAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this), + new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(), "collapse_notes"); @@ -2017,15 +2017,15 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transforms-tie"))); - new KAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, TQT_TQOBJECT(this), + new TDEAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsTieNotes()), actionCollection(), "tie_notes"); - new KAction(UntieNotesCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(UntieNotesCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsUntieNotes()), actionCollection(), "untie_notes"); - new KAction(MakeNotesViableCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(MakeNotesViableCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsMakeNotesViable()), actionCollection(), "make_notes_viable"); @@ -2033,49 +2033,49 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transforms-decounterpoint"))); - new KAction(DeCounterpointCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), + new TDEAction(DeCounterpointCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsDeCounterpoint()), actionCollection(), "de_counterpoint"); - new KAction(ChangeStemsCommand::getGlobalName(true), + new TDEAction(ChangeStemsCommand::getGlobalName(true), 0, Key_PageUp + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsStemsUp()), actionCollection(), "stems_up"); - new KAction(ChangeStemsCommand::getGlobalName(false), + new TDEAction(ChangeStemsCommand::getGlobalName(false), 0, Key_PageDown + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsStemsDown()), actionCollection(), "stems_down"); - new KAction(RestoreStemsCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(RestoreStemsCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRestoreStems()), actionCollection(), "restore_stems"); - new KAction(ChangeSlurPositionCommand::getGlobalName(true), + new TDEAction(ChangeSlurPositionCommand::getGlobalName(true), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsSlursAbove()), actionCollection(), "slurs_above"); - new KAction(ChangeSlurPositionCommand::getGlobalName(false), + new TDEAction(ChangeSlurPositionCommand::getGlobalName(false), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsSlursBelow()), actionCollection(), "slurs_below"); - new KAction(RestoreSlursCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(RestoreSlursCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRestoreSlurs()), actionCollection(), "restore_slurs"); - new KAction(ChangeTiePositionCommand::getGlobalName(true), + new TDEAction(ChangeTiePositionCommand::getGlobalName(true), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsTiesAbove()), actionCollection(), "ties_above"); - new KAction(ChangeTiePositionCommand::getGlobalName(false), + new TDEAction(ChangeTiePositionCommand::getGlobalName(false), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsTiesBelow()), actionCollection(), "ties_below"); - new KAction(RestoreTiesCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(RestoreTiesCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRestoreTies()), actionCollection(), "restore_ties"); @@ -2083,7 +2083,7 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-doubleflat"))); - new KAction(RespellCommand::getGlobalName + new TDEAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::DoubleFlat), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellDoubleFlat()), actionCollection(), @@ -2093,7 +2093,7 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-flat"))); - new KAction(RespellCommand::getGlobalName + new TDEAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Flat), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellFlat()), actionCollection(), @@ -2103,7 +2103,7 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-natural"))); - new KAction(RespellCommand::getGlobalName + new TDEAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Natural), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellNatural()), actionCollection(), @@ -2113,7 +2113,7 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-sharp"))); - new KAction(RespellCommand::getGlobalName + new TDEAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Sharp), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellSharp()), actionCollection(), @@ -2123,36 +2123,36 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("accmenu-doublesharp"))); - new KAction(RespellCommand::getGlobalName + new TDEAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::DoubleSharp), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellDoubleSharp()), actionCollection(), "respell_doublesharp"); - new KAction(RespellCommand::getGlobalName + new TDEAction(RespellCommand::getGlobalName (RespellCommand::Up, Accidentals::NoAccidental), Key_Up + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotRespellUp()), actionCollection(), "respell_up"); - new KAction(RespellCommand::getGlobalName + new TDEAction(RespellCommand::getGlobalName (RespellCommand::Down, Accidentals::NoAccidental), Key_Down + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotRespellDown()), actionCollection(), "respell_down"); - new KAction(RespellCommand::getGlobalName + new TDEAction(RespellCommand::getGlobalName (RespellCommand::Restore, Accidentals::NoAccidental), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRespellRestore()), actionCollection(), "respell_restore"); - new KAction(MakeAccidentalsCautionaryCommand::getGlobalName(true), + new TDEAction(MakeAccidentalsCautionaryCommand::getGlobalName(true), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowCautionary()), actionCollection(), "show_cautionary"); - new KAction(MakeAccidentalsCautionaryCommand::getGlobalName(false), + new TDEAction(MakeAccidentalsCautionaryCommand::getGlobalName(false), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancelCautionary()), actionCollection(), "cancel_cautionary"); @@ -2161,23 +2161,23 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("quantize"))); - new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, TQT_TQOBJECT(this), + new TDEAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsQuantize()), actionCollection(), "quantize"); - new KAction(FixNotationQuantizeCommand::getGlobalName(), 0, + new TDEAction(FixNotationQuantizeCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsFixQuantization()), actionCollection(), "fix_quantization"); - new KAction(RemoveNotationQuantizeCommand::getGlobalName(), 0, + new TDEAction(RemoveNotationQuantizeCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(), "remove_quantization"); - new KAction(InterpretCommand::getGlobalName(), 0, + new TDEAction(InterpretCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransformsInterpret()), actionCollection(), "interpret"); - new KAction(i18n("&Dump selected events to stderr"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Dump selected events to stderr"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump"); for (MarkActionDataMap::Iterator i = m_markActionDataMap->begin(); @@ -2188,7 +2188,7 @@ void NotationView::setupActions() icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeMarkMenuPixmap(markActionData.mark))); - new KAction(markActionData.title, + new TDEAction(markActionData.title, icon, markActionData.keycode, TQT_TQOBJECT(this), @@ -2201,59 +2201,59 @@ void NotationView::setupActions() (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("text-mark"))); - new KAction(AddTextMarkCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), + new TDEAction(AddTextMarkCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddTextMark()), actionCollection(), "add_text_mark"); - new KAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_plus"); - new KAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, TQT_TQOBJECT(this), + new TDEAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarksAddFingeringMark()), actionCollection(), "add_fingering_mark"); - new KAction(RemoveMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(RemoveMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarksRemoveMarks()), actionCollection(), "remove_marks"); - new KAction(RemoveFingeringMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(RemoveFingeringMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarksRemoveFingeringMarks()), actionCollection(), "remove_fingering_marks"); - new KAction(i18n("Ma&ke Ornament..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Ma&ke Ornament..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMakeOrnament()), actionCollection(), "make_ornament"); - new KAction(i18n("Trigger &Ornament..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Trigger &Ornament..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUseOrnament()), actionCollection(), "use_ornament"); - new KAction(i18n("Remove Ornament..."), 0, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(slashTitles[i], 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSlashes()), actionCollection(), TQString("slashes_%1").arg(i).ascii()); } - new KAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAddClef()), actionCollection(), "add_clef"); - new KAction(KeyInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(KeyInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAddKeySignature()), actionCollection(), "add_key_signature"); - new KAction(SustainInsertionCommand::getGlobalName(true), 0, TQT_TQOBJECT(this), + new TDEAction(SustainInsertionCommand::getGlobalName(true), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAddSustainDown()), actionCollection(), "add_sustain_down"); - new KAction(SustainInsertionCommand::getGlobalName(false), 0, TQT_TQOBJECT(this), + new TDEAction(SustainInsertionCommand::getGlobalName(false), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAddSustainUp()), actionCollection(), "add_sustain_up"); - new KAction(TransposeCommand::getDiatonicGlobalName(false), 0, TQT_TQOBJECT(this), + new TDEAction(TransposeCommand::getDiatonicGlobalName(false), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTranspose()), actionCollection(), "transpose_segment"); - new KAction(i18n("Convert Notation For..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Convert Notation For..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditSwitchPreset()), actionCollection(), "switch_preset"); @@ -2317,198 +2317,198 @@ void NotationView::setupActions() icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3].ascii()))); - new KToggleAction(actionsToolbars[i][0], icon, 0, + new TDEToggleAction(actionsToolbars[i][0], icon, 0, TQT_TQOBJECT(this), actionsToolbars[i][1].ascii(), actionCollection(), actionsToolbars[i][2].ascii()); } - new KAction(i18n("Cursor &Back"), 0, Key_Left, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor &Back"), 0, Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotStepBackward()), actionCollection(), "cursor_back"); - new KAction(i18n("Cursor &Forward"), 0, Key_Right, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Move Selection Left"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotMoveSelectionLeft()), actionCollection(), "move_selection_left"); */ - new KAction(i18n("Cursor to St&art"), 0, + new TDEAction(i18n("Cursor to St&art"), 0, /* #1025717: conflicting meanings for ctrl+a - dupe with Select All Key_A + CTRL, */ TQT_TQOBJECT(this), TQT_SLOT(slotJumpToStart()), actionCollection(), "cursor_start"); - new KAction(i18n("Cursor to &End"), 0, Key_E + CTRL, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotCurrentSegmentNext()), actionCollection(), "cursor_next_segment"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-cursor-to-pointer"))); - new KAction(i18n("Cursor to &Playback Pointer"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor to &Playback Pointer"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(), "cursor_to_playback_pointer"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-play"))); - KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), + TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), TQT_SIGNAL(play()), actionCollection(), "play"); // Alternative shortcut for Play - KShortcut playShortcut = play->shortcut(); + TDEShortcut playShortcut = play->shortcut(); playShortcut.append( KKey(Key_Return + CTRL) ); play->setShortcut(playShortcut); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-stop"))); - new KAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), + new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), TQT_SIGNAL(stop()), actionCollection(), "stop"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind"))); - new KAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), + new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlayback()), actionCollection(), "playback_pointer_back_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd"))); - new KAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), + new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlayback()), actionCollection(), "playback_pointer_forward_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind-end"))); - new KAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(), "playback_pointer_start"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd-end"))); - new KAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(), "playback_pointer_end"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-pointer-to-cursor"))); - new KAction(i18n("Playback Pointer to &Cursor"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Playback Pointer to &Cursor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(), "playback_pointer_to_cursor"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-solo"))); - new KToggleAction(i18n("&Solo"), icon, 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("&Solo"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSolo()), actionCollection(), "toggle_solo"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-tracking"))); - (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(m_playTracking); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-panic"))); - new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(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, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear L&oop"), Key_Colon + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotClearLoop()), actionCollection(), "clear_loop"); - new KAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), actionCollection(), "clear_selection"); // TQString pixmapDir = // TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); - new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotFilterSelection()), actionCollection(), "filter_selection"); - new KAction(i18n("Push &Left"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Push &Left"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionLeft()), actionCollection(), "fine_position_left"); - new KAction(i18n("Push &Right"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Push &Right"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionRight()), actionCollection(), "fine_position_right"); - new KAction(i18n("Push &Up"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Push &Up"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionUp()), actionCollection(), "fine_position_up"); - new KAction(i18n("Push &Down"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Push &Down"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionDown()), actionCollection(), "fine_position_down"); - new KAction(i18n("&Restore Positions"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Restore Positions"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFinePositionRestore()), actionCollection(), "fine_position_restore"); - new KAction(i18n("Make &Invisible"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Make &Invisible"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMakeInvisible()), actionCollection(), "make_invisible"); - new KAction(i18n("Make &Visible"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Make &Visible"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMakeVisible()), actionCollection(), "make_visible"); - new KAction(i18n("Toggle Dot"), Key_Period, TQT_TQOBJECT(this), + new TDEAction(i18n("Toggle Dot"), Key_Period, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDot()), actionCollection(), "toggle_dot"); - new KAction(i18n("Add Dot"), Key_Period + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Add Dot"), Key_Period + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotAddDot()), actionCollection(), "add_dot"); - new KAction(i18n("Add Dot"), Key_Period + CTRL + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Add Dot"), Key_Period + CTRL + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotAddDotNotationOnly()), actionCollection(), "add_notation_dot"); @@ -2518,21 +2518,21 @@ void NotationView::setupActions() bool NotationView::isInChordMode() { - return ((KToggleAction *)actionCollection()->action("chord_mode"))-> + return ((TDEToggleAction *)actionCollection()->action("chord_mode"))-> isChecked(); } bool NotationView::isInTripletMode() { - return ((KToggleAction *)actionCollection()->action("triplet_mode"))-> + return ((TDEToggleAction *)actionCollection()->action("triplet_mode"))-> isChecked(); } bool NotationView::isInGraceMode() { - return ((KToggleAction *)actionCollection()->action("grace_mode"))-> + return ((TDEToggleAction *)actionCollection()->action("grace_mode"))-> isChecked(); } @@ -2544,7 +2544,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName) std::vector<int> sizes = NoteFontFactory::getScreenSizes(oldFontName); for (unsigned int i = 0; i < sizes.size(); ++i) { - KAction *action = + TDEAction *action = actionCollection()->action (TQString("note_font_size_%1").arg(sizes[i]).ascii()); m_fontSizeActionMenu->remove @@ -2562,12 +2562,12 @@ NotationView::setupFontSizeMenu(std::string oldFontName) TQString actionName = TQString("note_font_size_%1").arg(sizes[i]); - KToggleAction *sizeAction = dynamic_cast<KToggleAction *> + TDEToggleAction *sizeAction = dynamic_cast<TDEToggleAction *> (actionCollection()->action(actionName.ascii())); if (!sizeAction) { sizeAction = - new KToggleAction(i18n("1 pixel", "%n pixels", sizes[i]), + new TDEToggleAction(i18n("1 pixel", "%n pixels", sizes[i]), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeFontSizeFromAction()), actionCollection(), actionName.ascii()); @@ -2607,7 +2607,7 @@ bool NotationView::isCurrentStaff(int i) void NotationView::initLayoutToolbar() { - KToolBar *layoutToolbar = toolBar("Layout Toolbar"); + TDEToolBar *layoutToolbar = toolBar("Layout Toolbar"); if (!layoutToolbar) { std::cerr @@ -3969,7 +3969,7 @@ void NotationView::slotNoteAction() void NotationView::slotLastNoteAction() { - KAction *action = actionCollection()->action(m_lastNoteAction.ascii()); + TDEAction *action = actionCollection()->action(m_lastNoteAction.ascii()); if (!action) action = actionCollection()->action("crotchet"); @@ -4331,14 +4331,14 @@ NotationView::slotChangeSpacing(int spacing) // m_spacingSlider->setSize(spacing); - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action(TQString("spacing_%1").arg(spacing).ascii())); if (action) action->setChecked(true); else { std::cerr << "WARNING: Expected action \"spacing_" << spacing - << "\" to be a KToggleAction, but it isn't (or doesn't exist)" + << "\" to be a TDEToggleAction, but it isn't (or doesn't exist)" << std::endl; } @@ -4389,14 +4389,14 @@ NotationView::slotChangeProportion(int proportion) // m_proportionSlider->setSize(proportion); - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action(TQString("proportion_%1").arg(proportion).ascii())); if (action) action->setChecked(true); else { std::cerr << "WARNING: Expected action \"proportion_" << proportion - << "\" to be a KToggleAction, but it isn't (or doesn't exist)" + << "\" to be a TDEToggleAction, but it isn't (or doesn't exist)" << std::endl; } @@ -4543,7 +4543,7 @@ NotationView::slotChangeFont(std::string newName, int newSize) bool thisOne = (f[i] == m_fontName); if (thisOne) m_fontCombo->setCurrentItem(i); - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action(TQString("note_font_" + strtoqstr(f[i])).ascii())); NOTATION_DEBUG << "inspecting " << f[i] << (action ? ", have action" : ", no action") << endl; if (action) @@ -4551,7 +4551,7 @@ NotationView::slotChangeFont(std::string newName, int newSize) else { std::cerr << "WARNING: Expected action \"note_font_" << f[i] - << "\" to be a KToggleAction, but it isn't (or doesn't exist)" + << "\" to be a TDEToggleAction, but it isn't (or doesn't exist)" << std::endl; } } @@ -5146,7 +5146,7 @@ void NotationView::slotToggleTransportToolBar() void NotationView::toggleNamedToolBar(const TQString& toolBarName, bool* force) { - KToolBar *namedToolBar = toolBar(toolBarName.ascii()); + TDEToolBar *namedToolBar = toolBar(toolBarName.ascii()); if (!namedToolBar) { NOTATION_DEBUG << "NotationView::toggleNamedToolBar() : toolBar " @@ -5660,7 +5660,7 @@ void NotationView::slotSwitchFromRestToNote() TQString actionName = NotationStrings::getReferenceName(note, false); actionName = actionName.replace("-", "_"); - KRadioAction *action = dynamic_cast<KRadioAction *> + TDERadioAction *action = dynamic_cast<TDERadioAction *> (actionCollection()->action(actionName.ascii())); if (!action) { @@ -5695,7 +5695,7 @@ void NotationView::slotSwitchFromNoteToRest() TQString actionName = NotationStrings::getReferenceName(note, true); actionName = actionName.replace("-", "_"); - KRadioAction *action = dynamic_cast<KRadioAction *> + TDERadioAction *action = dynamic_cast<TDERadioAction *> (actionCollection()->action(actionName.ascii())); if (!action) { @@ -7224,7 +7224,7 @@ NotationView::slotInsertableNoteEventReceived(int pitch, int velocity, bool note //or mixer, etc) is active, and we'll only allow insertion into //the most recently activated. How about that? - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_step_by_step")); if (!action) { NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl; @@ -7354,7 +7354,7 @@ NotationView::slotInsertableTimerElapsed() void NotationView::slotToggleStepByStep() { - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_step_by_step")); if (!action) { NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl; @@ -7370,7 +7370,7 @@ NotationView::slotToggleStepByStep() void NotationView::slotStepByStepTargetRequested(TQObject *obj) { - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_step_by_step")); if (!action) { NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl; diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h index 56b39ae..352e5e9 100644 --- a/src/gui/editors/notation/NotationView.h +++ b/src/gui/editors/notation/NotationView.h @@ -54,8 +54,8 @@ class TQCanvasItem; class TQCanvas; class KProgress; class KComboBox; -class KActionMenu; -class KAction; +class TDEActionMenu; +class TDEAction; namespace Rosegarden @@ -1083,7 +1083,7 @@ protected: bool m_annotationsVisible; bool m_lilyPondDirectivesVisible; - KAction* m_selectDefaultNote; + TDEAction* m_selectDefaultNote; typedef TQMap<TQString, NoteActionData *> NoteActionDataMap; static NoteActionDataMap* m_noteActionDataMap; @@ -1097,7 +1097,7 @@ protected: KComboBox *m_fontCombo; KComboBox *m_fontSizeCombo; KComboBox *m_spacingCombo; - KActionMenu *m_fontSizeActionMenu; + TDEActionMenu *m_fontSizeActionMenu; ScrollBoxDialog *m_pannerDialog; TQTimer *m_renderTimer; @@ -1122,7 +1122,7 @@ protected: HeadersGroup * m_headersGroup; TQFrame * m_headersTopFrame; - KAction * m_showHeadersMenuEntry; + TDEAction * m_showHeadersMenuEntry; }; diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp index d3dc2a3..709041e 100644 --- a/src/gui/editors/notation/NoteFontViewer.cpp +++ b/src/gui/editors/notation/NoteFontViewer.cpp @@ -87,7 +87,7 @@ NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName, i18n("Note Font Viewer: %1").arg(noteFontName), Close) { TQVBox *box = makeVBoxMainWidget(); - KToolBar* controls = new KToolBar(box); + TDEToolBar* controls = new TDEToolBar(box); controls->setMargin(3); (void) new TQLabel(i18n(" Component: "), controls); diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp index 3db308f..932b2cf 100644 --- a/src/gui/editors/notation/NoteInserter.cpp +++ b/src/gui/editors/notation/NoteInserter.cpp @@ -78,8 +78,8 @@ NoteInserter::NoteInserter(NotationView* view) m_defaultStyle = qstrtostr(config->readEntry ("style", strtoqstr(NoteStyleFactory::DefaultStyle))); - KToggleAction *autoBeamAction = - new KToggleAction(i18n("Auto-Beam when appropriate"), 0, this, + TDEToggleAction *autoBeamAction = + new TDEToggleAction(i18n("Auto-Beam when appropriate"), 0, this, TQT_SLOT(slotToggleAutoBeam()), actionCollection(), "toggle_auto_beam"); autoBeamAction->setChecked(m_autoBeam); @@ -89,7 +89,7 @@ NoteInserter::NoteInserter(NotationView* view) icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap(m_actionsAccidental[i][3]))); - KRadioAction* noteAction = new KRadioAction(i18n(m_actionsAccidental[i][0]), + TDERadioAction* noteAction = new TDERadioAction(i18n(m_actionsAccidental[i][0]), icon, 0, this, m_actionsAccidental[i][1], actionCollection(), @@ -100,24 +100,24 @@ NoteInserter::NoteInserter(NotationView* view) icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("dotted-crotchet"))); - new KToggleAction(i18n("Dotted note"), icon, 0, this, + new TDEToggleAction(i18n("Dotted note"), icon, 0, this, TQT_SLOT(slotToggleDot()), actionCollection(), "toggle_dot"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("select"))); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("rest-crotchet"))); - new KAction(i18n("Switch to Inserting Rests"), icon, 0, this, + new TDEAction(i18n("Switch to Inserting Rests"), icon, 0, this, TQT_SLOT(slotRestsSelected()), actionCollection(), "rests"); @@ -606,7 +606,7 @@ void NoteInserter::slotSetDots(unsigned int dots) { m_noteDots = dots; - KToggleAction *dotsAction = dynamic_cast<KToggleAction *> + TDEToggleAction *dotsAction = dynamic_cast<TDEToggleAction *> (actionCollection()->action("toggle_dot")); if (dotsAction) dotsAction->setChecked(dots > 0); @@ -662,7 +662,7 @@ void NoteInserter::slotToggleDot() Note note(m_noteType, m_noteDots); TQString actionName(NotationStrings::getReferenceName(note)); actionName.replace(TQRegExp("-"), "_"); - KAction *action = m_parentView->actionCollection()->action(actionName.ascii()); + TDEAction *action = m_parentView->actionCollection()->action(actionName.ascii()); if (!action) { std::cerr << "WARNING: No such action as " << actionName.ascii() << std::endl; } else { @@ -690,7 +690,7 @@ void NoteInserter::slotRestsSelected() Note note(m_noteType, m_noteDots); TQString actionName(NotationStrings::getReferenceName(note, true)); actionName.replace(TQRegExp("-"), "_"); - KAction *action = m_parentView->actionCollection()->action(actionName.ascii()); + TDEAction *action = m_parentView->actionCollection()->action(actionName.ascii()); if (!action) { std::cerr << "WARNING: No such action as " << actionName.ascii() << std::endl; } else { diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp index d55dd3e..674ce60 100644 --- a/src/gui/editors/notation/RestInserter.cpp +++ b/src/gui/editors/notation/RestInserter.cpp @@ -59,24 +59,24 @@ RestInserter::RestInserter(NotationView* view) icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("dotted-rest-crotchet"))); - new KToggleAction(i18n("Dotted rest"), icon, 0, this, + new TDEToggleAction(i18n("Dotted rest"), icon, 0, this, TQT_SLOT(slotToggleDot()), actionCollection(), "toggle_dot"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("select"))); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("crotchet"))); - new KAction(i18n("Switch to Inserting Notes"), icon, 0, this, + new TDEAction(i18n("Switch to Inserting Notes"), icon, 0, this, TQT_SLOT(slotNotesSelected()), actionCollection(), "notes"); @@ -128,7 +128,7 @@ void RestInserter::slotToggleDot() Note note(m_noteType, m_noteDots); TQString actionName(NotationStrings::getReferenceName(note, true)); actionName.replace(TQRegExp("-"), "_"); - KAction *action = m_parentView->actionCollection()->action(actionName.ascii()); + TDEAction *action = m_parentView->actionCollection()->action(actionName.ascii()); if (!action) { std::cerr << "WARNING: No such action as " << actionName.ascii() << std::endl; } else { diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp index b3709f1..90674fb 100644 --- a/src/gui/editors/notation/TextInserter.cpp +++ b/src/gui/editors/notation/TextInserter.cpp @@ -54,18 +54,18 @@ TextInserter::TextInserter(NotationView* view) { TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("select"))); - new KAction(i18n("Switch to Select Tool"), icon, 0, this, + new TDEAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); - new KAction(i18n("Switch to Erase Tool"), "eraser", 0, this, + new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); icon = TQIconSet (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("crotchet"))); - new KAction(i18n("Switch to Inserting Notes"), icon, 0, this, + new TDEAction(i18n("Switch to Inserting Notes"), icon, 0, this, TQT_SLOT(slotNotesSelected()), actionCollection(), "notes"); diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp index 7818efd..8a10ace 100644 --- a/src/gui/editors/segment/ControlEditorDialog.cpp +++ b/src/gui/editors/segment/ControlEditorDialog.cpp @@ -75,7 +75,7 @@ const TQString notShowing(i18n("<not showing>")); ControlEditorDialog::ControlEditorDialog(TQWidget *parent, RosegardenGUIDoc *doc, DeviceId device): - KMainWindow(parent, "controleditordialog"), + TDEMainWindow(parent, "controleditordialog"), m_studio(&doc->getStudio()), m_doc(doc), m_device(device), @@ -100,7 +100,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent, arg(device), mainFrame); new TQLabel("", mainFrame); - m_listView = new KListView(mainFrame); + m_listView = new TDEListView(mainFrame); m_listView->addColumn(i18n("Control Event name ")); m_listView->addColumn(i18n("Control Event type ")); m_listView->addColumn(i18n("Control Event value ")); @@ -337,7 +337,7 @@ ControlEditorDialog::slotClose() void ControlEditorDialog::setupActions() { - KAction* close = KStdAction::close(TQT_TQOBJECT(this), + TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); @@ -345,15 +345,15 @@ ControlEditorDialog::setupActions() connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose())); // some adjustments - new KToolBarPopupAction(i18n("Und&o"), + new TDEToolBarPopupAction(i18n("Und&o"), "undo", - KStdAccel::key(KStdAccel::Undo), + TDEStdAccel::key(TDEStdAccel::Undo), actionCollection(), KStdAction::stdName(KStdAction::Undo)); - new KToolBarPopupAction(i18n("Re&do"), + new TDEToolBarPopupAction(i18n("Re&do"), "redo", - KStdAccel::key(KStdAccel::Redo), + TDEStdAccel::key(TDEStdAccel::Redo), actionCollection(), KStdAction::stdName(KStdAction::Redo)); @@ -428,7 +428,7 @@ void ControlEditorDialog::closeEvent(TQCloseEvent *e) { emit closing(); - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } void diff --git a/src/gui/editors/segment/ControlEditorDialog.h b/src/gui/editors/segment/ControlEditorDialog.h index f606210..7b7b0b6 100644 --- a/src/gui/editors/segment/ControlEditorDialog.h +++ b/src/gui/editors/segment/ControlEditorDialog.h @@ -35,7 +35,7 @@ class TQWidget; class TQPushButton; class TQListViewItem; class TQCloseEvent; -class KListView; +class TDEListView; class KCommand; @@ -47,7 +47,7 @@ class RosegardenGUIDoc; class MultiViewCommandHistory; -class ControlEditorDialog : public KMainWindow +class ControlEditorDialog : public TDEMainWindow { Q_OBJECT @@ -109,7 +109,7 @@ protected: TQPushButton *m_addButton; TQPushButton *m_deleteButton; - KListView *m_listView; + TDEListView *m_listView; bool m_modified; diff --git a/src/gui/editors/segment/ControlParameterItem.h b/src/gui/editors/segment/ControlParameterItem.h index 7be91b3..2a354d3 100644 --- a/src/gui/editors/segment/ControlParameterItem.h +++ b/src/gui/editors/segment/ControlParameterItem.h @@ -34,7 +34,7 @@ namespace Rosegarden { -class ControlParameterItem : public KListViewItem +class ControlParameterItem : public TDEListViewItem { public: ControlParameterItem(int id, @@ -48,7 +48,7 @@ public: TQString str7, TQString str8, TQString str9): - KListViewItem(parent, str1, str2, str3, str4, str5, str6, str7, str8), + TDEListViewItem(parent, str1, str2, str3, str4, str5, str6, str7, str8), m_id(id) { setText(8, str9); } int getId() const { return m_id; } diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp index c6c2dd8..2a62a4a 100644 --- a/src/gui/editors/segment/MarkerEditor.cpp +++ b/src/gui/editors/segment/MarkerEditor.cpp @@ -73,7 +73,7 @@ namespace Rosegarden MarkerEditor::MarkerEditor(TQWidget *parent, RosegardenGUIDoc *doc): - KMainWindow(parent, "markereditordialog"), + TDEMainWindow(parent, "markereditordialog"), m_doc(doc), m_modified(false) { @@ -82,7 +82,7 @@ MarkerEditor::MarkerEditor(TQWidget *parent, setCaption(i18n("Manage Markers")); - m_listView = new KListView(mainFrame); + m_listView = new TDEListView(mainFrame); m_listView->addColumn(i18n("Marker time ")); m_listView->addColumn(i18n("Marker text ")); m_listView->addColumn(i18n("Marker description ")); @@ -367,7 +367,7 @@ MarkerEditor::slotClose() void MarkerEditor::setupActions() { - KAction* close = KStdAction::close(TQT_TQOBJECT(this), + TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); @@ -375,15 +375,15 @@ MarkerEditor::setupActions() connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose())); // some adjustments - new KToolBarPopupAction(i18n("Und&o"), + new TDEToolBarPopupAction(i18n("Und&o"), "undo", - KStdAccel::key(KStdAccel::Undo), + TDEStdAccel::key(TDEStdAccel::Undo), actionCollection(), KStdAction::stdName(KStdAction::Undo)); - new KToolBarPopupAction(i18n("Re&do"), + new TDEToolBarPopupAction(i18n("Re&do"), "redo", - KStdAccel::key(KStdAccel::Redo), + TDEStdAccel::key(TDEStdAccel::Redo), actionCollection(), KStdAction::stdName(KStdAction::Redo)); @@ -391,12 +391,12 @@ MarkerEditor::setupActions() kapp->config()->setGroup(MarkerEditorConfigGroup); int timeMode = kapp->config()->readNumEntry("timemode", 0); - KRadioAction *action; + TDERadioAction *action; TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png"); TQIconSet icon(pixmap); - action = new KRadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMusicalTime()), actionCollection(), "time_musical"); action->setExclusiveGroup("timeMode"); @@ -406,7 +406,7 @@ MarkerEditor::setupActions() pixmap.load(pixmapDir + "/toolbar/time-real.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRealTime()), actionCollection(), "time_real"); action->setExclusiveGroup("timeMode"); @@ -416,7 +416,7 @@ MarkerEditor::setupActions() pixmap.load(pixmapDir + "/toolbar/time-raw.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRawTime()), actionCollection(), "time_raw"); action->setExclusiveGroup("timeMode"); @@ -502,7 +502,7 @@ void MarkerEditor::closeEvent(TQCloseEvent *e) { emit closing(); - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } void diff --git a/src/gui/editors/segment/MarkerEditor.h b/src/gui/editors/segment/MarkerEditor.h index 3a03af8..71d998f 100644 --- a/src/gui/editors/segment/MarkerEditor.h +++ b/src/gui/editors/segment/MarkerEditor.h @@ -37,7 +37,7 @@ class TQListViewItem; class TQLabel; class TQCloseEvent; class TQAccel; -class KListView; +class TDEListView; class KCommand; @@ -48,7 +48,7 @@ class RosegardenGUIDoc; class MultiViewCommandHistory; -class MarkerEditor : public KMainWindow +class MarkerEditor : public TDEMainWindow { Q_OBJECT @@ -112,7 +112,7 @@ protected: TQPushButton *m_deleteButton; TQPushButton *m_deleteAllButton; - KListView *m_listView; + TDEListView *m_listView; bool m_modified; diff --git a/src/gui/editors/segment/MarkerEditorViewItem.cpp b/src/gui/editors/segment/MarkerEditorViewItem.cpp index 004f9d9..1cc4a0e 100644 --- a/src/gui/editors/segment/MarkerEditorViewItem.cpp +++ b/src/gui/editors/segment/MarkerEditorViewItem.cpp @@ -32,7 +32,7 @@ MarkerEditorViewItem::compare(TQListViewItem * i, int col, bool ascending) const MarkerEditorViewItem *ei = dynamic_cast<MarkerEditorViewItem *>(i); - if (!ei) return KListViewItem::compare(i, col, ascending); + if (!ei) return TDEListViewItem::compare(i, col, ascending); // Raw time sorting on time column // @@ -43,7 +43,7 @@ MarkerEditorViewItem::compare(TQListViewItem * i, int col, bool ascending) const else return 0; } else { - return KListViewItem::compare(i, col, ascending); + return TDEListViewItem::compare(i, col, ascending); } } diff --git a/src/gui/editors/segment/MarkerEditorViewItem.h b/src/gui/editors/segment/MarkerEditorViewItem.h index 1a835c0..ac15b65 100644 --- a/src/gui/editors/segment/MarkerEditorViewItem.h +++ b/src/gui/editors/segment/MarkerEditorViewItem.h @@ -32,7 +32,7 @@ namespace Rosegarden { -class MarkerEditorViewItem : public KListViewItem +class MarkerEditorViewItem : public TDEListViewItem { public: MarkerEditorViewItem(TQListView * parent, int id, @@ -44,7 +44,7 @@ public: TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()): - KListViewItem(parent, label1, label2, label3, label4, + TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), m_rawTime(0), m_fake(false), m_id(id) { ; } diff --git a/src/gui/editors/segment/PlayListView.cpp b/src/gui/editors/segment/PlayListView.cpp index ff4d1c8..bbaa4b3 100644 --- a/src/gui/editors/segment/PlayListView.cpp +++ b/src/gui/editors/segment/PlayListView.cpp @@ -30,7 +30,7 @@ namespace Rosegarden { PlayListView::PlayListView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { addColumn(i18n("Title")); addColumn(i18n("File name")); @@ -48,7 +48,7 @@ PlayListView::PlayListView(TQWidget *parent, const char *name) bool PlayListView::acceptDrag(TQDropEvent* e) const { - return TQUriDrag::canDecode(e) || KListView::acceptDrag(e); + return TQUriDrag::canDecode(e) || TDEListView::acceptDrag(e); } diff --git a/src/gui/editors/segment/PlayListView.h b/src/gui/editors/segment/PlayListView.h index 43390d0..c4e6aa3 100644 --- a/src/gui/editors/segment/PlayListView.h +++ b/src/gui/editors/segment/PlayListView.h @@ -29,7 +29,7 @@ namespace Rosegarden { -class PlayListView : public KListView +class PlayListView : public TDEListView { public: PlayListView(TQWidget *parent=0, const char *name=0); diff --git a/src/gui/editors/segment/PlayListViewItem.cpp b/src/gui/editors/segment/PlayListViewItem.cpp index ab0c25c..9bcd974 100644 --- a/src/gui/editors/segment/PlayListViewItem.cpp +++ b/src/gui/editors/segment/PlayListViewItem.cpp @@ -26,14 +26,14 @@ namespace Rosegarden { -PlayListViewItem::PlayListViewItem(KListView* parent, KURL kurl) - : KListViewItem(parent, kurl.fileName(), kurl.prettyURL()), +PlayListViewItem::PlayListViewItem(TDEListView* parent, KURL kurl) + : TDEListViewItem(parent, kurl.fileName(), kurl.prettyURL()), m_kurl(kurl) { } -PlayListViewItem::PlayListViewItem(KListView* parent, TQListViewItem* after, KURL kurl) - : KListViewItem(parent, after, kurl.fileName(), kurl.prettyURL()), +PlayListViewItem::PlayListViewItem(TDEListView* parent, TQListViewItem* after, KURL kurl) + : TDEListViewItem(parent, after, kurl.fileName(), kurl.prettyURL()), m_kurl(kurl) { } diff --git a/src/gui/editors/segment/PlayListViewItem.h b/src/gui/editors/segment/PlayListViewItem.h index a622682..ad6c476 100644 --- a/src/gui/editors/segment/PlayListViewItem.h +++ b/src/gui/editors/segment/PlayListViewItem.h @@ -30,11 +30,11 @@ namespace Rosegarden { -class PlayListViewItem : public KListViewItem +class PlayListViewItem : public TDEListViewItem { public: - PlayListViewItem(KListView* parent, KURL); - PlayListViewItem(KListView* parent, TQListViewItem*, KURL); + PlayListViewItem(TDEListView* parent, KURL); + PlayListViewItem(TDEListView* parent, TQListViewItem*, KURL); const KURL& getURL() { return m_kurl; } diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp index 8bfb621..ca05d84 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.cpp +++ b/src/gui/editors/segment/TriggerSegmentManager.cpp @@ -75,7 +75,7 @@ namespace Rosegarden TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent, RosegardenGUIDoc *doc): - KMainWindow(parent, "triggereditordialog"), + TDEMainWindow(parent, "triggereditordialog"), m_doc(doc), m_modified(false) { @@ -84,7 +84,7 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent, setCaption(i18n("Manage Triggered Segments")); - m_listView = new KListView(mainFrame); + m_listView = new TDEListView(mainFrame); m_listView->addColumn("Index"); m_listView->addColumn(i18n("ID")); m_listView->addColumn(i18n("Label")); @@ -375,7 +375,7 @@ TriggerSegmentManager::slotClose() void TriggerSegmentManager::setupActions() { - KAction* close = KStdAction::close(TQT_TQOBJECT(this), + TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); @@ -385,31 +385,31 @@ TriggerSegmentManager::setupActions() TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); // some adjustments - new KToolBarPopupAction(i18n("Und&o"), + new TDEToolBarPopupAction(i18n("Und&o"), "undo", - KStdAccel::key(KStdAccel::Undo), + TDEStdAccel::key(TDEStdAccel::Undo), actionCollection(), KStdAction::stdName(KStdAction::Undo)); - new KToolBarPopupAction(i18n("Re&do"), + new TDEToolBarPopupAction(i18n("Re&do"), "redo", - KStdAccel::key(KStdAccel::Redo), + TDEStdAccel::key(TDEStdAccel::Redo), actionCollection(), KStdAction::stdName(KStdAction::Redo)); - new KAction(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, TQT_TQOBJECT(this), TQT_SLOT(slotPasteAsNew()), actionCollection(), "paste_to_trigger_segment"); kapp->config()->setGroup(TriggerManagerConfigGroup); int timeMode = kapp->config()->readNumEntry("timemode", 0); - KRadioAction *action; + TDERadioAction *action; TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png"); TQIconSet icon(pixmap); - action = new KRadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMusicalTime()), actionCollection(), "time_musical"); action->setExclusiveGroup("timeMode"); @@ -419,7 +419,7 @@ TriggerSegmentManager::setupActions() pixmap.load(pixmapDir + "/toolbar/time-real.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRealTime()), actionCollection(), "time_real"); action->setExclusiveGroup("timeMode"); @@ -429,7 +429,7 @@ TriggerSegmentManager::setupActions() pixmap.load(pixmapDir + "/toolbar/time-raw.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRawTime()), actionCollection(), "time_raw"); action->setExclusiveGroup("timeMode"); @@ -490,7 +490,7 @@ void TriggerSegmentManager::closeEvent(TQCloseEvent *e) { emit closing(); - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } void diff --git a/src/gui/editors/segment/TriggerSegmentManager.h b/src/gui/editors/segment/TriggerSegmentManager.h index 0ec42bd..35fd847 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.h +++ b/src/gui/editors/segment/TriggerSegmentManager.h @@ -36,7 +36,7 @@ class TQPushButton; class TQListViewItem; class TQCloseEvent; class TQAccel; -class KListView; +class TDEListView; class KCommand; @@ -47,7 +47,7 @@ class RosegardenGUIDoc; class MultiViewCommandHistory; -class TriggerSegmentManager : public KMainWindow +class TriggerSegmentManager : public TDEMainWindow { Q_OBJECT @@ -104,7 +104,7 @@ protected: TQPushButton *m_deleteButton; TQPushButton *m_deleteAllButton; - KListView *m_listView; + TDEListView *m_listView; bool m_modified; diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp index 85800b2..9565553 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp @@ -42,7 +42,7 @@ namespace Rosegarden { SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc) - : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->parent())->factory(), TQT_TQOBJECT(canvas)), + : BaseTool("segment_tool_menu", dynamic_cast<TDEMainWindow*>(doc->parent())->factory(), TQT_TQOBJECT(canvas)), m_canvas(canvas), m_doc(doc), m_changeMade(false) diff --git a/src/gui/editors/tempo/TempoListItem.h b/src/gui/editors/tempo/TempoListItem.h index 4d62ab0..7f81f27 100644 --- a/src/gui/editors/tempo/TempoListItem.h +++ b/src/gui/editors/tempo/TempoListItem.h @@ -33,7 +33,7 @@ namespace Rosegarden { class Composition; -class TempoListItem : public KListViewItem +class TempoListItem : public TDEListViewItem { public: enum Type { TimeSignature, Tempo }; @@ -42,12 +42,12 @@ public: Type type, timeT time, int index, - KListView *parent, + TDEListView *parent, TQString label1, TQString label2, TQString label3, TQString label4 = TQString()) : - KListViewItem(parent, label1, label2, label3, label4), + TDEListViewItem(parent, label1, label2, label3, label4), m_composition(composition), m_type(type), m_time(time), diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp index 4386cb2..d5c4013 100644 --- a/src/gui/editors/tempo/TempoView.cpp +++ b/src/gui/editors/tempo/TempoView.cpp @@ -97,7 +97,7 @@ TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT openTime): connect(m_filterGroup, TQT_SIGNAL(released(int)), TQT_SLOT(slotModifyFilter(int))); - m_list = new KListView(getCentralWidget()); + m_list = new TDEListView(getCentralWidget()); m_list->setItemsRenameable(true); m_grid->addWidget(m_list, 2, 1); @@ -578,48 +578,48 @@ TempoView::setupActions() TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png")); - new KAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, TQT_TQOBJECT(this), + new TDEAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotEditInsertTempo()), actionCollection(), "insert_tempo"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-timesig.png"); icon = TQIconSet(pixmap); - new KAction(AddTimeSignatureCommand::getGlobalName(), icon, Key_G, TQT_TQOBJECT(this), + new TDEAction(AddTimeSignatureCommand::getGlobalName(), icon, Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotEditInsertTimeSignature()), actionCollection(), "insert_timesig"); pixmap.load(pixmapDir + "/toolbar/event-delete.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Delete"), icon, Key_Delete, TQT_TQOBJECT(this), + new TDEAction(i18n("&Delete"), icon, Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(), "delete"); pixmap.load(pixmapDir + "/toolbar/event-edit.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Edit Item"), icon, Key_E, TQT_TQOBJECT(this), + new TDEAction(i18n("&Edit Item"), icon, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), actionCollection(), "edit"); - new KAction(i18n("Select &All"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Select &All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection(), "select_all"); - new KAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), actionCollection(), "clear_selection"); m_config->setGroup(TempoViewConfigGroup); int timeMode = m_config->readNumEntry("timemode", 0); - KRadioAction *action; + TDERadioAction *action; pixmap.load(pixmapDir + "/toolbar/time-musical.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMusicalTime()), actionCollection(), "time_musical"); action->setExclusiveGroup("timeMode"); @@ -629,7 +629,7 @@ TempoView::setupActions() pixmap.load(pixmapDir + "/toolbar/time-real.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRealTime()), actionCollection(), "time_real"); action->setExclusiveGroup("timeMode"); @@ -639,7 +639,7 @@ TempoView::setupActions() pixmap.load(pixmapDir + "/toolbar/time-raw.png"); icon = TQIconSet(pixmap); - action = new KRadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), + action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRawTime()), actionCollection(), "time_raw"); action->setExclusiveGroup("timeMode"); diff --git a/src/gui/editors/tempo/TempoView.h b/src/gui/editors/tempo/TempoView.h index 8f9bdca..b3e944f 100644 --- a/src/gui/editors/tempo/TempoView.h +++ b/src/gui/editors/tempo/TempoView.h @@ -41,7 +41,7 @@ class TQListViewItem; class TQCloseEvent; class TQCheckBox; class TQButtonGroup; -class KListView; +class TDEListView; namespace Rosegarden @@ -152,7 +152,7 @@ protected: virtual void closeEvent(TQCloseEvent *); //--------------- Data members --------------------------------- - KListView *m_list; + TDEListView *m_list; int m_filter; static int m_lastSetFilter; diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index 661236c..06b365a 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -726,14 +726,14 @@ EditView::setupActions() TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-tempo.png"); TQIconSet icon = TQIconSet(pixmap); - new KAction(AddTempoChangeCommand::getGlobalName(), + new TDEAction(AddTempoChangeCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddTempo()), actionCollection(), "add_tempo"); pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png"); icon = TQIconSet(pixmap); - new KAction(AddTimeSignatureCommand::getGlobalName(), + new TDEAction(AddTimeSignatureCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddTimeSignature()), actionCollection(), "add_time_signature"); @@ -741,118 +741,118 @@ EditView::setupActions() // // Transforms // - new KAction(i18n("&Halve Durations"), Key_H + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("&Halve Durations"), Key_H + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotHalveDurations()), actionCollection(), "halve_durations"); - new KAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotDoubleDurations()), actionCollection(), "double_durations"); - new KAction(RescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(RescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRescale()), actionCollection(), "rescale"); - new KAction(TransposeCommand::getGlobalName(1), 0, + new TDEAction(TransposeCommand::getGlobalName(1), 0, Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeUp()), actionCollection(), "transpose_up"); - new KAction(TransposeCommand::getGlobalName(12), 0, + new TDEAction(TransposeCommand::getGlobalName(12), 0, Key_Up + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeUpOctave()), actionCollection(), "transpose_up_octave"); - new KAction(TransposeCommand::getGlobalName( -1), 0, + new TDEAction(TransposeCommand::getGlobalName( -1), 0, Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeDown()), actionCollection(), "transpose_down"); - new KAction(TransposeCommand::getGlobalName( -12), 0, + new TDEAction(TransposeCommand::getGlobalName( -12), 0, Key_Down + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeDownOctave()), actionCollection(), "transpose_down_octave"); - new KAction(TransposeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), + new TDEAction(TransposeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTranspose()), actionCollection(), "general_transpose"); - new KAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, TQT_TQOBJECT(this), + new TDEAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDiatonicTranspose()), actionCollection(), "general_diatonic_transpose"); - new KAction(InvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), + new TDEAction(InvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvert()), actionCollection(), "invert"); - new KAction(RetrogradeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), + new TDEAction(RetrogradeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRetrograde()), actionCollection(), "retrograde"); - new KAction(RetrogradeInvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), + new TDEAction(RetrogradeInvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRetrogradeInvert()), actionCollection(), "retrograde_invert"); - new KAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotJogLeft()), actionCollection(), "jog_left"); - new KAction(i18n("Jog &Right"), Key_Right + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Jog &Right"), Key_Right + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotJogRight()), actionCollection(), "jog_right"); // Control rulers // - new KAction(i18n("Show Velocity Property Ruler"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Show Velocity Property Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowVelocityControlRuler()), actionCollection(), "show_velocity_control_ruler"); /* - new KAction(i18n("Show Controllers Events Ruler"), 0, this, + new TDEAction(i18n("Show Controllers Events Ruler"), 0, this, TQT_SLOT(slotShowControllerEventsRuler()), actionCollection(), "show_controller_events_ruler"); */ // Disabled for now // - // new KAction(i18n("Add Control Ruler..."), 0, this, + // new TDEAction(i18n("Add Control Ruler..."), 0, this, // TQT_SLOT(slotShowPropertyControlRuler()), actionCollection(), // "add_control_ruler"); // // Control Ruler context menu // - new KAction(i18n("Insert item"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Insert item"), 0, TQT_TQOBJECT(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 KAction(i18n("Erase selected items"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Erase selected items"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEraseControlRulerItem()), actionCollection(), "erase_control_ruler_item"); - new KAction(i18n("Clear ruler"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearControlRulerItem()), actionCollection(), "clear_control_ruler_item"); - new KAction(i18n("Insert line of controllers"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Insert line of controllers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartControlLineItem()), actionCollection(), "start_control_line_item"); - new KAction(i18n("Flip forward"), Key_BracketRight, TQT_TQOBJECT(this), + new TDEAction(i18n("Flip forward"), Key_BracketRight, TQT_TQOBJECT(this), TQT_SLOT(slotFlipForwards()), actionCollection(), "flip_control_events_forward"); - new KAction(i18n("Flip backwards"), Key_BracketLeft, TQT_TQOBJECT(this), + new TDEAction(i18n("Flip backwards"), Key_BracketLeft, TQT_TQOBJECT(this), TQT_SLOT(slotFlipBackwards()), actionCollection(), "flip_control_events_back"); - new KAction(i18n("Draw property line"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Draw property line"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDrawPropertyLine()), actionCollection(), "draw_property_line"); - new KAction(i18n("Select all property values"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Select all property values"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAllProperties()), actionCollection(), "select_all_properties"); } @@ -1081,26 +1081,26 @@ EditView::createInsertPitchActionMenu() }, }; - KActionMenu *insertPitchActionMenu = - new KActionMenu(i18n("&Insert Note"), TQT_TQOBJECT(this), "insert_note_actionmenu"); + TDEActionMenu *insertPitchActionMenu = + new TDEActionMenu(i18n("&Insert Note"), TQT_TQOBJECT(this), "insert_note_actionmenu"); for (int octave = 0; octave <= 2; ++octave) { - KActionMenu *menu = insertPitchActionMenu; + TDEActionMenu *menu = insertPitchActionMenu; if (octave == 1) { - menu = new KActionMenu(i18n("&Upper Octave"), TQT_TQOBJECT(this), + menu = new TDEActionMenu(i18n("&Upper Octave"), TQT_TQOBJECT(this), "insert_note_actionmenu_upper_octave"); - insertPitchActionMenu->insert(new KActionSeparator(TQT_TQOBJECT(this))); + insertPitchActionMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this))); insertPitchActionMenu->insert(menu); } else if (octave == 2) { - menu = new KActionMenu(i18n("&Lower Octave"), TQT_TQOBJECT(this), + menu = new TDEActionMenu(i18n("&Lower Octave"), TQT_TQOBJECT(this), "insert_note_actionmenu_lower_octave"); insertPitchActionMenu->insert(menu); } for (unsigned int i = 0; i < 7; ++i) { - KAction *insertPitchAction = 0; + TDEAction *insertPitchAction = 0; TQString octaveSuffix; if (octave == 1) @@ -1113,7 +1113,7 @@ EditView::createInsertPitchActionMenu() if (i != 0 && i != 3) { insertPitchAction = - new KAction + new TDEAction (flat.arg(notePitchNames[i]), CTRL + SHIFT + notePitchKeys[octave][i], TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), @@ -1123,7 +1123,7 @@ EditView::createInsertPitchActionMenu() } insertPitchAction = - new KAction + new TDEAction (notePitchNames[i], notePitchKeys[octave][i], TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), @@ -1136,7 +1136,7 @@ EditView::createInsertPitchActionMenu() if (i != 2 && i != 6) { insertPitchAction = - new KAction + new TDEAction (sharp.arg(notePitchNames[i]), SHIFT + notePitchKeys[octave][i], TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), @@ -1146,7 +1146,7 @@ EditView::createInsertPitchActionMenu() } if (i < 6) - menu->insert(new KActionSeparator(TQT_TQOBJECT(this))); + menu->insert(new TDEActionSeparator(TQT_TQOBJECT(this))); } } @@ -1350,7 +1350,7 @@ void EditView::slotShowPropertyControlRuler() KDialogBase propChooserDialog(this, "propertychooserdialog", true, i18n("Select event property"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok); - KListBox* propList = new KListBox(propChooserDialog.makeVBoxMainWidget()); + TDEListBox* propList = new TDEListBox(propChooserDialog.makeVBoxMainWidget()); new TQListBoxRGProperty(propList, BaseProperties::VELOCITY.c_str()); int rc = propChooserDialog.exec(); diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp index ca8211a..7a26a67 100644 --- a/src/gui/general/EditViewBase.cpp +++ b/src/gui/general/EditViewBase.cpp @@ -187,15 +187,15 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard) KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); } - new KToolBarPopupAction(i18n("Und&o"), + new TDEToolBarPopupAction(i18n("Und&o"), "undo", - KStdAccel::key(KStdAccel::Undo), + TDEStdAccel::key(TDEStdAccel::Undo), actionCollection(), KStdAction::stdName(KStdAction::Undo)); - new KToolBarPopupAction(i18n("Re&do"), + new TDEToolBarPopupAction(i18n("Re&do"), "redo", - KStdAccel::key(KStdAccel::Redo), + TDEStdAccel::key(TDEStdAccel::Redo), actionCollection(), KStdAction::stdName(KStdAction::Redo)); @@ -203,33 +203,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard) TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png"); TQIconSet icon = TQIconSet(pixmap); - new KAction(i18n("Open in Matri&x Editor"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in Matri&x Editor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInMatrix()), actionCollection(), "open_in_matrix"); pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(), "open_in_percussion_matrix"); pixmap.load(pixmapDir + "/toolbar/notation.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Notation Editor"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Notation Editor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInNotation()), actionCollection(), "open_in_notation"); pixmap.load(pixmapDir + "/toolbar/eventlist.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Event List Editor"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Event List Editor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInEventList()), actionCollection(), "open_in_event_list"); - new KAction(i18n("Set Segment Start Time..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Segment Start Time..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSegmentStartTime()), actionCollection(), "set_segment_start"); - new KAction(i18n("Set Segment Duration..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Segment Duration..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSegmentDuration()), actionCollection(), "set_segment_duration"); @@ -418,7 +418,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e) } if (e) - KMainWindow::paintEvent(e); + TDEMainWindow::paintEvent(e); // moved this to the end of the method so that things called // from this method can still test whether the composition had @@ -446,7 +446,7 @@ void EditViewBase::closeEvent(TQCloseEvent* e) RG_DEBUG << "EditViewBase::closeEvent() : is in ctor, ignoring close event\n"; e->ignore(); } else { - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } } @@ -553,7 +553,7 @@ bool EditViewBase::getSegmentsOnlyRestsAndClefs() void EditViewBase::toggleWidget(TQWidget* widget, const TQString& toggleActionName) { - KToggleAction* toggleAction = getToggleAction(toggleActionName); + TDEToggleAction* toggleAction = getToggleAction(toggleActionName); if (!toggleAction) { RG_DEBUG << "!!! Unknown toggle action : " << toggleActionName << endl; @@ -586,7 +586,7 @@ EditViewBase::slotTestClipboard() void EditViewBase::slotToggleSolo() { - KToggleAction* toggleSoloAction = getToggleAction("toggle_solo"); + TDEToggleAction* toggleSoloAction = getToggleAction("toggle_solo"); if (!toggleSoloAction) return ; @@ -664,7 +664,7 @@ void EditViewBase::slotCompositionStateUpdate() { // update state of 'solo' toggle // - KToggleAction* toggleSolo = getToggleAction("toggle_solo"); + TDEToggleAction* toggleSolo = getToggleAction("toggle_solo"); if (!toggleSolo) return ; @@ -702,9 +702,9 @@ MultiViewCommandHistory* EditViewBase::getCommandHistory() return getDocument()->getCommandHistory(); } -KToggleAction* EditViewBase::getToggleAction(const TQString& actionName) +TDEToggleAction* EditViewBase::getToggleAction(const TQString& actionName) { - return dynamic_cast<KToggleAction*>(actionCollection()->action(actionName.ascii())); + return dynamic_cast<TDEToggleAction*>(actionCollection()->action(actionName.ascii())); } } diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h index a5da4ad..75bd995 100644 --- a/src/gui/general/EditViewBase.h +++ b/src/gui/general/EditViewBase.h @@ -39,7 +39,7 @@ class TQGridLayout; class TQFrame; class TQCloseEvent; class TQAccel; -class KToggleAction; +class TDEToggleAction; class TDEConfig; class KCommand; namespace Rosegarden { class EditViewTimeSigNotifier; } @@ -335,11 +335,11 @@ protected: bool getSegmentsOnlyRestsAndClefs(); /// Convenience function around actionCollection()->action() - KToggleAction* getToggleAction(const TQString& actionName); + TDEToggleAction* getToggleAction(const TQString& actionName); /** * Make a widget visible depending on the state of a - * KToggleAction + * TDEToggleAction */ virtual void toggleWidget(TQWidget* widget, const TQString& toggleActionName); diff --git a/src/gui/kdeext/KTmpStatusMsg.cpp b/src/gui/kdeext/KTmpStatusMsg.cpp index 620d7c5..3f9c127 100644 --- a/src/gui/kdeext/KTmpStatusMsg.cpp +++ b/src/gui/kdeext/KTmpStatusMsg.cpp @@ -29,7 +29,7 @@ #include "KTmpStatusMsg.h" #include "gui/application/RosegardenApplication.h" -KTmpStatusMsg::KTmpStatusMsg(const TQString& msg, KMainWindow* window, int id) +KTmpStatusMsg::KTmpStatusMsg(const TQString& msg, TDEMainWindow* window, int id) : m_mainWindow(window), m_id(id) { diff --git a/src/gui/kdeext/KTmpStatusMsg.h b/src/gui/kdeext/KTmpStatusMsg.h index 35e1adb..45c8bb2 100644 --- a/src/gui/kdeext/KTmpStatusMsg.h +++ b/src/gui/kdeext/KTmpStatusMsg.h @@ -22,10 +22,10 @@ #ifndef KTMPSTATUSMSG_H #define KTMPSTATUSMSG_H -class KMainWindow; +class TDEMainWindow; /** - * A class to create a temporary message on KMainWindow's status bar + * A class to create a temporary message on TDEMainWindow's status bar * * Use as follows : * { // some block of code starts here @@ -42,10 +42,10 @@ public: /** * Creates a new temporary status message on the status bar - * of the specified KMainWindow. + * of the specified TDEMainWindow. * The id of the text widget in the status bar can be specified */ - KTmpStatusMsg(const TQString& msg, KMainWindow*, int id = m_defaultId); + KTmpStatusMsg(const TQString& msg, TDEMainWindow*, int id = m_defaultId); ~KTmpStatusMsg(); @@ -77,7 +77,7 @@ protected: //--------------- Data members --------------------------------- - KMainWindow* m_mainWindow; + TDEMainWindow* m_mainWindow; int m_id; static int m_defaultId; diff --git a/src/gui/kdeext/RGLed.cpp b/src/gui/kdeext/RGLed.cpp index c1b9604..1edcc4f 100644 --- a/src/gui/kdeext/RGLed.cpp +++ b/src/gui/kdeext/RGLed.cpp @@ -58,12 +58,12 @@ * CVS_SILENT: fixincludes * * Revision 1.19 2001/08/08 14:35:12 hausmann - * - removed empty KActionCollection::childEvent + * - removed empty TDEActionCollection::childEvent * - added sizeHint() and minimumSizeHint() methods to KLed, as advised by * Rik in the comment in kled.h * - removed unused mousePressEvent, mouseMoveEvent and mouseReleaseEvent * handlers from KPassDlg - * - merged KToolBar::insertSeparator() and KToolBar::insertLineSeparator() + * - merged TDEToolBar::insertSeparator() and TDEToolBar::insertLineSeparator() * with their overloaded variants * * Revision 1.18 2001/04/16 22:08:43 pfeiffer diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp index ca7f26a..2e4e69b 100644 --- a/src/gui/kdeext/klearlook.cpp +++ b/src/gui/kdeext/klearlook.cpp @@ -609,7 +609,7 @@ void KlearlookStyle::polish( TQStyleControlElementData ceData, ControlElementFla || ::tqqt_cast<TQPopupMenu *>( widget ) ) widget->setBackgroundMode( TQWidget::PaletteBackground ); - else if ( widget->inherits( "KToolBarSeparator" ) ) { + else if ( widget->inherits( "TDEToolBarSeparator" ) ) { widget->setBackgroundMode( TQWidget::NoBackground ); installObjectEventHandler(ceData, elementFlags, ptr, this); @@ -652,7 +652,7 @@ void KlearlookStyle::unPolish( TQStyleControlElementData ceData, ControlElementF ::tqqt_cast<TQPopupMenu *>( widget ) ) widget->setBackgroundMode( TQWidget::PaletteBackground ); - else if ( widget->inherits( "KToolBarSeparator" ) ) { + else if ( widget->inherits( "TDEToolBarSeparator" ) ) { widget->setBackgroundMode( PaletteBackground ); removeObjectEventHandler(ceData, elementFlags, ptr, this); @@ -715,7 +715,7 @@ bool KlearlookStyle::objectEventHandler( TQStyleControlElementData ceData, Contr return false; // Now draw the contents } - } else if ( object->inherits( "KToolBarSeparator" ) && TQEvent::Paint == event->type() ) { + } else if ( object->inherits( "TDEToolBarSeparator" ) && TQEvent::Paint == event->type() ) { TQFrame * frame = dynamic_cast<TQFrame*>( object ); if ( frame && TQFrame::NoFrame != frame->frameShape() ) { @@ -3128,7 +3128,7 @@ void KlearlookStyle::drawComplexControl( #if TDE_VERSION >= 0x30200 if ( bflags & ( Style_Down | Style_On | Style_Raised ) || onControlButtons ) #else - // CPD: Style_MouseOver obove is *needed* for KDE's KToggleActions... + // CPD: Style_MouseOver obove is *needed* for KDE's TDEToggleActions... if ( bflags & ( Style_Down | Style_On | Style_Raised | Style_MouseOver ) || onControlButtons ) #endif diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp index e9db070..f1dd4e7 100644 --- a/src/gui/rulers/ControlRuler.cpp +++ b/src/gui/rulers/ControlRuler.cpp @@ -393,7 +393,7 @@ void ControlRuler::createMenu() { RG_DEBUG << "ControlRuler::createMenu()\n"; - KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow* parentMainWindow = dynamic_cast<TDEMainWindow*>(topLevelWidget()); if (parentMainWindow && parentMainWindow->factory()) { m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow)); diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp index f2c76a6..af8c27f 100644 --- a/src/gui/rulers/MarkerRuler.cpp +++ b/src/gui/rulers/MarkerRuler.cpp @@ -73,7 +73,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc, m_menu(0), m_doc(doc), m_rulerScale(rulerScale), - m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->parent())) + m_parentMainWindow(dynamic_cast<TDEMainWindow*>(doc->parent())) { // If the parent window has a main window above it, we need to use // that as the parent main window, not the document's parent. @@ -81,8 +81,8 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc, // (document-level) action collection regardless of which window // we're in. TQObject *probe = TQT_TQOBJECT(parent); - while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->parent(); - if (probe) m_parentMainWindow = dynamic_cast<KMainWindow *>(probe); + while (probe && !dynamic_cast<TDEMainWindow *>(probe)) probe = probe->parent(); + if (probe) m_parentMainWindow = dynamic_cast<TDEMainWindow *>(probe); // m_barFont = new TQFont("helvetica", 12); // m_barFont->setPixelSize(12); @@ -97,21 +97,21 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc, // don't become more event-specific in future... icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert.png")); - new KAction(i18n("Insert Marker"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Insert Marker"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertMarkerHere()), actionCollection(), "insert_marker_here"); - new KAction(i18n("Insert Marker at Playback Position"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Insert Marker at Playback Position"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(), "insert_marker_at_pointer"); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png")); - new KAction(i18n("Delete Marker"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Delete Marker"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteMarker()), actionCollection(), "delete_marker"); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png")); - new KAction(i18n("Edit Marker..."), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Edit Marker..."), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditMarker()), actionCollection(), "edit_marker"); diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h index c121285..ff261d5 100644 --- a/src/gui/rulers/MarkerRuler.h +++ b/src/gui/rulers/MarkerRuler.h @@ -37,7 +37,7 @@ class TQPaintEvent; class TQMouseEvent; class TQFont; class TQPopupMenu; -class KMainWindow; +class TDEMainWindow; namespace Rosegarden { @@ -112,7 +112,7 @@ protected: RosegardenGUIDoc *m_doc; RulerScale *m_rulerScale; - KMainWindow* m_parentMainWindow; + TDEMainWindow* m_parentMainWindow; }; diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp index 9a16467..6f9fe65 100644 --- a/src/gui/rulers/TempoRuler.cpp +++ b/src/gui/rulers/TempoRuler.cpp @@ -66,7 +66,7 @@ namespace Rosegarden TempoRuler::TempoRuler(RulerScale *rulerScale, RosegardenGUIDoc *doc, - KMainWindow *parentMainWindow, + TDEMainWindow *parentMainWindow, double xorigin, int height, bool small, @@ -124,37 +124,37 @@ TempoRuler::TempoRuler(RulerScale *rulerScale, TQIconSet icon; icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png")); - new KAction(i18n("Insert Tempo Change"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Insert Tempo Change"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertTempoHere()), actionCollection(), "insert_tempo_here"); - new KAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertTempoAtPointer()), actionCollection(), "insert_tempo_at_pointer"); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png")); - new KAction(i18n("Delete Tempo Change"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Delete Tempo Change"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteTempoChange()), actionCollection(), "delete_tempo"); - new KAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRampToNext()), actionCollection(), "ramp_to_next"); - new KAction(i18n("Un-Ramp Tempo"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Un-Ramp Tempo"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnramp()), actionCollection(), "unramp"); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png")); - new KAction(i18n("Edit Tempo..."), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Edit Tempo..."), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTempo()), actionCollection(), "edit_tempo"); - new KAction(i18n("Edit Time Signature..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Edit Time Signature..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTimeSignature()), actionCollection(), "edit_time_signature"); - new KAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTempos()), actionCollection(), "edit_tempos"); diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h index e330839..bd395df 100644 --- a/src/gui/rulers/TempoRuler.h +++ b/src/gui/rulers/TempoRuler.h @@ -41,7 +41,7 @@ class TQPopupMenu; class TQPaintEvent; class TQMouseEvent; class TQEvent; -class KMainWindow; +class TDEMainWindow; namespace Rosegarden @@ -73,7 +73,7 @@ public: */ TempoRuler(RulerScale *rulerScale, RosegardenGUIDoc *doc, - KMainWindow *parentMainWindow, + TDEMainWindow *parentMainWindow, double xorigin = 0.0, int height = 0, bool small = false, @@ -167,7 +167,7 @@ private: RulerScale *m_rulerScale; TextFloat *m_textFloat; TQPopupMenu *m_menu; - KMainWindow *m_parentMainWindow; + TDEMainWindow *m_parentMainWindow; TQFont m_font; TQFont m_boldFont; diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp index c0d3994..3805954 100644 --- a/src/gui/studio/AudioMixerWindow.cpp +++ b/src/gui/studio/AudioMixerWindow.cpp @@ -102,86 +102,86 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent, TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-play"))); - KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), + TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), TQT_SIGNAL(play()), actionCollection(), "play"); // Alternative shortcut for Play - KShortcut playShortcut = play->shortcut(); + TDEShortcut playShortcut = play->shortcut(); playShortcut.append( KKey(Key_Return + CTRL) ); play->setShortcut(playShortcut); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-stop"))); - new KAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), + new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), TQT_SIGNAL(stop()), actionCollection(), "stop"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind"))); - new KAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), + new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlayback()), actionCollection(), "playback_pointer_back_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd"))); - new KAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), + new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlayback()), actionCollection(), "playback_pointer_forward_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind-end"))); - new KAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(), "playback_pointer_start"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd-end"))); - new KAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(), "playback_pointer_end"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-record"))); - new KAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(record()), actionCollection(), "record"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-panic"))); - new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), TQT_SIGNAL(panic()), actionCollection(), "panic"); unsigned int mixerOptions = m_studio->getMixerDisplayOptions(); - (new KToggleAction(i18n("Show Audio &Faders"), 0, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Show Audio &Faders"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFaders()), actionCollection(), "show_audio_faders"))->setChecked (!(mixerOptions & MIXER_OMIT_FADERS)); - (new KToggleAction(i18n("Show Synth &Faders"), 0, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Show Synth &Faders"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSynthFaders()), actionCollection(), "show_synth_faders"))->setChecked (!(mixerOptions & MIXER_OMIT_SYNTH_FADERS)); - (new KToggleAction(i18n("Show &Submasters"), 0, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Show &Submasters"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSubmasters()), actionCollection(), "show_audio_submasters"))->setChecked (!(mixerOptions & MIXER_OMIT_SUBMASTERS)); - (new KToggleAction(i18n("Show &Plugin Buttons"), 0, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Show &Plugin Buttons"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePluginButtons()), actionCollection(), "show_plugin_buttons"))->setChecked (!(mixerOptions & MIXER_OMIT_PLUGINS)); - (new KToggleAction(i18n("Show &Unassigned Faders"), 0, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Show &Unassigned Faders"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleUnassignedFaders()), actionCollection(), "show_unassigned_faders"))->setChecked (mixerOptions & MIXER_SHOW_UNASSIGNED_FADERS); - KRadioAction *action = 0; + TDERadioAction *action = 0; for (int i = 1; i <= 16; i *= 2) { action = - new KRadioAction(i18n("1 Input", "%n Inputs", i), + new TDERadioAction(i18n("1 Input", "%n Inputs", i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetInputCountFromAction()), actionCollection(), TQString("inputs_%1").arg(i).ascii()); @@ -190,7 +190,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent, action->setChecked(true); } - action = new KRadioAction + action = new TDERadioAction (i18n("No Submasters"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(), @@ -199,7 +199,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent, action->setChecked(true); for (int i = 2; i <= 8; i *= 2) { - action = new KRadioAction + action = new TDERadioAction (i18n("1 Submaster", "%n Submasters", i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(), @@ -1584,7 +1584,7 @@ AudioMixerWindow::slotUpdateFaderVisibility() { bool d = !(m_studio->getMixerDisplayOptions() & MIXER_OMIT_FADERS); - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("show_audio_faders")); if (action) { action->setChecked(d); @@ -1616,7 +1616,7 @@ AudioMixerWindow::slotToggleSynthFaders() void AudioMixerWindow::slotUpdateSynthFaderVisibility() { - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("show_synth_faders")); if (!action) return ; @@ -1648,7 +1648,7 @@ AudioMixerWindow::slotToggleSubmasters() void AudioMixerWindow::slotUpdateSubmasterVisibility() { - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("show_audio_submasters")); if (!action) return ; @@ -1678,7 +1678,7 @@ AudioMixerWindow::slotTogglePluginButtons() void AudioMixerWindow::slotUpdatePluginButtonVisibility() { - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("show_plugin_buttons")); if (!action) return ; @@ -1697,7 +1697,7 @@ AudioMixerWindow::slotUpdatePluginButtonVisibility() void AudioMixerWindow::slotToggleUnassignedFaders() { - KToggleAction *action = dynamic_cast<KToggleAction *> + TDEToggleAction *action = dynamic_cast<TDEToggleAction *> (actionCollection()->action("show_unassigned_faders")); if (!action) return ; diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp index 1f34ce7..39538b0 100644 --- a/src/gui/studio/BankEditorDialog.cpp +++ b/src/gui/studio/BankEditorDialog.cpp @@ -81,7 +81,7 @@ namespace Rosegarden BankEditorDialog::BankEditorDialog(TQWidget *parent, RosegardenGUIDoc *doc, DeviceId defaultDevice): - KMainWindow(parent, "bankeditordialog"), + TDEMainWindow(parent, "bankeditordialog"), m_studio(&doc->getStudio()), m_doc(doc), m_copyBank(Device::NO_DEVICE, -1), @@ -124,7 +124,7 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent, // Left-side list view // TQVBox* leftPart = new TQVBox(splitter); - m_listView = new KListView(leftPart); + m_listView = new TDEListView(leftPart); m_listView->addColumn(i18n("MIDI Device")); m_listView->addColumn(i18n("Type")); m_listView->addColumn(i18n("MSB")); @@ -303,7 +303,7 @@ BankEditorDialog::~BankEditorDialog() void BankEditorDialog::setupActions() { - KAction* close = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); + TDEAction* close = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); m_closeButton->setText(close->text()); connect(m_closeButton, TQT_SIGNAL(clicked()), @@ -315,15 +315,15 @@ BankEditorDialog::setupActions() // some adjustments - new KToolBarPopupAction(i18n("Und&o"), + new TDEToolBarPopupAction(i18n("Und&o"), "undo", - KStdAccel::key(KStdAccel::Undo), + TDEStdAccel::key(TDEStdAccel::Undo), actionCollection(), KStdAction::stdName(KStdAction::Undo)); - new KToolBarPopupAction(i18n("Re&do"), + new TDEToolBarPopupAction(i18n("Re&do"), "redo", - KStdAccel::key(KStdAccel::Redo), + TDEStdAccel::key(TDEStdAccel::Redo), actionCollection(), KStdAction::stdName(KStdAction::Redo)); @@ -1706,7 +1706,7 @@ BankEditorDialog::closeEvent(TQCloseEvent *e) } emit closing(); - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } } diff --git a/src/gui/studio/BankEditorDialog.h b/src/gui/studio/BankEditorDialog.h index 8dbc164..36904b6 100644 --- a/src/gui/studio/BankEditorDialog.h +++ b/src/gui/studio/BankEditorDialog.h @@ -41,7 +41,7 @@ class TQListViewItem; class TQGroupBox; class TQCloseEvent; class TQCheckBox; -class KListView; +class TDEListView; class KCommand; class KComboBox; @@ -58,7 +58,7 @@ class MidiDeviceListViewItem; class MidiDevice; -class BankEditorDialog : public KMainWindow +class BankEditorDialog : public TDEMainWindow { Q_OBJECT @@ -165,7 +165,7 @@ protected: MidiProgramsEditor *m_programEditor; MidiKeyMappingEditor *m_keyMappingEditor; - KListView *m_listView; + TDEListView *m_listView; TQGroupBox *m_optionBox; TQCheckBox *m_variationToggle; diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp index 149a245..8cf3311 100644 --- a/src/gui/studio/DeviceManagerDialog.cpp +++ b/src/gui/studio/DeviceManagerDialog.cpp @@ -85,7 +85,7 @@ static const int RECORD_CONNECTION_COL = 2; DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, RosegardenGUIDoc *document) : - KMainWindow(parent, "deviceeditordialog"), + TDEMainWindow(parent, "deviceeditordialog"), m_document(document), m_studio(&document->getStudio()) { @@ -214,7 +214,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, layout->addWidget(closeButton); layout->addSpacing(5); - KAction* close = KStdAction::close(TQT_TQOBJECT(this), + TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); @@ -224,15 +224,15 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, mainLayout->addWidget(btnBox); // some adjustments - new KToolBarPopupAction(i18n("Und&o"), + new TDEToolBarPopupAction(i18n("Und&o"), "undo", - KStdAccel::shortcut(KStdAccel::Undo), + TDEStdAccel::shortcut(TDEStdAccel::Undo), actionCollection(), KStdAction::stdName(KStdAction::Undo)); - new KToolBarPopupAction(i18n("Re&do"), + new TDEToolBarPopupAction(i18n("Re&do"), "redo", - KStdAccel::shortcut(KStdAccel::Redo), + TDEStdAccel::shortcut(TDEStdAccel::Redo), actionCollection(), KStdAction::stdName(KStdAction::Redo)); @@ -456,7 +456,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, DeviceManagerDialog::closeEvent(TQCloseEvent *e) { emit closing(); - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } DeviceId diff --git a/src/gui/studio/DeviceManagerDialog.h b/src/gui/studio/DeviceManagerDialog.h index 8bb2c68..15ace21 100644 --- a/src/gui/studio/DeviceManagerDialog.h +++ b/src/gui/studio/DeviceManagerDialog.h @@ -47,7 +47,7 @@ class RosegardenGUIDoc; class MidiDevice; -class DeviceManagerDialog : public KMainWindow +class DeviceManagerDialog : public TDEMainWindow { Q_OBJECT diff --git a/src/gui/studio/MidiDeviceListViewItem.cpp b/src/gui/studio/MidiDeviceListViewItem.cpp index df64c82..bfece9e 100644 --- a/src/gui/studio/MidiDeviceListViewItem.cpp +++ b/src/gui/studio/MidiDeviceListViewItem.cpp @@ -36,7 +36,7 @@ namespace Rosegarden MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId, TQListView* parent, TQString name) - : KListViewItem(parent, name), + : TDEListViewItem(parent, name), m_deviceId(deviceId) {} @@ -44,7 +44,7 @@ MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId, TQListViewItem* parent, TQString name, bool percussion, int msb, int lsb) - : KListViewItem(parent, name, + : TDEListViewItem(parent, name, TQString(percussion ? i18n("Percussion Bank") : i18n("Bank")), TQString().setNum(msb), TQString().setNum(lsb)), m_deviceId(deviceId) @@ -52,7 +52,7 @@ MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId, MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId, TQListViewItem* parent, TQString name) -: KListViewItem(parent, name, i18n("Key Mapping"), "", ""), +: TDEListViewItem(parent, name, i18n("Key Mapping"), "", ""), m_deviceId(deviceId) {} diff --git a/src/gui/studio/MidiDeviceListViewItem.h b/src/gui/studio/MidiDeviceListViewItem.h index a17a46c..5c96f85 100644 --- a/src/gui/studio/MidiDeviceListViewItem.h +++ b/src/gui/studio/MidiDeviceListViewItem.h @@ -36,7 +36,7 @@ namespace Rosegarden -class MidiDeviceListViewItem : public KListViewItem +class MidiDeviceListViewItem : public TDEListViewItem { public: // Device diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp index e41539f..baddb83 100644 --- a/src/gui/studio/MidiMixerWindow.cpp +++ b/src/gui/studio/MidiMixerWindow.cpp @@ -78,51 +78,51 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent, TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-play"))); - KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), + TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), TQT_SIGNAL(play()), actionCollection(), "play"); // Alternative shortcut for Play - KShortcut playShortcut = play->shortcut(); + TDEShortcut playShortcut = play->shortcut(); playShortcut.append( KKey(Key_Return + CTRL) ); play->setShortcut(playShortcut); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-stop"))); - new KAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), + new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), TQT_SIGNAL(stop()), actionCollection(), "stop"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind"))); - new KAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), + new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlayback()), actionCollection(), "playback_pointer_back_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd"))); - new KAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), + new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlayback()), actionCollection(), "playback_pointer_forward_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind-end"))); - new KAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(), "playback_pointer_start"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd-end"))); - new KAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(), "playback_pointer_end"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-record"))); - new KAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), TQT_SIGNAL(record()), actionCollection(), "record"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-panic"))); - new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), TQT_SIGNAL(panic()), actionCollection(), "panic"); diff --git a/src/gui/studio/MixerWindow.cpp b/src/gui/studio/MixerWindow.cpp index d0c233a..3c3af9a 100644 --- a/src/gui/studio/MixerWindow.cpp +++ b/src/gui/studio/MixerWindow.cpp @@ -39,7 +39,7 @@ namespace Rosegarden MixerWindow::MixerWindow(TQWidget *parent, RosegardenGUIDoc *document) : - KMainWindow(parent, "mixerwindow"), + TDEMainWindow(parent, "mixerwindow"), m_document(document), m_studio(&document->getStudio()), m_currentId(0) @@ -52,7 +52,7 @@ MixerWindow::closeEvent(TQCloseEvent *e) { RG_DEBUG << "MixerWindow::closeEvent()\n"; emit closing(); - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } void diff --git a/src/gui/studio/MixerWindow.h b/src/gui/studio/MixerWindow.h index 50f5591..46a3774 100644 --- a/src/gui/studio/MixerWindow.h +++ b/src/gui/studio/MixerWindow.h @@ -42,7 +42,7 @@ class Studio; class RosegardenGUIDoc; -class MixerWindow: public KMainWindow +class MixerWindow: public TDEMainWindow { Q_OBJECT diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp index 4fdb00f..c721ffb 100644 --- a/src/gui/studio/SynthPluginManagerDialog.cpp +++ b/src/gui/studio/SynthPluginManagerDialog.cpp @@ -60,7 +60,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, , AudioPluginOSCGUIManager *guiManager #endif ) : - KMainWindow(parent, "synthpluginmanagerdialog"), + TDEMainWindow(parent, "synthpluginmanagerdialog"), m_document(doc), m_studio(&doc->getStudio()), m_pluginManager(doc->getPluginManager()) @@ -171,7 +171,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, layout->addWidget(closeButton); layout->addSpacing(5); - KAction* close = KStdAction::close(TQT_TQOBJECT(this), + TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); @@ -227,7 +227,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, SynthPluginManagerDialog::closeEvent(TQCloseEvent *e) { emit closing(); - KMainWindow::closeEvent(e); + TDEMainWindow::closeEvent(e); } void diff --git a/src/gui/studio/SynthPluginManagerDialog.h b/src/gui/studio/SynthPluginManagerDialog.h index 3851226..48a8f1d 100644 --- a/src/gui/studio/SynthPluginManagerDialog.h +++ b/src/gui/studio/SynthPluginManagerDialog.h @@ -46,7 +46,7 @@ class AudioPluginOSCGUIManager; class AudioPluginManager; -class SynthPluginManagerDialog : public KMainWindow +class SynthPluginManagerDialog : public TDEMainWindow { Q_OBJECT diff --git a/src/gui/widgets/AudioListItem.h b/src/gui/widgets/AudioListItem.h index b2bdf99..b2f08f8 100644 --- a/src/gui/widgets/AudioListItem.h +++ b/src/gui/widgets/AudioListItem.h @@ -35,30 +35,30 @@ class Segment; // Add an Id to a TQListViewItem // -class AudioListItem : public KListViewItem +class AudioListItem : public TDEListViewItem { public: - AudioListItem(KListView *parent):KListViewItem(parent), + AudioListItem(TDEListView *parent):TDEListViewItem(parent), m_segment(0) {;} - AudioListItem(KListViewItem *parent):KListViewItem(parent), + AudioListItem(TDEListViewItem *parent):TDEListViewItem(parent), m_segment(0) {;} - AudioListItem(KListView *parent, + AudioListItem(TDEListView *parent, TQString label, AudioFileId id): - KListViewItem(parent, + TDEListViewItem(parent, label, "", "", "", "", "", "", ""), m_id(id), m_segment(0) {;} - AudioListItem(KListViewItem *parent, + AudioListItem(TDEListViewItem *parent, TQString label, AudioFileId id): - KListViewItem(parent, + TDEListViewItem(parent, label, "", "", "", "", "", "", ""), m_id(id), diff --git a/src/gui/widgets/AudioListView.cpp b/src/gui/widgets/AudioListView.cpp index 3c75526..afe1a20 100644 --- a/src/gui/widgets/AudioListView.cpp +++ b/src/gui/widgets/AudioListView.cpp @@ -32,7 +32,7 @@ namespace Rosegarden { AudioListView::AudioListView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { setDragEnabled(true); setAcceptDrops(true); @@ -41,7 +41,7 @@ AudioListView::AudioListView(TQWidget *parent, const char *name) bool AudioListView::acceptDrag(TQDropEvent* e) const { - return TQUriDrag::canDecode(e) || KListView::acceptDrag(e); + return TQUriDrag::canDecode(e) || TDEListView::acceptDrag(e); } TQDragObject* AudioListView::dragObject() diff --git a/src/gui/widgets/AudioListView.h b/src/gui/widgets/AudioListView.h index 04c293e..3b48400 100644 --- a/src/gui/widgets/AudioListView.h +++ b/src/gui/widgets/AudioListView.h @@ -29,7 +29,7 @@ namespace Rosegarden { -class AudioListView : public KListView +class AudioListView : public TDEListView { public: AudioListView(TQWidget *parent = 0, const char *name = 0); diff --git a/src/sequencer/RosegardenSequencerApp.h b/src/sequencer/RosegardenSequencerApp.h index 8f5ed00..f0400d7 100644 --- a/src/sequencer/RosegardenSequencerApp.h +++ b/src/sequencer/RosegardenSequencerApp.h @@ -60,7 +60,7 @@ #include <deque> class KURL; -class KRecentFilesAction; +class TDERecentFilesAction; namespace Rosegarden { @@ -75,7 +75,7 @@ class SoundDriver; /** * The sequencer application */ -class RosegardenSequencerApp : public KMainWindow, +class RosegardenSequencerApp : public TDEMainWindow, virtual public RosegardenSequencerIface, public ExternalTransport { |