Rename many classes and header files to avoid conflicts with KDE4

67 files changed, 115 insertions, 115 deletions

diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index a4957be..68efb3a 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -27,15 +27,15 @@
 
 #include <klocale.h>
 #include "misc/Debug.h"
-#include <kactioncollection.h>
-#include <kaction.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <kstdaction.h>
 #include <tqobject.h>
 #include <tqpopupmenu.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index b160f45..e77fea1 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -33,7 +33,7 @@
 #include "RosegardenGUIApp.h"
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kuniqueapplication.h>
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 6bb154a..202c530 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -175,7 +175,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdcopactionproxy.h>
 #include <kdockwidget.h>
@@ -186,17 +186,17 @@
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstddirs.h>
 #include <ktempfile.h>
 #include <ktip.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 #include <kxmlguiclient.h>
 #include <tqaccel.h>
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 23215a9..970c6be 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -175,7 +175,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdcopactionproxy.h>
 #include <kdockwidget.h>
@@ -186,17 +186,17 @@
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstddirs.h>
 #include <ktempfile.h>
 #include <ktip.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 #include <kxmlguiclient.h>
 #include <tqaccel.h>
diff --git a/src/gui/application/RosegardenIface.cpp b/src/gui/application/RosegardenIface.cpp
index 4679e1c..b413612 100644
--- a/src/gui/application/RosegardenIface.cpp
+++ b/src/gui/application/RosegardenIface.cpp
@@ -32,9 +32,9 @@
 #include "sound/MappedComposition.h"
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdcopactionproxy.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqcstring.h>
 #include <tqstring.h>
 #include <tqvaluelist.h>
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index c554633..fc1488f 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -43,7 +43,7 @@
 #include "gui/general/GUIPalette.h"
 #include "TabbedConfigurationPage.h"
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqlistview.h>
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 9357145..132df33 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -33,7 +33,7 @@
 
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index e5cbb32..9bb61d7 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -45,7 +45,7 @@
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
 #include <tdeconfig.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kmessagebox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index 6cb68bf..0c0a33d 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -55,13 +55,13 @@
 #include "UnusedAudioSelectionDialog.h"
 #include <klocale.h>
 #include <kstddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klineeditdlg.h>
-#include <klistview.h>
-#include <kmainwindow.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
 #include <kurl.h>
diff --git a/src/gui/dialogs/AudioManagerDialog.h b/src/gui/dialogs/AudioManagerDialog.h
index 60e28d1..376e353 100644
--- a/src/gui/dialogs/AudioManagerDialog.h
+++ b/src/gui/dialogs/AudioManagerDialog.h
@@ -27,7 +27,7 @@
 #define _RG_AUDIOMANAGERDIALOG_H_
 
 #include "sound/AudioFile.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "document/ConfigGroups.h"
 
 
diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
index 2c86a01..8e4f40b 100644
--- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
+++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
@@ -27,7 +27,7 @@
 
 #include <klocale.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
 #include <tqlistview.h>
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index ab32181..8ecbb27 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -59,14 +59,14 @@
 #include "gui/general/MidiPitchLabel.h"
 #include "gui/kdeext/KTmpStatusMsg.h"
 #include "gui/dialogs/EventFilterDialog.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kstddirs.h>
 #include <kglobal.h>
 #include <klineeditdlg.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kxmlguiclient.h>
 #include <tqbuttongroup.h>
 #include <tqcanvas.h>
diff --git a/src/gui/editors/eventlist/EventViewItem.h b/src/gui/editors/eventlist/EventViewItem.h
index e86544f..3332e96 100644
--- a/src/gui/editors/eventlist/EventViewItem.h
+++ b/src/gui/editors/eventlist/EventViewItem.h
@@ -25,7 +25,7 @@
 #ifndef _RG_EVENTVIEWITEM_H_
 #define _RG_EVENTVIEWITEM_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp
index 7665066..ffd1a59 100644
--- a/src/gui/editors/matrix/MatrixEraser.cpp
+++ b/src/gui/editors/matrix/MatrixEraser.cpp
@@ -34,7 +34,7 @@
 #include "MatrixStaff.h"
 #include "MatrixTool.h"
 #include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <tqiconset.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index d2955fe..50344ab 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -43,7 +43,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include "MatrixVLayout.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp
