Rename a number of libraries and executables to avoid conflicts with KDE4

68 files changed, 81 insertions, 81 deletions

diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index f358c2a..10add69 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -42,7 +42,7 @@
 #include <tqsessionmanager.h>
 #include <tqstring.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstatusbar.h>
 
 
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index b4e0c6f..8e529d4 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -176,14 +176,14 @@
 #include <dcopobject.h>
 #include <dcopref.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdcopactionproxy.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klocale.h>
 #include <kmainwindow.h>
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 7d82eda..4007322 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -176,14 +176,14 @@
 #include <dcopobject.h>
 #include <dcopref.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdcopactionproxy.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klocale.h>
 #include <kmainwindow.h>
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index 878df77..ea12c38 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -80,7 +80,7 @@
 #include "sound/AudioFileManager.h"
 #include "sound/MappedEvent.h"
 #include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <tqapplication.h>
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 1269353..538e71b 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -29,7 +29,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstddirs.h>
 #include <ktip.h>
diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index f740dd5..43c143a 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -39,8 +39,8 @@
 #include "sound/MappedEvent.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqcstring.h>
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index 8713cd0..d076ad5 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -32,10 +32,10 @@
 #include "gui/studio/AudioPluginManager.h"
 #include "sound/AudioFileManager.h"
 #include "TabbedConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdiskfreesp.h>
