Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 22:21:09 -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

8
retroshare-gui/src/util/HandleRichText.cpp
View file

@ -795,10 +795,18 @@ bool RsHtml::makeEmbeddedImage(const QImage &originalImage, QString &embeddedIma
QString RsHtml::plainText(const QString &text)
{
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
return text.toHtmlEscaped();
#else
return Qt::escape(text);
#endif
}
QString RsHtml::plainText(const std::string &text)
{
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
return QString::fromUtf8(text.c_str()).toHtmlEscaped();
#else
return Qt::escape(QString::fromUtf8(text.c_str()));
#endif
}