index a6b0a15..e48e4ed 100644
--- a/src/gui/editors/matrix/MatrixPainter.cpp
+++ b/src/gui/editors/matrix/MatrixPainter.cpp
@@ -42,7 +42,7 @@
 #include "MatrixStaff.h"
 #include "MatrixTool.h"
 #include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index ff7760a..167d464 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -40,7 +40,7 @@
 #include "MatrixStaff.h"
 #include "MatrixTool.h"
 #include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 72060af..f118bfb 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -46,7 +46,7 @@
 #include "MatrixStaff.h"
 #include "MatrixTool.h"
 #include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
diff --git a/src/gui/editors/matrix/MatrixTool.cpp b/src/gui/editors/matrix/MatrixTool.cpp
index a478aa3..62cfd90 100644
--- a/src/gui/editors/matrix/MatrixTool.cpp
+++ b/src/gui/editors/matrix/MatrixTool.cpp
@@ -27,7 +27,7 @@
 
 #include "gui/general/EditTool.h"
 #include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqstring.h>
 
 
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 099ef06..8353ce2 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -104,14 +104,14 @@
 #include "sound/SequencerDataBlock.h"
 #include <klocale.h>
 #include <kstddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdockwidget.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kxmlguiclient.h>
 #include <tqcanvas.h>
 #include <tqcursor.h>
diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp
index 097fc5e..28198a2 100644
--- a/src/gui/editors/notation/ClefInserter.cpp
+++ b/src/gui/editors/notation/ClefInserter.cpp
@@ -36,7 +36,7 @@
 #include "NotationTool.h"
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqiconset.h>
 #include <tqstring.h>
 
diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp
index b730dd3..0885b66 100644
--- a/src/gui/editors/notation/GuitarChordInserter.cpp
+++ b/src/gui/editors/notation/GuitarChordInserter.cpp
@@ -40,7 +40,7 @@
 #include "NotationTool.h"
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqdialog.h>
 #include <tqiconset.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 198943e..fab2b4d 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -34,7 +34,7 @@
 #include "NotationTool.h"
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tqiconset.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index 549b2a5..c6d1c68 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -48,7 +48,7 @@
 #include "NotationTool.h"
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqapplication.h>
 #include <tqiconset.h>
 #include <tqrect.h>
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index f77bb36..d8fe2c6 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -180,7 +180,7 @@
 #include "sound/MappedEvent.h"
 #include "TextInserter.h"
 #include "HeadersGroup.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
@@ -192,7 +192,7 @@
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <ktempfile.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kxmlguiclient.h>
 #include <tqbrush.h>
 #include <tqcanvas.h>
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index 709041e..2474ec1 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -29,7 +29,7 @@
 #include "FontViewFrame.h"
 #include <kcombobox.h>
 #include <kdialogbase.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 932b2cf..de1ba52 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -49,7 +49,7 @@
 #include "NotationStaff.h"
 #include "NotePixmapFactory.h"
 #include "NoteStyleFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <tdeconfig.h>
 #include <tqiconset.h>
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index 674ce60..2dccf65 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -39,7 +39,7 @@
 #include "NotationView.h"
 #include "NoteInserter.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <tqiconset.h>
 #include <tqregexp.h>
diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp
index 90674fb..84a832e 100644
--- a/src/gui/editors/notation/TextInserter.cpp
+++ b/src/gui/editors/notation/TextInserter.cpp
@@ -39,7 +39,7 @@
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
 #include "NotationElement.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqdialog.h>
 #include <tqiconset.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 8a10ace..3480f06 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -46,11 +46,11 @@
 #include "document/MultiViewCommandHistory.h"
 #include "document/RosegardenGUIDoc.h"
 #include "document/ConfigGroups.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
-#include <klistview.h>
-#include <kmainwindow.h>
-#include <kstdaccel.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <tqcolor.h>
 #include <tqdialog.h>
