Fix conversion from std::wstring to null-terminated wchar_t*

9 files changed, 31 insertions, 31 deletions

diff --git a/plugins/soundsourcem4a/soundsourcem4a.cpp b/plugins/soundsourcem4a/soundsourcem4a.cpp
index f252d9139c..10d9a9958b 100644
--- a/plugins/soundsourcem4a/soundsourcem4a.cpp
+++ b/plugins/soundsourcem4a/soundsourcem4a.cpp
@@ -182,7 +182,7 @@ inline long unsigned SoundSourceM4A::length(){
 
 Result SoundSourceM4A::parseHeader(){
 #ifdef _WIN32
-    TagLib::MP4::File f(getFilename().toStdWString().data());
+    TagLib::MP4::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::MP4::File f(getFilename().toLocal8Bit().constData());
 #endif
@@ -208,7 +208,7 @@ Result SoundSourceM4A::parseHeader(){
 
 QImage SoundSourceM4A::parseCoverArt() {
 #ifdef _WIN32
-    TagLib::MP4::File f(getFilename().toStdWString().data());
+    TagLib::MP4::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::MP4::File f(getFilename().toLocal8Bit().constData());
 #endif
diff --git a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
index 95f1767385..da95876f84 100644
--- a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
+++ b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
@@ -375,7 +375,7 @@ inline unsigned long SoundSourceMediaFoundation::length()
 
 Result SoundSourceMediaFoundation::parseHeader()
 {
-    TagLib::MP4::File f(getFilename().toStdWString().data());
+    TagLib::MP4::File f(getFilename().toStdWString().c_str());
     if (!readFileHeader(this, f)) {
         return ERR;
     }
@@ -398,7 +398,7 @@ Result SoundSourceMediaFoundation::parseHeader()
 
 QImage SoundSourceMediaFoundation::parseCoverArt() {
     setType("m4a");
-    TagLib::MP4::File f(getFilename().toStdWString().data());
+    TagLib::MP4::File f(getFilename().toStdWString().c_str());
     TagLib::MP4::Tag *mp4(f.tag());
     if (mp4) {
         return Mixxx::getCoverInMP4Tag(*mp4);
diff --git a/plugins/soundsourcewv/soundsourcewv.cpp b/plugins/soundsourcewv/soundsourcewv.cpp
index db88fc8f8e..3d0107356f 100644
--- a/plugins/soundsourcewv/soundsourcewv.cpp
+++ b/plugins/soundsourcewv/soundsourcewv.cpp
@@ -161,7 +161,7 @@ inline long unsigned SoundSourceWV::length(){
 
 Result SoundSourceWV::parseHeader() {
 #ifdef _WIN32
-    TagLib::WavPack::File f(getFilename().toStdWString().data());
+    TagLib::WavPack::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::WavPack::File f(getFilename().toLocal8Bit().constData());
 #endif
@@ -187,7 +187,7 @@ Result SoundSourceWV::parseHeader() {
 
 QImage SoundSourceWV::parseCoverArt() {
 #ifdef _WIN32
-    TagLib::WavPack::File f(getFilename().toStdWString().data());
+    TagLib::WavPack::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::WavPack::File f(getFilename().toLocal8Bit().constData());
 #endif
diff --git a/src/soundsourceffmpeg.cpp b/src/soundsourceffmpeg.cpp
index b778e2e5ff..441c2591a9 100644
--- a/src/soundsourceffmpeg.cpp
+++ b/src/soundsourceffmpeg.cpp
@@ -567,7 +567,7 @@ Result SoundSourceFFmpeg::parseHeader() {
 
     if (is_flac) {
 #ifdef _WIN32
-        TagLib::FLAC::File f(getFilename().toStdWString().data());
+        TagLib::FLAC::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::FLAC::File f(qBAFilename.constData());
 #endif
@@ -594,7 +594,7 @@ Result SoundSourceFFmpeg::parseHeader() {
         }
     } else if (is_wav) {
 #ifdef _WIN32
-        TagLib::RIFF::WAV::File f(getFilename().toStdWString().data());
+        TagLib::RIFF::WAV::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::RIFF::WAV::File f(qBAFilename.constData());
 #endif
@@ -626,7 +626,7 @@ Result SoundSourceFFmpeg::parseHeader() {
     } else if (is_aiff) {
         // Try AIFF
 #ifdef _WIN32
-        TagLib::RIFF::AIFF::File f(getFilename().toStdWString().data());
+        TagLib::RIFF::AIFF::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::RIFF::AIFF::File f(qBAFilename.constData());
 #endif
@@ -641,7 +641,7 @@ Result SoundSourceFFmpeg::parseHeader() {
         }
     } else if (is_mp3) {
 #ifdef _WIN32
-        TagLib::MPEG::File f(getFilename().toStdWString().data());
+        TagLib::MPEG::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::MPEG::File f(qBAFilename.constData());
 #endif
@@ -669,7 +669,7 @@ Result SoundSourceFFmpeg::parseHeader() {
         }
     } else if (is_ogg) {
 #ifdef _WIN32
-        TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().data());
+        TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::Ogg::Vorbis::File f(qBAFilename.constData());
 #endif
@@ -691,7 +691,7 @@ Result SoundSourceFFmpeg::parseHeader() {
         }
     } else if (is_mp4) {
 #ifdef _WIN32
-        TagLib::MP4::File f(getFilename().toStdWString().data());
+        TagLib::MP4::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::MP4::File f(qBAFilename.constData());
 #endif
@@ -715,7 +715,7 @@ Result SoundSourceFFmpeg::parseHeader() {
     } else if (is_opus) {
         // If some have too old Taglib it's his own pain
 #ifdef _WIN32
-        TagLib::Ogg::Opus::File f(getFilename().toStdWString().data());
+        TagLib::Ogg::Opus::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::Ogg::Opus::File f(qBAFilename.constData());
 #endif
@@ -750,7 +750,7 @@ QImage SoundSourceFFmpeg::parseCoverArt() {
 
     if (getType() == "flac") {
 #ifdef _WIN32
-        TagLib::FLAC::File f(getFilename().toStdWString().data());
+        TagLib::FLAC::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::FLAC::File f(qBAFilename.constData());
 #endif
@@ -775,7 +775,7 @@ QImage SoundSourceFFmpeg::parseCoverArt() {
         }
     } else if (getType() == "wav") {
 #ifdef _WIN32
-        TagLib::RIFF::WAV::File f(getFilename().toStdWString().data());
+        TagLib::RIFF::WAV::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::RIFF::WAV::File f(qBAFilename.constData());
 #endif
@@ -786,7 +786,7 @@ QImage SoundSourceFFmpeg::parseCoverArt() {
     } else if (getType() == "aiff") {
         // Try AIFF
 #ifdef _WIN32
-        TagLib::RIFF::AIFF::File f(getFilename().toStdWString().data());
+        TagLib::RIFF::AIFF::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::RIFF::AIFF::File f(qBAFilename.constData());
 #endif
@@ -796,7 +796,7 @@ QImage SoundSourceFFmpeg::parseCoverArt() {
         }
     } else if (getType() == "mp3") {
 #ifdef _WIN32
-        TagLib::MPEG::File f(getFilename().toStdWString().data());
+        TagLib::MPEG::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::MPEG::File f(qBAFilename.constData());
 #endif
@@ -813,7 +813,7 @@ QImage SoundSourceFFmpeg::parseCoverArt() {
         }
     } else if (getType() == "ogg" || getType() == "opus") {
 #ifdef _WIN32
-        TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().data());
+        TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::Ogg::Vorbis::File f(qBAFilename.constData());
 #endif
@@ -823,7 +823,7 @@ QImage SoundSourceFFmpeg::parseCoverArt() {
         }
    } else if (getType() == "mp4" || getType() == "m4a") {
 #ifdef _WIN32
-        TagLib::MP4::File f(getFilename().toStdWString().data());
+        TagLib::MP4::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::MP4::File f(qBAFilename.constData());
 #endif
diff --git a/src/soundsourceflac.cpp b/src/soundsourceflac.cpp
index bc72cd0c65..ad0f36cc32 100644
--- a/src/soundsourceflac.cpp
+++ b/src/soundsourceflac.cpp
@@ -157,7 +157,7 @@ inline unsigned long SoundSourceFLAC::length() {
 
 Result SoundSourceFLAC::parseHeader() {
 #ifdef _WIN32
-    TagLib::FLAC::File f(getFilename().toStdWString().data());
+    TagLib::FLAC::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::FLAC::File f(getFilename().toLocal8Bit().constData());
 #endif
@@ -188,7 +188,7 @@ Result SoundSourceFLAC::parseHeader() {
 
 QImage SoundSourceFLAC::parseCoverArt() {
 #ifdef _WIN32
-    TagLib::FLAC::File f(getFilename().toStdWString().data());
+    TagLib::FLAC::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::FLAC::File f(getFilename().toLocal8Bit().constData());
 #endif
diff --git a/src/soundsourcemp3.cpp b/src/soundsourcemp3.cpp
index ed3f02c917..ba1fa69988 100644
--- a/src/soundsourcemp3.cpp
+++ b/src/soundsourcemp3.cpp
@@ -564,7 +564,7 @@ unsigned SoundSourceMp3::read(unsigned long samples_wanted, const SAMPLE * _dest
 
 Result SoundSourceMp3::parseHeader() {
 #ifdef _WIN32
-    TagLib::MPEG::File f(getFilename().toStdWString().data());
+    TagLib::MPEG::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::MPEG::File f(getFilename().toLocal8Bit().constData());
 #endif
@@ -597,7 +597,7 @@ Result SoundSourceMp3::parseHeader() {
 QImage SoundSourceMp3::parseCoverArt() {
     QImage coverArt;
 #ifdef _WIN32
-    TagLib::MPEG::File f(getFilename().toStdWString().data());
+    TagLib::MPEG::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::MPEG::File f(getFilename().toLocal8Bit().constData());
 #endif
diff --git a/src/soundsourceoggvorbis.cpp b/src/soundsourceoggvorbis.cpp
index 9bbb92d50c..06fe67b8cb 100644
--- a/src/soundsourceoggvorbis.cpp
+++ b/src/soundsourceoggvorbis.cpp
@@ -250,7 +250,7 @@ unsigned SoundSourceOggVorbis::read(volatile unsigned long size, const SAMPLE *
  */
 Result SoundSourceOggVorbis::parseHeader() {
 #ifdef _WIN32
-    TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().data());
+    TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::Ogg::Vorbis::File f(getFilename().toLocal8Bit().constData());
 #endif
@@ -276,7 +276,7 @@ Result SoundSourceOggVorbis::parseHeader() {
 
 QImage SoundSourceOggVorbis::parseCoverArt() {
 #ifdef _WIN32
-    TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().data());
+    TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::Ogg::Vorbis::File f(getFilename().toLocal8Bit().constData());
 #endif
diff --git a/src/soundsourceopus.cpp b/src/soundsourceopus.cpp
index 0e59b412fe..7bd209cfe0 100644
--- a/src/soundsourceopus.cpp
+++ b/src/soundsourceopus.cpp
@@ -205,7 +205,7 @@ Result SoundSourceOpus::parseHeader() {
 // If we don't have new enough Taglib we use libopusfile parser!
 #if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 9))
 #ifdef _WIN32
-    TagLib::Ogg::Opus::File f(getFilename().toStdWString().data());
+    TagLib::Ogg::Opus::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::Ogg::Opus::File f(qBAFilename.constData());
 #endif
@@ -292,7 +292,7 @@ QList<QString> SoundSourceOpus::supportedFileExtensions() {
 QImage SoundSourceOpus::parseCoverArt() {
 #if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 9))
 #ifdef _WIN32
-    TagLib::Ogg::Opus::File f(getFilename().toStdWString().data());
+    TagLib::Ogg::Opus::File f(getFilename().toStdWString().c_str());
 #else
     TagLib::Ogg::Opus::File f(getFilename().toLocal8Bit().constData());
 #endif
diff --git a/src/soundsourcesndfile.cpp b/src/soundsourcesndfile.cpp
index dae91f1121..4dd21a27d8 100644
--- a/src/soundsourcesndfile.cpp
+++ b/src/soundsourcesndfile.cpp
@@ -159,7 +159,7 @@ Result SoundSourceSndFile::parseHeader()
 
     if (is_flac) {
 #ifdef _WIN32
-        TagLib::FLAC::File f(getFilename().toStdWString().data());
+        TagLib::FLAC::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::FLAC::File f(qBAFilename.constData());
 #endif
@@ -254,7 +254,7 @@ QImage SoundSourceSndFile::parseCoverArt() {
 
     if (getType() == "flac") {
 #ifdef _WIN32
-        TagLib::FLAC::File f(getFilename().toStdWString().data());
+        TagLib::FLAC::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::FLAC::File f(qBAFilename.constData());
 #endif
@@ -279,7 +279,7 @@ QImage SoundSourceSndFile::parseCoverArt() {
         }
     } else if (getType() == "wav") {
 #ifdef _WIN32
-        TagLib::RIFF::WAV::File f(getFilename().toStdWString().data());
+        TagLib::RIFF::WAV::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::RIFF::WAV::File f(qBAFilename.constData());
 #endif
@@ -290,7 +290,7 @@ QImage SoundSourceSndFile::parseCoverArt() {
     } else {
         // Try AIFF
 #ifdef _WIN32
-        TagLib::RIFF::AIFF::File f(getFilename().toStdWString().data());
+        TagLib::RIFF::AIFF::File f(getFilename().toStdWString().c_str());
 #else
         TagLib::RIFF::AIFF::File f(qBAFilename.constData());
 #endif