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

src/CMakeLists.txt

@@ -129,7 +129,7 @@ tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC
 
 tde_add_executable( rosegarden AUTOMOC
   SOURCES gui/application/main.cpp
-  LINK dl pthread fontconfig tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
+  LINK dl pthread fontconfig tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} tdeio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -157,7 +157,7 @@ if( WANT_TEST )
 
   tde_add_executable( RosegardenTestDriver AUTOMOC
     SOURCES RosegardenTestDriver.cpp ${tests_SRCS}
-    LINK dl tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
+    LINK dl tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} tdeio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
     DESTINATION ${BIN_INSTALL_DIR}
   )
 

src/commands/edit/EventQuantizeCommand.cpp

@@ -36,7 +36,7 @@
 #include "base/SegmentNotationHelper.h"
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstring.h>
 #include "base/BaseProperties.h"
 #include "gui/application/RosegardenApplication.h"

src/document/RoseXmlHandler.cpp

@@ -59,7 +59,7 @@
 #include "gui/widgets/ProgressDialog.h"
 #include "RosegardenGUIDoc.h"
 #include "sound/AudioFileManager.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>

src/document/RosegardenGUIDoc.cpp

@@ -91,7 +91,7 @@
 #include "sound/PluginIdentifier.h"
 #include "sound/SoundDriver.h"
 #include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfilterdev.h>
 #include <kglobal.h>
 #include <kmessagebox.h>

src/document/io/LilyPondExporter.cpp

@@ -66,7 +66,7 @@
 #include "gui/editors/guitar/Chord.h"
 #include "gui/general/ProgressReporter.h"
 #include "gui/widgets/CurrentProgressDialog.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <tqfileinfo.h>
 #include <tqobject.h>

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>
 
 

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>

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>

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>

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>

src/gui/configuration/AudioConfigurationPage.cpp

@@ -39,8 +39,8 @@
 #include "sound/MappedEvent.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqcstring.h>

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 <tdefiledialog.h>
-#include <kfile.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;

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>

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>
 

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>

src/gui/configuration/GeneralConfigurationPage.cpp

@@ -36,8 +36,8 @@
 #include "sound/SoundDriver.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>

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>

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>

src/gui/configuration/MIDIConfigurationPage.cpp

@@ -39,8 +39,8 @@
 #include "sound/MappedEvent.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqcstring.h>

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>

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>

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>

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"
 

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>

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>

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>

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>
 

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>

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>
 
 

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>

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>

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>

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"

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>

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>

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"

src/gui/editors/segment/PlayList.cpp

@@ -30,8 +30,8 @@
 #include <tqlayout.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kurl.h>
 #include <tqframe.h>

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"

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>

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 {
 

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>
 
 

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>

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>

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"

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>

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>
 
 

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>
 

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>

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

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"

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>

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>

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>

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
 {

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>

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>

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>

src/misc/stableheaders.h

@@ -153,7 +153,7 @@
 #include <kcombobox.h>
 #include <kcommand.h>
 #include <kcompletion.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdcopactionproxy.h>
 #include <kdebug.h>
@@ -163,15 +163,15 @@
 #include <kdiskfreesp.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kfilterdev.h>
 #include <kfontrequester.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <kled.h>
 #include <klineeditdlg.h>

src/sound/AudioFileManager.cpp

@@ -38,7 +38,7 @@
 #include <kapp.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 
 #include <tqpixmap.h>