diff --git a/src/gui/editors/segment/ControlEditorDialog.h b/src/gui/editors/segment/ControlEditorDialog.h
index 7b7b0b6..816a52f 100644
--- a/src/gui/editors/segment/ControlEditorDialog.h
+++ b/src/gui/editors/segment/ControlEditorDialog.h
@@ -28,7 +28,7 @@
 
 #include "base/Device.h"
 #include "base/MidiDevice.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class TQWidget;
diff --git a/src/gui/editors/segment/ControlParameterItem.h b/src/gui/editors/segment/ControlParameterItem.h
index 2a354d3..fe63b5b 100644
--- a/src/gui/editors/segment/ControlParameterItem.h
+++ b/src/gui/editors/segment/ControlParameterItem.h
@@ -27,7 +27,7 @@
 #define _RG_CONTROLPARAMETERITEM_H_
 
 #include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 2a62a4a..5eb09d1 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <kstddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <tdeconfig.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@@ -44,12 +44,12 @@
 #include "document/RosegardenGUIDoc.h"
 #include "document/ConfigGroups.h"
 #include "gui/dialogs/MarkerModifyDialog.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <kglobal.h>
-#include <klistview.h>
-#include <kmainwindow.h>
-#include <kstdaccel.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <tqaccel.h>
 #include <tqdialog.h>
diff --git a/src/gui/editors/segment/MarkerEditor.h b/src/gui/editors/segment/MarkerEditor.h
index 71d998f..0dcd3b9 100644
--- a/src/gui/editors/segment/MarkerEditor.h
+++ b/src/gui/editors/segment/MarkerEditor.h
@@ -26,7 +26,7 @@
 #ifndef _RG_MARKEREDITOR_H_
 #define _RG_MARKEREDITOR_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqstring.h>
 #include "base/Event.h"
 
diff --git a/src/gui/editors/segment/MarkerEditorViewItem.h b/src/gui/editors/segment/MarkerEditorViewItem.h
index ac15b65..dbf09e6 100644
--- a/src/gui/editors/segment/MarkerEditorViewItem.h
+++ b/src/gui/editors/segment/MarkerEditorViewItem.h
@@ -25,7 +25,7 @@
 #ifndef _RG_MARKEREDITORVIEWITEM_H_
 #define _RG_MARKEREDITORVIEWITEM_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "base/Event.h"
 
diff --git a/src/gui/editors/segment/PlayListView.h b/src/gui/editors/segment/PlayListView.h
index c4e6aa3..635789a 100644
--- a/src/gui/editors/segment/PlayListView.h
+++ b/src/gui/editors/segment/PlayListView.h
@@ -25,7 +25,7 @@
 #ifndef _RG_PLAYLISTVIEW_H_
 #define _RG_PLAYLISTVIEW_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace Rosegarden {
 
diff --git a/src/gui/editors/segment/PlayListViewItem.h b/src/gui/editors/segment/PlayListViewItem.h
index ad6c476..1fe5988 100644
--- a/src/gui/editors/segment/PlayListViewItem.h
+++ b/src/gui/editors/segment/PlayListViewItem.h
@@ -25,7 +25,7 @@
 #ifndef _RG_PLAYLISTVIEWITEM_H_
 #define _RG_PLAYLISTVIEWITEM_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 namespace Rosegarden {
diff --git a/src/gui/editors/segment/TriggerManagerItem.h b/src/gui/editors/segment/TriggerManagerItem.h
index eb52a86..3e87ca0 100644
--- a/src/gui/editors/segment/TriggerManagerItem.h
+++ b/src/gui/editors/segment/TriggerManagerItem.h
@@ -25,7 +25,7 @@
 #ifndef _RG_TRIGGERMANAGERITEM_H_
 #define _RG_TRIGGERMANAGERITEM_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "base/Event.h"
 #include "base/TriggerSegment.h"
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index ca05d84..5444e80 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -47,13 +47,13 @@
 #include "document/ConfigGroups.h"
 #include "gui/dialogs/TimeDialog.h"
 #include "gui/general/MidiPitchLabel.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <kglobal.h>
-#include <klistview.h>
-#include <kmainwindow.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <tdeconfig.h>
 #include <tqaccel.h>
