Fix FTBFS

5 files changed, 16 insertions, 16 deletions

diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index 56734dd..6dced2b 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -184,7 +184,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
             new KRadioAction(i18n("1 Input", "%n Inputs", i),
                              0, TQT_TQOBJECT(this),
                              TQT_SLOT(slotSetInputCountFromAction()), actionCollection(),
-                             TQString("inputs_%1").tqarg(i));
+                             TQString("inputs_%1").tqarg(i).ascii());
         action->setExclusiveGroup("inputs");
         if (i == int(m_studio->getRecordIns().size()))
             action->setChecked(true);
@@ -194,7 +194,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
              (i18n("No Submasters"),
               0, TQT_TQOBJECT(this),
               TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
-              TQString("submasters_0"));
+              TQString("submasters_0").ascii());
     action->setExclusiveGroup("submasters");
     action->setChecked(true);
 
@@ -203,7 +203,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
                  (i18n("1 Submaster", "%n Submasters", i),
                   0, TQT_TQOBJECT(this),
                   TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
-                  TQString("submasters_%1").tqarg(i));
+                  TQString("submasters_%1").tqarg(i).ascii());
         action->setExclusiveGroup("submasters");
         if (i == int(m_studio->getBusses().size()) - 1)
             action->setChecked(true);
diff --git a/src/gui/studio/AudioPluginOSCGUI.cpp b/src/gui/studio/AudioPluginOSCGUI.cpp
index 3fd2ffb..857a454 100644
--- a/src/gui/studio/AudioPluginOSCGUI.cpp
+++ b/src/gui/studio/AudioPluginOSCGUI.cpp
@@ -164,13 +164,13 @@ AudioPluginOSCGUI::setGUIUrl(TQString url)
     if (m_address)
         lo_address_free(m_address);
 
-    char *host = lo_url_get_hostname(url);
-    char *port = lo_url_get_port(url);
+    char *host = lo_url_get_hostname(url.ascii());
+    char *port = lo_url_get_port(url.ascii());
     m_address = lo_address_new(host, port);
     free(host);
     free(port);
 
-    m_basePath = lo_url_get_path(url);
+    m_basePath = lo_url_get_path(url.ascii());
 }
 
 void
@@ -181,7 +181,7 @@ AudioPluginOSCGUI::show()
     if (!m_address)
         return ;
     TQString path = m_basePath + "/show";
-    lo_send(m_address, path, "");
+    lo_send(m_address, path.ascii(), "");
 }
 
 void
@@ -190,7 +190,7 @@ AudioPluginOSCGUI::hide()
     if (!m_address)
         return ;
     TQString path = m_basePath + "/hide";
-    lo_send(m_address, path, "");
+    lo_send(m_address, path.ascii(), "");
 }
 
 void
@@ -199,7 +199,7 @@ AudioPluginOSCGUI::quit()
     if (!m_address)
         return ;
     TQString path = m_basePath + "/quit";
-    lo_send(m_address, path, "");
+    lo_send(m_address, path.ascii(), "");
 }
 
 void
@@ -208,7 +208,7 @@ AudioPluginOSCGUI::sendProgram(int bank, int program)
     if (!m_address)
         return ;
     TQString path = m_basePath + "/program";
-    lo_send(m_address, path, "ii", bank, program);
+    lo_send(m_address, path.ascii(), "ii", bank, program);
 }
 
 void
@@ -217,7 +217,7 @@ AudioPluginOSCGUI::sendPortValue(int port, float value)
     if (!m_address)
         return ;
     TQString path = m_basePath + "/control";
-    lo_send(m_address, path, "if", port, value);
+    lo_send(m_address, path.ascii(), "if", port, value);
 }
 
 void
@@ -226,7 +226,7 @@ AudioPluginOSCGUI::sendConfiguration(TQString key, TQString value)
     if (!m_address)
         return ;
     TQString path = m_basePath + "/configure";
-    lo_send(m_address, path, "ss", key.data(), value.data());
+    lo_send(m_address, path.ascii(), "ss", key.ascii(), value.ascii());
 }
 
 }
diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
index 6662a53..01ade9c 100644
--- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
@@ -146,7 +146,7 @@ AudioPluginOSCGUIManager::hasGUI(InstrumentId instrument, int position)
     try {
         TQString filePath = AudioPluginOSCGUI::getGUIFilePath
                            (strtoqstr(pluginInstance->getIdentifier()));
-        return (filePath && filePath != "");
+        return (!filePath.isNull() && filePath != "");
     } catch (Exception e) { // that's OK
         return false;
     }
diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index 11283d6..79f0fbc 100644
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@@ -343,7 +343,7 @@ DeviceEditorDialog::getDeviceIdAt(int row) // -1 for new device w/o an id yet
     TQString number = re.cap(1);
     int id = -1;
 
-    if (number && number != "")
+    if (!number.isNull() && number != "")
     {
         id = number.toInt() - 1; // displayed device numbers are 1-based
     }
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index a4e9b97..d7917bf 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -118,7 +118,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
 
 
                 if (showEntryButtons) {
-                    TQPushButton *button = new TQPushButton("", numBox, numberText);
+                    TQPushButton *button = new TQPushButton("", numBox, numberText.ascii());
                     button->setMaximumWidth(40);
                     button->setMaximumHeight(20);
                     button->setFlat(true);
@@ -127,7 +127,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
                     m_entryButtons.push_back(button);
                 }
 
-                KLineEdit* lineEdit = new KLineEdit(numBox, numberText);
+                KLineEdit* lineEdit = new KLineEdit(numBox, numberText.ascii());
                 lineEdit->setMinimumWidth(110);
                 lineEdit->setCompletionMode(KGlobalSettings::CompletionAuto);
                 lineEdit->setCompletionObject(&m_completion);