Rename many classes and header files to avoid conflicts with KDE4

13 files changed, 25 insertions, 25 deletions

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>