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

Use tdeApp

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/30/head
Michele Calgaro 5 months ago
parent 7f981e3ef1
commit 0d553d92e4
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
62 changed files with 239 additions and 239 deletions
Show Stats Download Patch File Download Diff File

4
src/commands/edit/EventQuantizeCommand.cpp
Unescape Escape View File

@ -132,7 +132,7 @@ EventQuantizeCommand::modifySegment()
if (!m_configGroup.isNull()) { if (!m_configGroup.isNull()) {
//!!! need way to decide whether to do these even if no config group (i.e. through args to the command) //!!! need way to decide whether to do these even if no config group (i.e. through args to the command)
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(m_configGroup); config->setGroup(m_configGroup);
rebeam = config->readBoolEntry("quantizerebeam", true); rebeam = config->readBoolEntry("quantizerebeam", true);
@ -202,7 +202,7 @@ EventQuantizeCommand::makeQuantizer(TQString configGroup,
//!!! Excessive duplication with //!!! Excessive duplication with
// QuantizeParameters::getQuantizer in widgets.cpp // QuantizeParameters::getQuantizer in widgets.cpp
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(configGroup); config->setGroup(configGroup);
timeT defaultUnit = timeT defaultUnit =

16
src/document/RosegardenGUIDoc.cpp
Unescape Escape View File

@ -167,7 +167,7 @@ RosegardenGUIDoc::~RosegardenGUIDoc()
unsigned int unsigned int
RosegardenGUIDoc::getAutoSavePeriod() const RosegardenGUIDoc::getAutoSavePeriod() const
{ {
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
return config->readUnsignedNumEntry("autosaveinterval", 60); return config->readUnsignedNumEntry("autosaveinterval", 60);
} }
@ -281,7 +281,7 @@ TQString RosegardenGUIDoc::getAutoSaveFileName()
if (filename.isEmpty()) if (filename.isEmpty())
filename = TQDir::currentDirPath() + "/" + getTitle(); filename = TQDir::currentDirPath() + "/" + getTitle();
TQString autoSaveFileName = kapp->tempSaveName(filename); TQString autoSaveFileName = tdeApp->tempSaveName(filename);
return autoSaveFileName; return autoSaveFileName;
} }
@ -1102,7 +1102,7 @@ void RosegardenGUIDoc::initialiseStudio()
// Now commit all the remaining changes // Now commit all the remaining changes
StudioControl::setStudioObjectProperties(ids, properties, values); StudioControl::setStudioObjectProperties(ids, properties, values);
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
bool faderOuts = config->readBoolEntry("audiofaderouts", false); bool faderOuts = config->readBoolEntry("audiofaderouts", false);
@ -1961,7 +1961,7 @@ RosegardenGUIDoc::insertRecordedMidi(const MappedComposition &mC)
if (haveNotes) { if (haveNotes) {
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
int tracking = config->readUnsignedNumEntry("recordtracking", 0); int tracking = config->readUnsignedNumEntry("recordtracking", 0);
@ -2327,9 +2327,9 @@ RosegardenGUIDoc::syncDevices()
// when changed in the configuration dialog. // when changed in the configuration dialog.
static bool setTimer = false; static bool setTimer = false;
if (!setTimer) { if (!setTimer) {
kapp->config()->setGroup(SequencerOptionsConfigGroup); tdeApp->config()->setGroup(SequencerOptionsConfigGroup);
TQString currentTimer = getCurrentTimer(); TQString currentTimer = getCurrentTimer();
currentTimer = kapp->config()->readEntry("timer", currentTimer); currentTimer = tdeApp->config()->readEntry("timer", currentTimer);
setCurrentTimer(currentTimer); setCurrentTimer(currentTimer);
setTimer = true; setTimer = true;
} }
@ -2369,8 +2369,8 @@ RosegardenGUIDoc::syncDevices()
// Force update of view on current track selection // Force update of view on current track selection
// //
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
bool opt = kapp->config()->readBoolEntry("Show Track labels", true); bool opt = tdeApp->config()->readBoolEntry("Show Track labels", true);
TrackLabel::InstrumentTrackLabels labels = TrackLabel::ShowInstrument; TrackLabel::InstrumentTrackLabels labels = TrackLabel::ShowInstrument;
if (opt) if (opt)
labels = TrackLabel::ShowTrack; labels = TrackLabel::ShowTrack;

2
src/document/io/LilyPondExporter.cpp
Unescape Escape View File

@ -120,7 +120,7 @@ void
LilyPondExporter::readConfigVariables(void) LilyPondExporter::readConfigVariables(void)
{ {
// grab config info // grab config info
TDEConfig *cfg = kapp->config(); TDEConfig *cfg = tdeApp->config();
cfg->setGroup(NotationViewConfigGroup); cfg->setGroup(NotationViewConfigGroup);
m_paperSize = cfg->readUnsignedNumEntry("lilypapersize", PAPER_A4); m_paperSize = cfg->readUnsignedNumEntry("lilypapersize", PAPER_A4);

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

@ -133,7 +133,7 @@ void RosegardenApplication::saveState(TQSessionManager& sm)
RosegardenApplication* RosegardenApplication::rgApp() RosegardenApplication* RosegardenApplication::rgApp()
{ {
return dynamic_cast<RosegardenApplication*>(kApplication()); return dynamic_cast<RosegardenApplication*>(tdeApplication());
} }
TQByteArray RosegardenApplication::Empty; TQByteArray RosegardenApplication::Empty;

114
src/gui/application/RosegardenGUIApp.cpp
Unescape Escape View File

@ -383,9 +383,9 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
// Lookup the configuration parameter that specifies the default // Lookup the configuration parameter that specifies the default
// arrangement, and instantiate it. // arrangement, and instantiate it.
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
m_parameterArea->setArrangement((RosegardenParameterArea::Arrangement) m_parameterArea->setArrangement((RosegardenParameterArea::Arrangement)
kapp->config()->readUnsignedNumEntry("sidebarstyle", tdeApp->config()->readUnsignedNumEntry("sidebarstyle",
RosegardenParameterArea::CLASSIC_STYLE)); RosegardenParameterArea::CLASSIC_STYLE));
m_dockLeft->update(); m_dockLeft->update();
@ -1534,13 +1534,13 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
return ; return ;
emit documentAboutToChange(); emit documentAboutToChange();
kapp->processEvents(); // to make sure all opened dialogs (mixer, midi devices...) are closed tdeApp->processEvents(); // to make sure all opened dialogs (mixer, midi devices...) are closed
// Take care of all subparts which depend on the document // Take care of all subparts which depend on the document
// Caption // Caption
// //
TQString caption = kapp->caption(); TQString caption = tdeApp->caption();
setCaption(caption + ": " + newDocument->getTitle()); setCaption(caption + ": " + newDocument->getTitle());
// // reset AudioManagerDialog // // reset AudioManagerDialog
@ -1685,8 +1685,8 @@ RosegardenGUIApp::openFile(TQString filePath, ImportType type)
RG_DEBUG << "RosegardenGUIApp::openFile(): calling slotDocColoursChanged() in doc" << endl; RG_DEBUG << "RosegardenGUIApp::openFile(): calling slotDocColoursChanged() in doc" << endl;
doc->slotDocColoursChanged(); doc->slotDocColoursChanged();
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
if (kapp->config()->readBoolEntry("alwaysusedefaultstudio", false)) { if (tdeApp->config()->readBoolEntry("alwaysusedefaultstudio", false)) {
TQString autoloadFile = TQString autoloadFile =
TDEGlobal::dirs()->findResource("appdata", "autoload.rg"); TDEGlobal::dirs()->findResource("appdata", "autoload.rg");
@ -1780,7 +1780,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath)
// Check for an autosaved file to recover // Check for an autosaved file to recover
TQString effectiveFilePath = filePath; TQString effectiveFilePath = filePath;
bool canRecover = false; bool canRecover = false;
TQString autoSaveFileName = kapp->checkRecoverFile(filePath, canRecover); TQString autoSaveFileName = tdeApp->checkRecoverFile(filePath, canRecover);
if (canRecover) { if (canRecover) {
// First check if the auto-save file is more recent than the doc // First check if the auto-save file is more recent than the doc
@ -1852,32 +1852,32 @@ void RosegardenGUIApp::slotSaveOptions()
_settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked())); _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
#endif #endif
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
kapp->config()->writeEntry("Show Transport", m_viewTransport->isChecked()); tdeApp->config()->writeEntry("Show Transport", m_viewTransport->isChecked());
kapp->config()->writeEntry("Expanded Transport", m_transport ? getTransport()->isExpanded() : true); tdeApp->config()->writeEntry("Expanded Transport", m_transport ? getTransport()->isExpanded() : true);
kapp->config()->writeEntry("Show Track labels", m_viewTrackLabels->isChecked()); tdeApp->config()->writeEntry("Show Track labels", m_viewTrackLabels->isChecked());
kapp->config()->writeEntry("Show Rulers", m_viewRulers->isChecked()); tdeApp->config()->writeEntry("Show Rulers", m_viewRulers->isChecked());
kapp->config()->writeEntry("Show Tempo Ruler", m_viewTempoRuler->isChecked()); tdeApp->config()->writeEntry("Show Tempo Ruler", m_viewTempoRuler->isChecked());
kapp->config()->writeEntry("Show Chord Name Ruler", m_viewChordNameRuler->isChecked()); tdeApp->config()->writeEntry("Show Chord Name Ruler", m_viewChordNameRuler->isChecked());
kapp->config()->writeEntry("Show Previews", m_viewPreviews->isChecked()); tdeApp->config()->writeEntry("Show Previews", m_viewPreviews->isChecked());
kapp->config()->writeEntry("Show Segment Labels", m_viewSegmentLabels->isChecked()); tdeApp->config()->writeEntry("Show Segment Labels", m_viewSegmentLabels->isChecked());
kapp->config()->writeEntry("Show Parameters", m_dockVisible); tdeApp->config()->writeEntry("Show Parameters", m_dockVisible);
kapp->config()->writeEntry("MIDI Thru Routing", m_enableMIDIrouting->isChecked()); tdeApp->config()->writeEntry("MIDI Thru Routing", m_enableMIDIrouting->isChecked());
#ifdef SETTING_LOG_DEBUG #ifdef SETTING_LOG_DEBUG
RG_DEBUG << "SHOW PARAMETERS = " << m_dockVisible << endl; RG_DEBUG << "SHOW PARAMETERS = " << m_dockVisible << endl;
#endif #endif
m_fileRecent->saveEntries(kapp->config()); m_fileRecent->saveEntries(tdeApp->config());
// saveMainWindowSettings(kapp->config(), RosegardenGUIApp::MainWindowConfigGroup); - no need to, done by TDEMainWindow // saveMainWindowSettings(tdeApp->config(), RosegardenGUIApp::MainWindowConfigGroup); - no need to, done by TDEMainWindow
kapp->config()->sync(); tdeApp->config()->sync();
} }
void RosegardenGUIApp::setupFileDialogSpeedbar() void RosegardenGUIApp::setupFileDialogSpeedbar()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup("KFileDialog Speedbar"); config->setGroup("KFileDialog Speedbar");
@ -1908,9 +1908,9 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
void RosegardenGUIApp::readOptions() void RosegardenGUIApp::readOptions()
{ {
applyMainWindowSettings(kapp->config(), MainWindowConfigGroup); applyMainWindowSettings(tdeApp->config(), MainWindowConfigGroup);
kapp->config()->reparseConfiguration(); tdeApp->config()->reparseConfiguration();
// Statusbar and toolbars toggling action status // Statusbar and toolbars toggling action status
// //
@ -1924,13 +1924,13 @@ void RosegardenGUIApp::readOptions()
bool opt; bool opt;
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
opt = kapp->config()->readBoolEntry("Show Transport", true); opt = tdeApp->config()->readBoolEntry("Show Transport", true);
m_viewTransport->setChecked(opt); m_viewTransport->setChecked(opt);
slotToggleTransport(); slotToggleTransport();
opt = kapp->config()->readBoolEntry("Expanded Transport", true); opt = tdeApp->config()->readBoolEntry("Expanded Transport", true);
#ifdef SETTING_LOG_DEBUG #ifdef SETTING_LOG_DEBUG
@ -1942,7 +1942,7 @@ void RosegardenGUIApp::readOptions()
else else
getTransport()->slotPanelCloseButtonClicked(); getTransport()->slotPanelCloseButtonClicked();
opt = kapp->config()->readBoolEntry("Show Track labels", true); opt = tdeApp->config()->readBoolEntry("Show Track labels", true);
#ifdef SETTING_LOG_DEBUG #ifdef SETTING_LOG_DEBUG
@ -1952,27 +1952,27 @@ void RosegardenGUIApp::readOptions()
m_viewTrackLabels->setChecked(opt); m_viewTrackLabels->setChecked(opt);
slotToggleTrackLabels(); slotToggleTrackLabels();
opt = kapp->config()->readBoolEntry("Show Rulers", true); opt = tdeApp->config()->readBoolEntry("Show Rulers", true);
m_viewRulers->setChecked(opt); m_viewRulers->setChecked(opt);
slotToggleRulers(); slotToggleRulers();
opt = kapp->config()->readBoolEntry("Show Tempo Ruler", true); opt = tdeApp->config()->readBoolEntry("Show Tempo Ruler", true);
m_viewTempoRuler->setChecked(opt); m_viewTempoRuler->setChecked(opt);
slotToggleTempoRuler(); slotToggleTempoRuler();
opt = kapp->config()->readBoolEntry("Show Chord Name Ruler", false); opt = tdeApp->config()->readBoolEntry("Show Chord Name Ruler", false);
m_viewChordNameRuler->setChecked(opt); m_viewChordNameRuler->setChecked(opt);
slotToggleChordNameRuler(); slotToggleChordNameRuler();
opt = kapp->config()->readBoolEntry("Show Previews", true); opt = tdeApp->config()->readBoolEntry("Show Previews", true);
m_viewPreviews->setChecked(opt); m_viewPreviews->setChecked(opt);
slotTogglePreviews(); slotTogglePreviews();
opt = kapp->config()->readBoolEntry("Show Segment Labels", true); opt = tdeApp->config()->readBoolEntry("Show Segment Labels", true);
m_viewSegmentLabels->setChecked(opt); m_viewSegmentLabels->setChecked(opt);
slotToggleSegmentLabels(); slotToggleSegmentLabels();
opt = kapp->config()->readBoolEntry("Show Parameters", true); opt = tdeApp->config()->readBoolEntry("Show Parameters", true);
if (!opt) { if (!opt) {
m_dockLeft->undock(); m_dockLeft->undock();
m_dockLeft->hide(); m_dockLeft->hide();
@ -1981,13 +1981,13 @@ void RosegardenGUIApp::readOptions()
} }
// MIDI Thru routing // MIDI Thru routing
opt = kapp->config()->readBoolEntry("MIDI Thru Routing", true); opt = tdeApp->config()->readBoolEntry("MIDI Thru Routing", true);
m_enableMIDIrouting->setChecked(opt); m_enableMIDIrouting->setChecked(opt);
slotEnableMIDIThruRouting(); slotEnableMIDIThruRouting();
// initialise the recent file list // initialise the recent file list
// //
m_fileRecent->loadEntries(kapp->config()); m_fileRecent->loadEntries(tdeApp->config());
m_actionsSetup = true; m_actionsSetup = true;
@ -2002,7 +2002,7 @@ void RosegardenGUIApp::saveGlobalProperties(TDEConfig *cfg)
cfg->writeEntry("filename", filename); cfg->writeEntry("filename", filename);
cfg->writeEntry("modified", m_doc->isModified()); cfg->writeEntry("modified", m_doc->isModified());
TQString tempname = kapp->tempSaveName(filename); TQString tempname = tdeApp->tempSaveName(filename);
TQString errMsg; TQString errMsg;
bool res = m_doc->saveDocument(tempname, errMsg); bool res = m_doc->saveDocument(tempname, errMsg);
if (!res) { if (!res) {
@ -2023,7 +2023,7 @@ void RosegardenGUIApp::readGlobalProperties(TDEConfig* _cfg)
if (modified) { if (modified) {
bool canRecover; bool canRecover;
TQString tempname = kapp->checkRecoverFile(filename, canRecover); TQString tempname = tdeApp->checkRecoverFile(filename, canRecover);
if (canRecover) { if (canRecover) {
slotEnableTransport(false); slotEnableTransport(false);
@ -2042,7 +2042,7 @@ void RosegardenGUIApp::readGlobalProperties(TDEConfig* _cfg)
} }
} }
TQString caption = kapp->caption(); TQString caption = tdeApp->caption();
setCaption(caption + ": " + m_doc->getTitle()); setCaption(caption + ": " + m_doc->getTitle());
} }
@ -2176,10 +2176,10 @@ void RosegardenGUIApp::slotFileOpen()
{ {
slotStatusHelpMsg(i18n("Opening file...")); slotStatusHelpMsg(i18n("Opening file..."));
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
TQString lastOpenedVersion = TQString lastOpenedVersion =
kapp->config()->readEntry("Last File Opened Version", "none"); tdeApp->config()->readEntry("Last File Opened Version", "none");
if (lastOpenedVersion != VERSION) { if (lastOpenedVersion != VERSION) {
@ -2187,9 +2187,9 @@ void RosegardenGUIApp::slotFileOpen()
// program before. Default to the examples directory. // program before. Default to the examples directory.
TQString examplesDir = TDEGlobal::dirs()->findResource("appdata", "examples/"); TQString examplesDir = TDEGlobal::dirs()->findResource("appdata", "examples/");
kapp->config()->setGroup("Recent Dirs"); tdeApp->config()->setGroup("Recent Dirs");
TQString recentString = kapp->config()->readEntry("ROSEGARDEN", ""); TQString recentString = tdeApp->config()->readEntry("ROSEGARDEN", "");
kapp->config()->writeEntry tdeApp->config()->writeEntry
("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString)); ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
} }
@ -2204,8 +2204,8 @@ void RosegardenGUIApp::slotFileOpen()
if (m_doc && !m_doc->saveIfModified()) if (m_doc && !m_doc->saveIfModified())
return ; return ;
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
kapp->config()->writeEntry("Last File Opened Version", VERSION); tdeApp->config()->writeEntry("Last File Opened Version", VERSION);
openURL(url); openURL(url);
} }
@ -2383,7 +2383,7 @@ bool RosegardenGUIApp::slotFileSaveAs()
m_fileRecent->addURL(newName); m_fileRecent->addURL(newName);
TQString caption = kapp->caption(); TQString caption = tdeApp->caption();
setCaption(caption + ": " + m_doc->getTitle()); setCaption(caption + ": " + m_doc->getTitle());
// update the edit view's captions too // update the edit view's captions too
emit compositionStateUpdate(); emit compositionStateUpdate();
@ -4631,7 +4631,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
// //
// User mode should clear down sequencer processes. // User mode should clear down sequencer processes.
// //
if (kapp->dcopClient()->isApplicationRegistered( if (tdeApp->dcopClient()->isApplicationRegistered(
TQCString(ROSEGARDEN_SEQUENCER_APP_NAME))) { TQCString(ROSEGARDEN_SEQUENCER_APP_NAME))) {
RG_DEBUG << "RosegardenGUIApp::launchSequencer() - " RG_DEBUG << "RosegardenGUIApp::launchSequencer() - "
<< "existing DCOP registered sequencer found\n"; << "existing DCOP registered sequencer found\n";
@ -4656,7 +4656,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
sleep(1); sleep(1);
if (kapp->dcopClient()->isApplicationRegistered( if (tdeApp->dcopClient()->isApplicationRegistered(
TQCString(ROSEGARDEN_SEQUENCER_APP_NAME))) { TQCString(ROSEGARDEN_SEQUENCER_APP_NAME))) {
RG_DEBUG << "RosegardenGUIApp::launchSequencer() - " RG_DEBUG << "RosegardenGUIApp::launchSequencer() - "
<< "failed to kill existing sequencer\n"; << "failed to kill existing sequencer\n";
@ -4690,7 +4690,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
// Command line arguments // Command line arguments
// //
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
TQString options = config->readEntry("commandlineoptions"); TQString options = config->readEntry("commandlineoptions");
if (!options.isEmpty()) { if (!options.isEmpty()) {
@ -4775,7 +4775,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
#ifdef HAVE_LIBJACK #ifdef HAVE_LIBJACK
bool RosegardenGUIApp::launchJack() bool RosegardenGUIApp::launchJack()
{ {
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
bool startJack = config->readBoolEntry("jackstart", false); bool startJack = config->readBoolEntry("jackstart", false);
@ -5403,7 +5403,7 @@ void RosegardenGUIApp::slotPlay()
// Send the controllers at start of playback if required // Send the controllers at start of playback if required
// //
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
bool sendControllers = config->readBoolEntry("alwayssendcontrollers", false); bool sendControllers = config->readBoolEntry("alwayssendcontrollers", false);
@ -5641,7 +5641,7 @@ void RosegardenGUIApp::slotConfigure()
RG_DEBUG << "RosegardenGUIApp::slotConfigure\n"; RG_DEBUG << "RosegardenGUIApp::slotConfigure\n";
ConfigureDialog *configDlg = ConfigureDialog *configDlg =
new ConfigureDialog(m_doc, kapp->config(), this); new ConfigureDialog(m_doc, tdeApp->config(), this);
connect(configDlg, TQ_SIGNAL(updateAutoSaveInterval(unsigned int)), connect(configDlg, TQ_SIGNAL(updateAutoSaveInterval(unsigned int)),
this, TQ_SLOT(slotUpdateAutoSaveInterval(unsigned int))); this, TQ_SLOT(slotUpdateAutoSaveInterval(unsigned int)));
@ -7577,7 +7577,7 @@ RosegardenGUIApp::slotTutorial()
else else
{ {
TQString tutorialURL = i18n("http://rosegarden.sourceforge.net/tutorial/en/chapter-0.html"); TQString tutorialURL = i18n("http://rosegarden.sourceforge.net/tutorial/en/chapter-0.html");
kapp->invokeBrowser(tutorialURL); tdeApp->invokeBrowser(tutorialURL);
} }
} }
@ -7599,7 +7599,7 @@ RosegardenGUIApp::slotBugGuidelines()
else else
{ {
TQString tutorialURL = i18n("http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html"); TQString tutorialURL = i18n("http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html");
kapp->invokeBrowser(tutorialURL); tdeApp->invokeBrowser(tutorialURL);
} }
} }
@ -7944,7 +7944,7 @@ RosegardenGUIApp::slotAutoSave()
m_seqManager->getTransportStatus() == RECORDING) m_seqManager->getTransportStatus() == RECORDING)
return ; return ;
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
if (!config->readBoolEntry("autosave", true)) if (!config->readBoolEntry("autosave", true))
return ; return ;
@ -8025,7 +8025,7 @@ RosegardenGUIApp::awaitDialogClearance()
// std::cerr << "RosegardenGUIApp::awaitDialogClearance: have dialog = " // std::cerr << "RosegardenGUIApp::awaitDialogClearance: have dialog = "
// << haveDialog << std::endl; // << haveDialog << std::endl;
if (haveDialog) kapp->processEvents(); if (haveDialog) tdeApp->processEvents();
} }
std::cerr << "RosegardenGUIApp::awaitDialogClearance: exiting" << std::endl; std::cerr << "RosegardenGUIApp::awaitDialogClearance: exiting" << std::endl;

6
src/gui/application/RosegardenGUIView.cpp
Unescape Escape View File

@ -345,7 +345,7 @@ void RosegardenGUIView::slotEditSegment(Segment* segment)
slotEditSegmentAudio(segment); slotEditSegmentAudio(segment);
} else { } else {
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
GeneralConfigurationPage::DoubleClickClient GeneralConfigurationPage::DoubleClickClient
client = client =
@ -828,7 +828,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment)
std::cout << "RosegardenGUIView::slotEditSegmentAudio() - " std::cout << "RosegardenGUIView::slotEditSegmentAudio() - "
<< "starting external audio editor" << std::endl; << "starting external audio editor" << std::endl;
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
TQString application = config->readEntry("externalaudioeditor", ""); TQString application = config->readEntry("externalaudioeditor", "");
@ -1729,7 +1729,7 @@ RosegardenGUIView::slotUpdateRecordingSegment(Segment *segment,
return ; return ;
lastRecordingSegment = segment; lastRecordingSegment = segment;
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
int tracking = config->readUnsignedNumEntry("recordtracking", 0); int tracking = config->readUnsignedNumEntry("recordtracking", 0);

2
src/gui/application/RosegardenIface.cpp
Unescape Escape View File

@ -56,7 +56,7 @@ void RosegardenIface::iFaceDelayedInit(TDEMainWindow* mainWindow)
DCOPRef RosegardenIface::action(const TQCString &name) DCOPRef RosegardenIface::action(const TQCString &name)
{ {
return DCOPRef(kapp->dcopClient()->appId(), return DCOPRef(tdeApp->dcopClient()->appId(),
m_dcopActionProxy->actionObjectId(name)); m_dcopActionProxy->actionObjectId(name));
} }

2
src/gui/application/SetWaitCursor.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ namespace Rosegarden
{ {
SetWaitCursor::SetWaitCursor() SetWaitCursor::SetWaitCursor()
: m_guiApp(dynamic_cast<RosegardenGUIApp*>(kapp->mainWidget())) : m_guiApp(dynamic_cast<RosegardenGUIApp*>(tdeApp->mainWidget()))
{ {
if (m_guiApp) { if (m_guiApp) {

8
src/gui/application/main.cpp
Unescape Escape View File

@ -494,7 +494,7 @@ int main(int argc, char *argv[])
testInstalledVersion(); testInstalledVersion();
} }
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
TQString lastVersion = config->readEntry("lastversion", ""); TQString lastVersion = config->readEntry("lastversion", "");
@ -544,7 +544,7 @@ int main(int argc, char *argv[])
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
int install = config->readNumEntry("Install Own Theme", 1); int install = config->readNumEntry("Install Own Theme", 1);
if (install == 2 || (install == 1 && !getenv("TDE_FULL_SESSION"))) { if (install == 2 || (install == 1 && !getenv("TDE_FULL_SESSION"))) {
kapp->setStyle(new KlearlookStyle); tdeApp->setStyle(new KlearlookStyle);
} }
// Show Startup logo // Show Startup logo
@ -556,7 +556,7 @@ int main(int argc, char *argv[])
// See if the config wants us to control JACK // See if the config wants us to control JACK
// //
if (config->readBoolEntry("Logo", true) && (!kapp->isRestored() && args->isSet("splash")) ) { if (config->readBoolEntry("Logo", true) && (!tdeApp->isRestored() && args->isSet("splash")) ) {
RG_DEBUG << k_funcinfo << "Showing startup logo\n"; RG_DEBUG << k_funcinfo << "Showing startup logo\n";
startLogo = TDEStartupLogo::getInstance(); startLogo = TDEStartupLogo::getInstance();
startLogo->setShowTip(!newVersion); startLogo->setShowTip(!newVersion);
@ -735,6 +735,6 @@ int main(int argc, char *argv[])
CurrentProgressDialog::thaw(); CurrentProgressDialog::thaw();
} }
return kapp->exec(); return tdeApp->exec();
} }

4
src/gui/configuration/HeadersConfigurationPage.cpp
Unescape Escape View File

@ -158,7 +158,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
// //
// set default expansion to false for this group -- what a faff // set default expansion to false for this group -- what a faff
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
TQString groupTemp = config->group(); TQString groupTemp = config->group();
config->setGroup("CollapsingFrame"); config->setGroup("CollapsingFrame");
bool expanded = config->readBoolEntry("nonprintableheaders", false); bool expanded = config->readBoolEntry("nonprintableheaders", false);
@ -248,7 +248,7 @@ HeadersConfigurationPage::slotDeleteProperty()
void HeadersConfigurationPage::apply() void HeadersConfigurationPage::apply()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
// If one of the items still has focus, it won't remember edits. // If one of the items still has focus, it won't remember edits.

4
src/gui/dialogs/AddTracksDialog.cpp
Unescape Escape View File

@ -64,7 +64,7 @@ AddTracksDialog::AddTracksDialog(TQWidget *parent, int currentTrack) :
m_position->insertItem(i18n("Below the current selected track")); m_position->insertItem(i18n("Below the current selected track"));
m_position->insertItem(i18n("At the bottom")); m_position->insertItem(i18n("At the bottom"));
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
m_position->setCurrentItem(config->readUnsignedNumEntry("lastaddtracksposition", 2)); m_position->setCurrentItem(config->readUnsignedNumEntry("lastaddtracksposition", 2));
} }
@ -80,7 +80,7 @@ AddTracksDialog::getInsertPosition()
{ {
int opt = m_position->currentItem(); int opt = m_position->currentItem();
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
config->writeEntry("lastaddtracksposition", opt); config->writeEntry("lastaddtracksposition", opt);

4
src/gui/dialogs/AudioManagerDialog.cpp
Unescape Escape View File

@ -188,7 +188,7 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
m_fileList->setColumnAlignment(4, TQt::AlignHCenter); m_fileList->setColumnAlignment(4, TQt::AlignHCenter);
m_fileList->setColumnAlignment(5, TQt::AlignHCenter); m_fileList->setColumnAlignment(5, TQt::AlignHCenter);
m_fileList->restoreLayout(kapp->config(), m_listViewLayoutName); m_fileList->restoreLayout(tdeApp->config(), m_listViewLayoutName);
// a minimum width for the list box // a minimum width for the list box
//m_fileList->setMinimumWidth(300); //m_fileList->setMinimumWidth(300);
@ -240,7 +240,7 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
AudioManagerDialog::~AudioManagerDialog() AudioManagerDialog::~AudioManagerDialog()
{ {
RG_DEBUG << "\n*** AudioManagerDialog::~AudioManagerDialog\n" << endl; RG_DEBUG << "\n*** AudioManagerDialog::~AudioManagerDialog\n" << endl;
m_fileList->saveLayout(kapp->config(), m_listViewLayoutName); m_fileList->saveLayout(tdeApp->config(), m_listViewLayoutName);
//saveDialogSize(AudioManagerDialogConfigGroup); //saveDialogSize(AudioManagerDialogConfigGroup);
} }

26
src/gui/dialogs/AudioSplitDialog.cpp
Unescape Escape View File

@ -116,8 +116,8 @@ AudioSplitDialog::drawPreview()
rect->setX(border); rect->setX(border);
rect->setY(border); rect->setY(border);
rect->setZ(1); rect->setZ(1);
rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Dark)); rect->setPen(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Dark));
rect->setBrush(kapp->palette().color(TQPalette::Active, TQColorGroup::Base)); rect->setBrush(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Base));
rect->setVisible(true); rect->setVisible(true);
// Get preview in vector form // Get preview in vector form
@ -135,7 +135,7 @@ AudioSplitDialog::drawPreview()
false); false);
} catch (Exception e) { } catch (Exception e) {
TQCanvasText *text = new TQCanvasText(m_canvas); TQCanvasText *text = new TQCanvasText(m_canvas);
text->setColor(kapp->palette(). text->setColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Shadow)); color(TQPalette::Active, TQColorGroup::Shadow));
text->setText(i18n("<no preview generated for this audio file>")); text->setText(i18n("<no preview generated for this audio file>"));
text->setX(30); text->setX(30);
@ -186,9 +186,9 @@ AudioSplitDialog::drawPreview()
startX + i, startX + i,
endY); endY);
line->setZ(3); line->setZ(3);
line->setPen(kapp-> line->setPen(tdeApp->
palette().color(TQPalette::Active, TQColorGroup::Shadow)); palette().color(TQPalette::Active, TQColorGroup::Shadow));
line->setBrush(kapp-> line->setBrush(tdeApp->
palette().color(TQPalette::Active, TQColorGroup::Shadow)); palette().color(TQPalette::Active, TQColorGroup::Shadow));
line->setVisible(true); line->setVisible(true);
@ -200,8 +200,8 @@ AudioSplitDialog::drawPreview()
rect->setX(startX); rect->setX(startX);
rect->setY(halfHeight - 1); rect->setY(halfHeight - 1);
rect->setSize(m_previewWidth, 2); rect->setSize(m_previewWidth, 2);
rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); rect->setPen(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
rect->setBrush(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); rect->setBrush(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
rect->setZ(4); rect->setZ(4);
rect->setVisible(true); rect->setVisible(true);
@ -214,7 +214,7 @@ AudioSplitDialog::drawPreview()
.arg(msecs); .arg(msecs);
TQCanvasText *text = new TQCanvasText(m_canvas); TQCanvasText *text = new TQCanvasText(m_canvas);
text->setColor( text->setColor(
kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); tdeApp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
text->setText(startText); text->setText(startText);
text->setX(startX - 20); text->setX(startX - 20);
text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35); text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35);
@ -225,7 +225,7 @@ AudioSplitDialog::drawPreview()
rect->setX(startX - 1); rect->setX(startX - 1);
rect->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 14); rect->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 14);
rect->setSize(1, m_previewHeight + 28); rect->setSize(1, m_previewHeight + 28);
rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); rect->setPen(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
rect->setZ(3); rect->setZ(3);
rect->setVisible(true); rect->setVisible(true);
@ -237,7 +237,7 @@ AudioSplitDialog::drawPreview()
.arg(msecs); .arg(msecs);
text = new TQCanvasText(m_canvas); text = new TQCanvasText(m_canvas);
text->setColor( text->setColor(
kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); tdeApp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
text->setText(endText); text->setText(endText);
text->setX(startX + m_previewWidth - 20); text->setX(startX + m_previewWidth - 20);
text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35); text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35);
@ -248,7 +248,7 @@ AudioSplitDialog::drawPreview()
rect->setX(startX + m_previewWidth - 1); rect->setX(startX + m_previewWidth - 1);
rect->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 14); rect->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 14);
rect->setSize(1, m_previewHeight + 28); rect->setSize(1, m_previewHeight + 28);
rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); rect->setPen(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
rect->setZ(3); rect->setZ(3);
rect->setVisible(true); rect->setVisible(true);
@ -297,9 +297,9 @@ AudioSplitDialog::drawSplits(int threshold)
rect->setY(halfHeight - m_previewHeight / 2 - overlapHeight / 2); rect->setY(halfHeight - m_previewHeight / 2 - overlapHeight / 2);
rect->setZ(2); rect->setZ(2);
rect->setSize(x2 - x1, m_previewHeight + overlapHeight); rect->setSize(x2 - x1, m_previewHeight + overlapHeight);
rect->setPen(kapp-> rect->setPen(tdeApp->
palette().color(TQPalette::Active, TQColorGroup::Mid)); palette().color(TQPalette::Active, TQColorGroup::Mid));
rect->setBrush(kapp-> rect->setBrush(tdeApp->
palette().color(TQPalette::Active, TQColorGroup::Mid)); palette().color(TQPalette::Active, TQColorGroup::Mid));
rect->setVisible(true); rect->setVisible(true);
tempRects.push_back(rect); tempRects.push_back(rect);

2
src/gui/dialogs/EventFilterDialog.cpp
Unescape Escape View File

@ -63,7 +63,7 @@ EventFilterDialog::EventFilterDialog(TQWidget* parent)
: KDialogBase(parent, "eventfilerdialog", true, i18n("Event Filter"), Ok | Cancel, Ok), : KDialogBase(parent, "eventfilerdialog", true, i18n("Event Filter"), Ok | Cancel, Ok),
m_standardQuantizations(BasicQuantizer::getStandardQuantizations()) m_standardQuantizations(BasicQuantizer::getStandardQuantizations())
{ {
cfg = kapp->config(); cfg = tdeApp->config();
initDialog(); initDialog();
} }

4
src/gui/dialogs/ImportDeviceDialog.cpp
Unescape Escape View File

@ -166,7 +166,7 @@ ImportDeviceDialog::doImport()
m_mergeBanks = new TQRadioButton(i18n("Merge banks"), m_buttonGroup); m_mergeBanks = new TQRadioButton(i18n("Merge banks"), m_buttonGroup);
m_overwriteBanks = new TQRadioButton(i18n("Overwrite banks"), m_buttonGroup); m_overwriteBanks = new TQRadioButton(i18n("Overwrite banks"), m_buttonGroup);
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
m_importBanks->setChecked(config->readBoolEntry("importbanks", true)); m_importBanks->setChecked(config->readBoolEntry("importbanks", true));
@ -195,7 +195,7 @@ ImportDeviceDialog::slotOk()
m_device = m_devices[index]; m_device = m_devices[index];
int v = m_buttonGroup->id(m_buttonGroup->selected()); int v = m_buttonGroup->id(m_buttonGroup->selected());
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
config->writeEntry("importbanksoverwrite", v == 1); config->writeEntry("importbanksoverwrite", v == 1);
if (m_rename) if (m_rename)

4
src/gui/dialogs/InterpretDialog.cpp
Unescape Escape View File

@ -58,7 +58,7 @@ InterpretDialog::InterpretDialog(TQWidget *parent) :
m_allInterpretations = new TQCheckBox m_allInterpretations = new TQCheckBox
(i18n("All available interpretations"), groupBox); (i18n("All available interpretations"), groupBox);
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
m_allInterpretations->setChecked m_allInterpretations->setChecked
@ -91,7 +91,7 @@ InterpretDialog::slotAllBoxChanged()
int int
InterpretDialog::getInterpretations() InterpretDialog::getInterpretations()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
config->writeEntry("interpretall", m_allInterpretations->isChecked()); config->writeEntry("interpretall", m_allInterpretations->isChecked());

6
src/gui/dialogs/LilyPondOptionsDialog.cpp
Unescape Escape View File

@ -63,7 +63,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
{ {
setHelp("file-printing"); setHelp("file-printing");
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
TQVBox * mainbox = makeVBoxMainWidget(); TQVBox * mainbox = makeVBoxMainWidget();
@ -296,7 +296,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
void void
LilyPondOptionsDialog::slotApply() LilyPondOptionsDialog::slotApply()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
config->writeEntry("lilylanguage", m_lilyLanguage->currentItem()); config->writeEntry("lilylanguage", m_lilyLanguage->currentItem());
@ -327,7 +327,7 @@ LilyPondOptionsDialog::slotOk()
void void
LilyPondOptionsDialog::setDefaultLilyPondVersion(TQString version) LilyPondOptionsDialog::setDefaultLilyPondVersion(TQString version)
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
int index = -1; int index = -1;
bool unstable = false; bool unstable = false;

4
src/gui/dialogs/RescaleDialog.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ RescaleDialog::RescaleDialog(TQWidget *parent,
TQGroupBox *optionBox = new TQGroupBox(1, TQt::Horizontal, i18n("Options"), vbox); TQGroupBox *optionBox = new TQGroupBox(1, TQt::Horizontal, i18n("Options"), vbox);
m_closeGap = new TQCheckBox(i18n("Adjust times of following events accordingly"), m_closeGap = new TQCheckBox(i18n("Adjust times of following events accordingly"),
optionBox); optionBox);
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
m_closeGap->setChecked m_closeGap->setChecked
(config->readBoolEntry("rescaledialogadjusttimes", true)); (config->readBoolEntry("rescaledialogadjusttimes", true));
@ -82,7 +82,7 @@ bool
RescaleDialog::shouldCloseGap() RescaleDialog::shouldCloseGap()
{ {
if (m_closeGap) { if (m_closeGap) {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
config->writeEntry("rescaledialogadjusttimes", m_closeGap->isChecked()); config->writeEntry("rescaledialogadjusttimes", m_closeGap->isChecked());
return m_closeGap->isChecked(); return m_closeGap->isChecked();

4
src/gui/dialogs/TextEventDialog.cpp
Unescape Escape View File

@ -313,7 +313,7 @@ TextEventDialog::TextEventDialog(TQWidget *parent,
m_staffBelowLabel->setPixmap(map); m_staffBelowLabel->setPixmap(map);
// restore last setting for shortcut combos // restore last setting for shortcut combos
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
m_dynamicShortcutCombo->setCurrentItem(config->readNumEntry("dynamic_shortcut", 0)); m_dynamicShortcutCombo->setCurrentItem(config->readNumEntry("dynamic_shortcut", 0));
@ -509,7 +509,7 @@ void
TextEventDialog::slotOK() TextEventDialog::slotOK()
{ {
// store last setting for shortcut combos // store last setting for shortcut combos
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
config->writeEntry("dynamic_shortcut", m_dynamicShortcutCombo->currentItem()); config->writeEntry("dynamic_shortcut", m_dynamicShortcutCombo->currentItem());

4
src/gui/dialogs/TimeSignatureDialog.cpp
Unescape Escape View File

@ -167,7 +167,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
} }
groupBox = new TQGroupBox(1, TQt::Horizontal, i18n("Options"), vbox); groupBox = new TQGroupBox(1, TQt::Horizontal, i18n("Options"), vbox);
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
m_hideSignatureButton = new TQCheckBox m_hideSignatureButton = new TQCheckBox
@ -201,7 +201,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
TimeSignature TimeSignature
TimeSignatureDialog::getTimeSignature() const TimeSignatureDialog::getTimeSignature() const
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
config->writeEntry("timesigdialogmakehidden", m_hideSignatureButton->isChecked()); config->writeEntry("timesigdialogmakehidden", m_hideSignatureButton->isChecked());

4
src/gui/dialogs/TriggerSegmentDialog.cpp
Unescape Escape View File

@ -92,7 +92,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
void void
TriggerSegmentDialog::setupFromConfig() TriggerSegmentDialog::setupFromConfig()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
int seg = config->readNumEntry("triggersegmentlastornament", 0); int seg = config->readNumEntry("triggersegmentlastornament", 0);
@ -165,7 +165,7 @@ TriggerSegmentDialog::getTimeAdjust() const
void void
TriggerSegmentDialog::slotOk() TriggerSegmentDialog::slotOk()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
config->writeEntry("triggersegmenttiming", strtoqstr(getTimeAdjust())); config->writeEntry("triggersegmenttiming", strtoqstr(getTimeAdjust()));

4
src/gui/dialogs/UseOrnamentDialog.cpp
Unescape Escape View File

@ -140,7 +140,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
void void
UseOrnamentDialog::setupFromConfig() UseOrnamentDialog::setupFromConfig()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
Mark mark = qstrtostr(config->readEntry("useornamentmark", "trill")); Mark mark = qstrtostr(config->readEntry("useornamentmark", "trill"));
@ -247,7 +247,7 @@ UseOrnamentDialog::slotMarkChanged(int i)
void void
UseOrnamentDialog::slotOk() UseOrnamentDialog::slotOk()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
config->writeEntry("useornamentmark", strtoqstr(getMark())); config->writeEntry("useornamentmark", strtoqstr(getMark()));

4
src/gui/editors/matrix/MatrixSelector.cpp
Unescape Escape View File

@ -552,8 +552,8 @@ EventSelection* MatrixSelector::getSelection()
void MatrixSelector::setContextHelpFor(TQPoint p, bool ctrlPressed) void MatrixSelector::setContextHelpFor(TQPoint p, bool ctrlPressed)
{ {
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
if (!kapp->config()->readBoolEntry("toolcontexthelp", true)) return; if (!tdeApp->config()->readBoolEntry("toolcontexthelp", true)) return;
p = m_mParentView->inverseMapPoint(p); p = m_mParentView->inverseMapPoint(p);

6
src/gui/editors/notation/FontViewFrame.cpp
Unescape Escape View File

@ -182,8 +182,8 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
if (i == 0) { if (i == 0) {
if (j == 0) if (j == 0)
continue; continue;
p.setFont(kapp->font()); p.setFont(tdeApp->font());
TQFontMetrics afm(kapp->font()); TQFontMetrics afm(tdeApp->font());
TQString s = TQString("%1").arg(m_row * 256 + (j - 1) * 16); TQString s = TQString("%1").arg(m_row * 256 + (j - 1) * 16);
p.drawText(x - afm.width(s), y, s); p.drawText(x - afm.width(s), y, s);
p.setPen(TQColor(190, 190, 255)); p.setPen(TQColor(190, 190, 255));
@ -191,7 +191,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
p.setPen(TQt::black); p.setPen(TQt::black);
continue; continue;
} else if (j == 0) { } else if (j == 0) {
p.setFont(kapp->font()); p.setFont(tdeApp->font());
TQString s = TQString("%1").arg(i - 1); TQString s = TQString("%1").arg(i - 1);
p.drawText(x, y, s); p.drawText(x, y, s);
p.setPen(TQColor(190, 190, 255)); p.setPen(TQColor(190, 190, 255));

2
src/gui/editors/notation/NotationEraser.cpp
Unescape Escape View File

@ -45,7 +45,7 @@ NotationEraser::NotationEraser(NotationView* view)
: NotationTool("NotationEraser", view), : NotationTool("NotationEraser", view),
m_collapseRest(false) m_collapseRest(false)
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
m_collapseRest = config->readBoolEntry("collapse", false); m_collapseRest = config->readBoolEntry("collapse", false);

6
src/gui/editors/notation/NotationHLayout.cpp
Unescape Escape View File

@ -73,7 +73,7 @@ NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
{ {
// NOTATION_DEBUG << "NotationHLayout::NotationHLayout()" << endl; // NOTATION_DEBUG << "NotationHLayout::NotationHLayout()" << endl;
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup("Notation Options"); config->setGroup("Notation Options");
m_keySigCancelMode = config->readNumEntry("keysigcancelmode", 1); m_keySigCancelMode = config->readNumEntry("keysigcancelmode", 1);
} }
@ -253,7 +253,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
NOTATION_DEBUG << "ottava shift at start:" << ottavaShift << ", ottavaEnd " << ottavaEnd << endl; NOTATION_DEBUG << "ottava shift at start:" << ottavaShift << ", ottavaEnd " << ottavaEnd << endl;
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup("Notation Options"); config->setGroup("Notation Options");
int accOctaveMode = config->readNumEntry("accidentaloctavemode", 1); int accOctaveMode = config->readNumEntry("accidentaloctavemode", 1);
@ -1264,7 +1264,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
int startBar = getComposition()->getBarNumber(startTime); int startBar = getComposition()->getBarNumber(startTime);
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup("Notation Options"); config->setGroup("Notation Options");
bool showInvisibles = config->readBoolEntry("showinvisibles", true); bool showInvisibles = config->readBoolEntry("showinvisibles", true);

6
src/gui/editors/notation/NotationStaff.cpp
Unescape Escape View File

@ -96,7 +96,7 @@ NotationStaff::NotationStaff(TQCanvas *canvas, Segment *segment,
m_ready(false), m_ready(false),
m_lastRenderedBar(0) m_lastRenderedBar(0)
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
m_colourQuantize = config->readBoolEntry("colourquantize", false); m_colourQuantize = config->readBoolEntry("colourquantize", false);
@ -431,7 +431,7 @@ NotationStaff::getNoteNameAtCanvasCoords(double x, int y,
::Rosegarden::Key key; ::Rosegarden::Key key;
getClefAndKeyAtCanvasCoords(x, y, clef, key); getClefAndKeyAtCanvasCoords(x, y, clef, key);
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
int baseOctave = config->readNumEntry("midipitchoctave", -2); int baseOctave = config->readNumEntry("midipitchoctave", -2);
@ -915,7 +915,7 @@ NotationStaff::renderSingleElement(ViewElementList::iterator &vli,
<Bool>(BaseProperties::INVISIBLE, invisible) && invisible) { <Bool>(BaseProperties::INVISIBLE, invisible) && invisible) {
if (m_printPainter) if (m_printPainter)
return ; return ;
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup("Notation Options"); config->setGroup("Notation Options");
bool showInvisibles = config->readBoolEntry("showinvisibles", true); bool showInvisibles = config->readBoolEntry("showinvisibles", true);
if (!showInvisibles) if (!showInvisibles)

2
src/gui/editors/notation/NotationStrings.cpp
Unescape Escape View File

@ -258,7 +258,7 @@ NotationStrings::makeNoteMenuLabel(timeT duration,
} }
} }
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
GeneralConfigurationPage::NoteNameStyle noteNameStyle = GeneralConfigurationPage::NoteNameStyle noteNameStyle =
(GeneralConfigurationPage::NoteNameStyle) (GeneralConfigurationPage::NoteNameStyle)

4
src/gui/editors/notation/NotationView.cpp
Unescape Escape View File

@ -4805,7 +4805,7 @@ void NotationView::slotEditPaste()
(clipboard->getSingleSegment()->getEndTime() - (clipboard->getSingleSegment()->getEndTime() -
clipboard->getSingleSegment()->getStartTime()); clipboard->getSingleSegment()->getStartTime());
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType) PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType)
config->readUnsignedNumEntry("pastetype", config->readUnsignedNumEntry("pastetype",
@ -4839,7 +4839,7 @@ void NotationView::slotEditGeneralPaste()
LinedStaff *staff = getCurrentLinedStaff(); LinedStaff *staff = getCurrentLinedStaff();
Segment &segment = staff->getSegment(); Segment &segment = staff->getSegment();
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType) PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType)
config->readUnsignedNumEntry("pastetype", config->readUnsignedNumEntry("pastetype",

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

@ -55,7 +55,7 @@ NoteFontFactory::getFontNames(bool forceRescan)
if (!m_fontNames.empty()) if (!m_fontNames.empty())
return m_fontNames; return m_fontNames;
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
TQString fontNameList = ""; TQString fontNameList = "";

2
src/gui/editors/notation/NoteInserter.cpp
Unescape Escape View File

@ -69,7 +69,7 @@ NoteInserter::NoteInserter(NotationView* view)
{ {
TQIconSet icon; TQIconSet icon;
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
m_autoBeam = config->readBoolEntry("autobeam", true); m_autoBeam = config->readBoolEntry("autobeam", true);
m_matrixInsertType = (config->readNumEntry("inserttype", 0) > 0); m_matrixInsertType = (config->readNumEntry("inserttype", 0) > 0);

4
src/gui/editors/notation/NotePixmapFactory.cpp
Unescape Escape View File

@ -224,7 +224,7 @@ NotePixmapFactory::init(std::string fontName, int size)
// sizes only and we want pixels // sizes only and we want pixels
TQFont timeSigFont(defaultTimeSigFontFamily), TQFont timeSigFont(defaultTimeSigFontFamily),
textFont(defaultSerifFontFamily); textFont(defaultSerifFontFamily);
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(NotationViewConfigGroup); config->setGroup(NotationViewConfigGroup);
m_timeSigFont = config->readFontEntry("timesigfont", &timeSigFont); m_timeSigFont = config->readFontEntry("timesigfont", &timeSigFont);
@ -3217,7 +3217,7 @@ NotePixmapFactory::getTextFont(const Text &text) const
tiny = true; tiny = true;
} }
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
TQFont textFont; TQFont textFont;

8
src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
Unescape Escape View File

@ -217,19 +217,19 @@ AudioInstrumentParameterPanel::setButtonColour(
// Set the bypass colour on the plugin button // Set the bypass colour on the plugin button
if (bypassState) { if (bypassState) {
button-> button->
setPaletteForegroundColor(kapp->palette(). setPaletteForegroundColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Button)); color(TQPalette::Active, TQColorGroup::Button));
button-> button->
setPaletteBackgroundColor(kapp->palette(). setPaletteBackgroundColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::ButtonText)); color(TQPalette::Active, TQColorGroup::ButtonText));
} else if (colour == TQt::black) { } else if (colour == TQt::black) {
button-> button->
setPaletteForegroundColor(kapp->palette(). setPaletteForegroundColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::ButtonText)); color(TQPalette::Active, TQColorGroup::ButtonText));
button-> button->
setPaletteBackgroundColor(kapp->palette(). setPaletteBackgroundColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Button)); color(TQPalette::Active, TQColorGroup::Button));
} else { } else {
button-> button->

2
src/gui/editors/parameters/SegmentParameterBox.cpp
Unescape Escape View File

@ -1011,7 +1011,7 @@ SegmentParameterBox::updateHighLow()
Pitch highest(m_highestPlayable, accidental); Pitch highest(m_highestPlayable, accidental);
Pitch lowest(m_lowestPlayable, accidental); Pitch lowest(m_lowestPlayable, accidental);
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
int base = config->readNumEntry("midipitchoctave", -2); int base = config->readNumEntry("midipitchoctave", -2);
//!!! FIXME this code is broken, and needs to be fixed after the fashion of //!!! FIXME this code is broken, and needs to be fixed after the fashion of

4
src/gui/editors/parameters/TrackParameterBox.cpp
Unescape Escape View File

@ -106,7 +106,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
title_font.setBold(true); title_font.setBold(true);
// Set up default expansions for the collapsing elements // Set up default expansions for the collapsing elements
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
TQString groupTemp = config->group(); TQString groupTemp = config->group();
config->setGroup("CollapsingFrame"); config->setGroup("CollapsingFrame");
bool expanded = config->readBoolEntry("trackparametersplayback", true); bool expanded = config->readBoolEntry("trackparametersplayback", true);
@ -593,7 +593,7 @@ TrackParameterBox::updateHighLow()
Pitch highest(m_highestPlayable, accidental); Pitch highest(m_highestPlayable, accidental);
Pitch lowest(m_lowestPlayable, accidental); Pitch lowest(m_lowestPlayable, accidental);
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
int base = config->readNumEntry("midipitchoctave", -2); int base = config->readNumEntry("midipitchoctave", -2);
bool useSharps = true; bool useSharps = true;

4
src/gui/editors/segment/ControlEditorDialog.cpp
Unescape Escape View File

@ -115,7 +115,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
for (int i = 1; i < 9; ++i) for (int i = 1; i < 9; ++i)
m_listView->setColumnAlignment(i, TQt::AlignHCenter); m_listView->setColumnAlignment(i, TQt::AlignHCenter);
m_listView->restoreLayout(kapp->config(), ControlEditorConfigGroup); m_listView->restoreLayout(tdeApp->config(), ControlEditorConfigGroup);
TQFrame* btnBox = new TQFrame(mainFrame); TQFrame* btnBox = new TQFrame(mainFrame);
@ -178,7 +178,7 @@ ControlEditorDialog::~ControlEditorDialog()
{ {
RG_DEBUG << "\n*** ControlEditorDialog::~ControlEditorDialog\n" << endl; RG_DEBUG << "\n*** ControlEditorDialog::~ControlEditorDialog\n" << endl;
m_listView->saveLayout(kapp->config(), ControlEditorConfigGroup); m_listView->saveLayout(tdeApp->config(), ControlEditorConfigGroup);
if (m_doc) if (m_doc)
m_doc->getCommandHistory()->detachView(actionCollection()); m_doc->getCommandHistory()->detachView(actionCollection());

22
src/gui/editors/segment/MarkerEditor.cpp
Unescape Escape View File

@ -223,7 +223,7 @@ MarkerEditor::~MarkerEditor()
{ {
RG_DEBUG << "MarkerEditor::~MarkerEditor" << endl; RG_DEBUG << "MarkerEditor::~MarkerEditor" << endl;
m_listView->saveLayout(kapp->config(), MarkerEditorConfigGroup); m_listView->saveLayout(tdeApp->config(), MarkerEditorConfigGroup);
if (m_doc) if (m_doc)
m_doc->getCommandHistory()->detachView(actionCollection()); m_doc->getCommandHistory()->detachView(actionCollection());
@ -252,8 +252,8 @@ MarkerEditor::slotUpdate()
Composition::markerconstiterator it; Composition::markerconstiterator it;
kapp->config()->setGroup(MarkerEditorConfigGroup); tdeApp->config()->setGroup(MarkerEditorConfigGroup);
int timeMode = kapp->config()->readNumEntry("timemode", 0); int timeMode = tdeApp->config()->readNumEntry("timemode", 0);
for (it = markers.begin(); it != markers.end(); ++it) { for (it = markers.begin(); it != markers.end(); ++it) {
TQString timeString = makeTimeString((*it)->getTime(), timeMode); TQString timeString = makeTimeString((*it)->getTime(), timeMode);
@ -386,8 +386,8 @@ MarkerEditor::setupActions()
KStdAction::stdName(KStdAction::Redo)); KStdAction::stdName(KStdAction::Redo));
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
kapp->config()->setGroup(MarkerEditorConfigGroup); tdeApp->config()->setGroup(MarkerEditorConfigGroup);
int timeMode = kapp->config()->readNumEntry("timemode", 0); int timeMode = tdeApp->config()->readNumEntry("timemode", 0);
TDERadioAction *action; TDERadioAction *action;
@ -567,24 +567,24 @@ MarkerEditor::makeTimeString(timeT time, int timeMode)
void void
MarkerEditor::slotMusicalTime() MarkerEditor::slotMusicalTime()
{ {
kapp->config()->setGroup(MarkerEditorConfigGroup); tdeApp->config()->setGroup(MarkerEditorConfigGroup);
kapp->config()->writeEntry("timemode", 0); tdeApp->config()->writeEntry("timemode", 0);
slotUpdate(); slotUpdate();
} }
void void
MarkerEditor::slotRealTime() MarkerEditor::slotRealTime()
{ {
kapp->config()->setGroup(MarkerEditorConfigGroup); tdeApp->config()->setGroup(MarkerEditorConfigGroup);
kapp->config()->writeEntry("timemode", 1); tdeApp->config()->writeEntry("timemode", 1);
slotUpdate(); slotUpdate();
} }
void void
MarkerEditor::slotRawTime() MarkerEditor::slotRawTime()
{ {
kapp->config()->setGroup(MarkerEditorConfigGroup); tdeApp->config()->setGroup(MarkerEditorConfigGroup);
kapp->config()->writeEntry("timemode", 2); tdeApp->config()->writeEntry("timemode", 2);
slotUpdate(); slotUpdate();
} }

4
src/gui/editors/segment/TrackEditor.cpp
Unescape Escape View File

@ -169,8 +169,8 @@ TrackEditor::init(TQWidget* rosegardenguiview)
m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this); m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this);
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
if (kapp->config()->readBoolEntry("backgroundtextures", true)) { if (tdeApp->config()->readBoolEntry("backgroundtextures", true)) {
TQPixmap background; TQPixmap background;
TQString pixmapDir = TDEGlobal::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").

22
src/gui/editors/segment/TriggerSegmentManager.cpp
Unescape Escape View File

@ -174,7 +174,7 @@ TriggerSegmentManager::~TriggerSegmentManager()
{ {
RG_DEBUG << "TriggerSegmentManager::~TriggerSegmentManager" << endl; RG_DEBUG << "TriggerSegmentManager::~TriggerSegmentManager" << endl;
m_listView->saveLayout(kapp->config(), TriggerManagerConfigGroup); m_listView->saveLayout(tdeApp->config(), TriggerManagerConfigGroup);
if (m_doc) if (m_doc)
m_doc->getCommandHistory()->detachView(actionCollection()); m_doc->getCommandHistory()->detachView(actionCollection());
@ -203,8 +203,8 @@ TriggerSegmentManager::slotUpdate()
Composition::triggersegmentcontainerconstiterator it; Composition::triggersegmentcontainerconstiterator it;
kapp->config()->setGroup(TriggerManagerConfigGroup); tdeApp->config()->setGroup(TriggerManagerConfigGroup);
int timeMode = kapp->config()->readNumEntry("timemode", 0); int timeMode = tdeApp->config()->readNumEntry("timemode", 0);
int i = 0; int i = 0;
@ -399,8 +399,8 @@ TriggerSegmentManager::setupActions()
TQ_SLOT(slotPasteAsNew()), actionCollection(), TQ_SLOT(slotPasteAsNew()), actionCollection(),
"paste_to_trigger_segment"); "paste_to_trigger_segment");
kapp->config()->setGroup(TriggerManagerConfigGroup); tdeApp->config()->setGroup(TriggerManagerConfigGroup);
int timeMode = kapp->config()->readNumEntry("timemode", 0); int timeMode = tdeApp->config()->readNumEntry("timemode", 0);
TDERadioAction *action; TDERadioAction *action;
@ -549,24 +549,24 @@ TriggerSegmentManager::makeDurationString(timeT time,
void void
TriggerSegmentManager::slotMusicalTime() TriggerSegmentManager::slotMusicalTime()
{ {
kapp->config()->setGroup(TriggerManagerConfigGroup); tdeApp->config()->setGroup(TriggerManagerConfigGroup);
kapp->config()->writeEntry("timemode", 0); tdeApp->config()->writeEntry("timemode", 0);
slotUpdate(); slotUpdate();
} }
void void
TriggerSegmentManager::slotRealTime() TriggerSegmentManager::slotRealTime()
{ {
kapp->config()->setGroup(TriggerManagerConfigGroup); tdeApp->config()->setGroup(TriggerManagerConfigGroup);
kapp->config()->writeEntry("timemode", 1); tdeApp->config()->writeEntry("timemode", 1);
slotUpdate(); slotUpdate();
} }
void void
TriggerSegmentManager::slotRawTime() TriggerSegmentManager::slotRawTime()
{ {
kapp->config()->setGroup(TriggerManagerConfigGroup); tdeApp->config()->setGroup(TriggerManagerConfigGroup);
kapp->config()->writeEntry("timemode", 2); tdeApp->config()->writeEntry("timemode", 2);
slotUpdate(); slotUpdate();
} }

2
src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
Unescape Escape View File

@ -144,7 +144,7 @@ void AudioPreviewPainter::paintPreviewImage()
haveTempoChange = true; haveTempoChange = true;
} }
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
bool meterLevels = (config->readUnsignedNumEntry("audiopreviewstyle", 1) bool meterLevels = (config->readUnsignedNumEntry("audiopreviewstyle", 1)

8
src/gui/editors/segment/segmentcanvas/CompositionView.cpp
Unescape Escape View File

@ -1328,8 +1328,8 @@ bool CompositionView::event(TQEvent* e)
void CompositionView::enterEvent(TQEvent *e) void CompositionView::enterEvent(TQEvent *e)
{ {
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
if (!kapp->config()->readBoolEntry("toolcontexthelp", true)) return; if (!tdeApp->config()->readBoolEntry("toolcontexthelp", true)) return;
emit showContextHelp(m_toolContextHelp); emit showContextHelp(m_toolContextHelp);
m_contextHelpShown = true; m_contextHelpShown = true;
@ -1346,8 +1346,8 @@ void CompositionView::slotToolHelpChanged(const TQString &text)
if (m_toolContextHelp == text) return; if (m_toolContextHelp == text) return;
m_toolContextHelp = text; m_toolContextHelp = text;
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
if (!kapp->config()->readBoolEntry("toolcontexthelp", true)) return; if (!tdeApp->config()->readBoolEntry("toolcontexthelp", true)) return;
if (m_contextHelpShown) emit showContextHelp(text); if (m_contextHelpShown) emit showContextHelp(text);
} }

4
src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
Unescape Escape View File

@ -479,8 +479,8 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e)
void SegmentSelector::setContextHelpFor(TQPoint p, bool ctrlPressed) void SegmentSelector::setContextHelpFor(TQPoint p, bool ctrlPressed)
{ {
kapp->config()->setGroup(GeneralOptionsConfigGroup); tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
if (!kapp->config()->readBoolEntry("toolcontexthelp", true)) return; if (!tdeApp->config()->readBoolEntry("toolcontexthelp", true)) return;
CompositionItem item = m_canvas->getFirstItemAt(p); CompositionItem item = m_canvas->getFirstItemAt(p);

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

@ -79,7 +79,7 @@ EditViewBase::EditViewBase(RosegardenGUIDoc *doc,
KDockMainWindow(parent, name), KDockMainWindow(parent, name),
m_viewNumber( -1), m_viewNumber( -1),
m_viewLocalPropertyPrefix(makeViewLocalPropertyPrefix()), m_viewLocalPropertyPrefix(makeViewLocalPropertyPrefix()),
m_config(kapp->config()), m_config(tdeApp->config()),
m_doc(doc), m_doc(doc),
m_segments(segments), m_segments(segments),
m_tool(0), m_tool(0),

2
src/gui/general/GUIPalette.cpp
Unescape Escape View File

@ -35,7 +35,7 @@ namespace Rosegarden
TQColor GUIPalette::getColour(const char* const colourName) TQColor GUIPalette::getColour(const char* const colourName)
{ {
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(ColoursConfigGroup); config->setGroup(ColoursConfigGroup);
TQColor res = getInstance()->m_defaultsMap[colourName]; TQColor res = getInstance()->m_defaultsMap[colourName];

2
src/gui/general/MidiPitchLabel.cpp
Unescape Escape View File

@ -48,7 +48,7 @@ MidiPitchLabel::MidiPitchLabel(int pitch)
} else { } else {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
int baseOctave = config->readNumEntry("midipitchoctave", -2); int baseOctave = config->readNumEntry("midipitchoctave", -2);

2
src/gui/general/PresetHandlerDialog.cpp
Unescape Escape View File

@ -52,7 +52,7 @@ namespace Rosegarden
PresetHandlerDialog::PresetHandlerDialog(TQWidget *parent, bool fromNotation) PresetHandlerDialog::PresetHandlerDialog(TQWidget *parent, bool fromNotation)
: KDialogBase(parent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok), : KDialogBase(parent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok),
m_config(kapp->config()), m_config(tdeApp->config()),
m_fromNotation(fromNotation) m_fromNotation(fromNotation)
{ {
m_presets = new PresetGroup(); m_presets = new PresetGroup();

4
src/gui/seqmanager/MetronomeMmapper.cpp
Unescape Escape View File

@ -102,7 +102,7 @@ MetronomeMmapper::MetronomeMmapper(RosegardenGUIDoc* doc)
} }
} }
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
int midiClock = config->readNumEntry("midiclock", 0); int midiClock = config->readNumEntry("midiclock", 0);
int mtcMode = config->readNumEntry("mtcmode", 0); int mtcMode = config->readNumEntry("mtcmode", 0);
@ -224,7 +224,7 @@ void MetronomeMmapper::sortTicks()
size_t MetronomeMmapper::computeMmappedSize() size_t MetronomeMmapper::computeMmappedSize()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(Rosegarden::SequencerOptionsConfigGroup); config->setGroup(Rosegarden::SequencerOptionsConfigGroup);
int midiClock = config->readNumEntry("midiclock", 0); int midiClock = config->readNumEntry("midiclock", 0);
int mtcMode = config->readNumEntry("mtcmode", 0); int mtcMode = config->readNumEntry("mtcmode", 0);

18
src/gui/seqmanager/SequenceManager.cpp
Unescape Escape View File

@ -311,7 +311,7 @@ SequenceManager::play()
if (comp.isLooping()) if (comp.isLooping())
startPos = comp.getElapsedRealTime(comp.getLoopStart()); startPos = comp.getElapsedRealTime(comp.getLoopStart());
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
bool lowLat = config->readBoolEntry("audiolowlatencymonitoring", true); bool lowLat = config->readBoolEntry("audiolowlatencymonitoring", true);
@ -588,7 +588,7 @@ SequenceManager::record(bool toggled)
Composition &comp = m_doc->getComposition(); Composition &comp = m_doc->getComposition();
Studio &studio = m_doc->getStudio(); Studio &studio = m_doc->getStudio();
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup); config->setGroup(GeneralOptionsConfigGroup);
bool punchIn = false; // are we punching in? bool punchIn = false; // are we punching in?
@ -981,7 +981,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
// //
m_doc->syncDevices(); m_doc->syncDevices();
/*TDEConfig* config = kapp->config(); /*TDEConfig* config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
TQString recordDeviceStr = config->readEntry("midirecorddevice"); TQString recordDeviceStr = config->readEntry("midirecorddevice");
sendMIDIRecordingDevice(recordDeviceStr);*/ sendMIDIRecordingDevice(recordDeviceStr);*/
@ -1238,7 +1238,7 @@ SequenceManager::setLoop(const timeT &lhs, const timeT &rhs)
// do not set a loop if JACK transport sync is enabled, because this is // do not set a loop if JACK transport sync is enabled, because this is
// completely broken, and apparently broken due to a limitation of JACK // completely broken, and apparently broken due to a limitation of JACK
// transport itself. #1240039 - DMM // transport itself. #1240039 - DMM
// TDEConfig* config = kapp->config(); // TDEConfig* config = tdeApp->config();
// config->setGroup(SequencerOptionsConfigGroup); // config->setGroup(SequencerOptionsConfigGroup);
// if (config->readBoolEntry("jacktransport", false)) // if (config->readBoolEntry("jacktransport", false))
// { // {
@ -1499,7 +1499,7 @@ SequenceManager::sendMIDIRecordingDevice(const TQString recordDeviceStr)
void void
SequenceManager::restoreRecordSubscriptions() SequenceManager::restoreRecordSubscriptions()
{ {
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
//TQString recordDeviceStr = config->readEntry("midirecorddevice"); //TQString recordDeviceStr = config->readEntry("midirecorddevice");
TQStringList devList = config->readListEntry("midirecorddevice"); TQStringList devList = config->readListEntry("midirecorddevice");
@ -1514,7 +1514,7 @@ SequenceManager::restoreRecordSubscriptions()
void void
SequenceManager::reinitialiseSequencerStudio() SequenceManager::reinitialiseSequencerStudio()
{ {
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
//TQString recordDeviceStr = config->readEntry("midirecorddevice"); //TQString recordDeviceStr = config->readEntry("midirecorddevice");
@ -2017,7 +2017,7 @@ void SequenceManager::tempoChanged(const Composition *c)
void void
SequenceManager::sendTransportControlStatuses() SequenceManager::sendTransportControlStatuses()
{ {
TDEConfig* config = kapp->config(); TDEConfig* config = tdeApp->config();
config->setGroup(SequencerOptionsConfigGroup); config->setGroup(SequencerOptionsConfigGroup);
// Get the config values // Get the config values
@ -2129,8 +2129,8 @@ SequenceManager::getSampleRate()
bool bool
SequenceManager::shouldWarnForImpreciseTimer() SequenceManager::shouldWarnForImpreciseTimer()
{ {
kapp->config()->setGroup(SequencerOptionsConfigGroup); tdeApp->config()->setGroup(SequencerOptionsConfigGroup);
TQString timer = kapp->config()->readEntry("timer"); TQString timer = tdeApp->config()->readEntry("timer");
if (timer == "(auto)" || timer == "") return true; if (timer == "(auto)" || timer == "") return true;
else return false; // if the user has chosen the timer, leave them alone else return false; // if the user has chosen the timer, leave them alone
} }

18
src/gui/studio/AudioMixerWindow.cpp
Unescape Escape View File

@ -683,7 +683,7 @@ AudioMixerWindow::slotPluginSelected(InstrumentId id,
(rec.m_plugins[index], i18n("<no plugin>")); (rec.m_plugins[index], i18n("<no plugin>"));
rec.m_plugins[index]->setPaletteBackgroundColor rec.m_plugins[index]->setPaletteBackgroundColor
(kapp->palette(). (tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Button)); color(TQPalette::Active, TQColorGroup::Button));
} else { } else {
@ -692,7 +692,7 @@ AudioMixerWindow::slotPluginSelected(InstrumentId id,
= m_document->getPluginManager()->getPlugin(plugin); = m_document->getPluginManager()->getPlugin(plugin);
TQColor pluginBgColour = TQColor pluginBgColour =
kapp->palette().color(TQPalette::Active, TQColorGroup::Light); tdeApp->palette().color(TQPalette::Active, TQColorGroup::Light);
if (pluginClass) { if (pluginClass) {
rec.m_plugins[index]-> rec.m_plugins[index]->
@ -722,7 +722,7 @@ AudioMixerWindow::slotPluginSelected(InstrumentId id,
(rec.m_plugins[index], i18n("<no plugin>")); (rec.m_plugins[index], i18n("<no plugin>"));
rec.m_plugins[index]->setPaletteBackgroundColor rec.m_plugins[index]->setPaletteBackgroundColor
(kapp->palette(). (tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Button)); color(TQPalette::Active, TQColorGroup::Button));
} else { } else {
@ -731,7 +731,7 @@ AudioMixerWindow::slotPluginSelected(InstrumentId id,
= m_document->getPluginManager()->getPlugin(plugin); = m_document->getPluginManager()->getPlugin(plugin);
TQColor pluginBgColour = TQColor pluginBgColour =
kapp->palette().color(TQPalette::Active, TQColorGroup::Light); tdeApp->palette().color(TQPalette::Active, TQColorGroup::Light);
if (pluginClass) { if (pluginClass) {
rec.m_plugins[index]-> rec.m_plugins[index]->
@ -873,7 +873,7 @@ AudioMixerWindow::updatePluginButtons(int id)
bool used = false; bool used = false;
bool bypass = false; bool bypass = false;
TQColor pluginBgColour = TQColor pluginBgColour =
kapp->palette().color(TQPalette::Active, TQColorGroup::Light); tdeApp->palette().color(TQPalette::Active, TQColorGroup::Light);
rec->m_plugins[i]->show(); rec->m_plugins[i]->show();
@ -910,11 +910,11 @@ AudioMixerWindow::updatePluginButtons(int id)
if (bypass) { if (bypass) {
rec->m_plugins[i]->setPaletteForegroundColor rec->m_plugins[i]->setPaletteForegroundColor
(kapp->palette(). (tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Button)); color(TQPalette::Active, TQColorGroup::Button));
rec->m_plugins[i]->setPaletteBackgroundColor rec->m_plugins[i]->setPaletteBackgroundColor
(kapp->palette(). (tdeApp->palette().
color(TQPalette::Active, TQColorGroup::ButtonText)); color(TQPalette::Active, TQColorGroup::ButtonText));
} else if (used) { } else if (used) {
@ -926,11 +926,11 @@ AudioMixerWindow::updatePluginButtons(int id)
} else { } else {
rec->m_plugins[i]->setPaletteForegroundColor rec->m_plugins[i]->setPaletteForegroundColor
(kapp->palette(). (tdeApp->palette().
color(TQPalette::Active, TQColorGroup::ButtonText)); color(TQPalette::Active, TQColorGroup::ButtonText));
rec->m_plugins[i]->setPaletteBackgroundColor rec->m_plugins[i]->setPaletteBackgroundColor
(kapp->palette(). (tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Button)); color(TQPalette::Active, TQColorGroup::Button));
} }
} }

4
src/gui/studio/BankEditorDialog.cpp
Unescape Escape View File

@ -130,7 +130,7 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
m_listView->setRootIsDecorated(true); m_listView->setRootIsDecorated(true);
m_listView->setShowSortIndicator(true); m_listView->setShowSortIndicator(true);
m_listView->setItemsRenameable(true); m_listView->setItemsRenameable(true);
m_listView->restoreLayout(kapp->config(), BankEditorConfigGroup); m_listView->restoreLayout(tdeApp->config(), BankEditorConfigGroup);
TQFrame *bankBox = new TQFrame(leftPart); TQFrame *bankBox = new TQFrame(leftPart);
TQGridLayout *gridLayout = new TQGridLayout(bankBox, 4, 2, 6, 6); TQGridLayout *gridLayout = new TQGridLayout(bankBox, 4, 2, 6, 6);
@ -292,7 +292,7 @@ BankEditorDialog::~BankEditorDialog()
{ {
RG_DEBUG << "~BankEditorDialog()\n"; RG_DEBUG << "~BankEditorDialog()\n";
m_listView->saveLayout(kapp->config(), BankEditorConfigGroup); m_listView->saveLayout(tdeApp->config(), BankEditorConfigGroup);
if (m_doc) // see slotFileClose() for an explanation on why we need to test m_doc if (m_doc) // see slotFileClose() for an explanation on why we need to test m_doc
m_doc->getCommandHistory()->detachView(actionCollection()); m_doc->getCommandHistory()->detachView(actionCollection());

2
src/gui/studio/ChangeRecordDeviceCommand.cpp
Unescape Escape View File

@ -34,7 +34,7 @@ void
ChangeRecordDeviceCommand::swap() ChangeRecordDeviceCommand::swap()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(Rosegarden::SequencerOptionsConfigGroup); config->setGroup(Rosegarden::SequencerOptionsConfigGroup);
TQStringList devList = config->readListEntry("midirecorddevice"); TQStringList devList = config->readListEntry("midirecorddevice");
TQString sdevice = TQString::number(m_deviceId); TQString sdevice = TQString::number(m_deviceId);

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

@ -287,7 +287,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
{ {
DeviceList *devices = m_studio->getDevices(); DeviceList *devices = m_studio->getDevices();
//TDEConfig *config = kapp->config(); //TDEConfig *config = tdeApp->config();
//config->setGroup(SequencerOptionsConfigGroup); //config->setGroup(SequencerOptionsConfigGroup);
//DeviceId recordDevice = //DeviceId recordDevice =
//config->readUnsignedNumEntry("midirecorddevice"); //config->readUnsignedNumEntry("midirecorddevice");

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

@ -101,7 +101,7 @@ CollapsingFrame::setWidget(TQWidget *widget)
bool expanded = true; bool expanded = true;
if (name(0)) { if (name(0)) {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
TQString groupTemp = config->group(); TQString groupTemp = config->group();
config->setGroup("CollapsingFrame"); config->setGroup("CollapsingFrame");
expanded = config->readBoolEntry(name(), true); expanded = config->readBoolEntry(name(), true);
@ -130,7 +130,7 @@ CollapsingFrame::toggle()
} }
if (name(0)) { if (name(0)) {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
TQString groupTemp = config->group(); TQString groupTemp = config->group();
config->setGroup("CollapsingFrame"); config->setGroup("CollapsingFrame");
config->writeEntry(name(), !m_collapsed); config->writeEntry(name(), !m_collapsed);

2
src/gui/widgets/ProgressDialog.cpp
Unescape Escape View File

@ -197,7 +197,7 @@ void ProgressDialog::processEvents()
// RG_DEBUG << "ProgressDialog::processEvents: modalVisible is " // RG_DEBUG << "ProgressDialog::processEvents: modalVisible is "
// << m_modalVisible << endl; // << m_modalVisible << endl;
if (m_modalVisible) { if (m_modalVisible) {
kapp->processEvents(50); tdeApp->processEvents(50);
} else { } else {
rgapp->refreshGUI(50); rgapp->refreshGUI(50);
} }

4
src/gui/widgets/QuantizeParameters.cpp
Unescape Escape View File

@ -216,7 +216,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
int defaultIterate = 100; int defaultIterate = 100;
if (!m_configCategory.isNull()) { if (!m_configCategory.isNull()) {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(m_configCategory); config->setGroup(m_configCategory);
defaultType = defaultType =
config->readNumEntry("quantizetype", config->readNumEntry("quantizetype",
@ -411,7 +411,7 @@ QuantizeParameters::getQuantizer() const
} }
if (!m_configCategory.isNull()) { if (!m_configCategory.isNull()) {
TDEConfig *config = kapp->config(); TDEConfig *config = tdeApp->config();
config->setGroup(m_configCategory); config->setGroup(m_configCategory);
config->writeEntry("quantizetype", type); config->writeEntry("quantizetype", type);
config->writeEntry("quantizeunit", unit); config->writeEntry("quantizeunit", unit);

4
src/gui/widgets/Rotary.cpp
Unescape Escape View File

@ -181,7 +181,7 @@ Rotary::paintEvent(TQPaintEvent *)
paint.begin(&map); paint.begin(&map);
TQPen pen; TQPen pen;
pen.setColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Dark)); pen.setColor(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Dark));
pen.setWidth(scale); pen.setWidth(scale);
paint.setPen(pen); paint.setPen(pen);
@ -189,7 +189,7 @@ Rotary::paintEvent(TQPaintEvent *)
paint.setBrush(m_knobColour); paint.setBrush(m_knobColour);
} else { } else {
paint.setBrush( paint.setBrush(
kapp->palette().color(TQPalette::Active, TQColorGroup::Base)); tdeApp->palette().color(TQPalette::Active, TQColorGroup::Base));
} }
TQColor c(m_knobColour); TQColor c(m_knobColour);

2
src/gui/widgets/TextFloat.cpp
Unescape Escape View File

@ -76,7 +76,7 @@ TextFloat::paintEvent(TQPaintEvent *e)
paint.setClipRegion(e->region()); paint.setClipRegion(e->region());
paint.setClipRect(e->rect().normalize()); paint.setClipRect(e->rect().normalize());
paint.setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Dark)); paint.setPen(tdeApp->palette().color(TQPalette::Active, TQColorGroup::Dark));
paint.setPen(GUIPalette::getColour(GUIPalette::RotaryFloatForeground)); paint.setPen(GUIPalette::getColour(GUIPalette::RotaryFloatForeground));
paint.setBrush(GUIPalette::getColour(GUIPalette::RotaryFloatBackground)); paint.setBrush(GUIPalette::getColour(GUIPalette::RotaryFloatBackground));

32
src/sequencer/RosegardenSequencerApp.cpp
Unescape Escape View File

@ -84,7 +84,7 @@ RosegardenSequencerApp::RosegardenSequencerApp() :
SEQUENCER_DEBUG << "Registering with DCOP server" << endl; SEQUENCER_DEBUG << "Registering with DCOP server" << endl;
// Without DCOP we are nothing // Without DCOP we are nothing
TQCString realAppId = kapp->dcopClient()->registerAs(kapp->name(), false); TQCString realAppId = tdeApp->dcopClient()->registerAs(tdeApp->name(), false);
if (realAppId.isNull()) { if (realAppId.isNull()) {
SEQUENCER_DEBUG << "RosegardenSequencer cannot register " SEQUENCER_DEBUG << "RosegardenSequencer cannot register "
@ -415,7 +415,7 @@ RosegardenSequencerApp::notifySequencerStatus()
arg << (int)m_transportStatus; arg << (int)m_transportStatus;
if (!kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, if (!tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"notifySequencerStatus(int)", "notifySequencerStatus(int)",
data)) { data)) {
@ -597,7 +597,7 @@ RosegardenSequencerApp::processAsynchronousEvents()
// std::cerr << "processAsynchronousEvents: sent " << mC->size() << " events" << std::endl; // std::cerr << "processAsynchronousEvents: sent " << mC->size() << " events" << std::endl;
if (!kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, if (!tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"processAsynchronousMidi(MappedComposition)", data)) { "processAsynchronousMidi(MappedComposition)", data)) {
SEQUENCER_DEBUG << "RosegardenSequencer::processAsynchronousEvents() - " SEQUENCER_DEBUG << "RosegardenSequencer::processAsynchronousEvents() - "
@ -671,7 +671,7 @@ RosegardenSequencerApp::record(const RealTime &time,
TQCString replyType; TQCString replyType;
TQDataStream arg(data, IO_WriteOnly); TQDataStream arg(data, IO_WriteOnly);
if (!kapp->dcopClient()->call(ROSEGARDEN_GUI_APP_NAME, if (!tdeApp->dcopClient()->call(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"getArmedInstruments()", "getArmedInstruments()",
data, replyType, replyData, true)) { data, replyType, replyData, true)) {
@ -706,7 +706,7 @@ RosegardenSequencerApp::record(const RealTime &time,
arg << audioInstruments; arg << audioInstruments;
if (!kapp->dcopClient()->call(ROSEGARDEN_GUI_APP_NAME, if (!tdeApp->dcopClient()->call(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"createRecordAudioFiles(TQValueVector<InstrumentId>)", "createRecordAudioFiles(TQValueVector<InstrumentId>)",
data, replyType, replyData, true)) { data, replyType, replyData, true)) {
@ -1304,7 +1304,7 @@ RosegardenSequencerApp::setLowLatencyMode(bool ll)
void void
RosegardenSequencerApp::sequencerAlive() RosegardenSequencerApp::sequencerAlive()
{ {
if (!kapp->dcopClient()-> if (!tdeApp->dcopClient()->
isApplicationRegistered(TQCString(ROSEGARDEN_GUI_APP_NAME))) { isApplicationRegistered(TQCString(ROSEGARDEN_GUI_APP_NAME))) {
SEQUENCER_DEBUG << "RosegardenSequencerApp::sequencerAlive() - " SEQUENCER_DEBUG << "RosegardenSequencerApp::sequencerAlive() - "
<< "waiting for GUI to register" << endl; << "waiting for GUI to register" << endl;
@ -1313,7 +1313,7 @@ RosegardenSequencerApp::sequencerAlive()
TQByteArray data; TQByteArray data;
if (!kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, if (!tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"alive()", "alive()",
data)) { data)) {
@ -1426,7 +1426,7 @@ RosegardenSequencerApp::setMappedPropertyList(int id, const TQString &property,
TQByteArray data; TQByteArray data;
TQDataStream arg(data, IO_WriteOnly); TQDataStream arg(data, IO_WriteOnly);
arg << err; arg << err;
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"showError(TQString)", "showError(TQString)",
data); data);
@ -1756,28 +1756,28 @@ RosegardenSequencerApp::checkExternalTransport()
break; break;
case TransportStop: case TransportStop:
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"stop()", "stop()",
data); data);
break; break;
case TransportStart: case TransportStart:
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"play()", "play()",
data); data);
break; break;
case TransportPlay: case TransportPlay:
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"play()", "play()",
data); data);
break; break;
case TransportRecord: case TransportRecord:
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"record()", "record()",
data); data);
@ -1788,7 +1788,7 @@ RosegardenSequencerApp::checkExternalTransport()
arg << (int)pair.second.sec; arg << (int)pair.second.sec;
arg << (int)pair.second.usec(); arg << (int)pair.second.usec();
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"jumpToTime(int, int)", "jumpToTime(int, int)",
data); data);
@ -1807,7 +1807,7 @@ RosegardenSequencerApp::checkExternalTransport()
arg << (int)pair.second.sec; arg << (int)pair.second.sec;
arg << (int)pair.second.usec(); arg << (int)pair.second.usec();
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"startAtTime(int, int)", "startAtTime(int, int)",
data); data);
@ -1815,7 +1815,7 @@ RosegardenSequencerApp::checkExternalTransport()
} }
case TransportStopAtTime: { case TransportStopAtTime: {
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"stop()", "stop()",
data); data);
@ -1824,7 +1824,7 @@ RosegardenSequencerApp::checkExternalTransport()
arg << (int)pair.second.sec; arg << (int)pair.second.sec;
arg << (int)pair.second.usec(); arg << (int)pair.second.usec();
kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, tdeApp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
ROSEGARDEN_GUI_IFACE_NAME, ROSEGARDEN_GUI_IFACE_NAME,
"jumpToTime(int, int)", "jumpToTime(int, int)",
data); data);

12
src/sound/AudioFileManager.cpp
Unescape Escape View File

@ -769,7 +769,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
m_importProcess->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication); m_importProcess->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication);
while (m_importProcess->isRunning()) { while (m_importProcess->isRunning()) {
kapp->processEvents(100); tdeApp->processEvents(100);
} }
if (!m_importProcess->normalExit()) { if (!m_importProcess->normalExit()) {
@ -1063,9 +1063,9 @@ AudioFileManager::drawPreview(AudioFileId id,
false); false);
TQPainter painter(pixmap); TQPainter painter(pixmap);
pixmap->fill(kapp->palette().color(TQPalette::Active, pixmap->fill(tdeApp->palette().color(TQPalette::Active,
TQColorGroup::Base)); TQColorGroup::Base));
painter.setPen(kapp->palette().color(TQPalette::Active, painter.setPen(tdeApp->palette().color(TQPalette::Active,
TQColorGroup::Dark)); TQColorGroup::Dark));
if (values.size() == 0) { if (values.size() == 0) {
@ -1144,7 +1144,7 @@ AudioFileManager::drawHighlightedPreview(AudioFileId id,
(endTime - startTime))); (endTime - startTime)));
TQPainter painter(pixmap); TQPainter painter(pixmap);
pixmap->fill(kapp->palette().color(TQPalette::Active, pixmap->fill(tdeApp->palette().color(TQPalette::Active,
TQColorGroup::Base)); TQColorGroup::Base));
float yStep = pixmap->height() / 2; float yStep = pixmap->height() / 2;
@ -1169,10 +1169,10 @@ AudioFileManager::drawHighlightedPreview(AudioFileId id,
} }
if (i < startWidth || i > endWidth) if (i < startWidth || i > endWidth)
painter.setPen(kapp->palette().color(TQPalette::Active, painter.setPen(tdeApp->palette().color(TQPalette::Active,
TQColorGroup::Mid)); TQColorGroup::Mid));
else else
painter.setPen(kapp->palette().color(TQPalette::Active, painter.setPen(tdeApp->palette().color(TQPalette::Active,
TQColorGroup::Dark)); TQColorGroup::Dark));
painter.drawLine(i, static_cast<int>(yStep - ch1Value * yStep), painter.drawLine(i, static_cast<int>(yStep - ch1Value * yStep),

4
src/sound/AudioFileTimeStretcher.cpp
Unescape Escape View File

@ -238,13 +238,13 @@ AudioFileTimeStretcher::getStretchedAudioFile(AudioFileId source,
int progress = int int progress = int
((100.f * float(totalIn)) / float(fileTotalIn)); ((100.f * float(totalIn)) / float(fileTotalIn));
emit setProgress(progress); emit setProgress(progress);
kapp->processEvents(); tdeApp->processEvents();
progressCount = 0; progressCount = 0;
} }
} }
emit setProgress(100); emit setProgress(100);
kapp->processEvents(); tdeApp->processEvents();
writeFile.close(); writeFile.close();
std::cerr << "AudioFileTimeStretcher::getStretchedAudioFile: success, id is " std::cerr << "AudioFileTimeStretcher::getStretchedAudioFile: success, id is "

8
src/sound/MidiFile.cpp
Unescape Escape View File

@ -161,7 +161,7 @@ MidiFile::getMidiByte(ifstream* midiFile)
emit setProgress((int)(double(midiFile->tellg()) / emit setProgress((int)(double(midiFile->tellg()) /
double(m_fileSize) * 20.0)); double(m_fileSize) * 20.0));
kapp->processEvents(50); tdeApp->processEvents(50);
} }
return (MidiByte)byte; return (MidiByte)byte;
@ -239,7 +239,7 @@ MidiFile::getMidiBytes(ifstream* midiFile, unsigned long numberOfBytes)
if (bytesGot % 2000 == 0) { if (bytesGot % 2000 == 0) {
emit setProgress((int)(double(midiFile->tellg()) / emit setProgress((int)(double(midiFile->tellg()) /
double(m_fileSize) * 20.0)); double(m_fileSize) * 20.0));
kapp->processEvents(50); tdeApp->processEvents(50);
} }
return stringRet; return stringRet;
@ -832,7 +832,7 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
// split over these tracks // split over these tracks
emit setProgress(20 + emit setProgress(20 +
(int)((80.0 * double(i) / double(m_numberOfTracks)))); (int)((80.0 * double(i) / double(m_numberOfTracks))));
kapp->processEvents(50); tdeApp->processEvents(50);
// Convert the deltaTime to an absolute time since // Convert the deltaTime to an absolute time since
// the start of the segment. The addTime method // the start of the segment. The addTime method
@ -2110,7 +2110,7 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
if (progressCount % 500 == 0) { if (progressCount % 500 == 0) {
emit setProgress(progressCount * 100 / progressTotal); emit setProgress(progressCount * 100 / progressTotal);
kapp->processEvents(500); tdeApp->processEvents(500);
} }
} }

2
src/sound/PeakFile.cpp
Unescape Escape View File

@ -541,7 +541,7 @@ PeakFile::writePeaks(unsigned short /*updatePercentage*/,
emit setProgress((int)(double(byteCount) / emit setProgress((int)(double(byteCount) /
double(apprxTotalBytes) * 100.0)); double(apprxTotalBytes) * 100.0));
kapp->processEvents(); tdeApp->processEvents();
samplePtr = (unsigned char *)samples.c_str(); samplePtr = (unsigned char *)samples.c_str();

Write Preview
Loading…
Cancel
Save