Fix FTBFS

7 files changed, 22 insertions, 22 deletions

diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index cc919f0..f8b57b1 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -454,7 +454,7 @@ AudioFileManager::getFileInPath(const std::string &file)
         return searchFile.latin1();
 
     std::cout << "AudioFileManager::getFileInPath - "
-    << "searchInfo = " << searchFile << std::endl;
+    << "searchInfo = " << searchFile.ascii() << std::endl;
 
     return "";
 }
@@ -655,7 +655,7 @@ AudioFileManager::importURL(const KURL &url, int sampleRate)
 {
     if (url.isLocalFile()) return importFile(url.path().ascii(), sampleRate);
 
-    std::cerr << "AudioFileManager::importURL("<< url.prettyURL() << ", " << sampleRate << ")" << std::endl;
+    std::cerr << "AudioFileManager::importURL("<< url.prettyURL().ascii() << ", " << sampleRate << ")" << std::endl;
 
     emit setOperationName(i18n("Downloading file %1").tqarg(url.prettyURL()));
 
diff --git a/src/sound/AudioProcess.cpp b/src/sound/AudioProcess.cpp
index c209703..7a7f1ab 100644
--- a/src/sound/AudioProcess.cpp
+++ b/src/sound/AudioProcess.cpp
@@ -913,7 +913,7 @@ AudioInstrumentMixer::setPlugin(InstrumentId id, int position, TQString identifi
 {
     // Not RT safe
 
-    std::cerr << "AudioInstrumentMixer::setPlugin(" << id << ", " << position << ", " << identifier << ")" << std::endl;
+    std::cerr << "AudioInstrumentMixer::setPlugin(" << id << ", " << position << ", " << identifier.ascii() << ")" << std::endl;
 
     int channels = 2;
     if (m_bufferMap.find(id) != m_bufferMap.end()) {
@@ -938,7 +938,7 @@ AudioInstrumentMixer::setPlugin(InstrumentId id, int position, TQString identifi
         }
     } else {
         std::cerr << "AudioInstrumentMixer::setPlugin: No factory for identifier "
-        << identifier << std::endl;
+        << identifier.ascii() << std::endl;
     }
 
     RunnablePluginInstance *oldInstance = 0;
diff --git a/src/sound/DSSIPluginFactory.cpp b/src/sound/DSSIPluginFactory.cpp
index 60f7720..9189fa6 100644
--- a/src/sound/DSSIPluginFactory.cpp
+++ b/src/sound/DSSIPluginFactory.cpp
@@ -193,7 +193,7 @@ DSSIPluginFactory::getDSSIDescriptor(TQString identifier)
     if (m_libraryHandles.find(soname) == m_libraryHandles.end()) {
         loadLibrary(soname);
         if (m_libraryHandles.find(soname) == m_libraryHandles.end()) {
-            std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: loadLibrary failed for " << soname << std::endl;
+            std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: loadLibrary failed for " << soname.ascii() << std::endl;
             return 0;
         }
     }
@@ -204,7 +204,7 @@ DSSIPluginFactory::getDSSIDescriptor(TQString identifier)
                                   dlsym(libraryHandle, "dssi_descriptor");
 
     if (!fn) {
-        std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: No descriptor function in library " << soname << std::endl;
+        std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: No descriptor function in library " << soname.ascii() << std::endl;
         return 0;
     }
 
@@ -217,7 +217,7 @@ DSSIPluginFactory::getDSSIDescriptor(TQString identifier)
         ++index;
     }
 
-    std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: No such plugin as " << label << " in library " << soname << std::endl;
+    std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: No such plugin as " << label.ascii() << " in library " << soname.ascii() << std::endl;
 
     return 0;
 }
@@ -300,7 +300,7 @@ DSSIPluginFactory::discoverPlugins(TQString soName)
 
     if (!libraryHandle) {
         std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins: couldn't dlopen "
-        << soName << " - " << dlerror() << std::endl;
+        << soName.ascii() << " - " << dlerror() << std::endl;
         return ;
     }
 
@@ -308,7 +308,7 @@ DSSIPluginFactory::discoverPlugins(TQString soName)
                                   dlsym(libraryHandle, "dssi_descriptor");
 
     if (!fn) {
-        std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins: No descriptor function in " << soName << std::endl;
+        std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins: No descriptor function in " << soName.ascii() << std::endl;
         return ;
     }
 
@@ -319,7 +319,7 @@ DSSIPluginFactory::discoverPlugins(TQString soName)
 
         const LADSPA_Descriptor * ladspaDescriptor = descriptor->LADSPA_Plugin;
         if (!ladspaDescriptor) {
-            std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins: No LADSPA descriptor for plugin " << index << " in " << soName << std::endl;
+            std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins: No LADSPA descriptor for plugin " << index << " in " << soName.ascii() << std::endl;
             ++index;
             continue;
         }
diff --git a/src/sound/DSSIPluginInstance.cpp b/src/sound/DSSIPluginInstance.cpp
index 9f71629..df18b59 100644
--- a/src/sound/DSSIPluginInstance.cpp
+++ b/src/sound/DSSIPluginInstance.cpp
@@ -622,7 +622,7 @@ DSSIPluginInstance::activate()
         }
     }
 
