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

64 files changed, 178 insertions, 178 deletions

diff --git a/src/commands/edit/EventQuantizeCommand.cpp b/src/commands/edit/EventQuantizeCommand.cpp
index 4be8163..965f550 100644
--- a/src/commands/edit/EventQuantizeCommand.cpp
+++ b/src/commands/edit/EventQuantizeCommand.cpp
@@ -134,7 +134,7 @@ EventQuantizeCommand::modifySegment()
 
     if (!m_configGroup.isNull()) {
         //!!! need way to decide whether to do these even if no config group (i.e. through args to the command)
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(m_configGroup);
 
         rebeam = config->readBoolEntry("quantizerebeam", true);
@@ -204,7 +204,7 @@ EventQuantizeCommand::makeQuantizer(TQString configGroup,
     //!!! Excessive duplication with
     // QuantizeParameters::getQuantizer in widgets.cpp
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(configGroup);
 
     timeT defaultUnit =
diff --git a/src/commands/edit/EventQuantizeCommand.h b/src/commands/edit/EventQuantizeCommand.h
index 09ae1a7..0423ed5 100644
--- a/src/commands/edit/EventQuantizeCommand.h
+++ b/src/commands/edit/EventQuantizeCommand.h
@@ -58,14 +58,14 @@ public:
     EventQuantizeCommand(EventSelection &selection,
                          Quantizer *);
 
-    /// Constructs own quantizer based on KConfig data in given group
+    /// Constructs own quantizer based on TDEConfig data in given group
     EventQuantizeCommand(Segment &segment,
                          timeT startTime,
                          timeT endTime,
                          TQString configGroup,
                          bool notationDefault);
     
-    /// Constructs own quantizer based on KConfig data in given group
+    /// Constructs own quantizer based on TDEConfig data in given group
     EventQuantizeCommand(EventSelection &selection,
                          TQString configGroup,
                          bool notationDefault);
diff --git a/src/document/ConfigGroups.cpp b/src/document/ConfigGroups.cpp
index 8e164c3..6cd6c68 100644
--- a/src/document/ConfigGroups.cpp
+++ b/src/document/ConfigGroups.cpp
@@ -25,7 +25,7 @@ namespace Rosegarden
 {
 
     //
-    // KConfig group names
+    // TDEConfig group names
     //
     const char* const GeneralOptionsConfigGroup = "General Options";
     const char* const LatencyOptionsConfigGroup = "Latency Options";
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 3db3cfc..edc086c 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -169,7 +169,7 @@ RosegardenGUIDoc::~RosegardenGUIDoc()
 unsigned int
 RosegardenGUIDoc::getAutoSavePeriod() const
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     return config->readUnsignedNumEntry("autosaveinterval", 60);
 }
@@ -1104,7 +1104,7 @@ void RosegardenGUIDoc::initialiseStudio()
     // Now commit all the remaining changes
     StudioControl::setStudioObjectProperties(ids, properties, values);
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(SequencerOptionsConfigGroup);
 
     bool faderOuts = config->readBoolEntry("audiofaderouts", false);
@@ -1963,7 +1963,7 @@ RosegardenGUIDoc::insertRecordedMidi(const MappedComposition &mC)
 
         if (haveNotes) {
 
-            KConfig* config = kapp->config();
+            TDEConfig* config = kapp->config();
             config->setGroup(GeneralOptionsConfigGroup);
 
             int tracking = config->readUnsignedNumEntry("recordtracking", 0);
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index d8de526..38b0fea 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -122,7 +122,7 @@ void
 LilyPondExporter::readConfigVariables(void)
 {
     // grab config info
-    KConfig *cfg = kapp->config();
+    TDEConfig *cfg = kapp->config();
     cfg->setGroup(NotationViewConfigGroup);
 
     m_paperSize = cfg->readUnsignedNumEntry("lilypapersize", PAPER_A4);
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 ;
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 3e479ad..7d82eda 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -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);
 
@@ -7776,7 +7776,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 ;
@@ -7916,7 +7916,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 ;
diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h
index 4e5cc34..88a0d3d 100644
--- a/src/gui/application/RosegardenGUIApp.h
+++ b/src/gui/application/RosegardenGUIApp.h
@@ -53,7 +53,7 @@ class KTempFile;
 class KToggleAction;
 class KRecentFilesAction;
 class TDEProcess;
-class KConfig;
+class TDEConfig;
 class KAction;
 
 
@@ -101,7 +101,7 @@ class AudioManagerDialog;
   * full session management as well as keyboard accelerator configuration by using KAccel.
   * @see KTMainWindow
   * @see TDEApplication
-  * @see KConfig
+  * @see TDEConfig
   * @see KAccel
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
@@ -444,7 +444,7 @@ protected:
      *
      * @see KTMainWindow#saveProperties
      */
-    virtual void saveGlobalProperties(KConfig *_cfg);
+    virtual void saveGlobalProperties(TDEConfig *_cfg);
 
     /**
      * reads the session config file and restores the application's
@@ -453,7 +453,7 @@ protected:
      *
      * @see KTMainWindow#readProperties
      */
-    virtual void readGlobalProperties(KConfig *_cfg);
+    virtual void readGlobalProperties(TDEConfig *_cfg);
 
     /**
      * Create a new audio file for the sequencer and return the
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index fdf7901..878df77 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -347,7 +347,7 @@ void RosegardenGUIView::slotEditSegment(Segment* segment)
         slotEditSegmentAudio(segment);
     } else {
 
-        KConfig* config = kapp->config();
+        TDEConfig* config = kapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         GeneralConfigurationPage::DoubleClickClient
         client =
@@ -830,7 +830,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment)
     std::cout << "RosegardenGUIView::slotEditSegmentAudio() - "
     << "starting external audio editor" << std::endl;
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     TQString application = config->readEntry("externalaudioeditor", "");
@@ -1731,7 +1731,7 @@ RosegardenGUIView::slotUpdateRecordingSegment(Segment *segment,
         return ;
     lastRecordingSegment = segment;
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     int tracking = config->readUnsignedNumEntry("recordtracking", 0);
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index a4ddfdf..1269353 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -496,7 +496,7 @@ int main(int argc, char *argv[])
         testInstalledVersion();
     }
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 
     config->setGroup(GeneralOptionsConfigGroup);
     TQString lastVersion = config->readEntry("lastversion", "");
diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 6687afc..f740dd5 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -66,7 +66,7 @@ namespace Rosegarden
 
 AudioConfigurationPage::AudioConfigurationPage(
     RosegardenGUIDoc *doc,
-    KConfig *cfg,
+    TDEConfig *cfg,
     TQWidget *parent,
     const char *name):
     TabbedConfigurationPage(cfg, parent, name),
diff --git a/src/gui/configuration/AudioConfigurationPage.h b/src/gui/configuration/AudioConfigurationPage.h
index 2540e0d..2ff2776 100644
--- a/src/gui/configuration/AudioConfigurationPage.h
+++ b/src/gui/configuration/AudioConfigurationPage.h
@@ -37,7 +37,7 @@ class TQPushButton;
 class TQLabel;
 class TQComboBox;
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 class KComboBox;
 
 
@@ -53,7 +53,7 @@ class AudioConfigurationPage : public TabbedConfigurationPage
   
 public:
     AudioConfigurationPage(RosegardenGUIDoc *doc,
-                               KConfig *cfg,
+                               TDEConfig *cfg,
                                TQWidget *parent=0,
                                const char *name=0);
 
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index 25492e6..8713cd0 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -95,7 +95,7 @@ AudioPropertiesPage::calculateStats()
 {
     // This stolen from KDE libs kfile/kpropertiesdialog.cpp
     //
-    TQString mountPoint = KIO::findPathMountPoint(m_path->text());
+    TQString mountPoint = TDEIO::findPathMountPoint(m_path->text());
     KDiskFreeSp * job = new KDiskFreeSp;
     connect(job, TQT_SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long,
                                         unsigned long)),
@@ -111,8 +111,8 @@ AudioPropertiesPage::slotFoundMountPoint(const TQString&,
         unsigned long kBAvail )
 {
     m_diskSpace->setText(i18n("%1 out of %2 (%3% used)")
-                         .arg(KIO::convertSizeFromKB(kBAvail))
-                         .arg(KIO::convertSizeFromKB(kBSize))
+                         .arg(TDEIO::convertSizeFromKB(kBAvail))
+                         .arg(TDEIO::convertSizeFromKB(kBSize))
                          .arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 
 
diff --git a/src/gui/configuration/ConfigurationPage.h b/src/gui/configuration/ConfigurationPage.h
index bf0ccd9..cc23da5 100644
--- a/src/gui/configuration/ConfigurationPage.h
+++ b/src/gui/configuration/ConfigurationPage.h
@@ -32,7 +32,7 @@
 #include <tqwidget.h>
 
 
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -55,11 +55,11 @@ public:
                       TQWidget *parent=0, const char *name=0)
         : TQWidget(parent, name), m_doc(doc), m_cfg(0), m_pageIndex(0) {}
 
-    ConfigurationPage(KConfig *cfg,
+    ConfigurationPage(TDEConfig *cfg,
                       TQWidget *parent=0, const char *name=0)
         : TQWidget(parent, name), m_doc(0), m_cfg(cfg), m_pageIndex(0) {}
 
-    ConfigurationPage(RosegardenGUIDoc *doc, KConfig *cfg,
+    ConfigurationPage(RosegardenGUIDoc *doc, TDEConfig *cfg,
                       TQWidget *parent=0, const char *name=0)
         : TQWidget(parent, name), m_doc(doc), m_cfg(cfg), m_pageIndex(0) {}
 
@@ -67,14 +67,14 @@ public:
 
     /**
      * Should set the page up (ie. read the setting from the @ref
-     * KConfig object into the widgets) after creating it in the
+     * TDEConfig object into the widgets) after creating it in the
      * constructor. Called from @ref ConfigureDialog.
     */
 //     virtual void setup() = 0;
 
     /**
      * Should apply the changed settings (ie. read the settings from
-     * the widgets into the @ref KConfig object). Called from @ref
+     * the widgets into the @ref TDEConfig object). Called from @ref
      * ConfigureDialog.
      */
     virtual void apply() = 0;
@@ -94,7 +94,7 @@ protected:
     //--------------- Data members ---------------------------------
 
     RosegardenGUIDoc* m_doc;
-    KConfig* m_cfg;
+    TDEConfig* m_cfg;
 
     int m_pageIndex;
 };
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index a5bea6f..3b7864a 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -58,7 +58,7 @@ namespace Rosegarden
 {
 
 GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
-        KConfig *cfg,
+        TDEConfig *cfg,
         TQWidget *parent, const char *name)
         : TabbedConfigurationPage(cfg, parent, name),
         m_doc(doc),
diff --git a/src/gui/configuration/GeneralConfigurationPage.h b/src/gui/configuration/GeneralConfigurationPage.h
index 51b85bd..2309ce4 100644
--- a/src/gui/configuration/GeneralConfigurationPage.h
+++ b/src/gui/configuration/GeneralConfigurationPage.h
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -71,7 +71,7 @@ public:
     };
 
     GeneralConfigurationPage(RosegardenGUIDoc *doc,
-                             KConfig *cfg,
+                             TDEConfig *cfg,
                              TQWidget *parent=0, const char *name=0);
 
     virtual void apply();
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 0558c25..2282261 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -161,7 +161,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
     //
 
     // set default expansion to false for this group -- what a faff
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString groupTemp = config->group();
     config->setGroup("CollapsingFrame");
     bool expanded = config->readBoolEntry("nonprintableheaders", false);
@@ -251,7 +251,7 @@ HeadersConfigurationPage::slotDeleteProperty()
 
 void HeadersConfigurationPage::apply()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     // If one of the items still has focus, it won't remember edits.
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index 6910d3d..dd7bf19 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -44,7 +44,7 @@ namespace Rosegarden
 {
 
 LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
-        KConfig *cfg,
+        TDEConfig *cfg,
         TQWidget *parent,
         const char *name)
         : TabbedConfigurationPage(doc, cfg, parent, name)
diff --git a/src/gui/configuration/LatencyConfigurationPage.h b/src/gui/configuration/LatencyConfigurationPage.h
index 812a9a6..21cd926 100644
--- a/src/gui/configuration/LatencyConfigurationPage.h
+++ b/src/gui/configuration/LatencyConfigurationPage.h
@@ -34,7 +34,7 @@
 
 class TQWidget;
 class TQPushButton;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -55,7 +55,7 @@ class LatencyConfigurationPage : public TabbedConfigurationPage
 
 public:
     LatencyConfigurationPage(RosegardenGUIDoc *doc,
-                             KConfig *cfg,
+                             TDEConfig *cfg,
                              TQWidget *parent=0, const char *name=0);
 
     virtual void apply();
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index 84d9956..9cbfd82 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -66,7 +66,7 @@ namespace Rosegarden
 
 MIDIConfigurationPage::MIDIConfigurationPage(
     RosegardenGUIDoc *doc,
-    KConfig *cfg,
+    TDEConfig *cfg,
     TQWidget *parent,
     const char *name):
         TabbedConfigurationPage(cfg, parent, name),
diff --git a/src/gui/configuration/MIDIConfigurationPage.h b/src/gui/configuration/MIDIConfigurationPage.h
index 6b60b38..cf1c63b 100644
--- a/src/gui/configuration/MIDIConfigurationPage.h
+++ b/src/gui/configuration/MIDIConfigurationPage.h
@@ -38,7 +38,7 @@ class TQSlider;
 class TQPushButton;
 class TQLabel;
 class TQComboBox;
-class KConfig;
+class TDEConfig;
 class KComboBox;
 
 
@@ -54,7 +54,7 @@ class MIDIConfigurationPage : public TabbedConfigurationPage
   
 public:
     MIDIConfigurationPage(RosegardenGUIDoc *doc,
-                               KConfig *cfg,
+                               TDEConfig *cfg,
                                TQWidget *parent=0,
                                const char *name=0);
 
diff --git a/src/gui/configuration/MatrixConfigurationPage.cpp b/src/gui/configuration/MatrixConfigurationPage.cpp
index c996922..0178e3e 100644
--- a/src/gui/configuration/MatrixConfigurationPage.cpp
+++ b/src/gui/configuration/MatrixConfigurationPage.cpp
@@ -42,7 +42,7 @@
 namespace Rosegarden
 {
 
-MatrixConfigurationPage::MatrixConfigurationPage(KConfig *cfg,
+MatrixConfigurationPage::MatrixConfigurationPage(TDEConfig *cfg,
         TQWidget *parent,
         const char *name) :
         TabbedConfigurationPage(cfg, parent, name)
diff --git a/src/gui/configuration/MatrixConfigurationPage.h b/src/gui/configuration/MatrixConfigurationPage.h
index 215a419..3b9740e 100644
--- a/src/gui/configuration/MatrixConfigurationPage.h
+++ b/src/gui/configuration/MatrixConfigurationPage.h
@@ -32,7 +32,7 @@
 
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -49,7 +49,7 @@ class MatrixConfigurationPage : public TabbedConfigurationPage
   
 
 public:
-    MatrixConfigurationPage(KConfig *cfg,
+    MatrixConfigurationPage(TDEConfig *cfg,
                             TQWidget *parent = 0, const char *name=0);
 
     virtual void apply();
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index a9d26c3..191abac 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -66,7 +66,7 @@
 namespace Rosegarden
 {
 
-NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
+NotationConfigurationPage::NotationConfigurationPage(TDEConfig *cfg,
         TQWidget *parent,
         const char *name) :
         TabbedConfigurationPage(cfg, parent, name)
diff --git a/src/gui/configuration/NotationConfigurationPage.h b/src/gui/configuration/NotationConfigurationPage.h
index 0c7d049..7dd225d 100644
--- a/src/gui/configuration/NotationConfigurationPage.h
+++ b/src/gui/configuration/NotationConfigurationPage.h
@@ -39,7 +39,7 @@ class TQLabel;
 class TQComboBox;
 class TQCheckBox;
 class KFontRequester;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -57,7 +57,7 @@ class NotationConfigurationPage : public TabbedConfigurationPage
   
 
 public:
-    NotationConfigurationPage(KConfig *cfg,
+    NotationConfigurationPage(TDEConfig *cfg,
                               TQWidget *parent = 0, const char *name=0);
 
     virtual void apply();
diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp
index ae64894..fa26a5c 100644
--- a/src/gui/configuration/TabbedConfigurationPage.cpp
+++ b/src/gui/configuration/TabbedConfigurationPage.cpp
@@ -46,7 +46,7 @@ TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc,
     init();
 }
 
-TabbedConfigurationPage::TabbedConfigurationPage(KConfig *cfg,
+TabbedConfigurationPage::TabbedConfigurationPage(TDEConfig *cfg,
                                                  TQWidget *parent,
                                                  const char *name)
     : ConfigurationPage(cfg, parent, name)
@@ -55,7 +55,7 @@ TabbedConfigurationPage::TabbedConfigurationPage(KConfig *cfg,
 }
 
 TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc,
-                                                 KConfig *cfg,
+                                                 TDEConfig *cfg,
                                                  TQWidget *parent,
                                                  const char *name)
     : ConfigurationPage(doc, cfg, parent, name)
diff --git a/src/gui/configuration/TabbedConfigurationPage.h b/src/gui/configuration/TabbedConfigurationPage.h
index ec561c1..cd5e8d2 100644
--- a/src/gui/configuration/TabbedConfigurationPage.h
+++ b/src/gui/configuration/TabbedConfigurationPage.h
@@ -32,7 +32,7 @@
 
 class TQWidget;
 class TQTabWidget;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -54,11 +54,11 @@ public:
     TabbedConfigurationPage(RosegardenGUIDoc *doc,
                             TQWidget *parent=0, const char *name=0);
 
-    TabbedConfigurationPage(KConfig *cfg,
+    TabbedConfigurationPage(TDEConfig *cfg,
                             TQWidget *parent=0, const char *name=0);
 
     TabbedConfigurationPage(RosegardenGUIDoc *doc,
-                            KConfig *cfg,
+                            TDEConfig *cfg,
                             TQWidget *parent=0, const char *name=0);
 
     static TQString iconName() { return "misc"; }
diff --git a/src/gui/dialogs/AddTracksDialog.cpp b/src/gui/dialogs/AddTracksDialog.cpp
index 498e010..d088b9c 100644
--- a/src/gui/dialogs/AddTracksDialog.cpp
+++ b/src/gui/dialogs/AddTracksDialog.cpp
@@ -66,7 +66,7 @@ AddTracksDialog::AddTracksDialog(TQWidget *parent, int currentTrack) :
     m_position->insertItem(i18n("Below the current selected track"));
     m_position->insertItem(i18n("At the bottom"));
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     m_position->setCurrentItem(config->readUnsignedNumEntry("lastaddtracksposition", 2));
 }
@@ -82,7 +82,7 @@ AddTracksDialog::getInsertPosition()
 {
     int opt = m_position->currentItem();
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     config->writeEntry("lastaddtracksposition", opt);
 
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index cbb3b56..24e004f 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -60,7 +60,7 @@ static TQPixmap loadIcon(const char *name)
 
 
 ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
-                                 KConfig* cfg,
+                                 TDEConfig* cfg,
                                  TQWidget *parent,
                                  const char *name)
         : ConfigureDialogBase(parent, i18n("Configure Rosegarden"), name)
diff --git a/src/gui/dialogs/ConfigureDialog.h b/src/gui/dialogs/ConfigureDialog.h
index 8709e75..ee4af19 100644
--- a/src/gui/dialogs/ConfigureDialog.h
+++ b/src/gui/dialogs/ConfigureDialog.h
@@ -30,7 +30,7 @@
 
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -45,7 +45,7 @@ class ConfigureDialog : public ConfigureDialogBase
   
 public:
     ConfigureDialog(RosegardenGUIDoc *doc,
-                    KConfig* cfg,
+                    TDEConfig* cfg,
                     TQWidget *parent=0,
                     const char *name=0);
 signals:
diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h
index 4a78ecc..60ca24f 100644
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@@ -39,7 +39,7 @@ class TQWidget;
 class TQSpinBox;
 class TQPushButton;
 class TQGridLayout;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -66,7 +66,7 @@ public:
     EventFilterDialog(TQWidget* parent);
     ~EventFilterDialog();
 
-    KConfig *cfg;
+    TDEConfig *cfg;
 
     //-------[ accessor functions ]------------------------
 
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index c68bc4f..ab7cb17 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -83,7 +83,7 @@ ImportDeviceDialog::doImport()
     }
 
     TQString target;
-    if (KIO::NetAccess::download(m_url, target) == false) {
+    if (TDEIO::NetAccess::download(m_url, target) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1").arg(m_url.prettyURL()));
         return false;
     }
@@ -168,7 +168,7 @@ ImportDeviceDialog::doImport()
     m_mergeBanks = new TQRadioButton(i18n("Merge banks"), m_buttonGroup);
     m_overwriteBanks = new TQRadioButton(i18n("Overwrite banks"), m_buttonGroup);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     m_importBanks->setChecked(config->readBoolEntry("importbanks", true));
@@ -197,7 +197,7 @@ ImportDeviceDialog::slotOk()
     m_device = m_devices[index];
 
     int v = m_buttonGroup->id(m_buttonGroup->selected());
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     config->writeEntry("importbanksoverwrite", v == 1);
     if (m_rename)
diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp
index 465a50d..62ceeec 100644
--- a/src/gui/dialogs/InterpretDialog.cpp
+++ b/src/gui/dialogs/InterpretDialog.cpp
@@ -60,7 +60,7 @@ InterpretDialog::InterpretDialog(TQWidget *parent) :
     m_allInterpretations = new TQCheckBox
                            (i18n("All available interpretations"), groupBox);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     m_allInterpretations->setChecked
@@ -93,7 +93,7 @@ InterpretDialog::slotAllBoxChanged()
 int
 InterpretDialog::getInterpretations()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     config->writeEntry("interpretall", m_allInterpretations->isChecked());
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index 4eda3fe..dedc702 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -65,7 +65,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
 {
     setHelp("file-printing");
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     TQVBox * mainbox = makeVBoxMainWidget();
@@ -298,7 +298,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
 void
 LilyPondOptionsDialog::slotApply()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     config->writeEntry("lilylanguage", m_lilyLanguage->currentItem());
@@ -329,7 +329,7 @@ LilyPondOptionsDialog::slotOk()
 void
 LilyPondOptionsDialog::setDefaultLilyPondVersion(TQString version)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     int index = -1;
     bool unstable = false;
diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp
index 702443d..fe75a35 100644
--- a/src/gui/dialogs/RescaleDialog.cpp
+++ b/src/gui/dialogs/RescaleDialog.cpp
@@ -61,7 +61,7 @@ RescaleDialog::RescaleDialog(TQWidget *parent,
         TQGroupBox *optionBox = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), vbox);
         m_closeGap = new TQCheckBox(i18n("Adjust times of following events accordingly"),
                                    optionBox);
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         m_closeGap->setChecked
         (config->readBoolEntry("rescaledialogadjusttimes", true));
@@ -84,7 +84,7 @@ bool
 RescaleDialog::shouldCloseGap()
 {
     if (m_closeGap) {
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         config->writeEntry("rescaledialogadjusttimes", m_closeGap->isChecked());
         return m_closeGap->isChecked();
diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp
index e7984dd..7e88fc6 100644
--- a/src/gui/dialogs/TextEventDialog.cpp
+++ b/src/gui/dialogs/TextEventDialog.cpp
@@ -315,7 +315,7 @@ TextEventDialog::TextEventDialog(TQWidget *parent,
     m_staffBelowLabel->setPixmap(map);
 
     // restore last setting for shortcut combos
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     m_dynamicShortcutCombo->setCurrentItem(config->readNumEntry("dynamic_shortcut", 0));
@@ -511,7 +511,7 @@ void
 TextEventDialog::slotOK()
 {
     // store last setting for shortcut combos
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     config->writeEntry("dynamic_shortcut", m_dynamicShortcutCombo->currentItem());
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index f9de575..e814f28 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -169,7 +169,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
     }
 
     groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), vbox);
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     m_hideSignatureButton = new TQCheckBox
@@ -203,7 +203,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
 TimeSignature
 TimeSignatureDialog::getTimeSignature() const
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     config->writeEntry("timesigdialogmakehidden", m_hideSignatureButton->isChecked());
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index af19b79..aec2f52 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -123,7 +123,7 @@ TransportDialog::TransportDialog(TQWidget *parent,
 // Disable the loop button if JACK transport enabled, because this
 // causes a nasty race condition, and it just seems our loops are not JACK compatible
 // #1240039 - DMM
-//    KConfig* config = rgapp->config();
+//    TDEConfig* config = rgapp->config();
 //    config->setGroup(SequencerOptionsConfigGroup);
 //    if (config->readBoolEntry("jacktransport", false))
 //    {
@@ -267,7 +267,7 @@ TransportDialog::TransportDialog(TQWidget *parent,
 TransportDialog::~TransportDialog()
 {
     if (isVisible()) {
-        KConfig* config = rgapp->config();
+        TDEConfig* config = rgapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         config->writeEntry("transportx", x());
         config->writeEntry("transporty", y());
@@ -306,7 +306,7 @@ TransportDialog::initModeMap()
 void
 TransportDialog::show()
 {
-    KConfig* config = rgapp->config();
+    TDEConfig* config = rgapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     int x = config->readNumEntry("transportx", -1);
     int y = config->readNumEntry("transporty", -1);
@@ -328,7 +328,7 @@ void
 TransportDialog::hide()
 {
     if (isVisible()) {
-        KConfig* config = rgapp->config();
+        TDEConfig* config = rgapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         config->writeEntry("transportx", x());
         config->writeEntry("transporty", y());
@@ -1033,7 +1033,7 @@ void
 TransportDialog::slotLoopButtonClicked()
 {
     // disable if JACK transport has been set #1240039 - DMM
-    //    KConfig* config = rgapp->config();
+    //    TDEConfig* config = rgapp->config();
     //    config->setGroup(SequencerOptionsConfigGroup);
     //    if (config->readBoolEntry("jacktransport", false))
     //    {
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index 85035df..c4fc333 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -94,7 +94,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
 void
 TriggerSegmentDialog::setupFromConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     int seg = config->readNumEntry("triggersegmentlastornament", 0);
@@ -167,7 +167,7 @@ TriggerSegmentDialog::getTimeAdjust() const
 void
 TriggerSegmentDialog::slotOk()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     config->writeEntry("triggersegmenttiming", strtoqstr(getTimeAdjust()));
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 279f9f7..f21a85d 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -142,7 +142,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
 void
 UseOrnamentDialog::setupFromConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     Mark mark = qstrtostr(config->readEntry("useornamentmark", "trill"));
@@ -249,7 +249,7 @@ UseOrnamentDialog::slotMarkChanged(int i)
 void
 UseOrnamentDialog::slotOk()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     config->writeEntry("useornamentmark", strtoqstr(getMark()));
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index cc971ab..50929f4 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -47,7 +47,7 @@ NotationEraser::NotationEraser(NotationView* view)
         : NotationTool("NotationEraser", view),
         m_collapseRest(false)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     m_collapseRest = config->readBoolEntry("collapse", false);
 
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 4d891a6..32a47e2 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -75,7 +75,7 @@ NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
 {
     //    NOTATION_DEBUG << "NotationHLayout::NotationHLayout()" << endl;
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Notation Options");
     m_keySigCancelMode = config->readNumEntry("keysigcancelmode", 1);
 }
@@ -255,7 +255,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
 
     NOTATION_DEBUG << "ottava shift at start:" << ottavaShift << ", ottavaEnd " << ottavaEnd << endl;
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Notation Options");
 
     int accOctaveMode = config->readNumEntry("accidentaloctavemode", 1);
@@ -1266,7 +1266,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
 
     int startBar = getComposition()->getBarNumber(startTime);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Notation Options");
     bool showInvisibles = config->readBoolEntry("showinvisibles", true);
 
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 1baa33c..3be47ae 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -98,7 +98,7 @@ NotationStaff::NotationStaff(TQCanvas *canvas, Segment *segment,
         m_ready(false),
         m_lastRenderedBar(0)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     m_colourQuantize = config->readBoolEntry("colourquantize", false);
 
@@ -433,7 +433,7 @@ NotationStaff::getNoteNameAtCanvasCoords(double x, int y,
     ::Rosegarden::Key key;
     getClefAndKeyAtCanvasCoords(x, y, clef, key);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     int baseOctave = config->readNumEntry("midipitchoctave", -2);
 
@@ -917,7 +917,7 @@ NotationStaff::renderSingleElement(ViewElementList::iterator &vli,
             <Bool>(BaseProperties::INVISIBLE, invisible) && invisible) {
         if (m_printPainter)
             return ;
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup("Notation Options");
         bool showInvisibles = config->readBoolEntry("showinvisibles", true);
         if (!showInvisibles)
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index 9bbc6e6..f81ad1e 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -260,7 +260,7 @@ NotationStrings::makeNoteMenuLabel(timeT duration,
         }
     }
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     GeneralConfigurationPage::NoteNameStyle noteNameStyle =
         (GeneralConfigurationPage::NoteNameStyle)
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 4a8fd00..032b8cb 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -4807,7 +4807,7 @@ void NotationView::slotEditPaste()
         (clipboard->getSingleSegment()->getEndTime() -
          clipboard->getSingleSegment()->getStartTime());
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType)
         config->readUnsignedNumEntry("pastetype",
@@ -4841,7 +4841,7 @@ void NotationView::slotEditGeneralPaste()
     LinedStaff *staff = getCurrentLinedStaff();
     Segment &segment = staff->getSegment();
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType)
         config->readUnsignedNumEntry("pastetype",
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index 20c3ba8..9099b58 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -57,7 +57,7 @@ NoteFontFactory::getFontNames(bool forceRescan)
     if (!m_fontNames.empty())
         return m_fontNames;
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     TQString fontNameList = "";
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 5b192cc..a2b6b56 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -71,7 +71,7 @@ NoteInserter::NoteInserter(NotationView* view)
 {
     TQIconSet icon;
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     m_autoBeam = config->readBoolEntry("autobeam", true);
     m_matrixInsertType = (config->readNumEntry("inserttype", 0) > 0);
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index cb028c5..7474d4e 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -226,7 +226,7 @@ NotePixmapFactory::init(std::string fontName, int size)
     // sizes only and we want pixels
     TQFont timeSigFont(defaultTimeSigFontFamily),
         textFont(defaultSerifFontFamily);
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     m_timeSigFont = config->readFontEntry("timesigfont", &timeSigFont);
@@ -3219,7 +3219,7 @@ NotePixmapFactory::getTextFont(const Text &text) const
         tiny = true;
     }
     
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     TQFont textFont;
 
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 3f270dc..2eb39f8 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -1013,7 +1013,7 @@ SegmentParameterBox::updateHighLow()
     Pitch highest(m_highestPlayable, accidental);
     Pitch lowest(m_lowestPlayable, accidental);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     int base = config->readNumEntry("midipitchoctave", -2);
     //!!! FIXME this code is broken, and needs to be fixed after the fashion of
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index 08ac430..d627b01 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -108,7 +108,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
     title_font.setBold(true);
 
     // Set up default expansions for the collapsing elements
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString groupTemp = config->group();
     config->setGroup("CollapsingFrame");
     bool expanded = config->readBoolEntry("trackparametersplayback", true);
@@ -595,7 +595,7 @@ TrackParameterBox::updateHighLow()
     Pitch highest(m_highestPlayable, accidental);
     Pitch lowest(m_lowestPlayable, accidental);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     int base = config->readNumEntry("midipitchoctave", -2);
     bool useSharps = true;
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 90dae37..9bd2079 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -229,8 +229,8 @@ void PlayList::save()
         item = dynamic_cast<PlayListViewItem*>(item->nextSibling());
     }
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs(kc, PlayListConfigGroup);
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs(kc, PlayListConfigGroup);
     kc->writeEntry("Playlist Files", urlList);
 
     getListView()->saveLayout(kc, PlayListConfigGroup);
@@ -238,10 +238,10 @@ void PlayList::save()
 
 void PlayList::restore()
 {
-    KConfig *kc = TDEGlobal::config();
+    TDEConfig *kc = TDEGlobal::config();
     getListView()->restoreLayout(kc, PlayListConfigGroup);
 
-    KConfigGroupSaver cs(kc, PlayListConfigGroup);
+    TDEConfigGroupSaver cs(kc, PlayListConfigGroup);
     TQStringList urlList = kc->readListEntry("Playlist Files");
 
     for (TQStringList::Iterator it = urlList.begin();
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
index 786e1a4..3515e16 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
@@ -147,7 +147,7 @@ void AudioPreviewPainter::paintPreviewImage()
 	haveTempoChange = true;
     }
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     bool meterLevels = (config->readUnsignedNumEntry("audiopreviewstyle", 1)
diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h
index 293e7cc..a5da4ad 100644
--- a/src/gui/general/EditViewBase.h
+++ b/src/gui/general/EditViewBase.h
@@ -40,7 +40,7 @@ class TQFrame;
 class TQCloseEvent;
 class TQAccel;
 class KToggleAction;
-class KConfig;
+class TDEConfig;
 class KCommand;
 namespace Rosegarden { class EditViewTimeSigNotifier; }
 
@@ -361,7 +361,7 @@ protected:
     int m_viewNumber;
     std::string m_viewLocalPropertyPrefix;
 
-    KConfig* m_config;
+    TDEConfig* m_config;
 
     RosegardenGUIDoc* m_doc;
     std::vector<Segment *> m_segments;
diff --git a/src/gui/general/GUIPalette.cpp b/src/gui/general/GUIPalette.cpp
index fec72ca..e43d1de 100644
--- a/src/gui/general/GUIPalette.cpp
+++ b/src/gui/general/GUIPalette.cpp
@@ -37,7 +37,7 @@ namespace Rosegarden
 
 TQColor GUIPalette::getColour(const char* const colourName)
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(ColoursConfigGroup);
 
     TQColor res = getInstance()->m_defaultsMap[colourName];
diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp
index 51742c3..17138df 100644
--- a/src/gui/general/MidiPitchLabel.cpp
+++ b/src/gui/general/MidiPitchLabel.cpp
@@ -50,7 +50,7 @@ MidiPitchLabel::MidiPitchLabel(int pitch)
 
     } else {
 
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         int baseOctave = config->readNumEntry("midipitchoctave", -2);
 
diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h
index 36dad7a..83c617f 100644
--- a/src/gui/general/PresetHandlerDialog.h
+++ b/src/gui/general/PresetHandlerDialog.h
@@ -35,7 +35,7 @@
 #include "CategoryElement.h"
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class KComboBox;
 
 
@@ -58,7 +58,7 @@ public:
     PresetGroup *m_presets;
     CategoriesContainer m_categories;
 
-    KConfig *m_config;
+    TDEConfig *m_config;
     bool m_fromNotation;
 
     //-------[ accessor functions ]------------------------
diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp
index 7002696..672bc90 100644
--- a/src/gui/seqmanager/MetronomeMmapper.cpp
+++ b/src/gui/seqmanager/MetronomeMmapper.cpp
@@ -104,7 +104,7 @@ MetronomeMmapper::MetronomeMmapper(RosegardenGUIDoc* doc)
         }
     }
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(SequencerOptionsConfigGroup);
     int midiClock = config->readNumEntry("midiclock", 0);
     int mtcMode = config->readNumEntry("mtcmode", 0);
@@ -226,7 +226,7 @@ void MetronomeMmapper::sortTicks()
 
 size_t MetronomeMmapper::computeMmappedSize()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(Rosegarden::SequencerOptionsConfigGroup);
     int midiClock = config->readNumEntry("midiclock", 0);
     int mtcMode = config->readNumEntry("mtcmode", 0);
diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp
index 60981c9..c21b001 100644
--- a/src/gui/seqmanager/SequenceManager.cpp
+++ b/src/gui/seqmanager/SequenceManager.cpp
@@ -313,7 +313,7 @@ SequenceManager::play()
     if (comp.isLooping())
         startPos = comp.getElapsedRealTime(comp.getLoopStart());
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(SequencerOptionsConfigGroup);
 
     bool lowLat = config->readBoolEntry("audiolowlatencymonitoring", true);
@@ -590,7 +590,7 @@ SequenceManager::record(bool toggled)
 
     Composition &comp = m_doc->getComposition();
     Studio &studio = m_doc->getStudio();
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     bool punchIn = false; // are we punching in?
@@ -983,7 +983,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
                 //
                 m_doc->syncDevices();
 
-                /*KConfig* config = kapp->config();
+                /*TDEConfig* config = kapp->config();
                   		config->setGroup(SequencerOptionsConfigGroup);
                 TQString recordDeviceStr = config->readEntry("midirecorddevice");
                 sendMIDIRecordingDevice(recordDeviceStr);*/
@@ -1240,7 +1240,7 @@ SequenceManager::setLoop(const timeT &lhs, const timeT &rhs)
     // 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
     // transport itself.  #1240039 - DMM
-    //    KConfig* config = kapp->config();
+    //    TDEConfig* config = kapp->config();
     //    config->setGroup(SequencerOptionsConfigGroup);
     //    if (config->readBoolEntry("jacktransport", false))
     //    {
@@ -1501,7 +1501,7 @@ SequenceManager::sendMIDIRecordingDevice(const TQString recordDeviceStr)
 void
 SequenceManager::restoreRecordSubscriptions()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(SequencerOptionsConfigGroup);
     //TQString recordDeviceStr = config->readEntry("midirecorddevice");
     TQStringList devList = config->readListEntry("midirecorddevice");
@@ -1516,7 +1516,7 @@ SequenceManager::restoreRecordSubscriptions()
 void
 SequenceManager::reinitialiseSequencerStudio()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(SequencerOptionsConfigGroup);
     //TQString recordDeviceStr = config->readEntry("midirecorddevice");
 
@@ -2019,7 +2019,7 @@ void SequenceManager::tempoChanged(const Composition *c)
 void
 SequenceManager::sendTransportControlStatuses()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(SequencerOptionsConfigGroup);
 
     // Get the config values
diff --git a/src/gui/studio/ChangeRecordDeviceCommand.cpp b/src/gui/studio/ChangeRecordDeviceCommand.cpp
index 5f46eff..e9ee7f5 100644
--- a/src/gui/studio/ChangeRecordDeviceCommand.cpp
+++ b/src/gui/studio/ChangeRecordDeviceCommand.cpp
@@ -36,7 +36,7 @@ void
 ChangeRecordDeviceCommand::swap()
  {
 
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(Rosegarden::SequencerOptionsConfigGroup);
         TQStringList devList = config->readListEntry("midirecorddevice");
         TQString sdevice = TQString::number(m_deviceId);
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 4f85d2a..bb4e1f3 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -289,7 +289,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
     {
         DeviceList *devices = m_studio->getDevices();
 
-        //KConfig *config = kapp->config();
+        //TDEConfig *config = kapp->config();
         //config->setGroup(SequencerOptionsConfigGroup);
         //DeviceId recordDevice =
         //config->readUnsignedNumEntry("midirecorddevice");
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 3d350dd..eec56da 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -103,7 +103,7 @@ CollapsingFrame::setWidget(TQWidget *widget)
 
     bool expanded = true;
     if (name(0)) {
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         TQString groupTemp = config->group();
         config->setGroup("CollapsingFrame");
         expanded = config->readBoolEntry(name(), true);
@@ -132,7 +132,7 @@ CollapsingFrame::toggle()
     }
 
     if (name(0)) {
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         TQString groupTemp = config->group();
         config->setGroup("CollapsingFrame");
         config->writeEntry(name(), !m_collapsed);
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index 9e55e0d..01a7cc5 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -218,7 +218,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
     int defaultIterate = 100;
 
     if (!m_configCategory.isNull()) {
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(m_configCategory);
         defaultType =
             config->readNumEntry("quantizetype",
@@ -413,7 +413,7 @@ QuantizeParameters::getQuantizer() const
     }
 
     if (!m_configCategory.isNull()) {
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(m_configCategory);
         config->writeEntry("quantizetype", type);
         config->writeEntry("quantizeunit", unit);
diff --git a/src/gui/widgets/QuantizeParameters.h b/src/gui/widgets/QuantizeParameters.h
index c5a5c71..3cf56cb 100644
--- a/src/gui/widgets/QuantizeParameters.h
+++ b/src/gui/widgets/QuantizeParameters.h
@@ -63,7 +63,7 @@ public:
     
     /**
      * Returned quantizer object is on heap -- caller must delete.
-     * Also writes values to KConfig if so requested in constructor.
+     * Also writes values to TDEConfig if so requested in constructor.
      */
     Quantizer *getQuantizer() const;
 
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index a1e51dc..49c6fd3 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -660,7 +660,7 @@ AudioFileManager::importURL(const KURL &url, int sampleRate)
     emit setOperationName(i18n("Downloading file %1").arg(url.prettyURL()));
 
     TQString localPath = "";
-    if (!KIO::NetAccess::download(url, localPath)) {
+    if (!TDEIO::NetAccess::download(url, localPath)) {
 	KMessageBox::error(0, i18n("Cannot download file %1").arg(url.prettyURL()));
 	throw SoundFile::BadSoundFileException(url.prettyURL().ascii());
     }
@@ -670,10 +670,10 @@ AudioFileManager::importURL(const KURL &url, int sampleRate)
     try {
 	id = importFile(localPath.ascii(), sampleRate);
     } catch (BadAudioPathException ape) {
-	KIO::NetAccess::removeTempFile(localPath);
+	TDEIO::NetAccess::removeTempFile(localPath);
 	throw ape;
     } catch (SoundFile::BadSoundFileException bse) {
-	KIO::NetAccess::removeTempFile(localPath);
+	TDEIO::NetAccess::removeTempFile(localPath);
 	throw bse;
     }