-#include <kfiledialog.h>
-#include <kfile.h>
+#include <tdefiledialog.h>
+#include <tdefile.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqdialog.h>
@@ -93,7 +93,7 @@ AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc,
 void
 AudioPropertiesPage::calculateStats()
 {
-    // This stolen from KDE libs kfile/kpropertiesdialog.cpp
+    // This stolen from KDE libs tdefile/kpropertiesdialog.cpp
     //
     TQString mountPoint = TDEIO::findPathMountPoint(m_path->text());
     KDiskFreeSp * job = new KDiskFreeSp;
diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 18c5576..45191f2 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -37,7 +37,7 @@
 #include "gui/widgets/ColourTable.h"
 #include "TabbedConfigurationPage.h"
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <tqcolor.h>
 #include <tqframe.h>
diff --git a/src/gui/configuration/ConfigurationPage.cpp b/src/gui/configuration/ConfigurationPage.cpp
index d0e2369..31d13f0 100644
--- a/src/gui/configuration/ConfigurationPage.cpp
+++ b/src/gui/configuration/ConfigurationPage.cpp
@@ -26,7 +26,7 @@
 #include "ConfigurationPage.h"
 
 #include "document/RosegardenGUIDoc.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwidget.h>
 #include <algorithm>
 
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index 2261ba2..c554633 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -42,7 +42,7 @@
 #include "gui/configuration/HeadersConfigurationPage.h"
 #include "gui/general/GUIPalette.h"
 #include "TabbedConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <tqframe.h>
 #include <tqlabel.h>
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 3b7864a..0dff640 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -36,8 +36,8 @@
 #include "sound/SoundDriver.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 2282261..98780b0 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -32,7 +32,7 @@
 #include "misc/Strings.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <tqgroupbox.h>
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index dd7bf19..09a940f 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -30,7 +30,7 @@
 #include "ConfigurationPage.h"
 #include "document/RosegardenGUIDoc.h"
 #include "TabbedConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index 9cbfd82..6f521b0 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -39,8 +39,8 @@
 #include "sound/MappedEvent.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqcstring.h>
diff --git a/src/gui/configuration/MatrixConfigurationPage.cpp b/src/gui/configuration/MatrixConfigurationPage.cpp
index 0178e3e..6e49433 100644
--- a/src/gui/configuration/MatrixConfigurationPage.cpp
+++ b/src/gui/configuration/MatrixConfigurationPage.cpp
@@ -31,7 +31,7 @@
 #include "document/ConfigGroups.h"
 #include "gui/editors/matrix/MatrixView.h"
 #include "TabbedConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqstring.h>
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 191abac..85625d7 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -44,7 +44,7 @@
 #include "gui/widgets/QuantizeParameters.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontrequester.h>
 #include <kmessagebox.h>
 #include <tqcheckbox.h>
diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp
index fa26a5c..ae13d21 100644
--- a/src/gui/configuration/TabbedConfigurationPage.cpp
+++ b/src/gui/configuration/TabbedConfigurationPage.cpp
@@ -27,7 +27,7 @@
 
 #include "ConfigurationPage.h"
 #include "document/RosegardenGUIDoc.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <tqstring.h>
 #include <tqtabwidget.h>
diff --git a/src/gui/dialogs/AddTracksDialog.cpp b/src/gui/dialogs/AddTracksDialog.cpp
index d088b9c..a41d10b 100644
--- a/src/gui/dialogs/AddTracksDialog.cpp
+++ b/src/gui/dialogs/AddTracksDialog.cpp
@@ -34,7 +34,7 @@
 #include <tqvbox.h>
 #include <tqwidget.h>
 #include <kapp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "document/ConfigGroups.h"
 
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index 14e727d..ce5d518 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -57,7 +57,7 @@
 #include <kstddirs.h>
 #include <kaction.h>
 #include <kcommand.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klineeditdlg.h>
 #include <klistview.h>
@@ -66,7 +66,7 @@
 #include <kstdaction.h>
 #include <kurl.h>
 #include <kxmlguiclient.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqaccel.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index 24e004f..118f5ba 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -33,7 +33,7 @@
 #include "gui/configuration/NotationConfigurationPage.h"
 #include "gui/configuration/AudioConfigurationPage.h"
 #include "gui/configuration/MIDIConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kstddirs.h>
 #include <tqstring.h>
diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp
index 331fe29..cd1d889 100644
--- a/src/gui/dialogs/EventFilterDialog.cpp
+++ b/src/gui/dialogs/EventFilterDialog.cpp
@@ -38,7 +38,7 @@
 #include "gui/editors/notation/NotePixmapFactory.h"
 #include "document/ConfigGroups.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h
index 60ca24f..db75b34 100644
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@@ -123,7 +123,7 @@ protected slots:
     // set widget values to include nothing
     void slotToggleNone();
 
-    // write out settings to kconfig data for next time and call accept()
+    // write out settings to tdeconfig data for next time and call accept()
     virtual void slotOk();
 
     // update note name text display and ensure From <= To
diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp
index cd85b8d..04c3c20 100644
--- a/src/gui/dialogs/FileLocateDialog.cpp
+++ b/src/gui/dialogs/FileLocateDialog.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include "misc/Debug.h"
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqfileinfo.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index ab7cb17..42b6881 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -35,11 +35,11 @@
 #include "document/RosegardenGUIDoc.h"
 #include "sound/SF2PatchExtractor.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp
index 62ceeec..ce5ba1a 100644
--- a/src/gui/dialogs/InterpretDialog.cpp
+++ b/src/gui/dialogs/InterpretDialog.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include "document/ConfigGroups.h"
 #include "commands/notation/InterpretCommand.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index dedc702..0d5d27a 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -35,7 +35,7 @@
 #include "misc/Strings.h"
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp
index fe75a35..45c2fb4 100644
--- a/src/gui/dialogs/RescaleDialog.cpp
+++ b/src/gui/dialogs/RescaleDialog.cpp
@@ -29,7 +29,7 @@
 #include "document/ConfigGroups.h"
 #include "base/Composition.h"
 #include "gui/widgets/TimeWidget.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp
index 5ff0791..7597e69 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.cpp
+++ b/src/gui/dialogs/SimpleEventEditDialog.cpp
@@ -37,7 +37,7 @@
 #include "TimeDialog.h"
 #include <kcombobox.h>
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
 #include <tqdialog.h>
diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp
index 7e88fc6..dbba02f 100644
--- a/src/gui/dialogs/TextEventDialog.cpp
+++ b/src/gui/dialogs/TextEventDialog.cpp
@@ -32,7 +32,7 @@
 #include "base/NotationTypes.h"
 #include "gui/editors/notation/NotePixmapFactory.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tqbitmap.h>
 #include <tqgrid.h>
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index e814f28..2573752 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -32,7 +32,7 @@
 #include "base/NotationTypes.h"
 #include "gui/widgets/TimeWidget.h"
 #include "gui/widgets/BigArrowButton.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index aec2f52..f1297e3 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -37,7 +37,7 @@
 #include "gui/widgets/Label.h"
 #include "sound/MappedEvent.h"
 #include "document/ConfigGroups.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqaccel.h>
 #include <tqcolor.h>
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index c4fc333..c0ff424 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -33,7 +33,7 @@
 #include "base/Composition.h"
 #include "base/TriggerSegment.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index f21a85d..3c37239 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -36,7 +36,7 @@
 #include "base/TriggerSegment.h"
 #include "gui/editors/notation/NotePixmapFactory.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index c902a93..b804d17 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -60,7 +60,7 @@
 #include "gui/kdeext/KTmpStatusMsg.h"
 #include "gui/dialogs/EventFilterDialog.h"
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kstddirs.h>
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 5b3dd26..c9c3b32 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -49,7 +49,7 @@
 #include <kaction.h>
 #include <kglobal.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqdialog.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 5f69a39..f7665c9 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -106,7 +106,7 @@
 #include <kstddirs.h>
 #include <kaction.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdockwidget.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 50929f4..c12d87a 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -35,7 +35,7 @@
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqiconset.h>
 #include <tqstring.h>
 
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 32a47e2..50fb0f6 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -46,7 +46,7 @@
 #include "NotationProperties.h"
 #include "NotationStaff.h"
 #include "NotePixmapFactory.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqobject.h>
 #include <cmath>
 
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 3be47ae..f49b632 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -62,7 +62,7 @@
 #include "NotePixmapFactory.h"
 #include "NotePixmapParameters.h"
 #include "NoteStyleFactory.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <tqcanvas.h>
 #include <tqpainter.h>
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index f81ad1e..24d5c9d 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -32,7 +32,7 @@
 #include "base/Exception.h"
 #include "base/NotationTypes.h"
 #include "gui/configuration/GeneralConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstring.h>
 
 
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 032b8cb..02b8539 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -182,7 +182,7 @@
 #include "HeadersGroup.h"
 #include <kaction.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index 9099b58..9760734 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -35,7 +35,7 @@
 #include "gui/kdeext/KStartupLogo.h"
 #include "NoteFont.h"
 #include "NoteFontMap.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <tqdir.h>
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index a2b6b56..3db308f 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -51,7 +51,7 @@
 #include "NoteStyleFactory.h"
 #include <kaction.h>
 #include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqiconset.h>
 #include <tqregexp.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index 7474d4e..f34eeaa 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <kstddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/Exception.h"
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 2eb39f8..4562520 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -58,7 +58,7 @@
 #include <kcolordialog.h>
 #include <kcombobox.h>
 #include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineeditdlg.h>
 #include <ktabwidget.h>
 #include <tqbutton.h>
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index d627b01..62920b4 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -61,7 +61,7 @@
 #include "sound/PluginIdentifier.h"
 #include <kcolordialog.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
 #include <ksqueezedtextlabel.h>
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 0f25aeb..c6c2dd8 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kstddirs.h>
 #include <kstdaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Composition.h"
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 9bd2079..58d59cc 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -30,8 +30,8 @@
 #include <tqlayout.h>
 
 #include <klocale.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kurl.h>
 #include <tqframe.h>
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index cb8db68..6be14b5 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -28,7 +28,7 @@
 #include <kapplication.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "document/ConfigGroups.h"
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 60dde0c..8bfb621 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -55,7 +55,7 @@
 #include <kmessagebox.h>
 #include <kstdaccel.h>
 #include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqaccel.h>
 #include <tqdialog.h>
 #include <tqframe.h>
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
index 3515e16..b6f7518 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
@@ -38,7 +38,7 @@
 #include <tqapplication.h>
 
 #include <kapp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace Rosegarden {
 
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index fe52f26..89290fa 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -64,7 +64,7 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <algorithm>
 
 
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index c1b1f4b..02f3670 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -47,7 +47,7 @@
 #include "SegmentTool.h"
 #include "SegmentToolBox.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqcursor.h>
 #include <tqevent.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index 7d7346f..4386cb2 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -46,7 +46,7 @@
 #include "TempoListItem.h"
 #include <kaction.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kxmlguiclient.h>
 #include <tqbuttongroup.h>
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index c8e36eb..661236c 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -28,7 +28,7 @@
 
 #include "base/BaseProperties.h"
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "ActiveItem.h"
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 0795b5f..ca8211a 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -46,7 +46,7 @@
 #include "gui/kdeext/KTmpStatusMsg.h"
 #include <kaction.h>
 #include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <kglobal.h>
diff --git a/src/gui/general/GUIPalette.cpp b/src/gui/general/GUIPalette.cpp
index e43d1de..0a3bd91 100644
--- a/src/gui/general/GUIPalette.cpp
+++ b/src/gui/general/GUIPalette.cpp
@@ -28,7 +28,7 @@
 
 #include "base/Colour.h"
 #include "document/ConfigGroups.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqcolor.h>
 
 
diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp
index 17138df..7b46812 100644
--- a/src/gui/general/MidiPitchLabel.cpp
+++ b/src/gui/general/MidiPitchLabel.cpp
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 
 #include "document/ConfigGroups.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tqstring.h>
 
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index 79124e4..a5f77d9 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -37,7 +37,7 @@
 #include "PresetElement.h"
 #include "PresetGroup.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tqbuttongroup.h>
 #include <tqdialog.h>
diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h
index 83c617f..6d7b3b6 100644
--- a/src/gui/general/PresetHandlerDialog.h
+++ b/src/gui/general/PresetHandlerDialog.h
@@ -97,7 +97,7 @@ protected slots:
     // changes.
     void slotCategoryIndexChanged(int index);
 
-    // write out settings to kconfig data for next time and call accept()
+    // write out settings to tdeconfig data for next time and call accept()
     void slotOk();
 
 }; // PresetHandlerDialog
