Mercurial > hg > svcore

changeset 845:a299c4cec0f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Likewise, but for toLocal8Bit().data()
author Chris Cannam
date Tue, 26 Nov 2013 13:48:13 +0000
parents f5cd33909744
children 2010409af203
files base/Debug.cpp data/fileio/OggVorbisFileReader.cpp plugin/DSSIPluginInstance.cpp plugin/PluginXml.cpp plugin/plugins/SamplePlayer.cpp transform/TransformFactory.cpp
diffstat 6 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/base/Debug.cpp	Tue Nov 26 13:43:31 2013 +0000
+++ b/base/Debug.cpp	Tue Nov 26 13:48:13 2013 +0000
@@ -75,7 +75,7 @@
 std::ostream &
 operator<<(std::ostream &target, const QString &str)
 {
-    return target << str.toLocal8Bit().data();
+    return target << str;
 }
 
 std::ostream &
--- a/data/fileio/OggVorbisFileReader.cpp	Tue Nov 26 13:43:31 2013 +0000
+++ b/data/fileio/OggVorbisFileReader.cpp	Tue Nov 26 13:48:13 2013 +0000
@@ -50,7 +50,7 @@
     m_channelCount = 0;
     m_fileRate = 0;
 
-//    SVDEBUG << "OggVorbisFileReader::OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (++instances) << " instances" << endl;
+//    SVDEBUG << "OggVorbisFileReader::OggVorbisFileReader(" << m_path << "): now have " << (++instances) << " instances" << endl;
 
     Profiler profiler("OggVorbisFileReader::OggVorbisFileReader", true);
 
@@ -102,7 +102,7 @@
 
 OggVorbisFileReader::~OggVorbisFileReader()
 {
-//    SVDEBUG << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (--instances) << " instances" << endl;
+//    SVDEBUG << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path << "): now have " << (--instances) << " instances" << endl;
     if (m_decodeThread) {
         m_cancelled = true;
         m_decodeThread->wait();
--- a/plugin/DSSIPluginInstance.cpp	Tue Nov 26 13:43:31 2013 +0000
+++ b/plugin/DSSIPluginInstance.cpp	Tue Nov 26 13:48:13 2013 +0000
@@ -41,7 +41,7 @@
 #ifdef DEBUG_DSSI
 static std::ostream &operator<<(std::ostream& o, const QString &s)
 {
-    o << s.toLocal8Bit().data();
+    o << s;
     return o;
 }
 #endif
--- a/plugin/PluginXml.cpp	Tue Nov 26 13:43:31 2013 +0000
+++ b/plugin/PluginXml.cpp	Tue Nov 26 13:48:13 2013 +0000
@@ -200,7 +200,7 @@
     int errorColumn;
 
 //    SVDEBUG << "PluginXml::setParametersFromXml: XML is \""
-//              << xml.toLocal8Bit().data() << "\"" << endl;
+//              << xml << "\"" << endl;
 
     if (!doc.setContent(xml, false, &error, &errorLine, &errorColumn)) {
         cerr << "PluginXml::setParametersFromXml: Error in parsing XML: " << error << " at line " << errorLine << ", column " << errorColumn << endl;
--- a/plugin/plugins/SamplePlayer.cpp	Tue Nov 26 13:43:31 2013 +0000
+++ b/plugin/plugins/SamplePlayer.cpp	Tue Nov 26 13:48:13 2013 +0000
@@ -365,7 +365,7 @@
 
 #ifdef DEBUG_SAMPLE_PLAYER
     SVDEBUG << "SamplePlayer::searchSamples: Directory is \""
-	      << m_sampleDir.toLocal8Bit().data() << "\"" << endl;
+	      << m_sampleDir << "\"" << endl;
 #endif
 
     QDir dir(m_sampleDir, "*.wav");
@@ -376,7 +376,7 @@
             m_samples.push_back(std::pair<QString, QString>
                                 (file.baseName(), file.filePath()));
 #ifdef DEBUG_SAMPLE_PLAYER
-            cerr << "Found: " << dir[i].toLocal8Bit().data() << endl;
+            cerr << "Found: " << dir[i] << endl;
 #endif
         }
     }
@@ -397,7 +397,7 @@
     file = sf_open(path.toLocal8Bit().data(), SFM_READ, &info);
     if (!file) {
 	cerr << "SamplePlayer::loadSampleData: Failed to open file "
-		  << path.toLocal8Bit().data() << ": "
+		  << path << ": "
 		  << sf_strerror(file) << endl;
 	return;
     }
--- a/transform/TransformFactory.cpp	Tue Nov 26 13:43:31 2013 +0000
+++ b/transform/TransformFactory.cpp	Tue Nov 26 13:48:13 2013 +0000
@@ -413,7 +413,7 @@
 	    FeatureExtractionPluginFactory::instanceFor(pluginId);
 
 	if (!factory) {
-	    cerr << "WARNING: TransformFactory::populateTransforms: No feature extraction plugin factory for instance " << pluginId.toLocal8Bit().data() << endl;
+	    cerr << "WARNING: TransformFactory::populateTransforms: No feature extraction plugin factory for instance " << pluginId << endl;
 	    continue;
 	}
 
@@ -421,7 +421,7 @@
 	    factory->instantiatePlugin(pluginId, 44100);
 
 	if (!plugin) {
-	    cerr << "WARNING: TransformFactory::populateTransforms: Failed to instantiate plugin " << pluginId.toLocal8Bit().data() << endl;
+	    cerr << "WARNING: TransformFactory::populateTransforms: Failed to instantiate plugin " << pluginId << endl;
 	    continue;
 	}
 		
@@ -514,7 +514,7 @@
             RealTimePluginFactory::instanceFor(pluginId);
 
 	if (!factory) {
-	    cerr << "WARNING: TransformFactory::populateTransforms: No real time plugin factory for instance " << pluginId.toLocal8Bit().data() << endl;
+	    cerr << "WARNING: TransformFactory::populateTransforms: No real time plugin factory for instance " << pluginId << endl;
 	    continue;
 	}
 
@@ -522,7 +522,7 @@
             factory->getPluginDescriptor(pluginId);
 
         if (!descriptor) {
-	    cerr << "WARNING: TransformFactory::populateTransforms: Failed to query plugin " << pluginId.toLocal8Bit().data() << endl;
+	    cerr << "WARNING: TransformFactory::populateTransforms: Failed to query plugin " << pluginId << endl;
 	    continue;
 	}