TDE
/
rosegarden
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/rosegarden
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent c329cc4e7e
commit 59ff04ffaf
61 changed files with 191 additions and 191 deletions
Show Stats Download Patch File Download Diff File

6
src/document/RosegardenGUIDoc.cpp
Unescape View File

@ -545,7 +545,7 @@ void RosegardenGUIDoc::newDocument()
void RosegardenGUIDoc::performAutoload() void RosegardenGUIDoc::performAutoload()
{ {
TQString autoloadFile = TQString autoloadFile =
KGlobal::dirs()->findResource("appdata", "autoload.rg"); TDEGlobal::dirs()->findResource("appdata", "autoload.rg");
TQFileInfo autoloadFileInfo(autoloadFile); TQFileInfo autoloadFileInfo(autoloadFile);
@ -2305,12 +2305,12 @@ RosegardenGUIDoc::syncDevices()
if (isSequencerRunning() && !rgapp->isSequencerRegistered() && timeout == 0) { if (isSequencerRunning() && !rgapp->isSequencerRegistered() && timeout == 0) {
// Give up, kill sequencer if possible, and report // Give up, kill sequencer if possible, and report
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "/usr/bin/killall"; *proc << "/usr/bin/killall";
*proc << "rosegardensequencer"; *proc << "rosegardensequencer";
*proc << "lt-rosegardensequencer"; *proc << "lt-rosegardensequencer";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (proc->exitStatus()) { if (proc->exitStatus()) {
RG_DEBUG << "couldn't kill any sequencer processes" << endl; RG_DEBUG << "couldn't kill any sequencer processes" << endl;

2
src/gui/application/RosegardenApplication.cpp
Unescape View File

@ -92,7 +92,7 @@ bool RosegardenApplication::sequencerCall(TQCString dcopCall, TQCString& replyTy
dcopCall, params, replyType, replyData, useEventLoop); dcopCall, params, replyType, replyData, useEventLoop);
} }
void RosegardenApplication::sfxLoadExited(KProcess *proc) void RosegardenApplication::sfxLoadExited(TDEProcess *proc)
{ {
if (!proc->normalExit()) { if (!proc->normalExit()) {
TQString configGroup = config()->group(); TQString configGroup = config()->group();

4
src/gui/application/RosegardenApplication.h
Unescape View File

@ -32,7 +32,7 @@
class TQSessionManager; class TQSessionManager;
class KProcess; class TDEProcess;
namespace Rosegarden namespace Rosegarden
@ -81,7 +81,7 @@ signals:
void aboutToSaveState(); void aboutToSaveState();
public slots: public slots:
void sfxLoadExited(KProcess *proc); void sfxLoadExited(TDEProcess *proc);
void slotSetStatusMessage(TQString txt); void slotSetStatusMessage(TQString txt);
protected: protected:

74
src/gui/application/RosegardenGUIApp.cpp
Unescape View File

@ -745,7 +745,7 @@ void RosegardenGUIApp::setupActions()
// Create the select icon // Create the select icon
// //
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);
@ -1691,7 +1691,7 @@ RosegardenGUIApp::openFile(TQString filePath, ImportType type)
if (kapp->config()->readBoolEntry("alwaysusedefaultstudio", false)) { if (kapp->config()->readBoolEntry("alwaysusedefaultstudio", false)) {
TQString autoloadFile = TQString autoloadFile =
KGlobal::dirs()->findResource("appdata", "autoload.rg"); TDEGlobal::dirs()->findResource("appdata", "autoload.rg");
TQFileInfo autoloadFileInfo(autoloadFile); TQFileInfo autoloadFileInfo(autoloadFile);
if (autoloadFileInfo.isReadable()) { if (autoloadFileInfo.isReadable()) {
@ -1897,7 +1897,7 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
config->writeEntry(TQString("IconGroup_%1").arg(n), 4); config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
config->writeEntry(TQString("Icon_%1").arg(n), "folder"); config->writeEntry(TQString("Icon_%1").arg(n), "folder");
config->writeEntry(TQString("URL_%1").arg(n), 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; 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 // We haven't opened any files with this version of the
// program before. Default to the examples directory. // 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"); kapp->config()->setGroup("Recent Dirs");
TQString recentString = kapp->config()->readEntry("ROSEGARDEN", ""); TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
kapp->config()->writeEntry kapp->config()->writeEntry
@ -3704,13 +3704,13 @@ void RosegardenGUIApp::slotImportProject()
void RosegardenGUIApp::importProject(TQString filePath) void RosegardenGUIApp::importProject(TQString filePath)
{ {
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-project-package"; *proc << "rosegarden-project-package";
*proc << "--unpack"; *proc << "--unpack";
*proc << filePath; *proc << filePath;
KStartupLogo::hideIfStillThere(); KStartupLogo::hideIfStillThere();
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
CurrentProgressDialog::freeze(); CurrentProgressDialog::freeze();
@ -4640,16 +4640,16 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
if (useExisting) { if (useExisting) {
if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
m_sequencerProcess = (KProcess*)SequencerExternal; m_sequencerProcess = (TDEProcess*)SequencerExternal;
return true; return true;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "/usr/bin/killall"; *proc << "/usr/bin/killall";
*proc << "rosegardensequencer"; *proc << "rosegardensequencer";
*proc << "lt-rosegardensequencer"; *proc << "lt-rosegardensequencer";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
RG_DEBUG << "couldn't kill any sequencer processes" << endl; RG_DEBUG << "couldn't kill any sequencer processes" << endl;
@ -4663,13 +4663,13 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
RG_DEBUG << "RosegardenGUIApp::launchSequencer() - " RG_DEBUG << "RosegardenGUIApp::launchSequencer() - "
<< "failed to kill existing sequencer\n"; << "failed to kill existing sequencer\n";
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "/usr/bin/killall"; *proc << "/usr/bin/killall";
*proc << "-9"; *proc << "-9";
*proc << "rosegardensequencer"; *proc << "rosegardensequencer";
*proc << "lt-rosegardensequencer"; *proc << "lt-rosegardensequencer";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (proc->exitStatus()) { if (proc->exitStatus()) {
RG_DEBUG << "couldn't kill any sequencer processes" << endl; 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); KTmpStatusMsg msg(i18n("Starting the sequencer..."), this);
if (!m_sequencerProcess) { if (!m_sequencerProcess) {
m_sequencerProcess = new KProcess; m_sequencerProcess = new TDEProcess;
(*m_sequencerProcess) << "rosegardensequencer"; (*m_sequencerProcess) << "rosegardensequencer";
@ -4701,7 +4701,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
} }
} else { } 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 m_sequencerProcess->disconnect(); // disconnect processExit signal
// it will be reconnected later on // it will be reconnected later on
} }
@ -4739,8 +4739,8 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
stateChanged("sequencer_running"); stateChanged("sequencer_running");
slotEnableTransport(true); slotEnableTransport(true);
connect(m_sequencerProcess, TQT_SIGNAL(processExited(KProcess*)), connect(m_sequencerProcess, TQT_SIGNAL(processExited(TDEProcess*)),
TQT_TQOBJECT(this), TQT_SLOT(slotSequencerExited(KProcess*))); TQT_TQOBJECT(this), TQT_SLOT(slotSequencerExited(TDEProcess*)));
} catch (Exception e) { } catch (Exception e) {
m_sequencerProcess = 0; m_sequencerProcess = 0;
@ -4788,12 +4788,12 @@ bool RosegardenGUIApp::launchJack()
emit startupStatusMessage(i18n("Clearing down jackd...")); 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 << "/usr/bin/killall";
*proc << "-9"; *proc << "-9";
*proc << "jackd"; *proc << "jackd";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (proc->exitStatus()) if (proc->exitStatus())
RG_DEBUG << "couldn't kill any jackd processes" << endl; RG_DEBUG << "couldn't kill any jackd processes" << endl;
@ -4813,7 +4813,7 @@ bool RosegardenGUIApp::launchJack()
<< splitCommand.size() << endl; << splitCommand.size() << endl;
// start jack process // start jack process
m_jackProcess = new KProcess; m_jackProcess = new TDEProcess;
*m_jackProcess << splitCommand; *m_jackProcess << splitCommand;
@ -4831,7 +4831,7 @@ void RosegardenGUIApp::slotDocumentDevicesResyncd()
m_trackParameterBox->populateDeviceLists(); m_trackParameterBox->populateDeviceLists();
} }
void RosegardenGUIApp::slotSequencerExited(KProcess*) void RosegardenGUIApp::slotSequencerExited(TDEProcess*)
{ {
RG_DEBUG << "RosegardenGUIApp::slotSequencerExited Sequencer exited\n"; RG_DEBUG << "RosegardenGUIApp::slotSequencerExited Sequencer exited\n";
@ -4877,13 +4877,13 @@ void RosegardenGUIApp::slotExportProject()
return ; return ;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-project-package"; *proc << "rosegarden-project-package";
*proc << "--pack"; *proc << "--pack";
*proc << rgFile; *proc << rgFile;
*proc << fileName; *proc << fileName;
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName)); KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
@ -5015,7 +5015,7 @@ void RosegardenGUIApp::slotExportLilyPond()
exportLilyPondFile(fileName); exportLilyPondFile(fileName);
} }
std::map<KProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap; std::map<TDEProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap;
void RosegardenGUIApp::slotPrintLilyPond() void RosegardenGUIApp::slotPrintLilyPond()
@ -5031,15 +5031,15 @@ void RosegardenGUIApp::slotPrintLilyPond()
if (!exportLilyPondFile(file->name(), true)) { if (!exportLilyPondFile(file->name(), true)) {
return ; return ;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-lilypondview"; *proc << "rosegarden-lilypondview";
*proc << "--graphical"; *proc << "--graphical";
*proc << "--print"; *proc << "--print";
*proc << file->name(); *proc << file->name();
connect(proc, TQT_SIGNAL(processExited(KProcess *)), connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file; m_lilyTempFileMap[proc] = file;
proc->start(KProcess::NotifyOnExit); proc->start(TDEProcess::NotifyOnExit);
} }
void RosegardenGUIApp::slotPreviewLilyPond() void RosegardenGUIApp::slotPreviewLilyPond()
@ -5055,18 +5055,18 @@ void RosegardenGUIApp::slotPreviewLilyPond()
if (!exportLilyPondFile(file->name(), true)) { if (!exportLilyPondFile(file->name(), true)) {
return ; return ;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-lilypondview"; *proc << "rosegarden-lilypondview";
*proc << "--graphical"; *proc << "--graphical";
*proc << "--pdf"; *proc << "--pdf";
*proc << file->name(); *proc << file->name();
connect(proc, TQT_SIGNAL(processExited(KProcess *)), connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file; 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]; delete m_lilyTempFileMap[p];
m_lilyTempFileMap.erase(p); m_lilyTempFileMap.erase(p);
@ -7568,11 +7568,11 @@ RosegardenGUIApp::slotTutorial()
if( !exe.isNull() ) if( !exe.isNull() )
{ {
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "x-www-browser"; *proc << "x-www-browser";
*proc << "http://rosegarden.sourceforge.net/tutorial/en/chapter-0.html"; *proc << "http://rosegarden.sourceforge.net/tutorial/en/chapter-0.html";
proc->start(KProcess::DontCare); proc->start(TDEProcess::DontCare);
proc->detach(); proc->detach();
delete proc; delete proc;
} }
@ -7590,11 +7590,11 @@ RosegardenGUIApp::slotBugGuidelines()
if( !exe.isNull() ) if( !exe.isNull() )
{ {
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "x-www-browser"; *proc << "x-www-browser";
*proc << "http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html"; *proc << "http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html";
proc->start(KProcess::DontCare); proc->start(TDEProcess::DontCare);
proc->detach(); proc->detach();
delete proc; delete proc;
} }
@ -7771,7 +7771,7 @@ RosegardenGUIApp::slotImportDefaultStudio()
return ; return ;
TQString autoloadFile = TQString autoloadFile =
KGlobal::dirs()->findResource("appdata", "autoload.rg"); TDEGlobal::dirs()->findResource("appdata", "autoload.rg");
TQFileInfo autoloadFileInfo(autoloadFile); TQFileInfo autoloadFileInfo(autoloadFile);
@ -7789,7 +7789,7 @@ RosegardenGUIApp::slotImportStudio()
{ {
RG_DEBUG << "RosegardenGUIApp::slotImportStudio()\n"; RG_DEBUG << "RosegardenGUIApp::slotImportStudio()\n";
TQString studioDir = KGlobal::dirs()->findResource("appdata", "library/"); TQString studioDir = TDEGlobal::dirs()->findResource("appdata", "library/");
TQDir dir(studioDir); TQDir dir(studioDir);
if (!dir.exists()) { if (!dir.exists()) {
studioDir = ":ROSEGARDENDEVICE"; studioDir = ":ROSEGARDENDEVICE";

66
src/gui/application/RosegardenGUIApp.cpp.orig
Unescape View File

@ -745,7 +745,7 @@ void RosegardenGUIApp::setupActions()
// Create the select icon // Create the select icon
// //
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);
@ -1691,7 +1691,7 @@ RosegardenGUIApp::openFile(TQString filePath, ImportType type)
if (kapp->config()->readBoolEntry("alwaysusedefaultstudio", false)) { if (kapp->config()->readBoolEntry("alwaysusedefaultstudio", false)) {
TQString autoloadFile = TQString autoloadFile =
KGlobal::dirs()->findResource("appdata", "autoload.rg"); TDEGlobal::dirs()->findResource("appdata", "autoload.rg");
TQFileInfo autoloadFileInfo(autoloadFile); TQFileInfo autoloadFileInfo(autoloadFile);
if (autoloadFileInfo.isReadable()) { if (autoloadFileInfo.isReadable()) {
@ -1897,7 +1897,7 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
config->writeEntry(TQString("IconGroup_%1").arg(n), 4); config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
config->writeEntry(TQString("Icon_%1").arg(n), "folder"); config->writeEntry(TQString("Icon_%1").arg(n), "folder");
config->writeEntry(TQString("URL_%1").arg(n), 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; 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 // We haven't opened any files with this version of the
// program before. Default to the examples directory. // 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"); kapp->config()->setGroup("Recent Dirs");
TQString recentString = kapp->config()->readEntry("ROSEGARDEN", ""); TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
kapp->config()->writeEntry kapp->config()->writeEntry
@ -3704,13 +3704,13 @@ void RosegardenGUIApp::slotImportProject()
void RosegardenGUIApp::importProject(TQString filePath) void RosegardenGUIApp::importProject(TQString filePath)
{ {
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-project-package"; *proc << "rosegarden-project-package";
*proc << "--unpack"; *proc << "--unpack";
*proc << filePath; *proc << filePath;
KStartupLogo::hideIfStillThere(); KStartupLogo::hideIfStillThere();
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
CurrentProgressDialog::freeze(); CurrentProgressDialog::freeze();
@ -4640,16 +4640,16 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
if (useExisting) { if (useExisting) {
if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
m_sequencerProcess = (KProcess*)SequencerExternal; m_sequencerProcess = (TDEProcess*)SequencerExternal;
return true; return true;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "/usr/bin/killall"; *proc << "/usr/bin/killall";
*proc << "rosegardensequencer"; *proc << "rosegardensequencer";
*proc << "lt-rosegardensequencer"; *proc << "lt-rosegardensequencer";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
RG_DEBUG << "couldn't kill any sequencer processes" << endl; RG_DEBUG << "couldn't kill any sequencer processes" << endl;
@ -4663,13 +4663,13 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
RG_DEBUG << "RosegardenGUIApp::launchSequencer() - " RG_DEBUG << "RosegardenGUIApp::launchSequencer() - "
<< "failed to kill existing sequencer\n"; << "failed to kill existing sequencer\n";
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "/usr/bin/killall"; *proc << "/usr/bin/killall";
*proc << "-9"; *proc << "-9";
*proc << "rosegardensequencer"; *proc << "rosegardensequencer";
*proc << "lt-rosegardensequencer"; *proc << "lt-rosegardensequencer";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (proc->exitStatus()) { if (proc->exitStatus()) {
RG_DEBUG << "couldn't kill any sequencer processes" << endl; 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); KTmpStatusMsg msg(i18n("Starting the sequencer..."), this);
if (!m_sequencerProcess) { if (!m_sequencerProcess) {
m_sequencerProcess = new KProcess; m_sequencerProcess = new TDEProcess;
(*m_sequencerProcess) << "rosegardensequencer"; (*m_sequencerProcess) << "rosegardensequencer";
@ -4701,7 +4701,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
} }
} else { } 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 m_sequencerProcess->disconnect(); // disconnect processExit signal
// it will be reconnected later on // it will be reconnected later on
} }
@ -4739,8 +4739,8 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
stateChanged("sequencer_running"); stateChanged("sequencer_running");
slotEnableTransport(true); slotEnableTransport(true);
connect(m_sequencerProcess, TQT_SIGNAL(processExited(KProcess*)), connect(m_sequencerProcess, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotSequencerExited(KProcess*))); this, TQT_SLOT(slotSequencerExited(TDEProcess*)));
} catch (Exception e) { } catch (Exception e) {
m_sequencerProcess = 0; m_sequencerProcess = 0;
@ -4788,12 +4788,12 @@ bool RosegardenGUIApp::launchJack()
emit startupStatusMessage(i18n("Clearing down jackd...")); 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 << "/usr/bin/killall";
*proc << "-9"; *proc << "-9";
*proc << "jackd"; *proc << "jackd";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (proc->exitStatus()) if (proc->exitStatus())
RG_DEBUG << "couldn't kill any jackd processes" << endl; RG_DEBUG << "couldn't kill any jackd processes" << endl;
@ -4813,7 +4813,7 @@ bool RosegardenGUIApp::launchJack()
<< splitCommand.size() << endl; << splitCommand.size() << endl;
// start jack process // start jack process
m_jackProcess = new KProcess; m_jackProcess = new TDEProcess;
*m_jackProcess << splitCommand; *m_jackProcess << splitCommand;
@ -4831,7 +4831,7 @@ void RosegardenGUIApp::slotDocumentDevicesResyncd()
m_trackParameterBox->populateDeviceLists(); m_trackParameterBox->populateDeviceLists();
} }
void RosegardenGUIApp::slotSequencerExited(KProcess*) void RosegardenGUIApp::slotSequencerExited(TDEProcess*)
{ {
RG_DEBUG << "RosegardenGUIApp::slotSequencerExited Sequencer exited\n"; RG_DEBUG << "RosegardenGUIApp::slotSequencerExited Sequencer exited\n";
@ -4877,13 +4877,13 @@ void RosegardenGUIApp::slotExportProject()
return ; return ;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-project-package"; *proc << "rosegarden-project-package";
*proc << "--pack"; *proc << "--pack";
*proc << rgFile; *proc << rgFile;
*proc << fileName; *proc << fileName;
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName)); KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
@ -5015,7 +5015,7 @@ void RosegardenGUIApp::slotExportLilyPond()
exportLilyPondFile(fileName); exportLilyPondFile(fileName);
} }
std::map<KProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap; std::map<TDEProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap;
void RosegardenGUIApp::slotPrintLilyPond() void RosegardenGUIApp::slotPrintLilyPond()
@ -5031,15 +5031,15 @@ void RosegardenGUIApp::slotPrintLilyPond()
if (!exportLilyPondFile(file->name(), true)) { if (!exportLilyPondFile(file->name(), true)) {
return ; return ;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-lilypondview"; *proc << "rosegarden-lilypondview";
*proc << "--graphical"; *proc << "--graphical";
*proc << "--print"; *proc << "--print";
*proc << file->name(); *proc << file->name();
connect(proc, TQT_SIGNAL(processExited(KProcess *)), connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file; m_lilyTempFileMap[proc] = file;
proc->start(KProcess::NotifyOnExit); proc->start(TDEProcess::NotifyOnExit);
} }
void RosegardenGUIApp::slotPreviewLilyPond() void RosegardenGUIApp::slotPreviewLilyPond()
@ -5055,18 +5055,18 @@ void RosegardenGUIApp::slotPreviewLilyPond()
if (!exportLilyPondFile(file->name(), true)) { if (!exportLilyPondFile(file->name(), true)) {
return ; return ;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-lilypondview"; *proc << "rosegarden-lilypondview";
*proc << "--graphical"; *proc << "--graphical";
*proc << "--pdf"; *proc << "--pdf";
*proc << file->name(); *proc << file->name();
connect(proc, TQT_SIGNAL(processExited(KProcess *)), connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file; 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]; delete m_lilyTempFileMap[p];
m_lilyTempFileMap.erase(p); m_lilyTempFileMap.erase(p);
@ -7741,7 +7741,7 @@ RosegardenGUIApp::slotImportDefaultStudio()
return ; return ;
TQString autoloadFile = TQString autoloadFile =
KGlobal::dirs()->findResource("appdata", "autoload.rg"); TDEGlobal::dirs()->findResource("appdata", "autoload.rg");
TQFileInfo autoloadFileInfo(autoloadFile); TQFileInfo autoloadFileInfo(autoloadFile);
@ -7759,7 +7759,7 @@ RosegardenGUIApp::slotImportStudio()
{ {
RG_DEBUG << "RosegardenGUIApp::slotImportStudio()\n"; RG_DEBUG << "RosegardenGUIApp::slotImportStudio()\n";
TQString studioDir = KGlobal::dirs()->findResource("appdata", "library/"); TQString studioDir = TDEGlobal::dirs()->findResource("appdata", "library/");
TQDir dir(studioDir); TQDir dir(studioDir);
if (!dir.exists()) { if (!dir.exists()) {
studioDir = ":ROSEGARDENDEVICE"; studioDir = ":ROSEGARDENDEVICE";

12
src/gui/application/RosegardenGUIApp.h
Unescape View File

@ -52,7 +52,7 @@ class KURL;
class KTempFile; class KTempFile;
class KToggleAction; class KToggleAction;
class KRecentFilesAction; class KRecentFilesAction;
class KProcess; class TDEProcess;
class KConfig; class KConfig;
class KAction; class KAction;
@ -674,7 +674,7 @@ public slots:
*/ */
void slotPrintLilyPond(); void slotPrintLilyPond();
void slotPreviewLilyPond(); void slotPreviewLilyPond();
void slotLilyPondViewProcessExited(KProcess *); void slotLilyPondViewProcessExited(TDEProcess *);
/** /**
* Let the user enter a MusicXml file to export to * Let the user enter a MusicXml file to export to
@ -1132,7 +1132,7 @@ public slots:
/** /**
* Called when the sequencer auxiliary process exits * Called when the sequencer auxiliary process exits
*/ */
void slotSequencerExited(KProcess*); void slotSequencerExited(TDEProcess*);
/// When the transport closes /// When the transport closes
void slotCloseTransport(); void slotCloseTransport();
@ -1600,11 +1600,11 @@ private:
KAction *m_rewindEndTransport; KAction *m_rewindEndTransport;
KAction *m_ffwdEndTransport; KAction *m_ffwdEndTransport;
KProcess* m_sequencerProcess; TDEProcess* m_sequencerProcess;
bool m_sequencerCheckedIn; bool m_sequencerCheckedIn;
#ifdef HAVE_LIBJACK #ifdef HAVE_LIBJACK
KProcess* m_jackProcess; TDEProcess* m_jackProcess;
#endif // HAVE_LIBJACK #endif // HAVE_LIBJACK
ZoomSlider<double> *m_zoomSlider; ZoomSlider<double> *m_zoomSlider;
@ -1663,7 +1663,7 @@ private:
static RosegardenGUIApp *m_myself; 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 // Used to fetch the current sequencer position from the mmapped sequencer information file
// //

2
src/gui/application/RosegardenGUIView.cpp
Unescape View File

@ -874,7 +874,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment)
// Prepare the process // Prepare the process
// //
KProcess *process = new KProcess(); TDEProcess *process = new TDEProcess();
(*process) << splitCommand; (*process) << splitCommand;
(*process) << TQString(aF->getFilename().c_str()); (*process) << TQString(aF->getFilename().c_str());

26
src/gui/application/StartupTester.cpp
Unescape View File

@ -65,13 +65,13 @@ StartupTester::run()
m_audioFileImporterMutex.lock(); m_audioFileImporterMutex.lock();
m_ready = true; m_ready = true;
KProcess *proc = new KProcess(); TDEProcess *proc = new TDEProcess();
m_stdoutBuffer = ""; m_stdoutBuffer = "";
TQObject::connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(stdoutReceived(KProcess *, char *, int))); this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int)));
*proc << "rosegarden-audiofile-importer"; *proc << "rosegarden-audiofile-importer";
*proc << "--conftest"; *proc << "--conftest";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
RG_DEBUG << "StartupTester - No audio file importer available" << endl; RG_DEBUG << "StartupTester - No audio file importer available" << endl;
m_haveAudioFileImporter = false; m_haveAudioFileImporter = false;
@ -83,13 +83,13 @@ StartupTester::run()
delete proc; delete proc;
m_audioFileImporterMutex.unlock(); m_audioFileImporterMutex.unlock();
proc = new KProcess; proc = new TDEProcess;
m_stdoutBuffer = ""; m_stdoutBuffer = "";
TQObject::connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(stdoutReceived(KProcess *, char *, int))); this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int)));
*proc << "rosegarden-project-package"; *proc << "rosegarden-project-package";
*proc << "--conftest"; *proc << "--conftest";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
m_haveProjectPackager = false; m_haveProjectPackager = false;
// rosegarden-project-package ran but exited with an error code // rosegarden-project-package ran but exited with an error code
@ -103,13 +103,13 @@ StartupTester::run()
delete proc; delete proc;
m_projectPackagerMutex.unlock(); m_projectPackagerMutex.unlock();
proc = new KProcess(); proc = new TDEProcess();
m_stdoutBuffer = ""; m_stdoutBuffer = "";
TQObject::connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(stdoutReceived(KProcess *, char *, int))); this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int)));
*proc << "rosegarden-lilypondview"; *proc << "rosegarden-lilypondview";
*proc << "--conftest"; *proc << "--conftest";
proc->start(KProcess::Block, KProcess::All); proc->start(TDEProcess::Block, TDEProcess::All);
if (!proc->normalExit() || proc->exitStatus()) { if (!proc->normalExit() || proc->exitStatus()) {
RG_DEBUG << "StartupTester - No lilypondview available" << endl; RG_DEBUG << "StartupTester - No lilypondview available" << endl;
m_haveLilyPondView = false; m_haveLilyPondView = false;
@ -145,7 +145,7 @@ StartupTester::isReady()
} }
void void
StartupTester::stdoutReceived(KProcess *, char *buffer, int len) StartupTester::stdoutReceived(TDEProcess *, char *buffer, int len)
{ {
m_stdoutBuffer += TQString::fromLatin1(buffer, len); m_stdoutBuffer += TQString::fromLatin1(buffer, len);
} }

4
src/gui/application/StartupTester.h
Unescape View File

@ -32,7 +32,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqhttp.h> #include <tqhttp.h>
class KProcess; class TDEProcess;
namespace Rosegarden namespace Rosegarden
{ {
@ -61,7 +61,7 @@ signals:
void newerVersionAvailable(TQString); void newerVersionAvailable(TQString);
protected slots: protected slots:
void stdoutReceived(KProcess *, char *, int); void stdoutReceived(TDEProcess *, char *, int);
void slotHttpResponseHeaderReceived(const TQHttpResponseHeader &); void slotHttpResponseHeaderReceived(const TQHttpResponseHeader &);
void slotHttpDone(bool); void slotHttpDone(bool);

10
src/gui/application/main.cpp
Unescape View File

@ -509,7 +509,7 @@ int main(int argc, char *argv[])
// If there is no config setting for the startup window size, set // If there is no config setting for the startup window size, set
// one now. But base the default on the appropriate desktop size // one now. But base the default on the appropriate desktop size
// (i.e. not the entire desktop, if Xinerama is in use). This is // (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 // give it a meaningful point to measure from at this stage so we
// always use the "leftmost" display (point 0,0). // always use the "leftmost" display (point 0,0).
@ -523,7 +523,7 @@ int main(int argc, char *argv[])
TQDesktopWidget *desktop = TDEApplication::desktop(); TQDesktopWidget *desktop = TDEApplication::desktop();
if (desktop) { if (desktop) {
TQRect totalRect(desktop->screenGeometry()); TQRect totalRect(desktop->screenGeometry());
TQRect desktopRect = KGlobalSettings::desktopGeometry(TQPoint(0, 0)); TQRect desktopRect = TDEGlobalSettings::desktopGeometry(TQPoint(0, 0));
TQSize startupSize; TQSize startupSize;
if (desktopRect.height() <= 800) { if (desktopRect.height() <= 800) {
startupSize = TQSize((desktopRect.width() * 6) / 7, startupSize = TQSize((desktopRect.width() * 6) / 7,
@ -659,12 +659,12 @@ int main(int argc, char *argv[])
TQString soundFontPath = config->readEntry("soundfontpath", ""); TQString soundFontPath = config->readEntry("soundfontpath", "");
TQFileInfo sfxLoadInfo(sfxLoadPath), soundFontInfo(soundFontPath); TQFileInfo sfxLoadInfo(sfxLoadPath), soundFontInfo(soundFontPath);
if (sfxLoadInfo.isExecutable() && soundFontInfo.isReadable()) { if (sfxLoadInfo.isExecutable() && soundFontInfo.isReadable()) {
KProcess* sfxLoadProcess = new KProcess; TDEProcess* sfxLoadProcess = new TDEProcess;
(*sfxLoadProcess) << sfxLoadPath << soundFontPath; (*sfxLoadProcess) << sfxLoadPath << soundFontPath;
RG_DEBUG << "Starting sfxload : " << sfxLoadPath << " " << soundFontPath << endl; RG_DEBUG << "Starting sfxload : " << sfxLoadPath << " " << soundFontPath << endl;
TQObject::connect(sfxLoadProcess, TQT_SIGNAL(processExited(KProcess*)), TQObject::connect(sfxLoadProcess, TQT_SIGNAL(processExited(TDEProcess*)),
&app, TQT_SLOT(sfxLoadExited(KProcess*))); &app, TQT_SLOT(sfxLoadExited(TDEProcess*)));
sfxLoadProcess->start(); sfxLoadProcess->start();
} else { } else {

2
src/gui/dialogs/AudioManagerDialog.cpp
Unescape View File

@ -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 = 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(); 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")); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm"));
new KAction(i18n("&Add Audio File..."), "fileopen", 0, TQT_TQOBJECT(this), new KAction(i18n("&Add Audio File..."), "fileopen", 0, TQT_TQOBJECT(this),

4
src/gui/dialogs/ConfigureDialog.cpp
Unescape View File

@ -45,7 +45,7 @@ namespace Rosegarden
static TQPixmap loadIcon(const char *name) static TQPixmap loadIcon(const char *name)
{ {
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQString fileBase = pixmapDir + "/misc/"; TQString fileBase = pixmapDir + "/misc/";
fileBase += name; fileBase += name;
if (TQFile(fileBase + ".png").exists()) { if (TQFile(fileBase + ".png").exists()) {
@ -53,7 +53,7 @@ static TQPixmap loadIcon(const char *name)
} else if (TQFile(fileBase + ".xpm").exists()) { } else if (TQFile(fileBase + ".xpm").exists()) {
return TQPixmap(fileBase + ".xpm"); return TQPixmap(fileBase + ".xpm");
} }
TQPixmap pmap = KGlobal::instance()->iconLoader() TQPixmap pmap = TDEGlobal::instance()->iconLoader()
->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
return pmap; return pmap;
} }

4
src/gui/dialogs/DocumentConfigureDialog.cpp
Unescape View File

@ -43,7 +43,7 @@ namespace Rosegarden
{ {
static TQPixmap loadIcon(const char *name) static TQPixmap loadIcon(const char *name)
{ {
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQString fileBase = pixmapDir + "/misc/"; TQString fileBase = pixmapDir + "/misc/";
fileBase += name; fileBase += name;
if (TQFile(fileBase + ".png").exists()) { if (TQFile(fileBase + ".png").exists()) {
@ -52,7 +52,7 @@ static TQPixmap loadIcon(const char *name)
return TQPixmap(fileBase + ".xpm"); return TQPixmap(fileBase + ".xpm");
} }
TQPixmap pmap = KGlobal::instance()->iconLoader() TQPixmap pmap = TDEGlobal::instance()->iconLoader()
->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
return pmap; return pmap;
} }

4
src/gui/dialogs/LilyPondOptionsDialog.cpp
Unescape View File

@ -135,8 +135,8 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
m_lilyPaperSize->insertItem(i18n("Tabloid")); m_lilyPaperSize->insertItem(i18n("Tabloid"));
m_lilyPaperSize->insertItem(i18n("do not specify")); m_lilyPaperSize->insertItem(i18n("do not specify"));
int defaultPaperSize = 1; // A4 int defaultPaperSize = 1; // A4
if (KGlobal::locale()->country() == "us" || if (TDEGlobal::locale()->country() == "us" ||
KGlobal::locale()->country() == "US") defaultPaperSize = 5; // Letter TDEGlobal::locale()->country() == "US") defaultPaperSize = 5; // Letter
m_lilyPaperSize->setCurrentItem(config->readUnsignedNumEntry m_lilyPaperSize->setCurrentItem(config->readUnsignedNumEntry
("lilypapersize", defaultPaperSize)); ("lilypapersize", defaultPaperSize));

2
src/gui/dialogs/TransportDialog.cpp
Unescape View File

@ -341,7 +341,7 @@ TransportDialog::loadPixmaps()
{ {
m_lcdList.clear(); m_lcdList.clear();
TQString fileName; TQString fileName;
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
fileName = TQString("%1/transport/led-%2.xpm").arg(pixmapDir).arg(i); fileName = TQString("%1/transport/led-%2.xpm").arg(pixmapDir).arg(i);

2
src/gui/editors/eventlist/EventView.cpp
Unescape View File

@ -1117,7 +1117,7 @@ EventView::setupActions()
{ {
EditViewBase::setupActions("eventlist.rc"); 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")); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
new KAction(i18n("&Insert Event"), icon, Key_I, TQT_TQOBJECT(this), new KAction(i18n("&Insert Event"), icon, Key_I, TQT_TQOBJECT(this),

4
src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
Unescape View File

@ -442,7 +442,7 @@ GuitarChordSelectorDialog::getAvailableChordFiles()
std::vector<TQString> names; std::vector<TQString> names;
// Read config for default directory // 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) { for(TQStringList::iterator i = chordDictFiles.begin(); i != chordDictFiles.end(); ++i) {
NOTATION_DEBUG << "GuitarChordSelectorDialog::getAvailableChordFiles : adding file " << *i << endl; NOTATION_DEBUG << "GuitarChordSelectorDialog::getAvailableChordFiles : adding file " << *i << endl;
@ -456,7 +456,7 @@ bool
GuitarChordSelectorDialog::saveUserChordMap() GuitarChordSelectorDialog::saveUserChordMap()
{ {
// Read config for user directory // 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"; TQString userChordDictPath = userDir + "/user_chords.xml";

2
src/gui/editors/matrix/MatrixEraser.cpp
Unescape View File

@ -47,7 +47,7 @@ MatrixEraser::MatrixEraser(MatrixView* parent)
: MatrixTool("MatrixEraser", parent), : MatrixTool("MatrixEraser", parent),
m_currentStaff(0) m_currentStaff(0)
{ {
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);

2
src/gui/editors/matrix/MatrixMover.cpp
Unescape View File

@ -60,7 +60,7 @@ MatrixMover::MatrixMover(MatrixView* parent) :
m_currentStaff(0), m_currentStaff(0),
m_lastPlayedPitch(-1) m_lastPlayedPitch(-1)
{ {
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);

2
src/gui/editors/matrix/MatrixPainter.cpp
Unescape View File

@ -58,7 +58,7 @@ MatrixPainter::MatrixPainter(MatrixView* parent)
m_currentElement(0), m_currentElement(0),
m_currentStaff(0) m_currentStaff(0)
{ {
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);

2
src/gui/editors/matrix/MatrixResizer.cpp
Unescape View File

@ -56,7 +56,7 @@ MatrixResizer::MatrixResizer(MatrixView* parent)
m_currentElement(0), m_currentElement(0),
m_currentStaff(0) m_currentStaff(0)
{ {
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);

2
src/gui/editors/matrix/MatrixSelector.cpp
Unescape View File

@ -86,7 +86,7 @@ MatrixSelector::MatrixSelector(MatrixView* view)
TQT_SLOT(slotMoveSelected()), actionCollection(), TQT_SLOT(slotMoveSelected()), actionCollection(),
"move"); "move");
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);

6
src/gui/editors/matrix/MatrixView.cpp
Unescape View File

@ -166,7 +166,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
{ {
RG_DEBUG << "MatrixView ctor: drumMode " << drumMode << "\n"; 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"); TQPixmap matrixPixmap(pixmapDir + "/matrix.xpm");
m_dockLeft = createDockWidget("params dock", matrixPixmap, 0L, m_dockLeft = createDockWidget("params dock", matrixPixmap, 0L,
@ -199,7 +199,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
if (m_config->readBoolEntry("backgroundtextures-1.6-plus", true)) { if (m_config->readBoolEntry("backgroundtextures-1.6-plus", true)) {
TQPixmap background; TQPixmap background;
TQString pixmapDir = TQString pixmapDir =
KGlobal::dirs()->findResource("appdata", "pixmaps/"); TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
// We now use a lined background for the non-percussion matrix, // We now use a lined background for the non-percussion matrix,
// suggested and supplied by Alessandro Preziosi // suggested and supplied by Alessandro Preziosi
TQString backgroundPixmap = isDrumMode() ? "bg-paper-white.xpm" : "bg-matrix-lines.xpm"; TQString backgroundPixmap = isDrumMode() ? "bg-paper-white.xpm" : "bg-matrix-lines.xpm";
@ -635,7 +635,7 @@ void MatrixView::setupActions()
// //
KRadioAction* toolAction = 0; KRadioAction* toolAction = 0;
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm")); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm"));
toolAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, toolAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2,

28
src/gui/editors/notation/NotationView.cpp
Unescape View File

@ -511,7 +511,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_headersTopFrame = new TQFrame(getCentralWidget()); m_headersTopFrame = new TQFrame(getCentralWidget());
TQGridLayout * headersTopGrid TQGridLayout * headersTopGrid
= new TQGridLayout(m_headersTopFrame, 2, 2); = 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"); TQCanvasPixmap pixmap(pixmapDir + "/misc/close.xpm");
TQPushButton * hideHeadersButton TQPushButton * hideHeadersButton
= new TQPushButton(m_headersTopFrame); = new TQPushButton(m_headersTopFrame);
@ -1335,7 +1335,7 @@ void NotationView::positionPages()
m_config->setGroup(NotationViewConfigGroup); m_config->setGroup(NotationViewConfigGroup);
if (m_config->readBoolEntry("backgroundtextures", true)) { if (m_config->readBoolEntry("backgroundtextures", true)) {
TQString pixmapDir = TQString pixmapDir =
KGlobal::dirs()->findResource("appdata", "pixmaps/"); TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
if (background.load(TQString("%1/misc/bg-paper-cream.xpm"). if (background.load(TQString("%1/misc/bg-paper-cream.xpm").
arg(pixmapDir))) { arg(pixmapDir))) {
haveBackground = true; haveBackground = true;
@ -1818,7 +1818,7 @@ void NotationView::setupActions()
// //
int layoutMode = m_config->readNumEntry("layoutmode", 0); 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"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm");
icon = TQIconSet(pixmap); icon = TQIconSet(pixmap);
@ -2466,7 +2466,7 @@ void NotationView::setupActions()
"clear_selection"); "clear_selection");
// TQString pixmapDir = // TQString pixmapDir =
// KGlobal::dirs()->findResource("appdata", "pixmaps/"); // TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
// icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm"));
new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotFilterSelection()), actionCollection(), TQT_SLOT(slotFilterSelection()), actionCollection(),
@ -4640,7 +4640,7 @@ NotationView::slotFilePrintPreview()
printingView.print(true); printingView.print(true);
} }
std::map<KProcess *, KTempFile *> NotationView::m_lilyTempFileMap; std::map<TDEProcess *, KTempFile *> NotationView::m_lilyTempFileMap;
void NotationView::slotPrintLilyPond() void NotationView::slotPrintLilyPond()
{ {
@ -4655,15 +4655,15 @@ void NotationView::slotPrintLilyPond()
if (!exportLilyPondFile(file->name(), true)) { if (!exportLilyPondFile(file->name(), true)) {
return ; return ;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-lilypondview"; *proc << "rosegarden-lilypondview";
*proc << "--graphical"; *proc << "--graphical";
*proc << "--print"; *proc << "--print";
*proc << file->name(); *proc << file->name();
connect(proc, TQT_SIGNAL(processExited(KProcess *)), connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file; m_lilyTempFileMap[proc] = file;
proc->start(KProcess::NotifyOnExit); proc->start(TDEProcess::NotifyOnExit);
} }
void NotationView::slotPreviewLilyPond() void NotationView::slotPreviewLilyPond()
@ -4679,18 +4679,18 @@ void NotationView::slotPreviewLilyPond()
if (!exportLilyPondFile(file->name(), true)) { if (!exportLilyPondFile(file->name(), true)) {
return ; return ;
} }
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "rosegarden-lilypondview"; *proc << "rosegarden-lilypondview";
*proc << "--graphical"; *proc << "--graphical";
*proc << "--pdf"; *proc << "--pdf";
*proc << file->name(); *proc << file->name();
connect(proc, TQT_SIGNAL(processExited(KProcess *)), connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file; 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]; delete m_lilyTempFileMap[p];
m_lilyTempFileMap.erase(p); m_lilyTempFileMap.erase(p);

4
src/gui/editors/notation/NotationView.h
Unescape View File

@ -366,7 +366,7 @@ public slots:
*/ */
void slotPrintLilyPond(); void slotPrintLilyPond();
void slotPreviewLilyPond(); void slotPreviewLilyPond();
void slotLilyPondViewProcessExited(KProcess *); void slotLilyPondViewProcessExited(TDEProcess *);
/** /**
* put the marked text/object into the clipboard and remove it * put the marked text/object into the clipboard and remove it
@ -1115,7 +1115,7 @@ protected:
bool m_printMode; bool m_printMode;
int m_printSize; int m_printSize;
static std::map<KProcess *, KTempFile *> m_lilyTempFileMap; static std::map<TDEProcess *, KTempFile *> m_lilyTempFileMap;
int m_showHeadersGroup; int m_showHeadersGroup;
QDeferScrollView * m_headersGroupView; QDeferScrollView * m_headersGroupView;

2
src/gui/editors/notation/NoteFontFactory.cpp
Unescape View File

@ -74,7 +74,7 @@ NoteFontFactory::getFontNames(bool forceRescan)
NOTATION_DEBUG << "NoteFontFactory::getFontNames: No names available, rescanning..." << endl; NOTATION_DEBUG << "NoteFontFactory::getFontNames: No names available, rescanning..." << endl;
TQString mappingDir = TQString mappingDir =
KGlobal::dirs()->findResource("appdata", "fonts/mappings/"); TDEGlobal::dirs()->findResource("appdata", "fonts/mappings/");
TQDir dir(mappingDir); TQDir dir(mappingDir);
if (!dir.exists()) { if (!dir.exists()) {
std::cerr << "NoteFontFactory::getFontNames: mapping directory \"" std::cerr << "NoteFontFactory::getFontNames: mapping directory \""

2
src/gui/editors/notation/NoteFontMap.cpp
Unescape View File

@ -52,7 +52,7 @@ NoteFontMap::NoteFontMap(std::string name) :
m_errorString(i18n("unknown error")), m_errorString(i18n("unknown error")),
m_ok(true) m_ok(true)
{ {
m_fontDirectory = KGlobal::dirs()->findResource("appdata", "fonts/"); m_fontDirectory = TDEGlobal::dirs()->findResource("appdata", "fonts/");
TQString mapFileName; TQString mapFileName;

2
src/gui/editors/notation/NotePixmapFactory.cpp
Unescape View File

@ -1931,7 +1931,7 @@ NotePixmapFactory::makeUnknownPixmap()
TQCanvasPixmap* TQCanvasPixmap*
NotePixmapFactory::makeToolbarPixmap(const char *name, bool menuSize) 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/"; TQString fileBase = pixmapDir + "/toolbar/";
if (menuSize) fileBase += "menu-"; if (menuSize) fileBase += "menu-";
fileBase += name; fileBase += name;

2
src/gui/editors/notation/NoteStyleFactory.cpp
Unescape View File

@ -49,7 +49,7 @@ NoteStyleFactory::getAvailableStyleNames()
{ {
std::vector<NoteStyleName> names; std::vector<NoteStyleName> names;
TQString styleDir = KGlobal::dirs()->findResource("appdata", "styles/"); TQString styleDir = TDEGlobal::dirs()->findResource("appdata", "styles/");
TQDir dir(styleDir); TQDir dir(styleDir);
if (!dir.exists()) { if (!dir.exists()) {
std::cerr << "NoteStyle::getAvailableStyleNames: directory \"" << styleDir.ascii() std::cerr << "NoteStyle::getAvailableStyleNames: directory \"" << styleDir.ascii()

2
src/gui/editors/notation/NoteStyleFileReader.cpp
Unescape View File

@ -45,7 +45,7 @@ NoteStyleFileReader::NoteStyleFileReader(std::string name) :
m_haveNote(false) m_haveNote(false)
{ {
TQString styleDirectory = TQString styleDirectory =
KGlobal::dirs()->findResource("appdata", "styles/"); TDEGlobal::dirs()->findResource("appdata", "styles/");
TQString styleFileName = TQString styleFileName =
TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name)); TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name));

2
src/gui/editors/notation/SystemFont.cpp
Unescape View File

@ -71,7 +71,7 @@ SystemFont::loadSystemFont(const SystemFontSpec &spec)
} }
if (!haveFcDirectory) { if (!haveFcDirectory) {
TQString fontDir = KGlobal::dirs()->findResource("appdata", "fonts/"); TQString fontDir = TDEGlobal::dirs()->findResource("appdata", "fonts/");
if (!FcConfigAppFontAddDir(FcConfigGetCurrent(), if (!FcConfigAppFontAddDir(FcConfigGetCurrent(),
(const FcChar8 *)fontDir.latin1())) { (const FcChar8 *)fontDir.latin1())) {
NOTATION_DEBUG << "SystemFont::loadSystemFont[Xft]: Failed to add font directory " << fontDir << " to fontconfig, continuing without it" << endl; NOTATION_DEBUG << "SystemFont::loadSystemFont[Xft]: Failed to add font directory " << fontDir << " to fontconfig, continuing without it" << endl;

2
src/gui/editors/segment/MarkerEditor.cpp
Unescape View File

@ -387,7 +387,7 @@ MarkerEditor::setupActions()
actionCollection(), actionCollection(),
KStdAction::stdName(KStdAction::Redo)); KStdAction::stdName(KStdAction::Redo));
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
kapp->config()->setGroup(MarkerEditorConfigGroup); kapp->config()->setGroup(MarkerEditorConfigGroup);
int timeMode = kapp->config()->readNumEntry("timemode", 0); int timeMode = kapp->config()->readNumEntry("timemode", 0);

4
src/gui/editors/segment/PlayList.cpp
Unescape View File

@ -229,7 +229,7 @@ void PlayList::save()
item = dynamic_cast<PlayListViewItem*>(item->nextSibling()); item = dynamic_cast<PlayListViewItem*>(item->nextSibling());
} }
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs(kc, PlayListConfigGroup); KConfigGroupSaver cs(kc, PlayListConfigGroup);
kc->writeEntry("Playlist Files", urlList); kc->writeEntry("Playlist Files", urlList);
@ -238,7 +238,7 @@ void PlayList::save()
void PlayList::restore() void PlayList::restore()
{ {
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
getListView()->restoreLayout(kc, PlayListConfigGroup); getListView()->restoreLayout(kc, PlayListConfigGroup);
KConfigGroupSaver cs(kc, PlayListConfigGroup); KConfigGroupSaver cs(kc, PlayListConfigGroup);

2
src/gui/editors/segment/TrackButtons.cpp
Unescape View File

@ -644,7 +644,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
if (!havePixmaps) { if (!havePixmaps) {
TQString pixmapDir = TQString pixmapDir =
KGlobal::dirs()->findResource("appdata", "pixmaps/"); TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
connectedPixmap.load connectedPixmap.load
(TQString("%1/misc/connected.xpm").arg(pixmapDir)); (TQString("%1/misc/connected.xpm").arg(pixmapDir));

2
src/gui/editors/segment/TrackEditor.cpp
Unescape View File

@ -174,7 +174,7 @@ TrackEditor::init(TQWidget* rosegardenguiview)
kapp->config()->setGroup(GeneralOptionsConfigGroup); kapp->config()->setGroup(GeneralOptionsConfigGroup);
if (kapp->config()->readBoolEntry("backgroundtextures", true)) { if (kapp->config()->readBoolEntry("backgroundtextures", true)) {
TQPixmap background; 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"). if (background.load(TQString("%1/misc/bg-segmentcanvas.xpm").
arg(pixmapDir))) { arg(pixmapDir))) {
m_segmentCanvas->setBackgroundPixmap(background); m_segmentCanvas->setBackgroundPixmap(background);

2
src/gui/editors/segment/TriggerSegmentManager.cpp
Unescape View File

@ -382,7 +382,7 @@ TriggerSegmentManager::setupActions()
m_closeButton->setText(close->text()); m_closeButton->setText(close->text());
connect(m_closeButton, TQT_SIGNAL(released()), TQT_TQOBJECT(this), TQT_SLOT(slotClose())); 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 // some adjustments
new KToolBarPopupAction(i18n("Und&o"), new KToolBarPopupAction(i18n("Und&o"),

2
src/gui/editors/tempo/TempoView.cpp
Unescape View File

@ -575,7 +575,7 @@ TempoView::setupActions()
{ {
EditViewBase::setupActions("tempoview.rc", false); 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")); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));
new KAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, TQT_TQOBJECT(this), new KAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, TQT_TQOBJECT(this),

4
src/gui/general/EditView.cpp
Unescape View File

@ -360,7 +360,7 @@ void EditView::addPropertyBox(TQWidget *w)
void EditView::addControlRuler(ControlRuler* ruler) void EditView::addControlRuler(ControlRuler* ruler)
{ {
ruler->setWorldMatrix(m_currentRulerZoomMatrix); 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()); ruler->getName());
m_controlRulers->showPage(ruler); m_controlRulers->showPage(ruler);
@ -723,7 +723,7 @@ EditView::setupActions()
// //
// Tempo and time signature changes // 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"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-tempo.png");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);
new KAction(AddTempoChangeCommand::getGlobalName(), new KAction(AddTempoChangeCommand::getGlobalName(),

2
src/gui/general/EditViewBase.cpp
Unescape View File

@ -199,7 +199,7 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
actionCollection(), actionCollection(),
KStdAction::stdName(KStdAction::Redo)); KStdAction::stdName(KStdAction::Redo));
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);

4
src/gui/general/PresetGroup.cpp
Unescape View File

@ -65,9 +65,9 @@ PresetGroup::PresetGroup() :
m_amateur(false), m_amateur(false),
m_pro(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") TQString presetFileName = TQString("%1/presets-%2.xml")
.arg(m_presetDirectory).arg(language); .arg(m_presetDirectory).arg(language);

2
src/gui/rulers/MarkerRuler.cpp
Unescape View File

@ -89,7 +89,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
m_barFont = new TQFont(); m_barFont = new TQFont();
m_barFont->setPointSize(10); m_barFont->setPointSize(10);
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon; TQIconSet icon;
// Use the event insert, delete, edit icons because they are // Use the event insert, delete, edit icons because they are

2
src/gui/rulers/TempoRuler.cpp
Unescape View File

@ -120,7 +120,7 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
(doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()), (doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
this, TQT_SLOT(update())); this, TQT_SLOT(update()));
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon; TQIconSet icon;
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));

4
src/gui/seqmanager/CompositionMmapper.cpp
Unescape View File

@ -87,7 +87,7 @@ void CompositionMmapper::cleanup()
// Erase all 'segment_*' files // Erase all 'segment_*' files
// //
TQString tmpPath = KGlobal::dirs()->resourceDirs("tmp").last(); TQString tmpPath = TDEGlobal::dirs()->resourceDirs("tmp").last();
TQDir segmentsDir(tmpPath, "segment_*"); TQDir segmentsDir(tmpPath, "segment_*");
for (unsigned int i = 0; i < segmentsDir.count(); ++i) { for (unsigned int i = 0; i < segmentsDir.count(); ++i) {
@ -144,7 +144,7 @@ void CompositionMmapper::mmapSegment(Segment* segment)
TQString CompositionMmapper::makeFileName(Segment* segment) TQString CompositionMmapper::makeFileName(Segment* segment)
{ {
TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs("tmp");
return TQString("%1/segment_%2") return TQString("%1/segment_%2")
.arg(tmpDirs.last()) .arg(tmpDirs.last())

2
src/gui/seqmanager/ControlBlockMmapper.cpp
Unescape View File

@ -98,7 +98,7 @@ ControlBlockMmapper::~ControlBlockMmapper()
TQString ControlBlockMmapper::createFileName() 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) void ControlBlockMmapper::updateTrackData(Track *t)

2
src/gui/seqmanager/MetronomeMmapper.cpp
Unescape View File

@ -155,7 +155,7 @@ InstrumentId MetronomeMmapper::getMetronomeInstrument()
TQString MetronomeMmapper::createFileName() TQString MetronomeMmapper::createFileName()
{ {
return KGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_metronome"; return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_metronome";
} }
void MetronomeMmapper::dump() void MetronomeMmapper::dump()

2
src/gui/seqmanager/SequenceManager.cpp
Unescape View File

@ -241,7 +241,7 @@ SequenceManager::mapSequencer()
try { try {
m_sequencerMapper = new SequencerMapper( m_sequencerMapper = new SequencerMapper(
KGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_sequencer_timing_block"); TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_sequencer_timing_block");
} catch (Exception) { } catch (Exception) {
m_sequencerMapper = 0; m_sequencerMapper = 0;
} }

2
src/gui/seqmanager/SpecialSegmentMmapper.cpp
Unescape View File

@ -45,7 +45,7 @@ SpecialSegmentMmapper::SpecialSegmentMmapper(RosegardenGUIDoc* doc,
TQString SpecialSegmentMmapper::createFileName(TQString baseFileName) TQString SpecialSegmentMmapper::createFileName(TQString baseFileName)
{ {
return KGlobal::dirs()->resourceDirs("tmp").last() + "/" + baseFileName; return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/" + baseFileName;
} }
unsigned int SpecialSegmentMmapper::getSegmentRepeatCount() unsigned int SpecialSegmentMmapper::getSegmentRepeatCount()

2
src/gui/studio/AudioMixerWindow.cpp
Unescape View File

@ -267,7 +267,7 @@ AudioMixerWindow::populate()
InstrumentList instruments = m_studio->getPresentationInstruments(); InstrumentList instruments = m_studio->getPresentationInstruments();
BussList busses = m_studio->getBusses(); 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_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir)); m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));

4
src/gui/studio/AudioPluginOSCGUI.cpp
Unescape View File

@ -61,7 +61,7 @@ AudioPluginOSCGUI::AudioPluginOSCGUI(AudioPluginInstance *instance,
// arguments: osc url, dll name, label, instance tag // arguments: osc url, dll name, label, instance tag
m_gui = new KProcess(); m_gui = new TDEProcess();
*m_gui << filePath *m_gui << filePath
<< m_serverUrl << m_serverUrl
@ -73,7 +73,7 @@ AudioPluginOSCGUI::AudioPluginOSCGUI(AudioPluginInstance *instance,
<< filePath << " " << m_serverUrl << " " << filePath << " " << m_serverUrl << " "
<< soInfo.fileName() << " " << label << " " << friendlyName << endl; << 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; RG_DEBUG << "AudioPluginOSCGUI::AudioPluginOSCGUI: Couldn't start process " << filePath << endl;
delete m_gui; delete m_gui;
m_gui = 0; m_gui = 0;

4
src/gui/studio/AudioPluginOSCGUI.h
Unescape View File

@ -33,7 +33,7 @@
#include <tqstring.h> #include <tqstring.h>
class KProcess; class TDEProcess;
namespace Rosegarden namespace Rosegarden
@ -61,7 +61,7 @@ public:
static TQString getGUIFilePath(TQString identifier); static TQString getGUIFilePath(TQString identifier);
protected: protected:
KProcess *m_gui; TDEProcess *m_gui;
lo_address m_address; lo_address m_address;
TQString m_basePath; TQString m_basePath;
TQString m_serverUrl; TQString m_serverUrl;

2
src/gui/studio/BankEditorDialog.cpp
Unescape View File

@ -1462,7 +1462,7 @@ BankEditorDialog::getCommandHistory()
void void
BankEditorDialog::slotImport() BankEditorDialog::slotImport()
{ {
TQString deviceDir = KGlobal::dirs()->findResource("appdata", "library/"); TQString deviceDir = TDEGlobal::dirs()->findResource("appdata", "library/");
TQDir dir(deviceDir); TQDir dir(deviceDir);
if (!dir.exists()) { if (!dir.exists()) {
deviceDir = ":ROSEGARDENDEVICE"; deviceDir = ":ROSEGARDENDEVICE";

2
src/gui/studio/DeviceManagerDialog.cpp
Unescape View File

@ -689,7 +689,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
if (id == Device::NO_DEVICE) if (id == Device::NO_DEVICE)
return ; return ;
TQString deviceDir = KGlobal::dirs()->findResource("appdata", "library/"); TQString deviceDir = TDEGlobal::dirs()->findResource("appdata", "library/");
TQDir dir(deviceDir); TQDir dir(deviceDir);
if (!dir.exists()) { if (!dir.exists()) {
deviceDir = ":ROSEGARDENDEVICE"; deviceDir = ":ROSEGARDENDEVICE";

4
src/gui/studio/MidiProgramsEditor.cpp
Unescape View File

@ -222,7 +222,7 @@ MidiProgramsEditor::populate(TQListViewItem* item)
ProgramList::iterator it; ProgramList::iterator it;
TQPixmap noKeyPixmap, keyPixmap; TQPixmap noKeyPixmap, keyPixmap;
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQString file = pixmapDir + "/toolbar/key-white.png"; TQString file = pixmapDir + "/toolbar/key-white.png";
if (TQFile(file).exists()) if (TQFile(file).exists())
noKeyPixmap = TQPixmap(file); noKeyPixmap = TQPixmap(file);
@ -521,7 +521,7 @@ MidiProgramsEditor::slotEntryMenuItemSelected(int i)
} }
m_device->setKeyMappingForProgram(*program, newMapping); 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); bool haveKeyMappings = (m_device->getKeyMappings().size() > 0);
TQPushButton *btn = getEntryButton(m_currentMenuProgram); TQPushButton *btn = getEntryButton(m_currentMenuProgram);

2
src/gui/studio/NameSetEditor.cpp
Unescape View File

@ -129,7 +129,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
KLineEdit* lineEdit = new KLineEdit(numBox, numberText.ascii()); KLineEdit* lineEdit = new KLineEdit(numBox, numberText.ascii());
lineEdit->setMinimumWidth(110); lineEdit->setMinimumWidth(110);
lineEdit->setCompletionMode(KGlobalSettings::CompletionAuto); lineEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto);
lineEdit->setCompletionObject(&m_completion); lineEdit->setCompletionObject(&m_completion);
m_names.push_back(lineEdit); m_names.push_back(lineEdit);

2
src/gui/widgets/AudioFaderBox.cpp
Unescape View File

@ -115,7 +115,7 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
m_fader->setOutlineColour(GUIPalette::getColour(GUIPalette::PlaybackFaderOutline)); 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_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir)); m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));

4
src/gui/widgets/CollapsingFrame.cpp
Unescape View File

@ -60,7 +60,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
font.setBold(true); font.setBold(true);
m_toggleButton->setFont(font); 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"); TQPixmap pixmap(pixmapDir + "/misc/arrow-expanded.png");
m_toggleButton->setIconSet(pixmap); m_toggleButton->setIconSet(pixmap);
@ -122,7 +122,7 @@ CollapsingFrame::toggle()
m_widget->setShown(!m_collapsed); m_widget->setShown(!m_collapsed);
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQPixmap pixmap; TQPixmap pixmap;
if (m_collapsed) { if (m_collapsed) {

6
src/sequencer/RosegardenSequencerApp.cpp
Unescape View File

@ -77,7 +77,7 @@ RosegardenSequencerApp::RosegardenSequencerApp() :
m_loopStart(0, 0), m_loopStart(0, 0),
m_loopEnd(0, 0), m_loopEnd(0, 0),
m_studio(new MappedStudio()), m_studio(new MappedStudio()),
m_segmentFilesPath(KGlobal::dirs()->resourceDirs("tmp").last()), m_segmentFilesPath(TDEGlobal::dirs()->resourceDirs("tmp").last()),
m_metaIterator(0), m_metaIterator(0),
m_controlBlockMmapper(0), m_controlBlockMmapper(0),
m_transportToken(1), m_transportToken(1),
@ -567,7 +567,7 @@ RosegardenSequencerApp::processAsynchronousEvents()
lastCheckedAt = tv; lastCheckedAt = tv;
try { try {
m_controlBlockMmapper = new ControlBlockMmapper(KGlobal::dirs()->resourceDirs("tmp").last() m_controlBlockMmapper = new ControlBlockMmapper(TDEGlobal::dirs()->resourceDirs("tmp").last()
+ "/rosegarden_control_block"); + "/rosegarden_control_block");
} catch (Exception e) { } catch (Exception e) {
// Assume that the control block simply hasn't been // Assume that the control block simply hasn't been
@ -839,7 +839,7 @@ RosegardenSequencerApp::play(const RealTime &time,
mmapSegment(m_segmentFilesPath + "/" + segmentsDir[i]); mmapSegment(m_segmentFilesPath + "/" + segmentsDir[i]);
} }
TQString tmpDir = KGlobal::dirs()->resourceDirs("tmp").last(); TQString tmpDir = TDEGlobal::dirs()->resourceDirs("tmp").last();
// Map metronome // Map metronome
// //

2
src/sequencer/SequencerMmapper.cpp
Unescape View File

@ -138,7 +138,7 @@ SequencerMmapper::setFileSize(size_t size)
TQString TQString
SequencerMmapper::createFileName() SequencerMmapper::createFileName()
{ {
return KGlobal::dirs()->resourceDirs("tmp").last() + return TDEGlobal::dirs()->resourceDirs("tmp").last() +
"/rosegarden_sequencer_timing_block"; "/rosegarden_sequencer_timing_block";
} }

12
src/sound/AudioFileManager.cpp
Unescape View File

@ -684,7 +684,7 @@ bool
AudioFileManager::fileNeedsConversion(const std::string &fileName, AudioFileManager::fileNeedsConversion(const std::string &fileName,
int sampleRate) int sampleRate)
{ {
KProcess *proc = new KProcess(); TDEProcess *proc = new TDEProcess();
*proc << "rosegarden-audiofile-importer"; *proc << "rosegarden-audiofile-importer";
if (sampleRate > 0) { if (sampleRate > 0) {
*proc << "-r"; *proc << "-r";
@ -693,7 +693,7 @@ AudioFileManager::fileNeedsConversion(const std::string &fileName,
*proc << "-w"; *proc << "-w";
*proc << fileName.c_str(); *proc << fileName.c_str();
proc->start(KProcess::Block, KProcess::NoCommunication); proc->start(TDEProcess::Block, TDEProcess::NoCommunication);
int es = proc->exitStatus(); int es = proc->exitStatus();
delete proc; delete proc;
@ -711,7 +711,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
std::cerr << "AudioFileManager::importFile("<< fileName << ", " << sampleRate << ")" << std::endl; std::cerr << "AudioFileManager::importFile("<< fileName << ", " << sampleRate << ")" << std::endl;
KProcess *proc = new KProcess(); TDEProcess *proc = new TDEProcess();
*proc << "rosegarden-audiofile-importer"; *proc << "rosegarden-audiofile-importer";
if (sampleRate > 0) { if (sampleRate > 0) {
*proc << "-r"; *proc << "-r";
@ -720,7 +720,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
*proc << "-w"; *proc << "-w";
*proc << fileName.c_str(); *proc << fileName.c_str();
proc->start(KProcess::Block, KProcess::NoCommunication); proc->start(TDEProcess::Block, TDEProcess::NoCommunication);
int es = proc->exitStatus(); int es = proc->exitStatus();
delete proc; 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"; *m_importProcess << "rosegarden-audiofile-importer";
if (sampleRate > 0) { if (sampleRate > 0) {
@ -774,7 +774,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
*m_importProcess << fileName.c_str(); *m_importProcess << fileName.c_str();
*m_importProcess << (m_audioPath.c_str() + targetName); *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()) { while (m_importProcess->isRunning()) {
kapp->processEvents(100); kapp->processEvents(100);

4
src/sound/AudioFileManager.h
Unescape View File

@ -51,7 +51,7 @@
// is not (and should not be) used elsewhere within the // is not (and should not be) used elsewhere within the
// sound or sequencer libraries. // sound or sequencer libraries.
class KProcess; class TDEProcess;
namespace Rosegarden namespace Rosegarden
{ {
@ -318,7 +318,7 @@ private:
std::set<AudioFile *> m_recordedAudioFiles; std::set<AudioFile *> m_recordedAudioFiles;
std::set<AudioFile *> m_derivedAudioFiles; std::set<AudioFile *> m_derivedAudioFiles;
KProcess *m_importProcess; TDEProcess *m_importProcess;
int m_expectedSampleRate; int m_expectedSampleRate;
}; };

4
src/sound/MappedEvent.cpp
Unescape View File

@ -390,7 +390,7 @@ protected:
}; };
DataBlockFile::DataBlockFile(DataBlockRepository::blockid id) 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_file(m_fileName),
m_cleared(false) m_cleared(false)
{ {
@ -564,7 +564,7 @@ void DataBlockRepository::clear()
// Erase all 'datablock_*' files // Erase all 'datablock_*' files
// //
TQString tmpPath = KGlobal::dirs()->resourceDirs("tmp").first(); TQString tmpPath = TDEGlobal::dirs()->resourceDirs("tmp").first();
TQDir segmentsDir(tmpPath, "rosegarden_datablock_*"); TQDir segmentsDir(tmpPath, "rosegarden_datablock_*");
for (unsigned int i = 0; i < segmentsDir.count(); ++i) { for (unsigned int i = 0; i < segmentsDir.count(); ++i) {

Write Preview
Loading…
Cancel
Save