Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 14:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code maintenance for Qt 5:

Browse source 
- Added usage of QUrlQuery
- Removed QSound::isAvailable()
- Changed Qt::escape() to QString::toHtmlEscaped()
- Changed QAbstractItemModel::setSupportedDragActions() to virtual QAbstractItemModel::supportedDragActions()

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-10-19 20:59:55 +00:00
parent 68922f45a2
commit f10f029d45
8 changed files with 195 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

19
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -27,6 +27,10 @@
#include <QTextStream>
#include <QTextCodec>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <QUrlQuery>
#endif
#include "ConnectFriendWizard.h"
#include "ui_ConnectFriendWizard.h"
#include "gui/common/PeerDefs.h"
@ -435,8 +439,19 @@ static void sendMail(QString sAddress, QString sSubject, QString sBody)
#endif
QUrl url = QUrl("mailto:" + sAddress);
url.addEncodedQueryItem("subject", QUrl::toPercentEncoding(sSubject));
url.addEncodedQueryItem("body", QUrl::toPercentEncoding(sBody));
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
QUrlQuery urlQuery;
#else
QUrl &urlQuery(url);
#endif
urlQuery.addQueryItem("subject", sSubject);
urlQuery.addQueryItem("body", sBody);
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
url.setQuery(urlQuery);
#endif
std::cerr << "MAIL STRING:" << (std::string)url.toEncoded().constData() << std::endl;