summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2021-02-23 08:07:25 +0100
committerGitHub <noreply@github.com>2021-02-23 08:07:25 +0100
commitfb98fba8233c05b37bf3dcc951749e3c1cc2b98e (patch)
treed7179873c3d0315a5d52e8e0c12861c86692ba41 /src
parenta211e75dd63d61776065ca2297f3d5810f423701 (diff)
parent8bc5f6b56263491db87d3d175e87394c60ad0ad5 (diff)
Merge pull request #3630 from uklotzde/xml-no-text
Don't open XML as text files
Diffstat (limited to 'src')
-rw-r--r--src/library/itunes/itunesfeature.cpp2
-rw-r--r--src/library/rhythmbox/rhythmboxfeature.cpp4
-rw-r--r--src/library/traktor/traktorfeature.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/library/itunes/itunesfeature.cpp b/src/library/itunes/itunesfeature.cpp
index df697bef00..e65a037388 100644
--- a/src/library/itunes/itunesfeature.cpp
+++ b/src/library/itunes/itunesfeature.cpp
@@ -388,7 +388,7 @@ TreeItem* ITunesFeature::importLibrary() {
//Parse iTunes XML file using SAX (for performance)
QFile itunes_file(m_dbfile);
- if (!itunes_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ if (!itunes_file.open(QIODevice::ReadOnly)) {
qDebug() << "Cannot open iTunes music collection";
return nullptr;
}
diff --git a/src/library/rhythmbox/rhythmboxfeature.cpp b/src/library/rhythmbox/rhythmboxfeature.cpp
index d0b54b57b5..53df4526d3 100644
--- a/src/library/rhythmbox/rhythmboxfeature.cpp
+++ b/src/library/rhythmbox/rhythmboxfeature.cpp
@@ -151,7 +151,7 @@ TreeItem* RhythmboxFeature::importMusicCollection() {
}
if (!Sandbox::askForAccess(QFileInfo(db).absoluteFilePath()) ||
- !db.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ !db.open(QIODevice::ReadOnly)) {
return nullptr;
}
@@ -207,7 +207,7 @@ TreeItem* RhythmboxFeature::importPlaylists() {
}
}
//Open file
- if (!db.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ if (!db.open(QIODevice::ReadOnly)) {
return nullptr;
}
diff --git a/src/library/traktor/traktorfeature.cpp b/src/library/traktor/traktorfeature.cpp
index e0e1ebe5e2..35f77ab003 100644
--- a/src/library/traktor/traktorfeature.cpp
+++ b/src/library/traktor/traktorfeature.cpp
@@ -206,7 +206,7 @@ TreeItem* TraktorFeature::importLibrary(const QString& file) {
//Parse Trakor XML file using SAX (for performance)
QFile traktor_file(file);
- if (!Sandbox::askForAccess(file) || !traktor_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ if (!Sandbox::askForAccess(file) || !traktor_file.open(QIODevice::ReadOnly)) {
qDebug() << "Cannot open Traktor music collection";
return nullptr;
}