Skip to content

Commit 6eb975b

Browse files
author
g_j_m
committed
Move Q3Url code to QUrl
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5916 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8c445c8 commit 6eb975b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/providers/delimitedtext/qgsdelimitedtextprovider.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <QMessageBox>
2929
#include <QSettings>
3030
#include <QRegExp>
31-
#include <q3url.h>
31+
#include <QUrl>
3232

3333
#include <ogrsf_frmts.h>
3434

@@ -73,10 +73,10 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider(QString const &uri)
7373
temp = parameters.grep("yField=");
7474
mYField = temp.size()? temp[0].mid(temp[0].find("=") + 1) : "";
7575
// Decode the parts of the uri. Good if someone entered '=' as a delimiter, for instance.
76-
Q3Url::decode(mFileName);
77-
Q3Url::decode(mDelimiter);
78-
Q3Url::decode(mXField);
79-
Q3Url::decode(mYField);
76+
mFileName = QUrl::fromPercentEncoding(mFileName.toUtf8());
77+
mDelimiter = QUrl::fromPercentEncoding(mDelimiter.toUtf8());
78+
mXField = QUrl::fromPercentEncoding(mXField.toUtf8());
79+
mYField = QUrl::fromPercentEncoding(mYField.toUtf8());
8080
#ifdef QGISDEBUG
8181
std::cerr << "Data source uri is " << (const char *)uri.toLocal8Bit().data() << std::endl;
8282
std::cerr << "Delimited text file is: " << (const char *)mFileName.toLocal8Bit().data() << std::endl;

0 commit comments

Comments
 (0)