Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-02 18:44:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed pasting of rslinks with special characters with Qt5

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-06-18 12:53:54 +00:00
parent 99f0868f3f
commit 6a924cb854
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -163,6 +163,20 @@ void RetroShareLink::fromString(const QString& url)
fromUrl(QUrl::fromEncoded(url.toUtf8().constData())); fromUrl(QUrl::fromEncoded(url.toUtf8().constData()));
} }
// Qt 4 and Qt5 use different classes
// to make it work with Qt4 and Qt5, use a template
template<class QUrl_or_QUrlQuery>
QString decodedQueryItemValue(const QUrl_or_QUrlQuery& urlQuery, const QString& key)
{
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
// Qt5 needs a additional flag to properly decode everything
// we have to decode, becaue we want only decoded stuff in our QString
return urlQuery.queryItemValue(key, QUrl::FullyDecoded);
#else
return urlQuery.queryItemValue(key);
#endif
}
void RetroShareLink::fromUrl(const QUrl& url) void RetroShareLink::fromUrl(const QUrl& url)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
@ -188,7 +202,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
bool ok ; bool ok ;
_type = TYPE_FILE; _type = TYPE_FILE;
_name = urlQuery.queryItemValue(FILE_NAME); _name = decodedQueryItemValue(urlQuery, FILE_NAME);
_size = urlQuery.queryItemValue(FILE_SIZE).toULongLong(&ok); _size = urlQuery.queryItemValue(FILE_SIZE).toULongLong(&ok);
_hash = urlQuery.queryItemValue(FILE_HASH).left(40); // normally not necessary, but it's a security. _hash = urlQuery.queryItemValue(FILE_HASH).left(40); // normally not necessary, but it's a security.
@ -220,7 +234,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
bool ok ; bool ok ;
_type = TYPE_EXTRAFILE; _type = TYPE_EXTRAFILE;
_name = urlQuery.queryItemValue(FILE_NAME); _name = decodedQueryItemValue(urlQuery, FILE_NAME);
_size = urlQuery.queryItemValue(FILE_SIZE).toULongLong(&ok); _size = urlQuery.queryItemValue(FILE_SIZE).toULongLong(&ok);
_hash = urlQuery.queryItemValue(FILE_HASH).left(40); // normally not necessary, but it's a security. _hash = urlQuery.queryItemValue(FILE_HASH).left(40); // normally not necessary, but it's a security.
_SSLid = urlQuery.queryItemValue(FILE_SOURCE); _SSLid = urlQuery.queryItemValue(FILE_SOURCE);
@ -239,7 +253,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
} }
if (url.host() == HOST_PERSON) { if (url.host() == HOST_PERSON) {
_type = TYPE_PERSON; _type = TYPE_PERSON;
_name = urlQuery.queryItemValue(PERSON_NAME); _name = decodedQueryItemValue(urlQuery, PERSON_NAME);
_hash = urlQuery.queryItemValue(PERSON_HASH).left(40); // normally not necessary, but it's a security. _hash = urlQuery.queryItemValue(PERSON_HASH).left(40); // normally not necessary, but it's a security.
check(); check();
return; return;
@ -247,7 +261,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
if (url.host() == HOST_FORUM) { if (url.host() == HOST_FORUM) {
_type = TYPE_FORUM; _type = TYPE_FORUM;
_name = urlQuery.queryItemValue(FORUM_NAME); _name = decodedQueryItemValue(urlQuery, FORUM_NAME);
_hash = urlQuery.queryItemValue(FORUM_ID); _hash = urlQuery.queryItemValue(FORUM_ID);
_msgId = urlQuery.queryItemValue(FORUM_MSGID); _msgId = urlQuery.queryItemValue(FORUM_MSGID);
check(); check();
@ -256,7 +270,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
if (url.host() == HOST_CHANNEL) { if (url.host() == HOST_CHANNEL) {
_type = TYPE_CHANNEL; _type = TYPE_CHANNEL;
_name = urlQuery.queryItemValue(CHANNEL_NAME); _name = decodedQueryItemValue(urlQuery, CHANNEL_NAME);
_hash = urlQuery.queryItemValue(CHANNEL_ID); _hash = urlQuery.queryItemValue(CHANNEL_ID);
_msgId = urlQuery.queryItemValue(CHANNEL_MSGID); _msgId = urlQuery.queryItemValue(CHANNEL_MSGID);
check(); check();
@ -265,7 +279,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
if (url.host() == HOST_SEARCH) { if (url.host() == HOST_SEARCH) {
_type = TYPE_SEARCH; _type = TYPE_SEARCH;
_name = urlQuery.queryItemValue(SEARCH_KEYWORDS); _name = decodedQueryItemValue(urlQuery, SEARCH_KEYWORDS);
check(); check();
return; return;
} }