squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-31 04:38:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use qUtf8Printable() for logging strings

Browse Source 
qDebug(), qInfo(), qWarning(), qCritical(), qFatal() expect %s arguments
to be UTF-8 encoded, while qPrintable() converts to local 8-bit encoding.
Therefore qUtf8Printable() should be used for logging strings instead of
qPrintable().
This commit is contained in:
Vladimir Golovnev (qlassez)
2017-08-13 13:56:03 +03:00
parent 219a6b3ad1
commit cff6a64e9f
28 changed files with 100 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/properties/peerlistwidget.cpp
View File

@@ -249,7 +249,7 @@ void PeerListWidget::showPeerListMenu(const QPoint &)
int peerCount = 0;
foreach (const BitTorrent::PeerAddress &addr, peersList) {
if (torrent->connectPeer(addr)) {
qDebug("Adding peer %s...", qPrintable(addr.ip.toString()));
qDebug("Adding peer %s...", qUtf8Printable(addr.ip.toString()));
Logger::instance()->addMessage(tr("Manually adding peer '%1'...").arg(addr.ip.toString()));
peerCount++;
}
@@ -442,7 +442,7 @@ void PeerListWidget::handleResolved(const QString &ip, const QString &hostname)
{
QStandardItem *item = m_peerItems.value(ip, 0);
if (item) {
qDebug("Resolved %s -> %s", qPrintable(ip), qPrintable(hostname));
qDebug("Resolved %s -> %s", qUtf8Printable(ip), qUtf8Printable(hostname));
item->setData(hostname, Qt::DisplayRole);
}
}

12
src/gui/properties/propertieswidget.cpp
View File

@@ -514,7 +514,7 @@ void PropertiesWidget::loadUrlSeeds()
const QList<QUrl> hc_seeds = m_torrent->urlSeeds();
// Add url seeds
foreach (const QUrl &hc_seed, hc_seeds) {
qDebug("Loading URL seed: %s", qPrintable(hc_seed.toString()));
qDebug("Loading URL seed: %s", qUtf8Printable(hc_seed.toString()));
new QListWidgetItem(hc_seed.toString(), m_ui->listWebSeeds);
}
}
@@ -535,7 +535,7 @@ void PropertiesWidget::openFile(const QModelIndex &index)
const QDir saveDir(m_torrent->savePath(true));
const QString filename = m_torrent->filePath(i);
const QString file_path = Utils::Fs::expandPath(saveDir.absoluteFilePath(filename));
qDebug("Trying to open file at %s", qPrintable(file_path));
qDebug("Trying to open file at %s", qUtf8Printable(file_path));
// Flush data
m_torrent->flushCache();
Utils::Misc::openPath(file_path);
@@ -704,7 +704,7 @@ void PropertiesWidget::renameSelectedFile()
const QString newFilePath = oldFilePath.leftRef(oldFilePath.size() - oldFileName.size()) + newFileName;
if (oldFileName == newFileName) {
qDebug("Name did not change: %s", qPrintable(oldFileName));
qDebug("Name did not change: %s", qUtf8Printable(oldFileName));
return;
}
@@ -719,7 +719,7 @@ void PropertiesWidget::renameSelectedFile()
}
}
qDebug("Renaming %s to %s", qPrintable(oldFilePath), qPrintable(newFilePath));
qDebug("Renaming %s to %s", qUtf8Printable(oldFilePath), qUtf8Printable(newFilePath));
m_torrent->renameFile(fileIndex, newFilePath);
PropListModel->setData(modelIndex, newName);
@@ -766,7 +766,7 @@ void PropertiesWidget::renameSelectedFile()
if (!forceRecheck && QDir(m_torrent->savePath(true)).exists(newName))
forceRecheck = true;
newName = Utils::Fs::expandPath(newName);
qDebug("Rename %s to %s", qPrintable(currentName), qPrintable(newName));
qDebug("Rename %s to %s", qUtf8Printable(currentName), qUtf8Printable(newName));
m_torrent->renameFile(i, newName);
}
}
@@ -801,7 +801,7 @@ void PropertiesWidget::askWebSeed()
tr("New URL seed:"), QLineEdit::Normal,
QString::fromUtf8("http://www."), &ok);
if (!ok) return;
qDebug("Adding %s web seed", qPrintable(url_seed));
qDebug("Adding %s web seed", qUtf8Printable(url_seed));
if (!m_ui->listWebSeeds->findItems(url_seed, Qt::MatchFixedString).empty()) {
QMessageBox::warning(this, "qBittorrent",
tr("This URL seed is already in the list."),