From 87384ca2a22657660b3a0c8ae9962f0fde3d0ee9 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 7 Mar 2017 00:01:24 +0800 Subject: [PATCH] Replace Utils::String::toHtmlEscaped() by QString::.toHtmlEscaped() --- src/base/logger.cpp | 4 ++-- src/base/utils/string.cpp | 5 ----- src/base/utils/string.h | 2 -- src/gui/deletionconfirmationdlg.h | 2 +- src/gui/properties/peerlistwidget.cpp | 4 ++-- src/gui/properties/propertieswidget.cpp | 4 ++-- 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/base/logger.cpp b/src/base/logger.cpp index d2e95ab58..5399001c0 100644 --- a/src/base/logger.cpp +++ b/src/base/logger.cpp @@ -37,7 +37,7 @@ void Logger::addMessage(const QString &message, const Log::MsgType &type) { QWriteLocker locker(&lock); - Log::Msg temp = { msgCounter++, QDateTime::currentMSecsSinceEpoch(), type, Utils::String::toHtmlEscaped(message) }; + Log::Msg temp = { msgCounter++, QDateTime::currentMSecsSinceEpoch(), type, message.toHtmlEscaped() }; m_messages.push_back(temp); if (m_messages.size() >= MAX_LOG_MESSAGES) @@ -50,7 +50,7 @@ void Logger::addPeer(const QString &ip, bool blocked, const QString &reason) { QWriteLocker locker(&lock); - Log::Peer temp = { peerCounter++, QDateTime::currentMSecsSinceEpoch(), Utils::String::toHtmlEscaped(ip), blocked, Utils::String::toHtmlEscaped(reason) }; + Log::Peer temp = { peerCounter++, QDateTime::currentMSecsSinceEpoch(), ip.toHtmlEscaped(), blocked, reason.toHtmlEscaped() }; m_peers.push_back(temp); if (m_peers.size() >= MAX_LOG_MESSAGES) diff --git a/src/base/utils/string.cpp b/src/base/utils/string.cpp index 52bd7d2c0..52eaafd20 100644 --- a/src/base/utils/string.cpp +++ b/src/base/utils/string.cpp @@ -183,8 +183,3 @@ bool Utils::String::slowEquals(const QByteArray &a, const QByteArray &b) return (diff == 0); } - -QString Utils::String::toHtmlEscaped(const QString &str) -{ - return str.toHtmlEscaped(); -} diff --git a/src/base/utils/string.h b/src/base/utils/string.h index 17c52f6d7..c9a2b5795 100644 --- a/src/base/utils/string.h +++ b/src/base/utils/string.h @@ -46,8 +46,6 @@ namespace Utils // Taken from https://crackstation.net/hashing-security.htm bool slowEquals(const QByteArray &a, const QByteArray &b); - QString toHtmlEscaped(const QString &str); - bool naturalCompareCaseSensitive(const QString &left, const QString &right); bool naturalCompareCaseInsensitive(const QString &left, const QString &right); } diff --git a/src/gui/deletionconfirmationdlg.h b/src/gui/deletionconfirmationdlg.h index 7e65df46c..a6f21aa4d 100644 --- a/src/gui/deletionconfirmationdlg.h +++ b/src/gui/deletionconfirmationdlg.h @@ -46,7 +46,7 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg { DeletionConfirmationDlg(QWidget *parent, const int &size, const QString &name, bool defaultDeleteFiles): QDialog(parent) { setupUi(this); if (size == 1) - label->setText(tr("Are you sure you want to delete '%1' from the transfer list?", "Are you sure you want to delete 'ubuntu-linux-iso' from the transfer list?").arg(Utils::String::toHtmlEscaped(name))); + label->setText(tr("Are you sure you want to delete '%1' from the transfer list?", "Are you sure you want to delete 'ubuntu-linux-iso' from the transfer list?").arg(name.toHtmlEscaped())); else label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size))); // Icons diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp index 457bf2a1c..dadf2c0b2 100644 --- a/src/gui/properties/peerlistwidget.cpp +++ b/src/gui/properties/peerlistwidget.cpp @@ -397,7 +397,7 @@ QStandardItem* PeerListWidget::addPeer(const QString& ip, BitTorrent::TorrentHan m_listModel->setData(m_listModel->index(row, PeerListDelegate::CONNECTION), peer.connectionType()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flags()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flagsDescription(), Qt::ToolTipRole); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), Utils::String::toHtmlEscaped(peer.client())); + m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), peer.client().toHtmlEscaped()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::PROGRESS), peer.progress()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWN_SPEED), peer.payloadDownSpeed()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::UP_SPEED), peer.payloadUpSpeed()); @@ -428,7 +428,7 @@ void PeerListWidget::updatePeer(const QString &ip, BitTorrent::TorrentHandle *co m_listModel->setData(m_listModel->index(row, PeerListDelegate::PORT), peer.address().port); m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flags()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flagsDescription(), Qt::ToolTipRole); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), Utils::String::toHtmlEscaped(peer.client())); + m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), peer.client().toHtmlEscaped()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::PROGRESS), peer.progress()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWN_SPEED), peer.payloadDownSpeed()); m_listModel->setData(m_listModel->index(row, PeerListDelegate::UP_SPEED), peer.payloadUpSpeed()); diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 2147af49e..9015b2a33 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -307,12 +307,12 @@ void PropertiesWidget::loadTorrentInfos(BitTorrent::TorrentHandle *const torrent label_total_size_val->setText(Utils::Misc::friendlyUnit(m_torrent->totalSize())); // Comment - comment_text->setText(Utils::Misc::parseHtmlLinks(Utils::String::toHtmlEscaped(m_torrent->comment()))); + comment_text->setText(Utils::Misc::parseHtmlLinks(m_torrent->comment().toHtmlEscaped())); // URL seeds loadUrlSeeds(); - label_created_by_val->setText(Utils::String::toHtmlEscaped(m_torrent->creator())); + label_created_by_val->setText(m_torrent->creator().toHtmlEscaped()); // List files in torrent PropListModel->model()->setupModelData(m_torrent->info());