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

16 files changed, 18 insertions, 18 deletions

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>