diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:42 -0600 |
commit | 59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (patch) | |
tree | 3c5878d4255116c6146b38687214acf355eb7564 /src/gui/application | |
parent | c329cc4e7edb85184878ba8238c4344cbaba2ac0 (diff) | |
download | rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.tar.gz rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/application')
-rw-r--r-- | src/gui/application/RosegardenApplication.cpp | 2 | ||||
-rw-r--r-- | src/gui/application/RosegardenApplication.h | 4 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp | 74 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp.orig | 66 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIApp.h | 12 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIView.cpp | 2 | ||||
-rw-r--r-- | src/gui/application/StartupTester.cpp | 26 | ||||
-rw-r--r-- | src/gui/application/StartupTester.h | 4 | ||||
-rw-r--r-- | src/gui/application/main.cpp | 10 |
9 files changed, 100 insertions, 100 deletions
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 { |