Use QUrl to un-encode URLs

This commit is contained in:
craig.p.drummond
2012-12-30 22:08:31 +00:00
committed by craig.p.drummond
parent 0647961508
commit 05ab47d2a3

View File

@@ -56,9 +56,9 @@ static QStringList reverseList(const QStringList &orig)
}
#ifdef TAGLIB_FOUND
static QString unencodeUrl(QString u)
static inline QString unencodeUrl(QString u)
{
return u.replace("%20", " ").replace("%5C", "\\");
return QUrl(u).path();
}
#endif
@@ -508,8 +508,8 @@ bool PlayQueueModel::dropMimeData(const QMimeData *data,
foreach (QString u, orig) {
if (u.startsWith("http://")) {
useable.append(u);
} else if (allowLocal && (u.startsWith('/') || u.startsWith("file:///"))) {
if (u.startsWith("file://")) {
} else if (allowLocal && (u.startsWith('/') || u.startsWith("file:/"))) {
if (u.startsWith("file:/")) {
u=u.mid(7);
}
if (alwaysUseHttp || !mpdLocal) {