Rename KStartup for enhanced compatibility with KDE4

2 files changed, 14 insertions, 14 deletions

diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index 29f209c..1dc572b 100644
--- a/src/document/RoseXmlHandler.cpp
+++ b/src/document/RoseXmlHandler.cpp
@@ -52,7 +52,7 @@
 #include "gui/application/RosegardenApplication.h"
 #include "gui/dialogs/FileLocateDialog.h"
 #include "gui/general/ProgressReporter.h"
-#include "gui/kdeext/KStartupLogo.h"
+#include "gui/kdeext/TDEStartupLogo.h"
 #include "gui/studio/AudioPlugin.h"
 #include "gui/studio/AudioPluginManager.h"
 #include "gui/widgets/CurrentProgressDialog.h"
@@ -447,7 +447,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
                     minor > RosegardenGUIDoc::FILE_FORMAT_VERSION_MINOR) {
 
                 CurrentProgressDialog::freeze();
-                KStartupLogo::hideIfStillThere();
+                TDEStartupLogo::hideIfStillThere();
 
                 KMessageBox::information(0, i18n("This file was written by Rosegarden %1, which is more recent than this version.\nThere may be some incompatibilities with the file format.").arg(version));
 
@@ -1032,7 +1032,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
                 CurrentProgressDialog::freeze();
 
                 // Hide splash screen if present on startup
-                KStartupLogo::hideIfStillThere();
+                TDEStartupLogo::hideIfStillThere();
 
                 // Create a locate file dialog - give it the file name
                 // and the AudioFileManager path that we've already
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 6d38f5c..028e7d3 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -71,7 +71,7 @@
 #include "gui/editors/segment/TrackLabel.h"
 #include "gui/general/EditViewBase.h"
 #include "gui/general/GUIPalette.h"
-#include "gui/kdeext/KStartupLogo.h"
+#include "gui/kdeext/TDEStartupLogo.h"
 #include "gui/seqmanager/SequenceManager.h"
 #include "gui/studio/AudioPluginManager.h"
 #include "gui/studio/StudioControl.h"
@@ -576,7 +576,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
 
     // Check if file readable with fileInfo ?
     if (!fileInfo.isReadable() || fileInfo.isDir()) {
-        KStartupLogo::hideIfStillThere();
+        TDEStartupLogo::hideIfStillThere();
         TQString msg(i18n("Can't open file '%1'").arg(filename));
         KMessageBox::sorry(0, msg);
         return false;
@@ -637,7 +637,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
     }
 
     if (!okay) {
-        KStartupLogo::hideIfStillThere();
+        TDEStartupLogo::hideIfStillThere();
         TQString msg(i18n("Error when parsing file '%1': \"%2\"")
                     .arg(filename)
                     .arg(errMsg));
@@ -694,7 +694,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
         // generate any audio previews after loading the files
         m_audioFileManager.generatePreviews();
     } catch (Exception e) {
-        KStartupLogo::hideIfStillThere();
+        TDEStartupLogo::hideIfStillThere();
         CurrentProgressDialog::freeze();
         KMessageBox::error(0, strtoqstr(e.getMessage()));
         CurrentProgressDialog::thaw();
@@ -1601,7 +1601,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
 
         if (handler.isCancelled()) {
             RG_DEBUG << "File load cancelled\n";
-            KStartupLogo::hideIfStillThere();
+            TDEStartupLogo::hideIfStillThere();
             KMessageBox::information(0, i18n("File load cancelled"));
             cancelled = true;
             return true;
@@ -1614,7 +1614,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
         if (getSequenceManager() &&
             !(getSequenceManager()->getSoundDriverStatus() & AUDIO_OK)) {
 
-            KStartupLogo::hideIfStillThere();
+            TDEStartupLogo::hideIfStillThere();
             CurrentProgressDialog::freeze();
 
             if (handler.hasActiveAudio() ||
@@ -1659,7 +1659,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
 
                 if (er == 0) er = *rates.begin();
 
-                KStartupLogo::hideIfStillThere();
+                TDEStartupLogo::hideIfStillThere();
                 CurrentProgressDialog::freeze();
 
                 KMessageBox::information(0, i18n("<h3>Incorrect audio sample rate</h3><p>This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.</p>").arg(er).arg(sr).arg(er));
@@ -1669,7 +1669,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
  
             } else if (sr != 0 && mixed) {
                     
-                KStartupLogo::hideIfStillThere();
+                TDEStartupLogo::hideIfStillThere();
                 CurrentProgressDialog::freeze();
                 
                 KMessageBox::information(0, i18n("<h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p>").arg(sr),
@@ -1699,7 +1699,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
                 }
                 msg += "</ul>";
                 
-                KStartupLogo::hideIfStillThere();
+                TDEStartupLogo::hideIfStillThere();
                 CurrentProgressDialog::freeze();
                 KMessageBox::information(0, msg);
                 CurrentProgressDialog::thaw();
@@ -1712,7 +1712,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
                 TQString msg(i18n("This file contains one or more old element types that are now deprecated.\nSupport for these elements may disappear in future versions of Rosegarden.\nWe recommend you re-save this file from this version of Rosegarden to ensure that it can still be re-loaded in future versions."));
                 slotDocumentModified(); // so file can be re-saved immediately
                 
-                KStartupLogo::hideIfStillThere();
+                TDEStartupLogo::hideIfStillThere();
                 CurrentProgressDialog::freeze();
                 KMessageBox::information(0, msg);
                 CurrentProgressDialog::thaw();
@@ -2802,7 +2802,7 @@ RosegardenGUIDoc::finalizeAudioFile(InstrumentId iid)
         //!!! mtr just for now?: or better to do this once after the fact?
         //!!!	m_audioFileManager.generatePreviews();
     } catch (Exception e) {
-        KStartupLogo::hideIfStillThere();
+        TDEStartupLogo::hideIfStillThere();
         CurrentProgressDialog::freeze();
         KMessageBox::error(0, strtoqstr(e.getMessage()));
         CurrentProgressDialog::thaw();