diff --git a/src/gui/editors/segment/TriggerSegmentManager.h b/src/gui/editors/segment/TriggerSegmentManager.h
index 35fd847..755ea4a 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.h
+++ b/src/gui/editors/segment/TriggerSegmentManager.h
@@ -26,7 +26,7 @@
 #ifndef _RG_TRIGGERSEGMENTMANAGER_H_
 #define _RG_TRIGGERSEGMENTMANAGER_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqstring.h>
 #include "base/Event.h"
 
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
index 9565553..f9ac172 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
@@ -33,7 +33,7 @@
 #include "gui/general/BaseTool.h"
 #include "SegmentToolBox.h"
 #include <kcommand.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqpoint.h>
 #include <tqpopupmenu.h>
 
diff --git a/src/gui/editors/tempo/TempoListItem.h b/src/gui/editors/tempo/TempoListItem.h
index 7f81f27..8faca73 100644
--- a/src/gui/editors/tempo/TempoListItem.h
+++ b/src/gui/editors/tempo/TempoListItem.h
@@ -25,7 +25,7 @@
 #ifndef _RG_TEMPOLISTITEM_H_
 #define _RG_TEMPOLISTITEM_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "base/Event.h"
 
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index d5c4013..2041515 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -44,10 +44,10 @@
 #include "gui/general/EditViewBase.h"
 #include "gui/kdeext/KTmpStatusMsg.h"
 #include "TempoListItem.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kxmlguiclient.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index 06b365a..7c75195 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -79,7 +79,7 @@
 #include "gui/rulers/ControlRuler.h"
 #include "gui/rulers/PropertyControlRuler.h"
 #include "RosegardenCanvasView.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <kdockwidget.h>
 #include <kglobal.h>
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 7a26a67..f7f8e93 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -44,16 +44,16 @@
 #include "gui/dialogs/TimeDialog.h"
 #include "gui/general/EditViewTimeSigNotifier.h"
 #include "gui/kdeext/KTmpStatusMsg.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <tdeconfig.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <kglobal.h>
 #include <kkeydialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kxmlguiclient.h>
 #include <tqaccel.h>
diff --git a/src/gui/kdeext/KTmpStatusMsg.cpp b/src/gui/kdeext/KTmpStatusMsg.cpp
index 3f9c127..6051009 100644
--- a/src/gui/kdeext/KTmpStatusMsg.cpp
+++ b/src/gui/kdeext/KTmpStatusMsg.cpp
@@ -22,7 +22,7 @@
 #include <tqapplication.h>
 #include <tqeventloop.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index f1dd4e7..76a5a47 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -39,7 +39,7 @@
 #include "gui/general/EditView.h"
 #include "gui/general/RosegardenCanvasView.h"
 #include "gui/widgets/TextFloat.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqcanvas.h>
 #include <tqcolor.h>
 #include <tqcursor.h>
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index b8b45fe..cd6932e 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -37,7 +37,7 @@
 #include <tqwidget.h>
 #include <tqtooltip.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqpainter.h>
 #include <tqpointarray.h>
 #include "document/RosegardenGUIDoc.h"
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index af8c27f..7bb97eb 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -49,7 +49,7 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstddirs.h>
 #include <tqtooltip.h>
 
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 6f9fe65..fe81cf2 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -40,7 +40,7 @@
 #include "gui/general/GUIPalette.h"
 #include "gui/widgets/TextFloat.h"
 #include "TempoColour.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index 3805954..e28f14f 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -56,9 +56,9 @@
 #include "sound/MappedStudio.h"
 #include <klocale.h>
 #include <kstddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstdaction.h>
 #include <tqaccel.h>
 #include <tqcolor.h>
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 39538b0..863c637 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -47,15 +47,15 @@
 #include "MidiKeyMapListViewItem.h"
 #include "MidiKeyMappingEditor.h"
 #include "MidiProgramsEditor.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 #include <kcommand.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
-#include <klistview.h>
-#include <kmainwindow.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kxmlguiclient.h>
 #include <tqcheckbox.h>