-    if (m_program) {
+    if (!m_program.isNull()) {
 #ifdef DEBUG_DSSI
         std::cerr << "DSSIPluginInstance::activate: restoring program " << m_program << std::endl;
 #endif
diff --git a/src/sound/LADSPAPluginFactory.cpp b/src/sound/LADSPAPluginFactory.cpp
index 204f05e..9a7b49a 100644
--- a/src/sound/LADSPAPluginFactory.cpp
+++ b/src/sound/LADSPAPluginFactory.cpp
@@ -73,7 +73,7 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
         const LADSPA_Descriptor *descriptor = getLADSPADescriptor(*i);
 
         if (!descriptor) {
-            std::cerr << "WARNING: LADSPAPluginFactory::enumeratePlugins: couldn't get descriptor for identifier " << *i << std::endl;
+            std::cerr << "WARNING: LADSPAPluginFactory::enumeratePlugins: couldn't get descriptor for identifier " << (*i).ascii() << std::endl;
             continue;
         }
 
@@ -475,7 +475,7 @@ LADSPAPluginFactory::getLADSPADescriptor(TQString identifier)
     if (m_libraryHandles.find(soname) == m_libraryHandles.end()) {
         loadLibrary(soname);
         if (m_libraryHandles.find(soname) == m_libraryHandles.end()) {
-            std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: loadLibrary failed for " << soname << std::endl;
+            std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: loadLibrary failed for " << soname.ascii() << std::endl;
             return 0;
         }
     }
@@ -486,7 +486,7 @@ LADSPAPluginFactory::getLADSPADescriptor(TQString identifier)
                                     dlsym(libraryHandle, "ladspa_descriptor");
 
     if (!fn) {
-        std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: No descriptor function in library " << soname << std::endl;
+        std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: No descriptor function in library " << soname.ascii() << std::endl;
         return 0;
     }
 
@@ -499,7 +499,7 @@ LADSPAPluginFactory::getLADSPADescriptor(TQString identifier)
         ++index;
     }
 
-    std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: No such plugin as " << label << " in library " << soname << std::endl;
+    std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: No such plugin as " << label.ascii() << " in library " << soname.ascii() << std::endl;
 
     return 0;
 }
@@ -623,7 +623,7 @@ LADSPAPluginFactory::discoverPlugins()
     	      << "discovering plugins; path is ";
     for (std::vector<TQString>::iterator i = pathList.begin();
             i != pathList.end(); ++i) {
-        std::cerr << "[" << *i << "] ";
+        std::cerr << "[" << (*i).ascii() << "] ";
     }
     std::cerr << std::endl;
 
@@ -684,7 +684,7 @@ LADSPAPluginFactory::discoverPlugins(TQString soName)
 
     if (!libraryHandle) {
         std::cerr << "WARNING: LADSPAPluginFactory::discoverPlugins: couldn't dlopen "
-        << soName << " - " << dlerror() << std::endl;
+        << soName.ascii() << " - " << dlerror() << std::endl;
         return ;
     }
 
@@ -692,7 +692,7 @@ LADSPAPluginFactory::discoverPlugins(TQString soName)
                                     dlsym(libraryHandle, "ladspa_descriptor");
 
     if (!fn) {
-        std::cerr << "WARNING: LADSPAPluginFactory::discoverPlugins: No descriptor function in " << soName << std::endl;
+        std::cerr << "WARNING: LADSPAPluginFactory::discoverPlugins: No descriptor function in " << soName.ascii() << std::endl;
         return ;
     }
 
diff --git a/src/sound/MappedStudio.cpp b/src/sound/MappedStudio.cpp
index 1bb6cec..e5a583c 100644
--- a/src/sound/MappedStudio.cpp
+++ b/src/sound/MappedStudio.cpp
@@ -1410,7 +1410,7 @@ MappedPluginSlot::setProperty(const MappedObjectProperty &property,
                 // populate myself and my ports
                 PluginFactory *factory = PluginFactory::instanceFor(m_identifier);
                 if (!factory) {
-                    std::cerr << "WARNING: MappedPluginSlot::setProperty(identifier): No plugin factory for identifier " << m_identifier << "!" << std::endl;
+                    std::cerr << "WARNING: MappedPluginSlot::setProperty(identifier): No plugin factory for identifier " << m_identifier.ascii() << "!" << std::endl;
                     m_identifier = "";
                     return ;
                 }
@@ -1489,7 +1489,7 @@ MappedPluginSlot::setPropertyList(const MappedObjectProperty &property,
                     studio->getSoundDriver()->configurePlugin(m_instrument,
                             m_position,
                             key, value);
-                if (rv && rv != "") {
+                if (!rv.isNull() && rv != "") {
                     throw(rv);
                 }
             }
diff --git a/src/sound/PluginFactory.cpp b/src/sound/PluginFactory.cpp
index 173fdee..7880333 100644
--- a/src/sound/PluginFactory.cpp
+++ b/src/sound/PluginFactory.cpp
@@ -51,7 +51,7 @@ PluginFactory::instance(TQString pluginType)
     if (pluginType == "ladspa") {
 #ifdef HAVE_LADSPA
         if (!_ladspaInstance) {
-            std::cerr << "PluginFactory::instance(" << pluginType
+            std::cerr << "PluginFactory::instance(" << pluginType.ascii()
             << "): creating new LADSPAPluginFactory" << std::endl;
             _ladspaInstance = new LADSPAPluginFactory();
             _ladspaInstance->discoverPlugins();
@@ -65,7 +65,7 @@ PluginFactory::instance(TQString pluginType)
     } else if (pluginType == "dssi") {
 #ifdef HAVE_DSSI
         if (!_dssiInstance) {
-            std::cerr << "PluginFactory::instance(" << pluginType
+            std::cerr << "PluginFactory::instance(" << pluginType.ascii()
             << "): creating new DSSIPluginFactory" << std::endl;
             _dssiInstance = new DSSIPluginFactory();
             _dssiInstance->discoverPlugins();