Rename many classes and header files to avoid conflicts with KDE4

12 files changed, 22 insertions, 22 deletions

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>