Rename additional header files to avoid conflicts with KDE4

15 files changed, 23 insertions, 23 deletions

diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index f983cb9..abdb387 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -54,10 +54,10 @@
 #include "sound/MappedCommon.h"
 #include "sound/MappedEvent.h"
 #include "sound/MappedStudio.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdemainwindow.h>
 #include <kstdaction.h>
 #include <tqaccel.h>
diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
index 7b8bbd3..0a0ab7e 100644
--- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
@@ -30,7 +30,7 @@
 #include "AudioPluginOSCGUIManager.h"
 
 #include "sound/Midi.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "AudioPluginOSCGUI.h"
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 14a0636..40937c2 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@@ -51,10 +51,10 @@
 #include <kcombobox.h>
 #include <kcommand.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kxmlguiclient.h>
diff --git a/src/gui/studio/ChangeRecordDeviceCommand.h b/src/gui/studio/ChangeRecordDeviceCommand.h
index 70819db..cb47c22 100644
--- a/src/gui/studio/ChangeRecordDeviceCommand.h
+++ b/src/gui/studio/ChangeRecordDeviceCommand.h
@@ -26,7 +26,7 @@
 #define _RG_CHANGERECORDDEVICECOMMAND_H_
 
 #include "base/Studio.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcommand.h>
 
 namespace Rosegarden
diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index dc80ff6..9d19cc0 100644
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@@ -25,7 +25,7 @@
 
 #include "DeviceEditorDialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Device.h"
@@ -38,7 +38,7 @@
 #include "document/MultiViewCommandHistory.h"
 #include "gui/application/RosegardenApplication.h"
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqhbox.h>
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 8c8f160..0bc9b8d 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -45,13 +45,13 @@
 #include "gui/dialogs/ExportDeviceDialog.h"
 #include "gui/dialogs/ImportDeviceDialog.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <tqcstring.h>
diff --git a/src/gui/studio/MidiBankListViewItem.cpp b/src/gui/studio/MidiBankListViewItem.cpp
index 599eb9e..b568772 100644
--- a/src/gui/studio/MidiBankListViewItem.cpp
+++ b/src/gui/studio/MidiBankListViewItem.cpp
@@ -25,7 +25,7 @@
 
 #include "MidiBankListViewItem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Device.h"
 #include "MidiDeviceListViewItem.h"
 #include "MidiKeyMapListViewItem.h"
diff --git a/src/gui/studio/MidiDeviceListViewItem.cpp b/src/gui/studio/MidiDeviceListViewItem.cpp
index bfece9e..e155568 100644
--- a/src/gui/studio/MidiDeviceListViewItem.cpp
+++ b/src/gui/studio/MidiDeviceListViewItem.cpp
@@ -25,7 +25,7 @@
 
 #include "MidiDeviceListViewItem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Device.h"
 #include <tqlistview.h>
 #include <tqstring.h>
diff --git a/src/gui/studio/MidiKeyMapListViewItem.cpp b/src/gui/studio/MidiKeyMapListViewItem.cpp
index dd77055..9136d80 100644
--- a/src/gui/studio/MidiKeyMapListViewItem.cpp
+++ b/src/gui/studio/MidiKeyMapListViewItem.cpp
@@ -28,7 +28,7 @@
 #include "MidiDeviceListViewItem.h"
 #include "MidiBankListViewItem.h"
 #include "base/Device.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 
 
diff --git a/src/gui/studio/MidiKeyMappingEditor.cpp b/src/gui/studio/MidiKeyMappingEditor.cpp
index 0a607ad..11c8c6b 100644
--- a/src/gui/studio/MidiKeyMappingEditor.cpp
+++ b/src/gui/studio/MidiKeyMappingEditor.cpp
@@ -25,7 +25,7 @@
 
 #include "MidiKeyMappingEditor.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "BankEditorDialog.h"
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index 088369b..0c62685 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 
 #include "sound/Midi.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Colour.h"
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 25cad16..21ea94a 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -34,9 +34,9 @@
 #include "base/MidiProgram.h"
 #include "gui/widgets/RosegardenPopupMenu.h"
 #include <kcompletion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tqcheckbox.h>
 #include <tqcursor.h>
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index d349543..5f8438d 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -26,9 +26,9 @@
 #include "NameSetEditor.h"
 #include "BankEditorDialog.h"
 #include <kcompletion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqframe.h>
 #include <tqgroupbox.h>
 #include <tqhbox.h>
diff --git a/src/gui/studio/RemapInstrumentDialog.cpp b/src/gui/studio/RemapInstrumentDialog.cpp
index a957650..b06d334 100644
--- a/src/gui/studio/RemapInstrumentDialog.cpp
+++ b/src/gui/studio/RemapInstrumentDialog.cpp
@@ -38,7 +38,7 @@
 #include <kcombobox.h>
 #include <kcommand.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbuttongroup.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index ba57efc..6d0d14a 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -26,7 +26,7 @@
 #include "SynthPluginManagerDialog.h"
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "AudioPlugin.h"
 #include "AudioPluginManager.h"