Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

1 files changed, 25 insertions, 25 deletions

diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 1eb623f..b4e0c6f 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -1879,7 +1879,7 @@ void RosegardenGUIApp::slotSaveOptions()
 
 void RosegardenGUIApp::setupFileDialogSpeedbar()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 
     config->setGroup("KFileDialog Speedbar");
 
@@ -1995,7 +1995,7 @@ void RosegardenGUIApp::readOptions()
 
 }
 
-void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
+void RosegardenGUIApp::saveGlobalProperties(TDEConfig *cfg)
 {
     if (m_doc->getTitle() != i18n("Untitled") && !m_doc->isModified()) {
         // saving to tempfile not necessary
@@ -2018,7 +2018,7 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
     }
 }
 
-void RosegardenGUIApp::readGlobalProperties(KConfig* _cfg)
+void RosegardenGUIApp::readGlobalProperties(TDEConfig* _cfg)
 {
     TQString filename = _cfg->readEntry("filename", "");
     bool modified = _cfg->readBoolEntry("modified", false);
@@ -2159,7 +2159,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
 
     TQString target, caption(url.path());
 
-    if (KIO::NetAccess::download(url, target, this) == false) {
+    if (TDEIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
@@ -2225,14 +2225,14 @@ void RosegardenGUIApp::slotMerge()
 
     TQString target;
 
-    if (KIO::NetAccess::download(url, target, this) == false) {
+    if (TDEIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
     mergeFile(target);
 
-    KIO::NetAccess::removeTempFile( target );
+    TDEIO::NetAccess::removeTempFile( target );
 }
 
 void RosegardenGUIApp::slotFileOpenRecent(const KURL &url)
@@ -3695,11 +3695,11 @@ void RosegardenGUIApp::slotImportProject()
     }
 
     TQString tmpfile;
-    KIO::NetAccess::download(url, tmpfile, this);
+    TDEIO::NetAccess::download(url, tmpfile, this);
 
     importProject(tmpfile);
 
-    KIO::NetAccess::removeTempFile(tmpfile);
+    TDEIO::NetAccess::removeTempFile(tmpfile);
 }
 
 void RosegardenGUIApp::importProject(TQString filePath)
@@ -3742,10 +3742,10 @@ void RosegardenGUIApp::slotImportMIDI()
     }
 
     TQString tmpfile;
-    KIO::NetAccess::download(url, tmpfile, this);
+    TDEIO::NetAccess::download(url, tmpfile, this);
     openFile(tmpfile, ImportMIDI); // does everything including setting the document
 
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
 }
 
 void RosegardenGUIApp::slotMergeMIDI()
@@ -3759,10 +3759,10 @@ void RosegardenGUIApp::slotMergeMIDI()
     }
 
     TQString tmpfile;
-    KIO::NetAccess::download(url, tmpfile, this);
+    TDEIO::NetAccess::download(url, tmpfile, this);
     mergeFile(tmpfile, ImportMIDI);
 
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
 }
 
 TQTextCodec *
@@ -3995,10 +3995,10 @@ void RosegardenGUIApp::slotImportRG21()
     }
 
     TQString tmpfile;
-    KIO::NetAccess::download(url, tmpfile, this);
+    TDEIO::NetAccess::download(url, tmpfile, this);
     openFile(tmpfile, ImportRG21);
 
-    KIO::NetAccess::removeTempFile(tmpfile);
+    TDEIO::NetAccess::removeTempFile(tmpfile);
 }
 
 void RosegardenGUIApp::slotMergeRG21()
@@ -4012,10 +4012,10 @@ void RosegardenGUIApp::slotMergeRG21()
     }
 
     TQString tmpfile;
-    KIO::NetAccess::download(url, tmpfile, this);
+    TDEIO::NetAccess::download(url, tmpfile, this);
     mergeFile(tmpfile, ImportRG21);
 
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
 }
 
 RosegardenGUIDoc*
@@ -4082,10 +4082,10 @@ RosegardenGUIApp::slotImportHydrogen()
     }
 
     TQString tmpfile;
-    KIO::NetAccess::download(url, tmpfile, this);
+    TDEIO::NetAccess::download(url, tmpfile, this);
     openFile(tmpfile, ImportHydrogen);
 
-    KIO::NetAccess::removeTempFile(tmpfile);
+    TDEIO::NetAccess::removeTempFile(tmpfile);
 }
 
 void RosegardenGUIApp::slotMergeHydrogen()
@@ -4099,10 +4099,10 @@ void RosegardenGUIApp::slotMergeHydrogen()
     }
 
     TQString tmpfile;
-    KIO::NetAccess::download(url, tmpfile, this);
+    TDEIO::NetAccess::download(url, tmpfile, this);
     mergeFile(tmpfile, ImportHydrogen);
 
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
 }
 
 RosegardenGUIDoc*
@@ -4692,7 +4692,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 
         // Command line arguments
         //
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(SequencerOptionsConfigGroup);
         TQString options = config->readEntry("commandlineoptions");
         if (!options.isEmpty()) {
@@ -4777,7 +4777,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 #ifdef HAVE_LIBJACK
 bool RosegardenGUIApp::launchJack()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(SequencerOptionsConfigGroup);
 
     bool startJack = config->readBoolEntry("jackstart", false);
@@ -5405,7 +5405,7 @@ void RosegardenGUIApp::slotPlay()
 
     // Send the controllers at start of playback if required
     //
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(SequencerOptionsConfigGroup);
     bool sendControllers = config->readBoolEntry("alwayssendcontrollers", false);
 
@@ -7806,7 +7806,7 @@ RosegardenGUIApp::slotImportStudio()
         return ;
 
     TQString target;
-    if (KIO::NetAccess::download(url, target, this) == false) {
+    if (TDEIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1")
                            .arg(url.prettyURL()));
         return ;
@@ -7946,7 +7946,7 @@ RosegardenGUIApp::slotAutoSave()
         m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     if (!config->readBoolEntry("autosave", true))
         return ;