Use tdeAppHEADmaster

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 67 insertions, 67 deletions

diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index e76bd05..228f861 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -133,7 +133,7 @@ void RosegardenApplication::saveState(TQSessionManager& sm)
 
 RosegardenApplication* RosegardenApplication::rgApp()
 {
-    return dynamic_cast<RosegardenApplication*>(kApplication());
+    return dynamic_cast<RosegardenApplication*>(tdeApplication());
 }
 
 TQByteArray RosegardenApplication::Empty;
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 235636b..62cf3ef 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -383,9 +383,9 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
     // Lookup the configuration parameter that specifies the default
     // arrangement, and instantiate it.
 
-    kapp->config()->setGroup(GeneralOptionsConfigGroup);
+    tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
     m_parameterArea->setArrangement((RosegardenParameterArea::Arrangement)
-                                    kapp->config()->readUnsignedNumEntry("sidebarstyle",
+                                    tdeApp->config()->readUnsignedNumEntry("sidebarstyle",
                                                                          RosegardenParameterArea::CLASSIC_STYLE));
 
     m_dockLeft->update();
@@ -1534,13 +1534,13 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
         return ;
 
     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
 
     // Caption
     //
-    TQString caption = kapp->caption();
+    TQString caption = tdeApp->caption();
     setCaption(caption + ": " + newDocument->getTitle());
 
     //     // reset AudioManagerDialog
@@ -1685,8 +1685,8 @@ RosegardenGUIApp::openFile(TQString filePath, ImportType type)
         RG_DEBUG << "RosegardenGUIApp::openFile(): calling slotDocColoursChanged() in doc" << endl;
         doc->slotDocColoursChanged();
 
-        kapp->config()->setGroup(GeneralOptionsConfigGroup);
-        if (kapp->config()->readBoolEntry("alwaysusedefaultstudio", false)) {
+        tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
+        if (tdeApp->config()->readBoolEntry("alwaysusedefaultstudio", false)) {
 
             TQString autoloadFile =
                 TDEGlobal::dirs()->findResource("appdata", "autoload.rg");
@@ -1780,7 +1780,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath)
     // Check for an autosaved file to recover
     TQString effectiveFilePath = filePath;
     bool canRecover = false;
-    TQString autoSaveFileName = kapp->checkRecoverFile(filePath, canRecover);
+    TQString autoSaveFileName = tdeApp->checkRecoverFile(filePath, canRecover);
 
     if (canRecover) {
         // 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()));
 #endif
 
-    kapp->config()->setGroup(GeneralOptionsConfigGroup);
-    kapp->config()->writeEntry("Show Transport", m_viewTransport->isChecked());
-    kapp->config()->writeEntry("Expanded Transport", m_transport ? getTransport()->isExpanded() : true);
-    kapp->config()->writeEntry("Show Track labels", m_viewTrackLabels->isChecked());
-    kapp->config()->writeEntry("Show Rulers", m_viewRulers->isChecked());
-    kapp->config()->writeEntry("Show Tempo Ruler", m_viewTempoRuler->isChecked());
-    kapp->config()->writeEntry("Show Chord Name Ruler", m_viewChordNameRuler->isChecked());
-    kapp->config()->writeEntry("Show Previews", m_viewPreviews->isChecked());
-    kapp->config()->writeEntry("Show Segment Labels", m_viewSegmentLabels->isChecked());
-    kapp->config()->writeEntry("Show Parameters", m_dockVisible);
-    kapp->config()->writeEntry("MIDI Thru Routing", m_enableMIDIrouting->isChecked());
+    tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
+    tdeApp->config()->writeEntry("Show Transport", m_viewTransport->isChecked());
+    tdeApp->config()->writeEntry("Expanded Transport", m_transport ? getTransport()->isExpanded() : true);
+    tdeApp->config()->writeEntry("Show Track labels", m_viewTrackLabels->isChecked());
+    tdeApp->config()->writeEntry("Show Rulers", m_viewRulers->isChecked());
+    tdeApp->config()->writeEntry("Show Tempo Ruler", m_viewTempoRuler->isChecked());
+    tdeApp->config()->writeEntry("Show Chord Name Ruler", m_viewChordNameRuler->isChecked());
+    tdeApp->config()->writeEntry("Show Previews", m_viewPreviews->isChecked());
+    tdeApp->config()->writeEntry("Show Segment Labels", m_viewSegmentLabels->isChecked());
+    tdeApp->config()->writeEntry("Show Parameters", m_dockVisible);
+    tdeApp->config()->writeEntry("MIDI Thru Routing", m_enableMIDIrouting->isChecked());
 
 #ifdef SETTING_LOG_DEBUG
 
     RG_DEBUG << "SHOW PARAMETERS = " << m_dockVisible << endl;
 #endif
 
-    m_fileRecent->saveEntries(kapp->config());
+    m_fileRecent->saveEntries(tdeApp->config());
 
-    //     saveMainWindowSettings(kapp->config(), RosegardenGUIApp::MainWindowConfigGroup); - no need to, done by TDEMainWindow
-    kapp->config()->sync();
+    //     saveMainWindowSettings(tdeApp->config(), RosegardenGUIApp::MainWindowConfigGroup); - no need to, done by TDEMainWindow
+    tdeApp->config()->sync();
 }
 
 void RosegardenGUIApp::setupFileDialogSpeedbar()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
 
     config->setGroup("KFileDialog Speedbar");
 
@@ -1908,9 +1908,9 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
 
 void RosegardenGUIApp::readOptions()
 {
-    applyMainWindowSettings(kapp->config(), MainWindowConfigGroup);
+    applyMainWindowSettings(tdeApp->config(), MainWindowConfigGroup);
 
-    kapp->config()->reparseConfiguration();
+    tdeApp->config()->reparseConfiguration();
 
     // Statusbar and toolbars toggling action status
     //
@@ -1924,13 +1924,13 @@ void RosegardenGUIApp::readOptions()
 
     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);
     slotToggleTransport();
 
-    opt = kapp->config()->readBoolEntry("Expanded Transport", true);
+    opt = tdeApp->config()->readBoolEntry("Expanded Transport", true);
 
 #ifdef SETTING_LOG_DEBUG
 
@@ -1942,7 +1942,7 @@ void RosegardenGUIApp::readOptions()
     else
         getTransport()->slotPanelCloseButtonClicked();
 
-    opt = kapp->config()->readBoolEntry("Show Track labels", true);
+    opt = tdeApp->config()->readBoolEntry("Show Track labels", true);
 
 #ifdef SETTING_LOG_DEBUG
 
@@ -1952,27 +1952,27 @@ void RosegardenGUIApp::readOptions()
     m_viewTrackLabels->setChecked(opt);
     slotToggleTrackLabels();
 
-    opt = kapp->config()->readBoolEntry("Show Rulers", true);
+    opt = tdeApp->config()->readBoolEntry("Show Rulers", true);
     m_viewRulers->setChecked(opt);
     slotToggleRulers();
 
-    opt = kapp->config()->readBoolEntry("Show Tempo Ruler", true);
+    opt = tdeApp->config()->readBoolEntry("Show Tempo Ruler", true);
     m_viewTempoRuler->setChecked(opt);
     slotToggleTempoRuler();
 
-    opt = kapp->config()->readBoolEntry("Show Chord Name Ruler", false);
+    opt = tdeApp->config()->readBoolEntry("Show Chord Name Ruler", false);
     m_viewChordNameRuler->setChecked(opt);
     slotToggleChordNameRuler();
 
-    opt = kapp->config()->readBoolEntry("Show Previews", true);
+    opt = tdeApp->config()->readBoolEntry("Show Previews", true);
     m_viewPreviews->setChecked(opt);
     slotTogglePreviews();
 
-    opt = kapp->config()->readBoolEntry("Show Segment Labels", true);
+    opt = tdeApp->config()->readBoolEntry("Show Segment Labels", true);
     m_viewSegmentLabels->setChecked(opt);
     slotToggleSegmentLabels();
 
-    opt = kapp->config()->readBoolEntry("Show Parameters", true);
+    opt = tdeApp->config()->readBoolEntry("Show Parameters", true);
     if (!opt) {
         m_dockLeft->undock();
         m_dockLeft->hide();
@@ -1981,13 +1981,13 @@ void RosegardenGUIApp::readOptions()
     }
 
     // MIDI Thru routing
-    opt = kapp->config()->readBoolEntry("MIDI Thru Routing", true);
+    opt = tdeApp->config()->readBoolEntry("MIDI Thru Routing", true);
     m_enableMIDIrouting->setChecked(opt);
     slotEnableMIDIThruRouting();
 
     // initialise the recent file list
     //
-    m_fileRecent->loadEntries(kapp->config());
+    m_fileRecent->loadEntries(tdeApp->config());
 
     m_actionsSetup = true;
 
@@ -2002,7 +2002,7 @@ void RosegardenGUIApp::saveGlobalProperties(TDEConfig *cfg)
         cfg->writeEntry("filename", filename);
         cfg->writeEntry("modified", m_doc->isModified());
 
-        TQString tempname = kapp->tempSaveName(filename);
+        TQString tempname = tdeApp->tempSaveName(filename);
         TQString errMsg;
         bool res = m_doc->saveDocument(tempname, errMsg);
         if (!res) {
@@ -2023,7 +2023,7 @@ void RosegardenGUIApp::readGlobalProperties(TDEConfig* _cfg)
 
     if (modified) {
         bool canRecover;
-        TQString tempname = kapp->checkRecoverFile(filename, canRecover);
+        TQString tempname = tdeApp->checkRecoverFile(filename, canRecover);
 
         if (canRecover) {
             slotEnableTransport(false);
@@ -2042,7 +2042,7 @@ void RosegardenGUIApp::readGlobalProperties(TDEConfig* _cfg)
         }
     }
 
-    TQString caption = kapp->caption();
+    TQString caption = tdeApp->caption();
     setCaption(caption + ": " + m_doc->getTitle());
 }
 
@@ -2176,10 +2176,10 @@ void RosegardenGUIApp::slotFileOpen()
 {
     slotStatusHelpMsg(i18n("Opening file..."));
 
-    kapp->config()->setGroup(GeneralOptionsConfigGroup);
+    tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
 
     TQString lastOpenedVersion =
-        kapp->config()->readEntry("Last File Opened Version", "none");
+        tdeApp->config()->readEntry("Last File Opened Version", "none");
 
     if (lastOpenedVersion != VERSION) {
 
@@ -2187,9 +2187,9 @@ void RosegardenGUIApp::slotFileOpen()
         // program before.  Default to the examples directory.
 
         TQString examplesDir = TDEGlobal::dirs()->findResource("appdata", "examples/");
-        kapp->config()->setGroup("Recent Dirs");
-        TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
-        kapp->config()->writeEntry
+        tdeApp->config()->setGroup("Recent Dirs");
+        TQString recentString = tdeApp->config()->readEntry("ROSEGARDEN", "");
+        tdeApp->config()->writeEntry
         ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
     }
 
@@ -2204,8 +2204,8 @@ void RosegardenGUIApp::slotFileOpen()
     if (m_doc && !m_doc->saveIfModified())
         return ;
 
-    kapp->config()->setGroup(GeneralOptionsConfigGroup);
-    kapp->config()->writeEntry("Last File Opened Version", VERSION);
+    tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
+    tdeApp->config()->writeEntry("Last File Opened Version", VERSION);
 
     openURL(url);
 }
@@ -2383,7 +2383,7 @@ bool RosegardenGUIApp::slotFileSaveAs()
 
         m_fileRecent->addURL(newName);
 
-        TQString caption = kapp->caption();
+        TQString caption = tdeApp->caption();
         setCaption(caption + ": " + m_doc->getTitle());
         // update the edit view's captions too
         emit compositionStateUpdate();
@@ -4631,7 +4631,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
     //
     // User mode should clear down sequencer processes.
     //
-    if (kapp->dcopClient()->isApplicationRegistered(
+    if (tdeApp->dcopClient()->isApplicationRegistered(
                 TQCString(ROSEGARDEN_SEQUENCER_APP_NAME))) {
         RG_DEBUG << "RosegardenGUIApp::launchSequencer() - "
         << "existing DCOP registered sequencer found\n";
@@ -4656,7 +4656,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 
         sleep(1);
 
-        if (kapp->dcopClient()->isApplicationRegistered(
+        if (tdeApp->dcopClient()->isApplicationRegistered(
                     TQCString(ROSEGARDEN_SEQUENCER_APP_NAME))) {
             RG_DEBUG << "RosegardenGUIApp::launchSequencer() - "
             << "failed to kill existing sequencer\n";
@@ -4690,7 +4690,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 
         // Command line arguments
         //
-        TDEConfig *config = kapp->config();
+        TDEConfig *config = tdeApp->config();
         config->setGroup(SequencerOptionsConfigGroup);
         TQString options = config->readEntry("commandlineoptions");
         if (!options.isEmpty()) {
@@ -4775,7 +4775,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 #ifdef HAVE_LIBJACK
 bool RosegardenGUIApp::launchJack()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup(SequencerOptionsConfigGroup);
 
     bool startJack = config->readBoolEntry("jackstart", false);
@@ -5403,7 +5403,7 @@ void RosegardenGUIApp::slotPlay()
 
     // Send the controllers at start of playback if required
     //
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(SequencerOptionsConfigGroup);
     bool sendControllers = config->readBoolEntry("alwayssendcontrollers", false);
 
@@ -5641,7 +5641,7 @@ void RosegardenGUIApp::slotConfigure()
     RG_DEBUG << "RosegardenGUIApp::slotConfigure\n";
 
     ConfigureDialog *configDlg =
-        new ConfigureDialog(m_doc, kapp->config(), this);
+        new ConfigureDialog(m_doc, tdeApp->config(), this);
 
     connect(configDlg, TQ_SIGNAL(updateAutoSaveInterval(unsigned int)),
             this, TQ_SLOT(slotUpdateAutoSaveInterval(unsigned int)));
@@ -7577,7 +7577,7 @@ RosegardenGUIApp::slotTutorial()
     else
     {
         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
     {
         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)
         return ;
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     if (!config->readBoolEntry("autosave", true))
         return ;
@@ -8025,7 +8025,7 @@ RosegardenGUIApp::awaitDialogClearance()
 //        std::cerr << "RosegardenGUIApp::awaitDialogClearance: have dialog = "
 //                  << haveDialog << std::endl;
     
-        if (haveDialog) kapp->processEvents();
+        if (haveDialog) tdeApp->processEvents();
     }
 
     std::cerr << "RosegardenGUIApp::awaitDialogClearance: exiting" << std::endl;
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index e72e6a4..e98a132 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -345,7 +345,7 @@ void RosegardenGUIView::slotEditSegment(Segment* segment)
         slotEditSegmentAudio(segment);
     } else {
 
-        TDEConfig* config = kapp->config();
+        TDEConfig* config = tdeApp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         GeneralConfigurationPage::DoubleClickClient
         client =
@@ -828,7 +828,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment)
     std::cout << "RosegardenGUIView::slotEditSegmentAudio() - "
     << "starting external audio editor" << std::endl;
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     TQString application = config->readEntry("externalaudioeditor", "");
@@ -1729,7 +1729,7 @@ RosegardenGUIView::slotUpdateRecordingSegment(Segment *segment,
         return ;
     lastRecordingSegment = segment;
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     int tracking = config->readUnsignedNumEntry("recordtracking", 0);
diff --git a/src/gui/application/RosegardenIface.cpp b/src/gui/application/RosegardenIface.cpp
index d42ef35..d529536 100644
--- a/src/gui/application/RosegardenIface.cpp
+++ b/src/gui/application/RosegardenIface.cpp
@@ -56,7 +56,7 @@ void RosegardenIface::iFaceDelayedInit(TDEMainWindow* mainWindow)
 
 DCOPRef RosegardenIface::action(const TQCString &name)
 {
-    return DCOPRef(kapp->dcopClient()->appId(),
+    return DCOPRef(tdeApp->dcopClient()->appId(),
                    m_dcopActionProxy->actionObjectId(name));
 }
 
diff --git a/src/gui/application/SetWaitCursor.cpp b/src/gui/application/SetWaitCursor.cpp
index f6b52ca..4eff90c 100644
--- a/src/gui/application/SetWaitCursor.cpp
+++ b/src/gui/application/SetWaitCursor.cpp
@@ -37,7 +37,7 @@ namespace Rosegarden
 {
 
 SetWaitCursor::SetWaitCursor()
-        : m_guiApp(dynamic_cast<RosegardenGUIApp*>(kapp->mainWidget()))
+        : m_guiApp(dynamic_cast<RosegardenGUIApp*>(tdeApp->mainWidget()))
 {
     if (m_guiApp) {
 
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index a3f1d9d..1f845bb 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -494,7 +494,7 @@ int main(int argc, char *argv[])
         testInstalledVersion();
     }
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
 
     config->setGroup(GeneralOptionsConfigGroup);
     TQString lastVersion = config->readEntry("lastversion", "");
@@ -544,7 +544,7 @@ int main(int argc, char *argv[])
     config->setGroup(GeneralOptionsConfigGroup);
     int install = config->readNumEntry("Install Own Theme", 1);
     if (install == 2 || (install == 1 && !getenv("TDE_FULL_SESSION"))) {
-	kapp->setStyle(new KlearlookStyle);
+	tdeApp->setStyle(new KlearlookStyle);
     }
 
     // Show Startup logo
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
 
     // 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";
         startLogo = TDEStartupLogo::getInstance();
 	startLogo->setShowTip(!newVersion);
@@ -735,6 +735,6 @@ int main(int argc, char *argv[])
 	CurrentProgressDialog::thaw();
     }
 
-    return kapp->exec();
+    return tdeApp->exec();
 }