diff --git a/src/gui/studio/BankEditorDialog.h b/src/gui/studio/BankEditorDialog.h
index 36904b6..b2c926f 100644
--- a/src/gui/studio/BankEditorDialog.h
+++ b/src/gui/studio/BankEditorDialog.h
@@ -30,7 +30,7 @@
 #include "base/MidiProgram.h"
 #include <map>
 #include <string>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <utility>
 
 
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 8cf3311..0902afc 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -47,12 +47,12 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kstddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
diff --git a/src/gui/studio/DeviceManagerDialog.h b/src/gui/studio/DeviceManagerDialog.h
index 15ace21..18d9d7a 100644
--- a/src/gui/studio/DeviceManagerDialog.h
+++ b/src/gui/studio/DeviceManagerDialog.h
@@ -27,7 +27,7 @@
 #define _RG_DEVICEMANAGERDIALOG_H_
 
 #include "base/Device.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <vector>
diff --git a/src/gui/studio/MidiDeviceListViewItem.h b/src/gui/studio/MidiDeviceListViewItem.h
index 5c96f85..f405cd1 100644
--- a/src/gui/studio/MidiDeviceListViewItem.h
+++ b/src/gui/studio/MidiDeviceListViewItem.h
@@ -27,7 +27,7 @@
 #define _RG_MIDIDEVICELISTVIEWITEM_H_
 
 #include "base/Device.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 
 
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index baddb83..088369b 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -46,8 +46,8 @@
 #include "MixerWindow.h"
 #include "sound/MappedEvent.h"
 #include "StudioControl.h"
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
 #include <kstdaction.h>
 #include <tqaccel.h>
 #include <tqcolor.h>
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 64a9e02..25cad16 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -293,7 +293,7 @@ MidiProgramsEditor::slotNewPercussion()
     RG_DEBUG << "MidiProgramsEditor::slotNewPercussion" << endl;
     bool percussion = m_percussion->isChecked();
     m_percussion->blockSignals(true);
