Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

7 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index 24a35c9..c0d3994 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -267,7 +267,7 @@ AudioMixerWindow::populate()
     InstrumentList instruments = m_studio->getPresentationInstruments();
     BussList busses = m_studio->getBusses();
 
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
     m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));
 
diff --git a/src/gui/studio/AudioPluginOSCGUI.cpp b/src/gui/studio/AudioPluginOSCGUI.cpp
index 857a454..dab0aa5 100644
--- a/src/gui/studio/AudioPluginOSCGUI.cpp
+++ b/src/gui/studio/AudioPluginOSCGUI.cpp
@@ -61,7 +61,7 @@ AudioPluginOSCGUI::AudioPluginOSCGUI(AudioPluginInstance *instance,
 
     // arguments: osc url, dll name, label, instance tag
 
-    m_gui = new KProcess();
+    m_gui = new TDEProcess();
 
     *m_gui << filePath
     << m_serverUrl
@@ -73,7 +73,7 @@ AudioPluginOSCGUI::AudioPluginOSCGUI(AudioPluginInstance *instance,
     << filePath << " " << m_serverUrl << " "
     << soInfo.fileName() << " " << label << " " << friendlyName << endl;
 
-    if (!m_gui->start(KProcess::NotifyOnExit, KProcess::NoCommunication)) {
+    if (!m_gui->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication)) {
         RG_DEBUG << "AudioPluginOSCGUI::AudioPluginOSCGUI: Couldn't start process " << filePath << endl;
         delete m_gui;
         m_gui = 0;
diff --git a/src/gui/studio/AudioPluginOSCGUI.h b/src/gui/studio/AudioPluginOSCGUI.h
index 950feb1..66a8fe1 100644
--- a/src/gui/studio/AudioPluginOSCGUI.h
+++ b/src/gui/studio/AudioPluginOSCGUI.h
@@ -33,7 +33,7 @@
 #include <tqstring.h>
 
 
-class KProcess;
+class TDEProcess;
 
 
 namespace Rosegarden
@@ -61,7 +61,7 @@ public:
     static TQString getGUIFilePath(TQString identifier);
 
 protected:
-    KProcess *m_gui;
+    TDEProcess *m_gui;
     lo_address m_address;
     TQString m_basePath;
     TQString m_serverUrl;
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index eb2ae52..8c0b885 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -1462,7 +1462,7 @@ BankEditorDialog::getCommandHistory()
 void
 BankEditorDialog::slotImport()
 {
-    TQString deviceDir = KGlobal::dirs()->findResource("appdata", "library/");
+    TQString deviceDir = TDEGlobal::dirs()->findResource("appdata", "library/");
     TQDir dir(deviceDir);
     if (!dir.exists()) {
         deviceDir = ":ROSEGARDENDEVICE";
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index d426994..4f85d2a 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -689,7 +689,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         if (id == Device::NO_DEVICE)
             return ;
 
-        TQString deviceDir = KGlobal::dirs()->findResource("appdata", "library/");
+        TQString deviceDir = TDEGlobal::dirs()->findResource("appdata", "library/");
         TQDir dir(deviceDir);
         if (!dir.exists()) {
             deviceDir = ":ROSEGARDENDEVICE";
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 735260a..64a9e02 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -222,7 +222,7 @@ MidiProgramsEditor::populate(TQListViewItem* item)
     ProgramList::iterator it;
 
     TQPixmap noKeyPixmap, keyPixmap;
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQString file = pixmapDir + "/toolbar/key-white.png";
     if (TQFile(file).exists())
         noKeyPixmap = TQPixmap(file);
@@ -521,7 +521,7 @@ MidiProgramsEditor::slotEntryMenuItemSelected(int i)
     }
 
     m_device->setKeyMappingForProgram(*program, newMapping);
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     bool haveKeyMappings = (m_device->getKeyMappings().size() > 0);
     TQPushButton *btn = getEntryButton(m_currentMenuProgram);
 
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index cda327f..d349543 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -129,7 +129,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
 
                 KLineEdit* lineEdit = new KLineEdit(numBox, numberText.ascii());
                 lineEdit->setMinimumWidth(110);
-                lineEdit->setCompletionMode(KGlobalSettings::CompletionAuto);
+                lineEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto);
                 lineEdit->setCompletionObject(&m_completion);
                 m_names.push_back(lineEdit);