diff --git a/src/gui/kdeext/KStartupLogo.cpp b/src/gui/kdeext/KStartupLogo.cpp
index d1b4870..da473e9 100644
--- a/src/gui/kdeext/KStartupLogo.cpp
+++ b/src/gui/kdeext/KStartupLogo.cpp
@@ -30,7 +30,7 @@
 
 #include <kapp.h>
 #include <kstddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktip.h>
 
 #include "KStartupLogo.h"
diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp
index 672bc90..5e79b3e 100644
--- a/src/gui/seqmanager/MetronomeMmapper.cpp
+++ b/src/gui/seqmanager/MetronomeMmapper.cpp
@@ -40,7 +40,7 @@
 #include "document/RosegardenGUIDoc.h"
 #include "SegmentMmapper.h"
 #include "sound/MappedEvent.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqstring.h>
 #include <algorithm>
diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp
index c21b001..a8d6e30 100644
--- a/src/gui/seqmanager/SequenceManager.cpp
+++ b/src/gui/seqmanager/SequenceManager.cpp
@@ -63,7 +63,7 @@
 #include "TimeSigSegmentMmapper.h"
 #include <klocale.h>
 #include <kstddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <tqapplication.h>
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 8c0b885..1f34ce7 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -50,7 +50,7 @@
 #include <kaction.h>
 #include <kcombobox.h>
 #include <kcommand.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klistview.h>
 #include <kmainwindow.h>
diff --git a/src/gui/studio/ChangeRecordDeviceCommand.cpp b/src/gui/studio/ChangeRecordDeviceCommand.cpp
index e9ee7f5..fb819ea 100644
--- a/src/gui/studio/ChangeRecordDeviceCommand.cpp
+++ b/src/gui/studio/ChangeRecordDeviceCommand.cpp
@@ -27,7 +27,7 @@
 #include "document/ConfigGroups.h"
 #include "sound/MappedEvent.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index bb4e1f3..149a245 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -48,7 +48,7 @@
 #include <klocale.h>
 #include <kstddirs.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kmainwindow.h>
 #include <kmessagebox.h>
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index eec56da..2fe179f 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -26,7 +26,7 @@
 #include "CollapsingFrame.h"
 #include <kapplication.h>
 #include <kstddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqfont.h>
 #include <tqframe.h>
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index 01a7cc5..a51f099 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -36,7 +36,7 @@
 #include "gui/editors/notation/NotationStrings.h"
 #include "gui/editors/notation/NotePixmapFactory.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
 #include <tqgroupbox.h>