-    if (banklistContains(MidiBank(percussion, m_msb->value(), m_lsb->value()))) {
+    if (bantdelistContains(MidiBank(percussion, m_msb->value(), m_lsb->value()))) {
         RG_DEBUG << "MidiProgramsEditor::slotNewPercussion: calling setChecked(" << !percussion << ")" << endl;
         m_percussion->setChecked(!percussion);
     } else {
@@ -547,7 +547,7 @@ int
 MidiProgramsEditor::ensureUniqueMSB(int msb, bool ascending)
 {
     int newMSB = msb;
-    while (banklistContains(MidiBank(m_percussion->isChecked(),
+    while (bantdelistContains(MidiBank(m_percussion->isChecked(),
                                      newMSB, m_lsb->value()))
             && newMSB < 128
             && newMSB > -1)
@@ -566,7 +566,7 @@ int
 MidiProgramsEditor::ensureUniqueLSB(int lsb, bool ascending)
 {
     int newLSB = lsb;
-    while (banklistContains(MidiBank(m_percussion->isChecked(),
+    while (bantdelistContains(MidiBank(m_percussion->isChecked(),
                                      m_msb->value(), newLSB))
             && newLSB < 128
             && newLSB > -1)
@@ -582,7 +582,7 @@ MidiProgramsEditor::ensureUniqueLSB(int lsb, bool ascending)
 }
 
 bool
-MidiProgramsEditor::banklistContains(const MidiBank &bank)
+MidiProgramsEditor::bantdelistContains(const MidiBank &bank)
 {
     BankList::iterator it;
 
diff --git a/src/gui/studio/MidiProgramsEditor.h b/src/gui/studio/MidiProgramsEditor.h
index 7d40e8e..f583ec3 100644
--- a/src/gui/studio/MidiProgramsEditor.h
+++ b/src/gui/studio/MidiProgramsEditor.h
@@ -78,9 +78,9 @@ protected:
     int ensureUniqueMSB(int msb, bool ascending);
     int ensureUniqueLSB(int lsb, bool ascending);
 
-    // Does the banklist contain this combination already?
+    // Does the bantdelist contain this combination already?
     //
-    bool banklistContains(const MidiBank &);
+    bool bantdelistContains(const MidiBank &);
 
     ProgramList getBankSubset(const MidiBank &);
 
diff --git a/src/gui/studio/MixerWindow.cpp b/src/gui/studio/MixerWindow.cpp
index 3c3af9a..387e8bf 100644
--- a/src/gui/studio/MixerWindow.cpp
+++ b/src/gui/studio/MixerWindow.cpp
@@ -29,7 +29,7 @@
 #include "base/MidiProgram.h"
 #include "base/Studio.h"
 #include "document/RosegardenGUIDoc.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqaccel.h>
 #include <tqwidget.h>
 
diff --git a/src/gui/studio/MixerWindow.h b/src/gui/studio/MixerWindow.h
index 46a3774..9e4d0c5 100644
--- a/src/gui/studio/MixerWindow.h
+++ b/src/gui/studio/MixerWindow.h
@@ -27,7 +27,7 @@
 #define _RG_MIXERWINDOW_H_
 
 #include "base/MidiProgram.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class TQWidget;
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index c721ffb..ba57efc 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -37,9 +37,9 @@
 #include "base/Studio.h"
 #include "document/RosegardenGUIDoc.h"
 #include "document/ConfigGroups.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstdaction.h>
 #include <tqframe.h>
 #include <tqgroupbox.h>
diff --git a/src/gui/studio/SynthPluginManagerDialog.h b/src/gui/studio/SynthPluginManagerDialog.h
index 48a8f1d..04ad2c7 100644
--- a/src/gui/studio/SynthPluginManagerDialog.h
+++ b/src/gui/studio/SynthPluginManagerDialog.h
@@ -27,7 +27,7 @@
 #define _RG_SYNTHPLUGINMANAGERDIALOG_H_
 
 #include "base/MidiProgram.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <vector>
 
 
diff --git a/src/gui/widgets/AudioListItem.h b/src/gui/widgets/AudioListItem.h
index b2f08f8..5cfdba3 100644
--- a/src/gui/widgets/AudioListItem.h
+++ b/src/gui/widgets/AudioListItem.h
@@ -26,7 +26,7 @@
 #define _RG_AUDIOLISTITEM_H_
 
 #include <sound/AudioFile.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/widgets/AudioListView.h b/src/gui/widgets/AudioListView.h
index 3b48400..967c94f 100644
--- a/src/gui/widgets/AudioListView.h
+++ b/src/gui/widgets/AudioListView.h
@@ -25,7 +25,7 @@
 #ifndef _RG_AUDIOLISTVIEW_H_
 #define _RG_AUDIOLISTVIEW_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace Rosegarden {
         
diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h
index 53db99e..d9b325b 100644
--- a/src/misc/stableheaders.h
+++ b/src/misc/stableheaders.h
@@ -142,9 +142,9 @@
 #include <dcopobject.h>
 #include <dcopref.h>
 #include <kaboutdata.h>
-#include <kaccel.h>
-#include <kactioncollection.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
 #include <kapp.h>
 #include <kapplication.h>
 #include <karrowbutton.h>
@@ -166,7 +166,7 @@
 #include <tdefiledialog.h>
 #include <tdefile.h>
 #include <kfilterdev.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
@@ -176,26 +176,26 @@
 #include <kled.h>
 #include <klineeditdlg.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kpixmapeffect.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprinter.h>
 #include <kprocess.h>
 #include <kpushbutton.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstddirs.h>
 #include <ktabwidget.h>
 #include <ktempfile.h>
 #include <ktip.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kuniqueapplication.h>
 #include <kurl.h>
 #include <kxmlguiclient.h>
diff --git a/src/sequencer/RosegardenSequencerApp.h b/src/sequencer/RosegardenSequencerApp.h
index f0400d7..2dc0138 100644
--- a/src/sequencer/RosegardenSequencerApp.h
+++ b/src/sequencer/RosegardenSequencerApp.h
@@ -39,8 +39,8 @@
 
 // include files for KDE 
 #include <kapp.h>
-#include <kmainwindow.h>
-#include <kaccel.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
 
 #include <tqtimer.h>