Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare-gui/src/gui/RemoteDirModel.cpp
View File

@ -51,10 +51,20 @@ RetroshareDirModel::RetroshareDirModel(bool mode, QObject *parent)
{
_visible = false ;
_needs_update = true ;
#if QT_VERSION < QT_VERSION_CHECK (5, 0, 0)
setSupportedDragActions(Qt::CopyAction);
#endif
treeStyle();
}
// QAbstractItemModel::setSupportedDragActions() was replaced by virtual QAbstractItemModel::supportedDragActions()
#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
Qt::DropActions RetroshareDirModel::supportedDragActions() const
{
return Qt::CopyAction;
}
#endif
void RetroshareDirModel::update()
{
if(_needs_update)
@ -528,7 +538,7 @@ QVariant RetroshareDirModel::data(const QModelIndex &index, int role) const
if (role == Qt::TextColorRole)
{
if(details.min_age > ageIndicator)
return Qt::gray ;
return QVariant(QColor(Qt::gray)) ;
else
return QVariant() ; // standard
} /* end of TextColorRole */

3
retroshare-gui/src/gui/RemoteDirModel.h
View File

@ -73,6 +73,9 @@ class RetroshareDirModel : public QAbstractItemModel
virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const;
virtual QStringList mimeTypes () const;
virtual QVariant data(const QModelIndex &index, int role) const;
#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
virtual Qt::DropActions supportedDragActions() const;
#endif
protected:
bool _visible ;

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

@ -28,6 +28,10 @@
#include <QIcon>
#include <QObject>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <QUrlQuery>
#endif
#include "RetroShareLink.h"
#include "MainWindow.h"
#include "ForumsDialog.h"
@ -163,6 +167,12 @@ void RetroShareLink::fromString(const QString& url)
void RetroShareLink::fromUrl(const QUrl& url)
{
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
const QUrlQuery urlQuery(url);
#else
const QUrl &urlQuery(url);
#endif
clear();
// parse
@ -180,9 +190,9 @@ void RetroShareLink::fromUrl(const QUrl& url)
bool ok ;
_type = TYPE_FILE;
_name = url.queryItemValue(FILE_NAME);
_size = url.queryItemValue(FILE_SIZE).toULongLong(&ok);
_hash = url.queryItemValue(FILE_HASH).left(40); // normally not necessary, but it's a security.
_name = urlQuery.queryItemValue(FILE_NAME);
_size = urlQuery.queryItemValue(FILE_SIZE).toULongLong(&ok);
_hash = urlQuery.queryItemValue(FILE_HASH).left(40); // normally not necessary, but it's a security.
if (ok) {
#ifdef DEBUG_RSLINK
@ -200,9 +210,9 @@ void RetroShareLink::fromUrl(const QUrl& url)
{
bool ok ;
_type = TYPE_PRIVATE_CHAT ;
_time_stamp = url.queryItemValue(PRIVATE_CHAT_TIME_STAMP).toUInt(&ok) ;
_encrypted_chat_info = url.queryItemValue(PRIVATE_CHAT_STRING) ;
_GPGid = url.queryItemValue(PRIVATE_CHAT_GPG_ID) ;
_time_stamp = urlQuery.queryItemValue(PRIVATE_CHAT_TIME_STAMP).toUInt(&ok) ;
_encrypted_chat_info = urlQuery.queryItemValue(PRIVATE_CHAT_STRING) ;
_GPGid = urlQuery.queryItemValue(PRIVATE_CHAT_GPG_ID) ;
check() ;
return;
@ -211,9 +221,9 @@ void RetroShareLink::fromUrl(const QUrl& url)
{
bool ok ;
_type = TYPE_PUBLIC_MSG ;
_hash = url.queryItemValue(PUBLIC_MSG_HASH) ;
_time_stamp = url.queryItemValue(PUBLIC_MSG_TIME_STAMP).toUInt(&ok) ;
_GPGid = url.queryItemValue(PUBLIC_MSG_SRC_PGP_ID) ;
_hash = urlQuery.queryItemValue(PUBLIC_MSG_HASH) ;
_time_stamp = urlQuery.queryItemValue(PUBLIC_MSG_TIME_STAMP).toUInt(&ok) ;
_GPGid = urlQuery.queryItemValue(PUBLIC_MSG_SRC_PGP_ID) ;
check() ;
return;
@ -223,10 +233,10 @@ void RetroShareLink::fromUrl(const QUrl& url)
bool ok ;
_type = TYPE_EXTRAFILE;
_name = url.queryItemValue(FILE_NAME);
_size = url.queryItemValue(FILE_SIZE).toULongLong(&ok);
_hash = url.queryItemValue(FILE_HASH).left(40); // normally not necessary, but it's a security.
_SSLid = url.queryItemValue(FILE_SOURCE);
_name = urlQuery.queryItemValue(FILE_NAME);
_size = urlQuery.queryItemValue(FILE_SIZE).toULongLong(&ok);
_hash = urlQuery.queryItemValue(FILE_HASH).left(40); // normally not necessary, but it's a security.
_SSLid = urlQuery.queryItemValue(FILE_SOURCE);
if (ok) {
#ifdef DEBUG_RSLINK
@ -242,55 +252,55 @@ void RetroShareLink::fromUrl(const QUrl& url)
}
if (url.host() == HOST_PERSON) {
_type = TYPE_PERSON;
_name = url.queryItemValue(PERSON_NAME);
_hash = url.queryItemValue(PERSON_HASH).left(40); // normally not necessary, but it's a security.
_name = urlQuery.queryItemValue(PERSON_NAME);
_hash = urlQuery.queryItemValue(PERSON_HASH).left(40); // normally not necessary, but it's a security.
check();
return;
}
if (url.host() == HOST_FORUM) {
_type = TYPE_FORUM;
_name = url.queryItemValue(FORUM_NAME);
_hash = url.queryItemValue(FORUM_ID);
_msgId = url.queryItemValue(FORUM_MSGID);
_name = urlQuery.queryItemValue(FORUM_NAME);
_hash = urlQuery.queryItemValue(FORUM_ID);
_msgId = urlQuery.queryItemValue(FORUM_MSGID);
check();
return;
}
if (url.host() == HOST_CHANNEL) {
_type = TYPE_CHANNEL;
_name = url.queryItemValue(CHANNEL_NAME);
_hash = url.queryItemValue(CHANNEL_ID);
_msgId = url.queryItemValue(CHANNEL_MSGID);
_name = urlQuery.queryItemValue(CHANNEL_NAME);
_hash = urlQuery.queryItemValue(CHANNEL_ID);
_msgId = urlQuery.queryItemValue(CHANNEL_MSGID);
check();
return;
}
if (url.host() == HOST_SEARCH) {
_type = TYPE_SEARCH;
_name = url.queryItemValue(SEARCH_KEYWORDS);
_name = urlQuery.queryItemValue(SEARCH_KEYWORDS);
check();
return;
}
if (url.host() == HOST_MESSAGE) {
_type = TYPE_MESSAGE;
std::string id = url.queryItemValue(MESSAGE_ID).toStdString();
createMessage(id, url.queryItemValue(MESSAGE_SUBJECT));
std::string id = urlQuery.queryItemValue(MESSAGE_ID).toStdString();
createMessage(id, urlQuery.queryItemValue(MESSAGE_SUBJECT));
return;
}
if (url.host() == HOST_CERTIFICATE) {
_type = TYPE_CERTIFICATE;
_SSLid = url.queryItemValue(CERTIFICATE_SSLID);
_name = url.queryItemValue(CERTIFICATE_NAME);
_location = url.queryItemValue(CERTIFICATE_LOCATION);
_GPGBase64String = url.queryItemValue(CERTIFICATE_GPG_BASE64);
_GPGid = url.queryItemValue(CERTIFICATE_GPG_ID);
_GPGBase64CheckSum = url.queryItemValue(CERTIFICATE_GPG_CHECKSUM);
_ext_ip_port = url.queryItemValue(CERTIFICATE_EXT_IPPORT);
_loc_ip_port = url.queryItemValue(CERTIFICATE_LOC_IPPORT);
_dyndns_name = url.queryItemValue(CERTIFICATE_DYNDNS);
_SSLid = urlQuery.queryItemValue(CERTIFICATE_SSLID);
_name = urlQuery.queryItemValue(CERTIFICATE_NAME);
_location = urlQuery.queryItemValue(CERTIFICATE_LOCATION);
_GPGBase64String = urlQuery.queryItemValue(CERTIFICATE_GPG_BASE64);
_GPGid = urlQuery.queryItemValue(CERTIFICATE_GPG_ID);
_GPGBase64CheckSum = urlQuery.queryItemValue(CERTIFICATE_GPG_CHECKSUM);
_ext_ip_port = urlQuery.queryItemValue(CERTIFICATE_EXT_IPPORT);
_loc_ip_port = urlQuery.queryItemValue(CERTIFICATE_LOC_IPPORT);
_dyndns_name = urlQuery.queryItemValue(CERTIFICATE_DYNDNS);
std::cerr << "Got a certificate link!!" << std::endl;
check() ;
return;
@ -728,143 +738,132 @@ static QString encodeItem(QString item)
QString RetroShareLink::toString() const
{
QUrl url;
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
QUrlQuery urlQuery;
#else
QUrl &urlQuery(url);
#endif
switch (_type) {
case TYPE_UNKNOWN:
break;
return "";
case TYPE_FILE:
{
QUrl url;
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_FILE);
url.addQueryItem(FILE_NAME, encodeItem(_name));
url.addQueryItem(FILE_SIZE, QString::number(_size));
url.addQueryItem(FILE_HASH, _hash);
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_FILE);
urlQuery.addQueryItem(FILE_NAME, encodeItem(_name));
urlQuery.addQueryItem(FILE_SIZE, QString::number(_size));
urlQuery.addQueryItem(FILE_HASH, _hash);
break;
return url.toString();
}
case TYPE_PRIVATE_CHAT:
{
QUrl url;
url.setScheme(RSLINK_SCHEME) ;
url.setHost(HOST_PRIVATE_CHAT) ;
url.addQueryItem(PRIVATE_CHAT_TIME_STAMP,QString::number(_time_stamp)) ;
url.addQueryItem(PRIVATE_CHAT_GPG_ID,_GPGid) ;
url.addQueryItem(PRIVATE_CHAT_STRING,_encrypted_chat_info) ;
url.setScheme(RSLINK_SCHEME) ;
url.setHost(HOST_PRIVATE_CHAT) ;
urlQuery.addQueryItem(PRIVATE_CHAT_TIME_STAMP,QString::number(_time_stamp)) ;
urlQuery.addQueryItem(PRIVATE_CHAT_GPG_ID,_GPGid) ;
urlQuery.addQueryItem(PRIVATE_CHAT_STRING,_encrypted_chat_info) ;
break;
return url.toString() ;
}
case TYPE_PUBLIC_MSG:
{
QUrl url;
url.setScheme(RSLINK_SCHEME) ;
url.setHost(HOST_PUBLIC_MSG) ;
url.addQueryItem(PUBLIC_MSG_TIME_STAMP,QString::number(_time_stamp)) ;
url.addQueryItem(PUBLIC_MSG_HASH,_hash) ;
url.addQueryItem(PUBLIC_MSG_SRC_PGP_ID,_GPGid) ;
url.setScheme(RSLINK_SCHEME) ;
url.setHost(HOST_PUBLIC_MSG) ;
urlQuery.addQueryItem(PUBLIC_MSG_TIME_STAMP,QString::number(_time_stamp)) ;
urlQuery.addQueryItem(PUBLIC_MSG_HASH,_hash) ;
urlQuery.addQueryItem(PUBLIC_MSG_SRC_PGP_ID,_GPGid) ;
return url.toString() ;
}
break;
case TYPE_EXTRAFILE:
{
QUrl url;
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_EXTRAFILE);
url.addQueryItem(FILE_NAME, encodeItem(_name));
url.addQueryItem(FILE_SIZE, QString::number(_size));
url.addQueryItem(FILE_HASH, _hash);
url.addQueryItem(FILE_SOURCE, _SSLid);
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_EXTRAFILE);
urlQuery.addQueryItem(FILE_NAME, encodeItem(_name));
urlQuery.addQueryItem(FILE_SIZE, QString::number(_size));
urlQuery.addQueryItem(FILE_HASH, _hash);
urlQuery.addQueryItem(FILE_SOURCE, _SSLid);
return url.toString();
}
break;
case TYPE_PERSON:
{
QUrl url;
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_PERSON);
url.addQueryItem(PERSON_NAME, encodeItem(_name));
url.addQueryItem(PERSON_HASH, _hash);
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_PERSON);
urlQuery.addQueryItem(PERSON_NAME, encodeItem(_name));
urlQuery.addQueryItem(PERSON_HASH, _hash);
break;
return url.toString();
}
case TYPE_FORUM:
{
QUrl url;
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_FORUM);
url.addQueryItem(FORUM_NAME, encodeItem(_name));
url.addQueryItem(FORUM_ID, _hash);
if (!_msgId.isEmpty()) {
url.addQueryItem(FORUM_MSGID, _msgId);
}
return url.toString();
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_FORUM);
urlQuery.addQueryItem(FORUM_NAME, encodeItem(_name));
urlQuery.addQueryItem(FORUM_ID, _hash);
if (!_msgId.isEmpty()) {
urlQuery.addQueryItem(FORUM_MSGID, _msgId);
}
break;
case TYPE_CHANNEL:
{
QUrl url;
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_CHANNEL);
url.addQueryItem(CHANNEL_NAME, encodeItem(_name));
url.addQueryItem(CHANNEL_ID, _hash);
if (!_msgId.isEmpty()) {
url.addQueryItem(CHANNEL_MSGID, _msgId);
}
return url.toString();
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_CHANNEL);
urlQuery.addQueryItem(CHANNEL_NAME, encodeItem(_name));
urlQuery.addQueryItem(CHANNEL_ID, _hash);
if (!_msgId.isEmpty()) {
urlQuery.addQueryItem(CHANNEL_MSGID, _msgId);
}
break;
case TYPE_SEARCH:
{
QUrl url;
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_SEARCH);
url.addQueryItem(SEARCH_KEYWORDS, encodeItem(_name));
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_SEARCH);
urlQuery.addQueryItem(SEARCH_KEYWORDS, encodeItem(_name));
break;
return url.toString();
}
case TYPE_MESSAGE:
{
QUrl url;
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_MESSAGE);
url.addQueryItem(MESSAGE_ID, _hash);
if (_subject.isEmpty() == false) {
url.addQueryItem(MESSAGE_SUBJECT, encodeItem(_subject));
}
return url.toString();
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_MESSAGE);
urlQuery.addQueryItem(MESSAGE_ID, _hash);
if (_subject.isEmpty() == false) {
urlQuery.addQueryItem(MESSAGE_SUBJECT, encodeItem(_subject));
}
case TYPE_CERTIFICATE:
{
QUrl url ;
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_CERTIFICATE) ;
if (!_SSLid.isEmpty()) {
url.addQueryItem(CERTIFICATE_SSLID, _SSLid);
}
url.addQueryItem(CERTIFICATE_GPG_ID, _GPGid);
url.addQueryItem(CERTIFICATE_GPG_BASE64, _GPGBase64String);
url.addQueryItem(CERTIFICATE_GPG_CHECKSUM, _GPGBase64CheckSum);
if (!_location.isEmpty()) {
url.addQueryItem(CERTIFICATE_LOCATION, encodeItem(_location));
}
url.addQueryItem(CERTIFICATE_NAME, encodeItem(_name));
if (!_loc_ip_port.isEmpty()) {
url.addQueryItem(CERTIFICATE_LOC_IPPORT, encodeItem(_loc_ip_port));
}
if (!_ext_ip_port.isEmpty()) {
url.addQueryItem(CERTIFICATE_EXT_IPPORT, encodeItem(_ext_ip_port));
}
if (!_dyndns_name.isEmpty()) {
url.addQueryItem(CERTIFICATE_DYNDNS, encodeItem(_dyndns_name));
}
return url.toString();
break;
case TYPE_CERTIFICATE:
url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_CERTIFICATE) ;
if (!_SSLid.isEmpty()) {
urlQuery.addQueryItem(CERTIFICATE_SSLID, _SSLid);
}
urlQuery.addQueryItem(CERTIFICATE_GPG_ID, _GPGid);
urlQuery.addQueryItem(CERTIFICATE_GPG_BASE64, _GPGBase64String);
urlQuery.addQueryItem(CERTIFICATE_GPG_CHECKSUM, _GPGBase64CheckSum);
if (!_location.isEmpty()) {
urlQuery.addQueryItem(CERTIFICATE_LOCATION, encodeItem(_location));
}
urlQuery.addQueryItem(CERTIFICATE_NAME, encodeItem(_name));
if (!_loc_ip_port.isEmpty()) {
urlQuery.addQueryItem(CERTIFICATE_LOC_IPPORT, encodeItem(_loc_ip_port));
}
if (!_ext_ip_port.isEmpty()) {
urlQuery.addQueryItem(CERTIFICATE_EXT_IPPORT, encodeItem(_ext_ip_port));
}
if (!_dyndns_name.isEmpty()) {
urlQuery.addQueryItem(CERTIFICATE_DYNDNS, encodeItem(_dyndns_name));
}
break;
}
return "";
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
url.setQuery(urlQuery);
#endif
return url.toString();
}
QString RetroShareLink::niceName() const

8
retroshare-gui/src/gui/SoundManager.cpp
View File

@ -115,7 +115,13 @@ void SoundManager::setEventFilename(const QString &event, const QString &filenam
void SoundManager::play(const QString &event)
{
if (isMute() || !QSound::isAvailable() || !eventEnabled(event)) {
#if QT_VERSION < QT_VERSION_CHECK (5, 0, 0)
if (!QSound::isAvailable()) {
return;
}
#endif
if (isMute() || !eventEnabled(event)) {
return;
}

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;

5
retroshare-gui/src/idle/idle_platform.cpp
View File

@ -131,7 +131,12 @@ bool IdlePlatform::init()
{
if(d->lib)
return true;
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
QFunctionPointer p;
#else
void *p;
#endif
// try to find the built-in Windows 2000 function
d->lib = new QLibrary("user32");

2
retroshare-gui/src/retroshare-gui.pro
View File

@ -176,7 +176,7 @@ win32 {
# create lib directory
QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib $(MKDIR) lib
DEFINES += WINDOWS_SYS
DEFINES *= WINDOWS_SYS WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
INCLUDEPATH += .
}

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
}