diff options
Diffstat (limited to 'src')
61 files changed, 191 insertions, 191 deletions
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp index fab09c3..3db3cfc 100644 --- a/src/document/RosegardenGUIDoc.cpp +++ b/src/document/RosegardenGUIDoc.cpp @@ -545,7 +545,7 @@ void RosegardenGUIDoc::newDocument() void RosegardenGUIDoc::performAutoload() { TQString autoloadFile = - KGlobal::dirs()->findResource("appdata", "autoload.rg"); + TDEGlobal::dirs()->findResource("appdata", "autoload.rg"); TQFileInfo autoloadFileInfo(autoloadFile); @@ -2305,12 +2305,12 @@ RosegardenGUIDoc::syncDevices() if (isSequencerRunning() && !rgapp->isSequencerRegistered() && timeout == 0) { // Give up, kill sequencer if possible, and report - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/killall"; *proc << "rosegardensequencer"; *proc << "lt-rosegardensequencer"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (proc->exitStatus()) { RG_DEBUG << "couldn't kill any sequencer processes" << endl; diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp index d94cbcd..f358c2a 100644 --- a/src/gui/application/RosegardenApplication.cpp +++ b/src/gui/application/RosegardenApplication.cpp @@ -92,7 +92,7 @@ bool RosegardenApplication::sequencerCall(TQCString dcopCall, TQCString& replyTy dcopCall, params, replyType, replyData, useEventLoop); } -void RosegardenApplication::sfxLoadExited(KProcess *proc) +void RosegardenApplication::sfxLoadExited(TDEProcess *proc) { if (!proc->normalExit()) { TQString configGroup = config()->group(); diff --git a/src/gui/application/RosegardenApplication.h b/src/gui/application/RosegardenApplication.h index 4fbda57..39f8044 100644 --- a/src/gui/application/RosegardenApplication.h +++ b/src/gui/application/RosegardenApplication.h @@ -32,7 +32,7 @@ class TQSessionManager; -class KProcess; +class TDEProcess; namespace Rosegarden @@ -81,7 +81,7 @@ signals: void aboutToSaveState(); public slots: - void sfxLoadExited(KProcess *proc); + void sfxLoadExited(TDEProcess *proc); void slotSetStatusMessage(TQString txt); protected: diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index 61544bf..1eb623f 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -745,7 +745,7 @@ void RosegardenGUIApp::setupActions() // Create the select icon // - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); @@ -1691,7 +1691,7 @@ RosegardenGUIApp::openFile(TQString filePath, ImportType type) if (kapp->config()->readBoolEntry("alwaysusedefaultstudio", false)) { TQString autoloadFile = - KGlobal::dirs()->findResource("appdata", "autoload.rg"); + TDEGlobal::dirs()->findResource("appdata", "autoload.rg"); TQFileInfo autoloadFileInfo(autoloadFile); if (autoloadFileInfo.isReadable()) { @@ -1897,7 +1897,7 @@ void RosegardenGUIApp::setupFileDialogSpeedbar() config->writeEntry(TQString("IconGroup_%1").arg(n), 4); config->writeEntry(TQString("Icon_%1").arg(n), "folder"); config->writeEntry(TQString("URL_%1").arg(n), - KGlobal::dirs()->findResource("appdata", "examples/")); + TDEGlobal::dirs()->findResource("appdata", "examples/")); RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl; @@ -2188,7 +2188,7 @@ void RosegardenGUIApp::slotFileOpen() // We haven't opened any files with this version of the // program before. Default to the examples directory. - TQString examplesDir = KGlobal::dirs()->findResource("appdata", "examples/"); + TQString examplesDir = TDEGlobal::dirs()->findResource("appdata", "examples/"); kapp->config()->setGroup("Recent Dirs"); TQString recentString = kapp->config()->readEntry("ROSEGARDEN", ""); kapp->config()->writeEntry @@ -3704,13 +3704,13 @@ void RosegardenGUIApp::slotImportProject() void RosegardenGUIApp::importProject(TQString filePath) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-project-package"; *proc << "--unpack"; *proc << filePath; KStartupLogo::hideIfStillThere(); - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { CurrentProgressDialog::freeze(); @@ -4640,16 +4640,16 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) if (useExisting) { if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); - m_sequencerProcess = (KProcess*)SequencerExternal; + m_sequencerProcess = (TDEProcess*)SequencerExternal; return true; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/killall"; *proc << "rosegardensequencer"; *proc << "lt-rosegardensequencer"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { RG_DEBUG << "couldn't kill any sequencer processes" << endl; @@ -4663,13 +4663,13 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) RG_DEBUG << "RosegardenGUIApp::launchSequencer() - " << "failed to kill existing sequencer\n"; - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/killall"; *proc << "-9"; *proc << "rosegardensequencer"; *proc << "lt-rosegardensequencer"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (proc->exitStatus()) { RG_DEBUG << "couldn't kill any sequencer processes" << endl; @@ -4686,7 +4686,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) KTmpStatusMsg msg(i18n("Starting the sequencer..."), this); if (!m_sequencerProcess) { - m_sequencerProcess = new KProcess; + m_sequencerProcess = new TDEProcess; (*m_sequencerProcess) << "rosegardensequencer"; @@ -4701,7 +4701,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) } } else { - RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer KProcess already created\n"; + RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer TDEProcess already created\n"; m_sequencerProcess->disconnect(); // disconnect processExit signal // it will be reconnected later on } @@ -4739,8 +4739,8 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) stateChanged("sequencer_running"); slotEnableTransport(true); - connect(m_sequencerProcess, TQT_SIGNAL(processExited(KProcess*)), - TQT_TQOBJECT(this), TQT_SLOT(slotSequencerExited(KProcess*))); + connect(m_sequencerProcess, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_TQOBJECT(this), TQT_SLOT(slotSequencerExited(TDEProcess*))); } catch (Exception e) { m_sequencerProcess = 0; @@ -4788,12 +4788,12 @@ bool RosegardenGUIApp::launchJack() emit startupStatusMessage(i18n("Clearing down jackd...")); - KProcess *proc = new KProcess; // TODO: do it in a less clumsy way + TDEProcess *proc = new TDEProcess; // TODO: do it in a less clumsy way *proc << "/usr/bin/killall"; *proc << "-9"; *proc << "jackd"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (proc->exitStatus()) RG_DEBUG << "couldn't kill any jackd processes" << endl; @@ -4813,7 +4813,7 @@ bool RosegardenGUIApp::launchJack() << splitCommand.size() << endl; // start jack process - m_jackProcess = new KProcess; + m_jackProcess = new TDEProcess; *m_jackProcess << splitCommand; @@ -4831,7 +4831,7 @@ void RosegardenGUIApp::slotDocumentDevicesResyncd() m_trackParameterBox->populateDeviceLists(); } -void RosegardenGUIApp::slotSequencerExited(KProcess*) +void RosegardenGUIApp::slotSequencerExited(TDEProcess*) { RG_DEBUG << "RosegardenGUIApp::slotSequencerExited Sequencer exited\n"; @@ -4877,13 +4877,13 @@ void RosegardenGUIApp::slotExportProject() return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-project-package"; *proc << "--pack"; *proc << rgFile; *proc << fileName; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName)); @@ -5015,7 +5015,7 @@ void RosegardenGUIApp::slotExportLilyPond() exportLilyPondFile(fileName); } -std::map<KProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap; +std::map<TDEProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap; void RosegardenGUIApp::slotPrintLilyPond() @@ -5031,15 +5031,15 @@ void RosegardenGUIApp::slotPrintLilyPond() if (!exportLilyPondFile(file->name(), true)) { return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-lilypondview"; *proc << "--graphical"; *proc << "--print"; *proc << file->name(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); } void RosegardenGUIApp::slotPreviewLilyPond() @@ -5055,18 +5055,18 @@ void RosegardenGUIApp::slotPreviewLilyPond() if (!exportLilyPondFile(file->name(), true)) { return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-lilypondview"; *proc << "--graphical"; *proc << "--pdf"; *proc << file->name(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); } -void RosegardenGUIApp::slotLilyPondViewProcessExited(KProcess *p) +void RosegardenGUIApp::slotLilyPondViewProcessExited(TDEProcess *p) { delete m_lilyTempFileMap[p]; m_lilyTempFileMap.erase(p); @@ -7568,11 +7568,11 @@ RosegardenGUIApp::slotTutorial() if( !exe.isNull() ) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "x-www-browser"; *proc << "http://rosegarden.sourceforge.net/tutorial/en/chapter-0.html"; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); proc->detach(); delete proc; } @@ -7590,11 +7590,11 @@ RosegardenGUIApp::slotBugGuidelines() if( !exe.isNull() ) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "x-www-browser"; *proc << "http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html"; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); proc->detach(); delete proc; } @@ -7771,7 +7771,7 @@ RosegardenGUIApp::slotImportDefaultStudio() return ; TQString autoloadFile = - KGlobal::dirs()->findResource("appdata", "autoload.rg"); + TDEGlobal::dirs()->findResource("appdata", "autoload.rg"); TQFileInfo autoloadFileInfo(autoloadFile); @@ -7789,7 +7789,7 @@ RosegardenGUIApp::slotImportStudio() { RG_DEBUG << "RosegardenGUIApp::slotImportStudio()\n"; - TQString studioDir = KGlobal::dirs()->findResource("appdata", "library/"); + TQString studioDir = TDEGlobal::dirs()->findResource("appdata", "library/"); TQDir dir(studioDir); if (!dir.exists()) { studioDir = ":ROSEGARDENDEVICE"; diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig index 45fa853..3e479ad 100644 --- a/src/gui/application/RosegardenGUIApp.cpp.orig +++ b/src/gui/application/RosegardenGUIApp.cpp.orig @@ -745,7 +745,7 @@ void RosegardenGUIApp::setupActions() // Create the select icon // - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); @@ -1691,7 +1691,7 @@ RosegardenGUIApp::openFile(TQString filePath, ImportType type) if (kapp->config()->readBoolEntry("alwaysusedefaultstudio", false)) { TQString autoloadFile = - KGlobal::dirs()->findResource("appdata", "autoload.rg"); + TDEGlobal::dirs()->findResource("appdata", "autoload.rg"); TQFileInfo autoloadFileInfo(autoloadFile); if (autoloadFileInfo.isReadable()) { @@ -1897,7 +1897,7 @@ void RosegardenGUIApp::setupFileDialogSpeedbar() config->writeEntry(TQString("IconGroup_%1").arg(n), 4); config->writeEntry(TQString("Icon_%1").arg(n), "folder"); config->writeEntry(TQString("URL_%1").arg(n), - KGlobal::dirs()->findResource("appdata", "examples/")); + TDEGlobal::dirs()->findResource("appdata", "examples/")); RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl; @@ -2188,7 +2188,7 @@ void RosegardenGUIApp::slotFileOpen() // We haven't opened any files with this version of the // program before. Default to the examples directory. - TQString examplesDir = KGlobal::dirs()->findResource("appdata", "examples/"); + TQString examplesDir = TDEGlobal::dirs()->findResource("appdata", "examples/"); kapp->config()->setGroup("Recent Dirs"); TQString recentString = kapp->config()->readEntry("ROSEGARDEN", ""); kapp->config()->writeEntry @@ -3704,13 +3704,13 @@ void RosegardenGUIApp::slotImportProject() void RosegardenGUIApp::importProject(TQString filePath) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-project-package"; *proc << "--unpack"; *proc << filePath; KStartupLogo::hideIfStillThere(); - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { CurrentProgressDialog::freeze(); @@ -4640,16 +4640,16 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) if (useExisting) { if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); - m_sequencerProcess = (KProcess*)SequencerExternal; + m_sequencerProcess = (TDEProcess*)SequencerExternal; return true; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/killall"; *proc << "rosegardensequencer"; *proc << "lt-rosegardensequencer"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { RG_DEBUG << "couldn't kill any sequencer processes" << endl; @@ -4663,13 +4663,13 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) RG_DEBUG << "RosegardenGUIApp::launchSequencer() - " << "failed to kill existing sequencer\n"; - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/killall"; *proc << "-9"; *proc << "rosegardensequencer"; *proc << "lt-rosegardensequencer"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (proc->exitStatus()) { RG_DEBUG << "couldn't kill any sequencer processes" << endl; @@ -4686,7 +4686,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) KTmpStatusMsg msg(i18n("Starting the sequencer..."), this); if (!m_sequencerProcess) { - m_sequencerProcess = new KProcess; + m_sequencerProcess = new TDEProcess; (*m_sequencerProcess) << "rosegardensequencer"; @@ -4701,7 +4701,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) } } else { - RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer KProcess already created\n"; + RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer TDEProcess already created\n"; m_sequencerProcess->disconnect(); // disconnect processExit signal // it will be reconnected later on } @@ -4739,8 +4739,8 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) stateChanged("sequencer_running"); slotEnableTransport(true); - connect(m_sequencerProcess, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotSequencerExited(KProcess*))); + connect(m_sequencerProcess, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotSequencerExited(TDEProcess*))); } catch (Exception e) { m_sequencerProcess = 0; @@ -4788,12 +4788,12 @@ bool RosegardenGUIApp::launchJack() emit startupStatusMessage(i18n("Clearing down jackd...")); - KProcess *proc = new KProcess; // TODO: do it in a less clumsy way + TDEProcess *proc = new TDEProcess; // TODO: do it in a less clumsy way *proc << "/usr/bin/killall"; *proc << "-9"; *proc << "jackd"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (proc->exitStatus()) RG_DEBUG << "couldn't kill any jackd processes" << endl; @@ -4813,7 +4813,7 @@ bool RosegardenGUIApp::launchJack() << splitCommand.size() << endl; // start jack process - m_jackProcess = new KProcess; + m_jackProcess = new TDEProcess; *m_jackProcess << splitCommand; @@ -4831,7 +4831,7 @@ void RosegardenGUIApp::slotDocumentDevicesResyncd() m_trackParameterBox->populateDeviceLists(); } -void RosegardenGUIApp::slotSequencerExited(KProcess*) +void RosegardenGUIApp::slotSequencerExited(TDEProcess*) { RG_DEBUG << "RosegardenGUIApp::slotSequencerExited Sequencer exited\n"; @@ -4877,13 +4877,13 @@ void RosegardenGUIApp::slotExportProject() return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-project-package"; *proc << "--pack"; *proc << rgFile; *proc << fileName; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName)); @@ -5015,7 +5015,7 @@ void RosegardenGUIApp::slotExportLilyPond() exportLilyPondFile(fileName); } -std::map<KProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap; +std::map<TDEProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap; void RosegardenGUIApp::slotPrintLilyPond() @@ -5031,15 +5031,15 @@ void RosegardenGUIApp::slotPrintLilyPond() if (!exportLilyPondFile(file->name(), true)) { return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-lilypondview"; *proc << "--graphical"; *proc << "--print"; *proc << file->name(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); } void RosegardenGUIApp::slotPreviewLilyPond() @@ -5055,18 +5055,18 @@ void RosegardenGUIApp::slotPreviewLilyPond() if (!exportLilyPondFile(file->name(), true)) { return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-lilypondview"; *proc << "--graphical"; *proc << "--pdf"; *proc << file->name(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); } -void RosegardenGUIApp::slotLilyPondViewProcessExited(KProcess *p) +void RosegardenGUIApp::slotLilyPondViewProcessExited(TDEProcess *p) { delete m_lilyTempFileMap[p]; m_lilyTempFileMap.erase(p); @@ -7741,7 +7741,7 @@ RosegardenGUIApp::slotImportDefaultStudio() return ; TQString autoloadFile = - KGlobal::dirs()->findResource("appdata", "autoload.rg"); + TDEGlobal::dirs()->findResource("appdata", "autoload.rg"); TQFileInfo autoloadFileInfo(autoloadFile); @@ -7759,7 +7759,7 @@ RosegardenGUIApp::slotImportStudio() { RG_DEBUG << "RosegardenGUIApp::slotImportStudio()\n"; - TQString studioDir = KGlobal::dirs()->findResource("appdata", "library/"); + TQString studioDir = TDEGlobal::dirs()->findResource("appdata", "library/"); TQDir dir(studioDir); if (!dir.exists()) { studioDir = ":ROSEGARDENDEVICE"; diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h index 23933ea..4e5cc34 100644 --- a/src/gui/application/RosegardenGUIApp.h +++ b/src/gui/application/RosegardenGUIApp.h @@ -52,7 +52,7 @@ class KURL; class KTempFile; class KToggleAction; class KRecentFilesAction; -class KProcess; +class TDEProcess; class KConfig; class KAction; @@ -674,7 +674,7 @@ public slots: */ void slotPrintLilyPond(); void slotPreviewLilyPond(); - void slotLilyPondViewProcessExited(KProcess *); + void slotLilyPondViewProcessExited(TDEProcess *); /** * Let the user enter a MusicXml file to export to @@ -1132,7 +1132,7 @@ public slots: /** * Called when the sequencer auxiliary process exits */ - void slotSequencerExited(KProcess*); + void slotSequencerExited(TDEProcess*); /// When the transport closes void slotCloseTransport(); @@ -1600,11 +1600,11 @@ private: KAction *m_rewindEndTransport; KAction *m_ffwdEndTransport; - KProcess* m_sequencerProcess; + TDEProcess* m_sequencerProcess; bool m_sequencerCheckedIn; #ifdef HAVE_LIBJACK - KProcess* m_jackProcess; + TDEProcess* m_jackProcess; #endif // HAVE_LIBJACK ZoomSlider<double> *m_zoomSlider; @@ -1663,7 +1663,7 @@ private: static RosegardenGUIApp *m_myself; - static std::map<KProcess *, KTempFile *> m_lilyTempFileMap; + static std::map<TDEProcess *, KTempFile *> m_lilyTempFileMap; // Used to fetch the current sequencer position from the mmapped sequencer information file // diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp index 8bda485..fdf7901 100644 --- a/src/gui/application/RosegardenGUIView.cpp +++ b/src/gui/application/RosegardenGUIView.cpp @@ -874,7 +874,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment) // Prepare the process // - KProcess *process = new KProcess(); + TDEProcess *process = new TDEProcess(); (*process) << splitCommand; (*process) << TQString(aF->getFilename().c_str()); diff --git a/src/gui/application/StartupTester.cpp b/src/gui/application/StartupTester.cpp index 74704e1..3a685c0 100644 --- a/src/gui/application/StartupTester.cpp +++ b/src/gui/application/StartupTester.cpp @@ -65,13 +65,13 @@ StartupTester::run() m_audioFileImporterMutex.lock(); m_ready = true; - KProcess *proc = new KProcess(); + TDEProcess *proc = new TDEProcess(); m_stdoutBuffer = ""; - TQObject::connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(stdoutReceived(KProcess *, char *, int))); + TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int))); *proc << "rosegarden-audiofile-importer"; *proc << "--conftest"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { RG_DEBUG << "StartupTester - No audio file importer available" << endl; m_haveAudioFileImporter = false; @@ -83,13 +83,13 @@ StartupTester::run() delete proc; m_audioFileImporterMutex.unlock(); - proc = new KProcess; + proc = new TDEProcess; m_stdoutBuffer = ""; - TQObject::connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(stdoutReceived(KProcess *, char *, int))); + TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int))); *proc << "rosegarden-project-package"; *proc << "--conftest"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { m_haveProjectPackager = false; // rosegarden-project-package ran but exited with an error code @@ -103,13 +103,13 @@ StartupTester::run() delete proc; m_projectPackagerMutex.unlock(); - proc = new KProcess(); + proc = new TDEProcess(); m_stdoutBuffer = ""; - TQObject::connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(stdoutReceived(KProcess *, char *, int))); + TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int))); *proc << "rosegarden-lilypondview"; *proc << "--conftest"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (!proc->normalExit() || proc->exitStatus()) { RG_DEBUG << "StartupTester - No lilypondview available" << endl; m_haveLilyPondView = false; @@ -145,7 +145,7 @@ StartupTester::isReady() } void -StartupTester::stdoutReceived(KProcess *, char *buffer, int len) +StartupTester::stdoutReceived(TDEProcess *, char *buffer, int len) { m_stdoutBuffer += TQString::fromLatin1(buffer, len); } diff --git a/src/gui/application/StartupTester.h b/src/gui/application/StartupTester.h index 8c74c5d..8c95f9e 100644 --- a/src/gui/application/StartupTester.h +++ b/src/gui/application/StartupTester.h @@ -32,7 +32,7 @@ #include <tqobject.h> #include <tqhttp.h> -class KProcess; +class TDEProcess; namespace Rosegarden { @@ -61,7 +61,7 @@ signals: void newerVersionAvailable(TQString); protected slots: - void stdoutReceived(KProcess *, char *, int); + void stdoutReceived(TDEProcess *, char *, int); void slotHttpResponseHeaderReceived(const TQHttpResponseHeader &); void slotHttpDone(bool); diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index c1aac43..a4ddfdf 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -509,7 +509,7 @@ int main(int argc, char *argv[]) // If there is no config setting for the startup window size, set // one now. But base the default on the appropriate desktop size // (i.e. not the entire desktop, if Xinerama is in use). This is - // obtained from KGlobalSettings::desktopGeometry(), but we can't + // obtained from TDEGlobalSettings::desktopGeometry(), but we can't // give it a meaningful point to measure from at this stage so we // always use the "leftmost" display (point 0,0). @@ -523,7 +523,7 @@ int main(int argc, char *argv[]) TQDesktopWidget *desktop = TDEApplication::desktop(); if (desktop) { TQRect totalRect(desktop->screenGeometry()); - TQRect desktopRect = KGlobalSettings::desktopGeometry(TQPoint(0, 0)); + TQRect desktopRect = TDEGlobalSettings::desktopGeometry(TQPoint(0, 0)); TQSize startupSize; if (desktopRect.height() <= 800) { startupSize = TQSize((desktopRect.width() * 6) / 7, @@ -659,12 +659,12 @@ int main(int argc, char *argv[]) TQString soundFontPath = config->readEntry("soundfontpath", ""); TQFileInfo sfxLoadInfo(sfxLoadPath), soundFontInfo(soundFontPath); if (sfxLoadInfo.isExecutable() && soundFontInfo.isReadable()) { - KProcess* sfxLoadProcess = new KProcess; + TDEProcess* sfxLoadProcess = new TDEProcess; (*sfxLoadProcess) << sfxLoadPath << soundFontPath; RG_DEBUG << "Starting sfxload : " << sfxLoadPath << " " << soundFontPath << endl; - TQObject::connect(sfxLoadProcess, TQT_SIGNAL(processExited(KProcess*)), - &app, TQT_SLOT(sfxLoadExited(KProcess*))); + TQObject::connect(sfxLoadProcess, TQT_SIGNAL(processExited(TDEProcess*)), + &app, TQT_SLOT(sfxLoadExited(TDEProcess*))); sfxLoadProcess->start(); } else { diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp index e9a0f7c..14e727d 100644 --- a/src/gui/dialogs/AudioManagerDialog.cpp +++ b/src/gui/dialogs/AudioManagerDialog.cpp @@ -126,7 +126,7 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent, m_wrongSampleRates = new TQLabel(i18n("* Some audio files are encoded at a sample rate different from that of the JACK audio server.\nRosegarden will play them at the correct speed, but they will sound terrible.\nPlease consider resampling such files externally, or adjusting the sample rate of the JACK server."), box); m_wrongSampleRates->hide(); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + 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), diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp index db00fdc..cbb3b56 100644 --- a/src/gui/dialogs/ConfigureDialog.cpp +++ b/src/gui/dialogs/ConfigureDialog.cpp @@ -45,7 +45,7 @@ namespace Rosegarden static TQPixmap loadIcon(const char *name) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString fileBase = pixmapDir + "/misc/"; fileBase += name; if (TQFile(fileBase + ".png").exists()) { @@ -53,7 +53,7 @@ static TQPixmap loadIcon(const char *name) } else if (TQFile(fileBase + ".xpm").exists()) { return TQPixmap(fileBase + ".xpm"); } - TQPixmap pmap = KGlobal::instance()->iconLoader() + TQPixmap pmap = TDEGlobal::instance()->iconLoader() ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); return pmap; } diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp index b235078..52d5e5f 100644 --- a/src/gui/dialogs/DocumentConfigureDialog.cpp +++ b/src/gui/dialogs/DocumentConfigureDialog.cpp @@ -43,7 +43,7 @@ namespace Rosegarden { static TQPixmap loadIcon(const char *name) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString fileBase = pixmapDir + "/misc/"; fileBase += name; if (TQFile(fileBase + ".png").exists()) { @@ -52,7 +52,7 @@ static TQPixmap loadIcon(const char *name) return TQPixmap(fileBase + ".xpm"); } - TQPixmap pmap = KGlobal::instance()->iconLoader() + TQPixmap pmap = TDEGlobal::instance()->iconLoader() ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); return pmap; } diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp index f8e1efb..4eda3fe 100644 --- a/src/gui/dialogs/LilyPondOptionsDialog.cpp +++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp @@ -135,8 +135,8 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyPaperSize->insertItem(i18n("Tabloid")); m_lilyPaperSize->insertItem(i18n("do not specify")); int defaultPaperSize = 1; // A4 - if (KGlobal::locale()->country() == "us" || - KGlobal::locale()->country() == "US") defaultPaperSize = 5; // Letter + if (TDEGlobal::locale()->country() == "us" || + TDEGlobal::locale()->country() == "US") defaultPaperSize = 5; // Letter m_lilyPaperSize->setCurrentItem(config->readUnsignedNumEntry ("lilypapersize", defaultPaperSize)); diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp index f3fdd70..af19b79 100644 --- a/src/gui/dialogs/TransportDialog.cpp +++ b/src/gui/dialogs/TransportDialog.cpp @@ -341,7 +341,7 @@ TransportDialog::loadPixmaps() { m_lcdList.clear(); TQString fileName; - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); for (int i = 0; i < 10; i++) { fileName = TQString("%1/transport/led-%2.xpm").arg(pixmapDir).arg(i); diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp index b1f7f87..c902a93 100644 --- a/src/gui/editors/eventlist/EventView.cpp +++ b/src/gui/editors/eventlist/EventView.cpp @@ -1117,7 +1117,7 @@ EventView::setupActions() { EditViewBase::setupActions("eventlist.rc"); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + 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), diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp index 1b7a4ed..accbcc5 100644 --- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp +++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp @@ -442,7 +442,7 @@ GuitarChordSelectorDialog::getAvailableChordFiles() std::vector<TQString> names; // Read config for default directory - TQStringList chordDictFiles = KGlobal::dirs()->findAllResources("appdata", "chords/*.xml"); + TQStringList chordDictFiles = TDEGlobal::dirs()->findAllResources("appdata", "chords/*.xml"); for(TQStringList::iterator i = chordDictFiles.begin(); i != chordDictFiles.end(); ++i) { NOTATION_DEBUG << "GuitarChordSelectorDialog::getAvailableChordFiles : adding file " << *i << endl; @@ -456,7 +456,7 @@ bool GuitarChordSelectorDialog::saveUserChordMap() { // Read config for user directory - TQString userDir = KGlobal::dirs()->saveLocation("appdata", "chords/"); + TQString userDir = TDEGlobal::dirs()->saveLocation("appdata", "chords/"); TQString userChordDictPath = userDir + "/user_chords.xml"; diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp index 9f60479..7edddfc 100644 --- a/src/gui/editors/matrix/MatrixEraser.cpp +++ b/src/gui/editors/matrix/MatrixEraser.cpp @@ -47,7 +47,7 @@ MatrixEraser::MatrixEraser(MatrixView* parent) : MatrixTool("MatrixEraser", parent), m_currentStaff(0) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp index cb604ba..4366ab3 100644 --- a/src/gui/editors/matrix/MatrixMover.cpp +++ b/src/gui/editors/matrix/MatrixMover.cpp @@ -60,7 +60,7 @@ MatrixMover::MatrixMover(MatrixView* parent) : m_currentStaff(0), m_lastPlayedPitch(-1) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp index 04048a7..18a4822 100644 --- a/src/gui/editors/matrix/MatrixPainter.cpp +++ b/src/gui/editors/matrix/MatrixPainter.cpp @@ -58,7 +58,7 @@ MatrixPainter::MatrixPainter(MatrixView* parent) m_currentElement(0), m_currentStaff(0) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp index 253f3c0..2335cd7 100644 --- a/src/gui/editors/matrix/MatrixResizer.cpp +++ b/src/gui/editors/matrix/MatrixResizer.cpp @@ -56,7 +56,7 @@ MatrixResizer::MatrixResizer(MatrixView* parent) m_currentElement(0), m_currentStaff(0) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp index 50a1692..5b3dd26 100644 --- a/src/gui/editors/matrix/MatrixSelector.cpp +++ b/src/gui/editors/matrix/MatrixSelector.cpp @@ -86,7 +86,7 @@ MatrixSelector::MatrixSelector(MatrixView* view) TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index a63ca0a..5f69a39 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -166,7 +166,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, { RG_DEBUG << "MatrixView ctor: drumMode " << drumMode << "\n"; - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/toolbar"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/toolbar"); TQPixmap matrixPixmap(pixmapDir + "/matrix.xpm"); m_dockLeft = createDockWidget("params dock", matrixPixmap, 0L, @@ -199,7 +199,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, if (m_config->readBoolEntry("backgroundtextures-1.6-plus", true)) { TQPixmap background; TQString pixmapDir = - KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); // We now use a lined background for the non-percussion matrix, // suggested and supplied by Alessandro Preziosi TQString backgroundPixmap = isDrumMode() ? "bg-paper-white.xpm" : "bg-matrix-lines.xpm"; @@ -635,7 +635,7 @@ void MatrixView::setupActions() // KRadioAction* toolAction = 0; - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm")); toolAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index 7c9f498..4a8fd00 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -511,7 +511,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_headersTopFrame = new TQFrame(getCentralWidget()); TQGridLayout * headersTopGrid = new TQGridLayout(m_headersTopFrame, 2, 2); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/misc/close.xpm"); TQPushButton * hideHeadersButton = new TQPushButton(m_headersTopFrame); @@ -1335,7 +1335,7 @@ void NotationView::positionPages() m_config->setGroup(NotationViewConfigGroup); if (m_config->readBoolEntry("backgroundtextures", true)) { TQString pixmapDir = - KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); if (background.load(TQString("%1/misc/bg-paper-cream.xpm"). arg(pixmapDir))) { haveBackground = true; @@ -1818,7 +1818,7 @@ void NotationView::setupActions() // int layoutMode = m_config->readNumEntry("layoutmode", 0); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm"); icon = TQIconSet(pixmap); @@ -2466,7 +2466,7 @@ void NotationView::setupActions() "clear_selection"); // TQString pixmapDir = - // KGlobal::dirs()->findResource("appdata", "pixmaps/"); + // TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotFilterSelection()), actionCollection(), @@ -4640,7 +4640,7 @@ NotationView::slotFilePrintPreview() printingView.print(true); } -std::map<KProcess *, KTempFile *> NotationView::m_lilyTempFileMap; +std::map<TDEProcess *, KTempFile *> NotationView::m_lilyTempFileMap; void NotationView::slotPrintLilyPond() { @@ -4655,15 +4655,15 @@ void NotationView::slotPrintLilyPond() if (!exportLilyPondFile(file->name(), true)) { return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-lilypondview"; *proc << "--graphical"; *proc << "--print"; *proc << file->name(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); } void NotationView::slotPreviewLilyPond() @@ -4679,18 +4679,18 @@ void NotationView::slotPreviewLilyPond() if (!exportLilyPondFile(file->name(), true)) { return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-lilypondview"; *proc << "--graphical"; *proc << "--pdf"; *proc << file->name(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); } -void NotationView::slotLilyPondViewProcessExited(KProcess *p) +void NotationView::slotLilyPondViewProcessExited(TDEProcess *p) { delete m_lilyTempFileMap[p]; m_lilyTempFileMap.erase(p); diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h index 861a523..56b39ae 100644 --- a/src/gui/editors/notation/NotationView.h +++ b/src/gui/editors/notation/NotationView.h @@ -366,7 +366,7 @@ public slots: */ void slotPrintLilyPond(); void slotPreviewLilyPond(); - void slotLilyPondViewProcessExited(KProcess *); + void slotLilyPondViewProcessExited(TDEProcess *); /** * put the marked text/object into the clipboard and remove it @@ -1115,7 +1115,7 @@ protected: bool m_printMode; int m_printSize; - static std::map<KProcess *, KTempFile *> m_lilyTempFileMap; + static std::map<TDEProcess *, KTempFile *> m_lilyTempFileMap; int m_showHeadersGroup; QDeferScrollView * m_headersGroupView; diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp index ec0a18f..20c3ba8 100644 --- a/src/gui/editors/notation/NoteFontFactory.cpp +++ b/src/gui/editors/notation/NoteFontFactory.cpp @@ -74,7 +74,7 @@ NoteFontFactory::getFontNames(bool forceRescan) NOTATION_DEBUG << "NoteFontFactory::getFontNames: No names available, rescanning..." << endl; TQString mappingDir = - KGlobal::dirs()->findResource("appdata", "fonts/mappings/"); + TDEGlobal::dirs()->findResource("appdata", "fonts/mappings/"); TQDir dir(mappingDir); if (!dir.exists()) { std::cerr << "NoteFontFactory::getFontNames: mapping directory \"" diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp index f82a263..3060375 100644 --- a/src/gui/editors/notation/NoteFontMap.cpp +++ b/src/gui/editors/notation/NoteFontMap.cpp @@ -52,7 +52,7 @@ NoteFontMap::NoteFontMap(std::string name) : m_errorString(i18n("unknown error")), m_ok(true) { - m_fontDirectory = KGlobal::dirs()->findResource("appdata", "fonts/"); + m_fontDirectory = TDEGlobal::dirs()->findResource("appdata", "fonts/"); TQString mapFileName; diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index 9103d4e..cb028c5 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -1931,7 +1931,7 @@ NotePixmapFactory::makeUnknownPixmap() TQCanvasPixmap* NotePixmapFactory::makeToolbarPixmap(const char *name, bool menuSize) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString fileBase = pixmapDir + "/toolbar/"; if (menuSize) fileBase += "menu-"; fileBase += name; diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp index 4303cc6..340a657 100644 --- a/src/gui/editors/notation/NoteStyleFactory.cpp +++ b/src/gui/editors/notation/NoteStyleFactory.cpp @@ -49,7 +49,7 @@ NoteStyleFactory::getAvailableStyleNames() { std::vector<NoteStyleName> names; - TQString styleDir = KGlobal::dirs()->findResource("appdata", "styles/"); + TQString styleDir = TDEGlobal::dirs()->findResource("appdata", "styles/"); TQDir dir(styleDir); if (!dir.exists()) { std::cerr << "NoteStyle::getAvailableStyleNames: directory \"" << styleDir.ascii() diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp index 10e5f13..d8a552f 100644 --- a/src/gui/editors/notation/NoteStyleFileReader.cpp +++ b/src/gui/editors/notation/NoteStyleFileReader.cpp @@ -45,7 +45,7 @@ NoteStyleFileReader::NoteStyleFileReader(std::string name) : m_haveNote(false) { TQString styleDirectory = - KGlobal::dirs()->findResource("appdata", "styles/"); + TDEGlobal::dirs()->findResource("appdata", "styles/"); TQString styleFileName = TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name)); diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp index bf98e58..e49a68f 100644 --- a/src/gui/editors/notation/SystemFont.cpp +++ b/src/gui/editors/notation/SystemFont.cpp @@ -71,7 +71,7 @@ SystemFont::loadSystemFont(const SystemFontSpec &spec) } if (!haveFcDirectory) { - TQString fontDir = KGlobal::dirs()->findResource("appdata", "fonts/"); + TQString fontDir = TDEGlobal::dirs()->findResource("appdata", "fonts/"); if (!FcConfigAppFontAddDir(FcConfigGetCurrent(), (const FcChar8 *)fontDir.latin1())) { NOTATION_DEBUG << "SystemFont::loadSystemFont[Xft]: Failed to add font directory " << fontDir << " to fontconfig, continuing without it" << endl; diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp index 20fb211..0f25aeb 100644 --- a/src/gui/editors/segment/MarkerEditor.cpp +++ b/src/gui/editors/segment/MarkerEditor.cpp @@ -387,7 +387,7 @@ MarkerEditor::setupActions() actionCollection(), KStdAction::stdName(KStdAction::Redo)); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); kapp->config()->setGroup(MarkerEditorConfigGroup); int timeMode = kapp->config()->readNumEntry("timemode", 0); diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp index 95d9cfc..90dae37 100644 --- a/src/gui/editors/segment/PlayList.cpp +++ b/src/gui/editors/segment/PlayList.cpp @@ -229,7 +229,7 @@ void PlayList::save() item = dynamic_cast<PlayListViewItem*>(item->nextSibling()); } - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs(kc, PlayListConfigGroup); kc->writeEntry("Playlist Files", urlList); @@ -238,7 +238,7 @@ void PlayList::save() void PlayList::restore() { - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); getListView()->restoreLayout(kc, PlayListConfigGroup); KConfigGroupSaver cs(kc, PlayListConfigGroup); diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp index 2d5a66d..e4eb458 100644 --- a/src/gui/editors/segment/TrackButtons.cpp +++ b/src/gui/editors/segment/TrackButtons.cpp @@ -644,7 +644,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i if (!havePixmaps) { TQString pixmapDir = - KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); connectedPixmap.load (TQString("%1/misc/connected.xpm").arg(pixmapDir)); diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp index 9eeb21b..cb8db68 100644 --- a/src/gui/editors/segment/TrackEditor.cpp +++ b/src/gui/editors/segment/TrackEditor.cpp @@ -174,7 +174,7 @@ TrackEditor::init(TQWidget* rosegardenguiview) kapp->config()->setGroup(GeneralOptionsConfigGroup); if (kapp->config()->readBoolEntry("backgroundtextures", true)) { TQPixmap background; - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); if (background.load(TQString("%1/misc/bg-segmentcanvas.xpm"). arg(pixmapDir))) { m_segmentCanvas->setBackgroundPixmap(background); diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp index 62fd06b..60dde0c 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.cpp +++ b/src/gui/editors/segment/TriggerSegmentManager.cpp @@ -382,7 +382,7 @@ TriggerSegmentManager::setupActions() m_closeButton->setText(close->text()); connect(m_closeButton, TQT_SIGNAL(released()), TQT_TQOBJECT(this), TQT_SLOT(slotClose())); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); // some adjustments new KToolBarPopupAction(i18n("Und&o"), diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp index 0569fd9..7d7346f 100644 --- a/src/gui/editors/tempo/TempoView.cpp +++ b/src/gui/editors/tempo/TempoView.cpp @@ -575,7 +575,7 @@ TempoView::setupActions() { EditViewBase::setupActions("tempoview.rc", false); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + 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), diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index 42655f8..c8e36eb 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -360,7 +360,7 @@ void EditView::addPropertyBox(TQWidget *w) void EditView::addControlRuler(ControlRuler* ruler) { ruler->setWorldMatrix(m_currentRulerZoomMatrix); - m_controlRulers->addTab(ruler, KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Small), + m_controlRulers->addTab(ruler, TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Small), ruler->getName()); m_controlRulers->showPage(ruler); @@ -723,7 +723,7 @@ EditView::setupActions() // // Tempo and time signature changes // - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-tempo.png"); TQIconSet icon = TQIconSet(pixmap); new KAction(AddTempoChangeCommand::getGlobalName(), diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp index 6f5cbfe..0795b5f 100644 --- a/src/gui/general/EditViewBase.cpp +++ b/src/gui/general/EditViewBase.cpp @@ -199,7 +199,7 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard) actionCollection(), KStdAction::stdName(KStdAction::Redo)); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp index 2c39256..9eb17ba 100644 --- a/src/gui/general/PresetGroup.cpp +++ b/src/gui/general/PresetGroup.cpp @@ -65,9 +65,9 @@ PresetGroup::PresetGroup() : m_amateur(false), m_pro(false) { - m_presetDirectory = KGlobal::dirs()->findResource("appdata", "presets/"); + m_presetDirectory = TDEGlobal::dirs()->findResource("appdata", "presets/"); - TQString language = KGlobal::locale()->language(); + TQString language = TDEGlobal::locale()->language(); TQString presetFileName = TQString("%1/presets-%2.xml") .arg(m_presetDirectory).arg(language); diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp index 6d385b5..f2c76a6 100644 --- a/src/gui/rulers/MarkerRuler.cpp +++ b/src/gui/rulers/MarkerRuler.cpp @@ -89,7 +89,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc, m_barFont = new TQFont(); m_barFont->setPointSize(10); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon; // Use the event insert, delete, edit icons because they are diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp index 30d6108..9a16467 100644 --- a/src/gui/rulers/TempoRuler.cpp +++ b/src/gui/rulers/TempoRuler.cpp @@ -120,7 +120,7 @@ TempoRuler::TempoRuler(RulerScale *rulerScale, (doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(update())); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon; icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png")); diff --git a/src/gui/seqmanager/CompositionMmapper.cpp b/src/gui/seqmanager/CompositionMmapper.cpp index 869e68c..543959d 100644 --- a/src/gui/seqmanager/CompositionMmapper.cpp +++ b/src/gui/seqmanager/CompositionMmapper.cpp @@ -87,7 +87,7 @@ void CompositionMmapper::cleanup() // Erase all 'segment_*' files // - TQString tmpPath = KGlobal::dirs()->resourceDirs("tmp").last(); + TQString tmpPath = TDEGlobal::dirs()->resourceDirs("tmp").last(); TQDir segmentsDir(tmpPath, "segment_*"); for (unsigned int i = 0; i < segmentsDir.count(); ++i) { @@ -144,7 +144,7 @@ void CompositionMmapper::mmapSegment(Segment* segment) TQString CompositionMmapper::makeFileName(Segment* segment) { - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs("tmp"); return TQString("%1/segment_%2") .arg(tmpDirs.last()) diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp index 2417c67..2d64c57 100644 --- a/src/gui/seqmanager/ControlBlockMmapper.cpp +++ b/src/gui/seqmanager/ControlBlockMmapper.cpp @@ -98,7 +98,7 @@ ControlBlockMmapper::~ControlBlockMmapper() TQString ControlBlockMmapper::createFileName() { - return KGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_control_block"; + return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_control_block"; } void ControlBlockMmapper::updateTrackData(Track *t) diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp index d9804cd..7002696 100644 --- a/src/gui/seqmanager/MetronomeMmapper.cpp +++ b/src/gui/seqmanager/MetronomeMmapper.cpp @@ -155,7 +155,7 @@ InstrumentId MetronomeMmapper::getMetronomeInstrument() TQString MetronomeMmapper::createFileName() { - return KGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_metronome"; + return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_metronome"; } void MetronomeMmapper::dump() diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp index b05a3d4..60981c9 100644 --- a/src/gui/seqmanager/SequenceManager.cpp +++ b/src/gui/seqmanager/SequenceManager.cpp @@ -241,7 +241,7 @@ SequenceManager::mapSequencer() try { m_sequencerMapper = new SequencerMapper( - KGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_sequencer_timing_block"); + TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_sequencer_timing_block"); } catch (Exception) { m_sequencerMapper = 0; } diff --git a/src/gui/seqmanager/SpecialSegmentMmapper.cpp b/src/gui/seqmanager/SpecialSegmentMmapper.cpp index ecd1e11..e556820 100644 --- a/src/gui/seqmanager/SpecialSegmentMmapper.cpp +++ b/src/gui/seqmanager/SpecialSegmentMmapper.cpp @@ -45,7 +45,7 @@ SpecialSegmentMmapper::SpecialSegmentMmapper(RosegardenGUIDoc* doc, TQString SpecialSegmentMmapper::createFileName(TQString baseFileName) { - return KGlobal::dirs()->resourceDirs("tmp").last() + "/" + baseFileName; + return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/" + baseFileName; } unsigned int SpecialSegmentMmapper::getSegmentRepeatCount() diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp index 24a35c9..c0d3994 100644 --- a/src/gui/studio/AudioMixerWindow.cpp +++ b/src/gui/studio/AudioMixerWindow.cpp @@ -267,7 +267,7 @@ AudioMixerWindow::populate() InstrumentList instruments = m_studio->getPresentationInstruments(); BussList busses = m_studio->getBusses(); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir)); m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir)); diff --git a/src/gui/studio/AudioPluginOSCGUI.cpp b/src/gui/studio/AudioPluginOSCGUI.cpp index 857a454..dab0aa5 100644 --- a/src/gui/studio/AudioPluginOSCGUI.cpp +++ b/src/gui/studio/AudioPluginOSCGUI.cpp @@ -61,7 +61,7 @@ AudioPluginOSCGUI::AudioPluginOSCGUI(AudioPluginInstance *instance, // arguments: osc url, dll name, label, instance tag - m_gui = new KProcess(); + m_gui = new TDEProcess(); *m_gui << filePath << m_serverUrl @@ -73,7 +73,7 @@ AudioPluginOSCGUI::AudioPluginOSCGUI(AudioPluginInstance *instance, << filePath << " " << m_serverUrl << " " << soInfo.fileName() << " " << label << " " << friendlyName << endl; - if (!m_gui->start(KProcess::NotifyOnExit, KProcess::NoCommunication)) { + if (!m_gui->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication)) { RG_DEBUG << "AudioPluginOSCGUI::AudioPluginOSCGUI: Couldn't start process " << filePath << endl; delete m_gui; m_gui = 0; diff --git a/src/gui/studio/AudioPluginOSCGUI.h b/src/gui/studio/AudioPluginOSCGUI.h index 950feb1..66a8fe1 100644 --- a/src/gui/studio/AudioPluginOSCGUI.h +++ b/src/gui/studio/AudioPluginOSCGUI.h @@ -33,7 +33,7 @@ #include <tqstring.h> -class KProcess; +class TDEProcess; namespace Rosegarden @@ -61,7 +61,7 @@ public: static TQString getGUIFilePath(TQString identifier); protected: - KProcess *m_gui; + TDEProcess *m_gui; lo_address m_address; TQString m_basePath; TQString m_serverUrl; diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp index eb2ae52..8c0b885 100644 --- a/src/gui/studio/BankEditorDialog.cpp +++ b/src/gui/studio/BankEditorDialog.cpp @@ -1462,7 +1462,7 @@ BankEditorDialog::getCommandHistory() void BankEditorDialog::slotImport() { - TQString deviceDir = KGlobal::dirs()->findResource("appdata", "library/"); + TQString deviceDir = TDEGlobal::dirs()->findResource("appdata", "library/"); TQDir dir(deviceDir); if (!dir.exists()) { deviceDir = ":ROSEGARDENDEVICE"; diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp index d426994..4f85d2a 100644 --- a/src/gui/studio/DeviceManagerDialog.cpp +++ b/src/gui/studio/DeviceManagerDialog.cpp @@ -689,7 +689,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, if (id == Device::NO_DEVICE) return ; - TQString deviceDir = KGlobal::dirs()->findResource("appdata", "library/"); + TQString deviceDir = TDEGlobal::dirs()->findResource("appdata", "library/"); TQDir dir(deviceDir); if (!dir.exists()) { deviceDir = ":ROSEGARDENDEVICE"; diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp index 735260a..64a9e02 100644 --- a/src/gui/studio/MidiProgramsEditor.cpp +++ b/src/gui/studio/MidiProgramsEditor.cpp @@ -222,7 +222,7 @@ MidiProgramsEditor::populate(TQListViewItem* item) ProgramList::iterator it; TQPixmap noKeyPixmap, keyPixmap; - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString file = pixmapDir + "/toolbar/key-white.png"; if (TQFile(file).exists()) noKeyPixmap = TQPixmap(file); @@ -521,7 +521,7 @@ MidiProgramsEditor::slotEntryMenuItemSelected(int i) } m_device->setKeyMappingForProgram(*program, newMapping); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); bool haveKeyMappings = (m_device->getKeyMappings().size() > 0); TQPushButton *btn = getEntryButton(m_currentMenuProgram); diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp index cda327f..d349543 100644 --- a/src/gui/studio/NameSetEditor.cpp +++ b/src/gui/studio/NameSetEditor.cpp @@ -129,7 +129,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor, KLineEdit* lineEdit = new KLineEdit(numBox, numberText.ascii()); lineEdit->setMinimumWidth(110); - lineEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + lineEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); lineEdit->setCompletionObject(&m_completion); m_names.push_back(lineEdit); diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp index 7410c88..3313a79 100644 --- a/src/gui/widgets/AudioFaderBox.cpp +++ b/src/gui/widgets/AudioFaderBox.cpp @@ -115,7 +115,7 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent, m_fader->setOutlineColour(GUIPalette::getColour(GUIPalette::PlaybackFaderOutline)); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir)); m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir)); diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp index 7889a78..3d350dd 100644 --- a/src/gui/widgets/CollapsingFrame.cpp +++ b/src/gui/widgets/CollapsingFrame.cpp @@ -60,7 +60,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n font.setBold(true); m_toggleButton->setFont(font); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQPixmap pixmap(pixmapDir + "/misc/arrow-expanded.png"); m_toggleButton->setIconSet(pixmap); @@ -122,7 +122,7 @@ CollapsingFrame::toggle() m_widget->setShown(!m_collapsed); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQPixmap pixmap; if (m_collapsed) { diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp index ceeddf6..3acca16 100644 --- a/src/sequencer/RosegardenSequencerApp.cpp +++ b/src/sequencer/RosegardenSequencerApp.cpp @@ -77,7 +77,7 @@ RosegardenSequencerApp::RosegardenSequencerApp() : m_loopStart(0, 0), m_loopEnd(0, 0), m_studio(new MappedStudio()), - m_segmentFilesPath(KGlobal::dirs()->resourceDirs("tmp").last()), + m_segmentFilesPath(TDEGlobal::dirs()->resourceDirs("tmp").last()), m_metaIterator(0), m_controlBlockMmapper(0), m_transportToken(1), @@ -567,7 +567,7 @@ RosegardenSequencerApp::processAsynchronousEvents() lastCheckedAt = tv; try { - m_controlBlockMmapper = new ControlBlockMmapper(KGlobal::dirs()->resourceDirs("tmp").last() + m_controlBlockMmapper = new ControlBlockMmapper(TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_control_block"); } catch (Exception e) { // Assume that the control block simply hasn't been @@ -839,7 +839,7 @@ RosegardenSequencerApp::play(const RealTime &time, mmapSegment(m_segmentFilesPath + "/" + segmentsDir[i]); } - TQString tmpDir = KGlobal::dirs()->resourceDirs("tmp").last(); + TQString tmpDir = TDEGlobal::dirs()->resourceDirs("tmp").last(); // Map metronome // diff --git a/src/sequencer/SequencerMmapper.cpp b/src/sequencer/SequencerMmapper.cpp index 0a7e487..80ed6a2 100644 --- a/src/sequencer/SequencerMmapper.cpp +++ b/src/sequencer/SequencerMmapper.cpp @@ -138,7 +138,7 @@ SequencerMmapper::setFileSize(size_t size) TQString SequencerMmapper::createFileName() { - return KGlobal::dirs()->resourceDirs("tmp").last() + + return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_sequencer_timing_block"; } diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp index 10d6474..a1e51dc 100644 --- a/src/sound/AudioFileManager.cpp +++ b/src/sound/AudioFileManager.cpp @@ -684,7 +684,7 @@ bool AudioFileManager::fileNeedsConversion(const std::string &fileName, int sampleRate) { - KProcess *proc = new KProcess(); + TDEProcess *proc = new TDEProcess(); *proc << "rosegarden-audiofile-importer"; if (sampleRate > 0) { *proc << "-r"; @@ -693,7 +693,7 @@ AudioFileManager::fileNeedsConversion(const std::string &fileName, *proc << "-w"; *proc << fileName.c_str(); - proc->start(KProcess::Block, KProcess::NoCommunication); + proc->start(TDEProcess::Block, TDEProcess::NoCommunication); int es = proc->exitStatus(); delete proc; @@ -711,7 +711,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate) std::cerr << "AudioFileManager::importFile("<< fileName << ", " << sampleRate << ")" << std::endl; - KProcess *proc = new KProcess(); + TDEProcess *proc = new TDEProcess(); *proc << "rosegarden-audiofile-importer"; if (sampleRate > 0) { *proc << "-r"; @@ -720,7 +720,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate) *proc << "-w"; *proc << fileName.c_str(); - proc->start(KProcess::Block, KProcess::NoCommunication); + proc->start(TDEProcess::Block, TDEProcess::NoCommunication); int es = proc->exitStatus(); delete proc; @@ -763,7 +763,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate) } } - m_importProcess = new KProcess; + m_importProcess = new TDEProcess; *m_importProcess << "rosegarden-audiofile-importer"; if (sampleRate > 0) { @@ -774,7 +774,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate) *m_importProcess << fileName.c_str(); *m_importProcess << (m_audioPath.c_str() + targetName); - m_importProcess->start(KProcess::NotifyOnExit, KProcess::NoCommunication); + m_importProcess->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication); while (m_importProcess->isRunning()) { kapp->processEvents(100); diff --git a/src/sound/AudioFileManager.h b/src/sound/AudioFileManager.h index c129ad3..1de9588 100644 --- a/src/sound/AudioFileManager.h +++ b/src/sound/AudioFileManager.h @@ -51,7 +51,7 @@ // is not (and should not be) used elsewhere within the // sound or sequencer libraries. -class KProcess; +class TDEProcess; namespace Rosegarden { @@ -318,7 +318,7 @@ private: std::set<AudioFile *> m_recordedAudioFiles; std::set<AudioFile *> m_derivedAudioFiles; - KProcess *m_importProcess; + TDEProcess *m_importProcess; int m_expectedSampleRate; }; diff --git a/src/sound/MappedEvent.cpp b/src/sound/MappedEvent.cpp index 4bae51e..6a3a86a 100644 --- a/src/sound/MappedEvent.cpp +++ b/src/sound/MappedEvent.cpp @@ -390,7 +390,7 @@ protected: }; DataBlockFile::DataBlockFile(DataBlockRepository::blockid id) - : m_fileName(KGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").arg(id)), + : m_fileName(TDEGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").arg(id)), m_file(m_fileName), m_cleared(false) { @@ -564,7 +564,7 @@ void DataBlockRepository::clear() // Erase all 'datablock_*' files // - TQString tmpPath = KGlobal::dirs()->resourceDirs("tmp").first(); + TQString tmpPath = TDEGlobal::dirs()->resourceDirs("tmp").first(); TQDir segmentsDir(tmpPath, "rosegarden_datablock_*"); for (unsigned int i = 0; i < segmentsDir.count(); ++i) { |