d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #7268 from glassez/logging-strings 

Use qUtf8Printable() for logging strings
adaptive-webui-19844
Vladimir Golovnev 7 years ago committed by GitHub
parent
219a6b3ad1 cff6a64e9f
commit
50cea9d912
28 changed files with 100 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/app/application.cpp
  2. 20
      src/base/bittorrent/session.cpp
  3. 2
      src/base/bittorrent/torrentcreatorthread.cpp
  4. 29
      src/base/bittorrent/torrenthandle.cpp
  5. 2
      src/base/bittorrent/torrentinfo.cpp
  6. 12
      src/base/bittorrent/tracker.cpp
  7. 14
      src/base/filesystemwatcher.cpp
  8. 8
      src/base/net/downloadhandler.cpp
  9. 2
      src/base/net/downloadmanager.cpp
  10. 2
      src/base/net/proxyconfigurationmanager.cpp
  11. 6
      src/base/preferences.cpp
  12. 2
      src/base/profile.cpp
  13. 6
      src/base/scanfoldersmodel.cpp
  14. 6
      src/base/searchengine.cpp
  15. 6
      src/gui/addnewtorrentdialog.cpp
  16. 6
      src/gui/mainwindow.cpp
  17. 4
      src/gui/optionsdlg.cpp
  18. 4
      src/gui/powermanagement/powermanagement_x11.cpp
  19. 4
      src/gui/programupdater.cpp
  20. 4
      src/gui/properties/peerlistwidget.cpp
  21. 12
      src/gui/properties/propertieswidget.cpp
  22. 6
      src/gui/search/pluginselectdlg.cpp
  23. 4
      src/gui/search/searchwidget.cpp
  24. 2
      src/gui/torrentcontentmodel.cpp
  25. 10
      src/gui/transferlistwidget.cpp
  26. 4
      src/webui/abstractwebapplication.cpp
  27. 10
      src/webui/prefjson.cpp
  28. 2
      src/webui/webapplication.cpp

10
src/app/application.cpp
Unescape View File

@ -554,7 +554,7 @@ bool Application::event(QEvent *ev)
if (path.isEmpty()) if (path.isEmpty())
// Get the url instead // Get the url instead
path = static_cast<QFileOpenEvent *>(ev)->url().toString(); path = static_cast<QFileOpenEvent *>(ev)->url().toString();
qDebug("Received a mac file open event: %s", qPrintable(path)); qDebug("Received a mac file open event: %s", qUtf8Printable(path));
if (m_running) if (m_running)
processParams(QStringList(path)); processParams(QStringList(path));
else else
@ -589,16 +589,16 @@ void Application::initializeTranslation()
if (m_qtTranslator.load(QString::fromUtf8("qtbase_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) || if (m_qtTranslator.load(QString::fromUtf8("qtbase_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) ||
m_qtTranslator.load(QString::fromUtf8("qt_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) m_qtTranslator.load(QString::fromUtf8("qt_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
qDebug("Qt %s locale recognized, using translation.", qPrintable(localeStr)); qDebug("Qt %s locale recognized, using translation.", qUtf8Printable(localeStr));
else else
qDebug("Qt %s locale unrecognized, using default (en).", qPrintable(localeStr)); qDebug("Qt %s locale unrecognized, using default (en).", qUtf8Printable(localeStr));
installTranslator(&m_qtTranslator); installTranslator(&m_qtTranslator);
if (m_translator.load(QString::fromUtf8(":/lang/qbittorrent_") + localeStr)) if (m_translator.load(QString::fromUtf8(":/lang/qbittorrent_") + localeStr))
qDebug("%s locale recognized, using translation.", qPrintable(localeStr)); qDebug("%s locale recognized, using translation.", qUtf8Printable(localeStr));
else else
qDebug("%s locale unrecognized, using default (en).", qPrintable(localeStr)); qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(localeStr));
installTranslator(&m_translator); installTranslator(&m_translator);
#ifndef DISABLE_GUI #ifndef DISABLE_GUI

20
src/base/bittorrent/session.cpp
Unescape View File

@ -1658,7 +1658,7 @@ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles)
TorrentHandle *const torrent = m_torrents.take(hash); TorrentHandle *const torrent = m_torrents.take(hash);
if (!torrent) return false; if (!torrent) return false;
qDebug("Deleting torrent with hash: %s", qPrintable(torrent->hash())); qDebug("Deleting torrent with hash: %s", qUtf8Printable(torrent->hash()));
emit torrentAboutToBeRemoved(torrent); emit torrentAboutToBeRemoved(torrent);
// Remove it from session // Remove it from session
@ -1683,10 +1683,10 @@ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles)
#endif #endif
// Remove unwanted and incomplete files // Remove unwanted and incomplete files
foreach (const QString &unwantedFile, unwantedFiles) { foreach (const QString &unwantedFile, unwantedFiles) {
qDebug("Removing unwanted file: %s", qPrintable(unwantedFile)); qDebug("Removing unwanted file: %s", qUtf8Printable(unwantedFile));
Utils::Fs::forceRemove(unwantedFile); Utils::Fs::forceRemove(unwantedFile);
const QString parentFolder = Utils::Fs::branchPath(unwantedFile); const QString parentFolder = Utils::Fs::branchPath(unwantedFile);
qDebug("Attempt to remove parent folder (if empty): %s", qPrintable(parentFolder)); qDebug("Attempt to remove parent folder (if empty): %s", qUtf8Printable(parentFolder));
QDir().rmpath(parentFolder); QDir().rmpath(parentFolder);
} }
} }
@ -1954,7 +1954,7 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri
} }
qDebug("Adding torrent..."); qDebug("Adding torrent...");
qDebug(" -> Hash: %s", qPrintable(hash)); qDebug(" -> Hash: %s", qUtf8Printable(hash));
// Preallocation mode // Preallocation mode
if (isPreallocationEnabled()) if (isPreallocationEnabled())
@ -2031,8 +2031,8 @@ bool Session::loadMetadata(const MagnetUri &magnetUri)
if (m_loadedMetadata.contains(hash)) return false; if (m_loadedMetadata.contains(hash)) return false;
qDebug("Adding torrent to preload metadata..."); qDebug("Adding torrent to preload metadata...");
qDebug(" -> Hash: %s", qPrintable(hash)); qDebug(" -> Hash: %s", qUtf8Printable(hash));
qDebug(" -> Name: %s", qPrintable(name)); qDebug(" -> Name: %s", qUtf8Printable(name));
libt::add_torrent_params p = magnetUri.addTorrentParams(); libt::add_torrent_params p = magnetUri.addTorrentParams();
@ -2114,7 +2114,7 @@ void Session::generateResumeData(bool final)
if (!final && !torrent->needSaveResumeData()) continue; if (!final && !torrent->needSaveResumeData()) continue;
saveTorrentResumeData(torrent, final); saveTorrentResumeData(torrent, final);
qDebug("Saving fastresume data for %s", qPrintable(torrent->name())); qDebug("Saving fastresume data for %s", qUtf8Printable(torrent->name()));
} }
} }
@ -2237,7 +2237,7 @@ const QStringList Session::getListeningIPs()
// Attempt to listen on provided interface // Attempt to listen on provided interface
const QNetworkInterface networkIFace = QNetworkInterface::interfaceFromName(ifaceName); const QNetworkInterface networkIFace = QNetworkInterface::interfaceFromName(ifaceName);
if (!networkIFace.isValid()) { if (!networkIFace.isValid()) {
qDebug("Invalid network interface: %s", qPrintable(ifaceName)); qDebug("Invalid network interface: %s", qUtf8Printable(ifaceName));
logger->addMessage(tr("The network interface defined is invalid: %1").arg(ifaceName), Log::CRITICAL); logger->addMessage(tr("The network interface defined is invalid: %1").arg(ifaceName), Log::CRITICAL);
IPs.append("127.0.0.1"); // Force listening to localhost and avoid accidental connection that will expose user data. IPs.append("127.0.0.1"); // Force listening to localhost and avoid accidental connection that will expose user data.
return IPs; return IPs;
@ -3189,7 +3189,7 @@ void Session::handleTorrentFinished(TorrentHandle *const torrent)
if (torrentRelpath.endsWith(".torrent", Qt::CaseInsensitive)) { if (torrentRelpath.endsWith(".torrent", Qt::CaseInsensitive)) {
qDebug("Found possible recursive torrent download."); qDebug("Found possible recursive torrent download.");
const QString torrentFullpath = torrent->savePath(true) + "/" + torrentRelpath; const QString torrentFullpath = torrent->savePath(true) + "/" + torrentRelpath;
qDebug("Full subtorrent path is %s", qPrintable(torrentFullpath)); qDebug("Full subtorrent path is %s", qUtf8Printable(torrentFullpath));
TorrentInfo torrentInfo = TorrentInfo::loadFromFile(torrentFullpath); TorrentInfo torrentInfo = TorrentInfo::loadFromFile(torrentFullpath);
if (torrentInfo.isValid()) { if (torrentInfo.isValid()) {
qDebug("emitting recursiveTorrentDownloadPossible()"); qDebug("emitting recursiveTorrentDownloadPossible()");
@ -3996,7 +3996,7 @@ namespace
{ {
QFile file(path); QFile file(path);
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
qDebug("Cannot read file %s: %s", qPrintable(path), qPrintable(file.errorString())); qDebug("Cannot read file %s: %s", qUtf8Printable(path), qUtf8Printable(file.errorString()));
return false; return false;
} }

2
src/base/bittorrent/torrentcreatorthread.cpp
Unescape View File

@ -135,7 +135,7 @@ void TorrentCreatorThread::run()
if (isInterruptionRequested()) return; if (isInterruptionRequested()) return;
// create the torrent and print it to out // create the torrent and print it to out
qDebug("Saving to %s", qPrintable(m_savePath)); qDebug("Saving to %s", qUtf8Printable(m_savePath));
#ifdef _MSC_VER #ifdef _MSC_VER
wchar_t *savePathW = new wchar_t[m_savePath.length() + 1]; wchar_t *savePathW = new wchar_t[m_savePath.length() + 1];
int len = Utils::Fs::toNativePath(m_savePath).toWCharArray(savePathW); int len = Utils::Fs::toNativePath(m_savePath).toWCharArray(savePathW);

29
src/base/bittorrent/torrenthandle.cpp
Unescape View File

@ -1426,7 +1426,7 @@ void TorrentHandle::resume(bool forced)
void TorrentHandle::moveStorage(const QString &newPath, bool overwrite) void TorrentHandle::moveStorage(const QString &newPath, bool overwrite)
{ {
if (isMoveInProgress()) { if (isMoveInProgress()) {
qDebug("enqueue move storage to %s", qPrintable(newPath)); qDebug("enqueue move storage to %s", qUtf8Printable(newPath));
m_moveStorageInfo.queuedPath = newPath; m_moveStorageInfo.queuedPath = newPath;
m_moveStorageInfo.queuedOverwrite = overwrite; m_moveStorageInfo.queuedOverwrite = overwrite;
} }
@ -1434,7 +1434,7 @@ void TorrentHandle::moveStorage(const QString &newPath, bool overwrite)
const QString oldPath = nativeActualSavePath(); const QString oldPath = nativeActualSavePath();
if (QDir(oldPath) == QDir(newPath)) return; if (QDir(oldPath) == QDir(newPath)) return;
qDebug("move storage: %s to %s", qPrintable(oldPath), qPrintable(newPath)); qDebug("move storage: %s to %s", qUtf8Printable(oldPath), qUtf8Printable(newPath));
// Actually move the storage // Actually move the storage
m_nativeHandle.move_storage(newPath.toUtf8().constData() m_nativeHandle.move_storage(newPath.toUtf8().constData()
, (overwrite ? libt::always_replace_files : libt::dont_replace)); , (overwrite ? libt::always_replace_files : libt::dont_replace));
@ -1506,7 +1506,8 @@ void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p)
return; return;
} }
qDebug("Torrent is successfully moved from %s to %s", qPrintable(m_moveStorageInfo.oldPath), qPrintable(m_moveStorageInfo.newPath)); qDebug("Torrent is successfully moved from %s to %s"
, qUtf8Printable(m_moveStorageInfo.oldPath), qUtf8Printable(m_moveStorageInfo.newPath));
const QDir oldDir {m_moveStorageInfo.oldPath}; const QDir oldDir {m_moveStorageInfo.oldPath};
if ((oldDir == QDir(m_session->torrentTempPath(info()))) if ((oldDir == QDir(m_session->torrentTempPath(info())))
&& (oldDir != QDir(m_session->tempPath()))) { && (oldDir != QDir(m_session->tempPath()))) {
@ -1559,7 +1560,7 @@ void TorrentHandle::handleTrackerReplyAlert(libtorrent::tracker_reply_alert *p)
#else #else
QString trackerUrl(p->tracker_url()); QString trackerUrl(p->tracker_url());
#endif #endif
qDebug("Received a tracker reply from %s (Num_peers = %d)", qPrintable(trackerUrl), p->num_peers); qDebug("Received a tracker reply from %s (Num_peers = %d)", qUtf8Printable(trackerUrl), p->num_peers);
// Connection was successful now. Remove possible old errors // Connection was successful now. Remove possible old errors
m_trackerInfos[trackerUrl].lastMessage.clear(); // Reset error/warning message m_trackerInfos[trackerUrl].lastMessage.clear(); // Reset error/warning message
m_trackerInfos[trackerUrl].numPeers = p->num_peers; m_trackerInfos[trackerUrl].numPeers = p->num_peers;
@ -1576,7 +1577,7 @@ void TorrentHandle::handleTrackerWarningAlert(libtorrent::tracker_warning_alert
QString trackerUrl(p->tracker_url()); QString trackerUrl(p->tracker_url());
QString message = QString::fromStdString(p->message()); QString message = QString::fromStdString(p->message());
#endif #endif
qDebug("Received a tracker warning for %s: %s", qPrintable(trackerUrl), qPrintable(message)); qDebug("Received a tracker warning for %s: %s", qUtf8Printable(trackerUrl), qUtf8Printable(message));
// Connection was successful now but there is a warning message // Connection was successful now but there is a warning message
m_trackerInfos[trackerUrl].lastMessage = message; // Store warning message m_trackerInfos[trackerUrl].lastMessage = message; // Store warning message
@ -1592,7 +1593,7 @@ void TorrentHandle::handleTrackerErrorAlert(libtorrent::tracker_error_alert *p)
QString trackerUrl(p->tracker_url()); QString trackerUrl(p->tracker_url());
QString message = QString::fromStdString(p->message()); QString message = QString::fromStdString(p->message());
#endif #endif
qDebug("Received a tracker error for %s: %s", qPrintable(trackerUrl), qPrintable(message)); qDebug("Received a tracker error for %s: %s", qUtf8Printable(trackerUrl), qUtf8Printable(message));
m_trackerInfos[trackerUrl].lastMessage = message; m_trackerInfos[trackerUrl].lastMessage = message;
if (p->status_code == 401) if (p->status_code == 401)
@ -1604,7 +1605,7 @@ void TorrentHandle::handleTrackerErrorAlert(libtorrent::tracker_error_alert *p)
void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert *p) void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert *p)
{ {
Q_UNUSED(p); Q_UNUSED(p);
qDebug("%s have just finished checking", qPrintable(hash())); qDebug("%s have just finished checking", qUtf8Printable(hash()));
updateStatus(); updateStatus();
@ -1627,7 +1628,7 @@ void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert
void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_alert *p) void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_alert *p)
{ {
Q_UNUSED(p); Q_UNUSED(p);
qDebug("Got a torrent finished alert for %s", qPrintable(name())); qDebug("Got a torrent finished alert for %s", qUtf8Printable(name()));
qDebug("Torrent has seed status: %s", m_hasSeedStatus ? "yes" : "no"); qDebug("Torrent has seed status: %s", m_hasSeedStatus ? "yes" : "no");
if (m_hasSeedStatus) return; if (m_hasSeedStatus) return;
@ -1711,7 +1712,7 @@ void TorrentHandle::handleSaveResumeDataFailedAlert(libtorrent::save_resume_data
void TorrentHandle::handleFastResumeRejectedAlert(libtorrent::fastresume_rejected_alert *p) void TorrentHandle::handleFastResumeRejectedAlert(libtorrent::fastresume_rejected_alert *p)
{ {
qDebug("/!\\ Fast resume failed for %s, reason: %s", qPrintable(name()), p->message().c_str()); qDebug("/!\\ Fast resume failed for %s, reason: %s", qUtf8Printable(name()), p->message().c_str());
Logger *const logger = Logger::instance(); Logger *const logger = Logger::instance();
updateStatus(); updateStatus();
@ -1746,9 +1747,9 @@ void TorrentHandle::handleFileRenamedAlert(libtorrent::file_renamed_alert *p)
newPathParts.removeLast(); newPathParts.removeLast();
QString newPath = newPathParts.join("/"); QString newPath = newPathParts.join("/");
if (!newPathParts.isEmpty() && (oldPath != newPath)) { if (!newPathParts.isEmpty() && (oldPath != newPath)) {
qDebug("oldPath(%s) != newPath(%s)", qPrintable(oldPath), qPrintable(newPath)); qDebug("oldPath(%s) != newPath(%s)", qUtf8Printable(oldPath), qUtf8Printable(newPath));
oldPath = QString("%1/%2").arg(savePath(true)).arg(oldPath); oldPath = QString("%1/%2").arg(savePath(true)).arg(oldPath);
qDebug("Detected folder renaming, attempt to delete old folder: %s", qPrintable(oldPath)); qDebug("Detected folder renaming, attempt to delete old folder: %s", qUtf8Printable(oldPath));
QDir().rmpath(oldPath); QDir().rmpath(oldPath);
} }
} }
@ -1773,13 +1774,13 @@ void TorrentHandle::handleFileCompletedAlert(libtorrent::file_completed_alert *p
{ {
updateStatus(); updateStatus();
qDebug("A file completed download in torrent \"%s\"", qPrintable(name())); qDebug("A file completed download in torrent \"%s\"", qUtf8Printable(name()));
if (m_session->isAppendExtensionEnabled()) { if (m_session->isAppendExtensionEnabled()) {
QString name = filePath(p->index); QString name = filePath(p->index);
if (name.endsWith(QB_EXT)) { if (name.endsWith(QB_EXT)) {
const QString oldName = name; const QString oldName = name;
name.chop(QB_EXT.size()); name.chop(QB_EXT.size());
qDebug("Renaming %s to %s", qPrintable(oldName), qPrintable(name)); qDebug("Renaming %s to %s", qUtf8Printable(oldName), qUtf8Printable(name));
renameFile(p->index, name); renameFile(p->index, name);
} }
} }
@ -1796,7 +1797,7 @@ void TorrentHandle::handleStatsAlert(libtorrent::stats_alert *p)
void TorrentHandle::handleMetadataReceivedAlert(libt::metadata_received_alert *p) void TorrentHandle::handleMetadataReceivedAlert(libt::metadata_received_alert *p)
{ {
Q_UNUSED(p); Q_UNUSED(p);
qDebug("Metadata received for torrent %s.", qPrintable(name())); qDebug("Metadata received for torrent %s.", qUtf8Printable(name()));
updateStatus(); updateStatus();
if (m_session->isAppendExtensionEnabled()) if (m_session->isAppendExtensionEnabled())
manageIncompleteFiles(); manageIncompleteFiles();

2
src/base/bittorrent/torrentinfo.cpp
Unescape View File

@ -67,7 +67,7 @@ TorrentInfo TorrentInfo::loadFromFile(const QString &path, QString &error)
TorrentInfo info(NativePtr(new libt::torrent_info(Utils::Fs::toNativePath(path).toStdString(), ec))); TorrentInfo info(NativePtr(new libt::torrent_info(Utils::Fs::toNativePath(path).toStdString(), ec)));
if (ec) { if (ec) {
error = QString::fromUtf8(ec.message().c_str()); error = QString::fromUtf8(ec.message().c_str());
qDebug("Cannot load .torrent file: %s", qPrintable(error)); qDebug("Cannot load .torrent file: %s", qUtf8Printable(error));
} }
return info; return info;

12
src/base/bittorrent/tracker.cpp
Unescape View File

@ -109,14 +109,14 @@ Http::Response Tracker::processRequest(const Http::Request &request, const Http:
{ {
clear(); // clear response clear(); // clear response
//qDebug("Tracker received the following request:\n%s", qPrintable(parser.toString())); //qDebug("Tracker received the following request:\n%s", qUtf8Printable(parser.toString()));
// Is request a GET request? // Is request a GET request?
if (request.method != "GET") { if (request.method != "GET") {
qDebug("Tracker: Unsupported HTTP request: %s", qPrintable(request.method)); qDebug("Tracker: Unsupported HTTP request: %s", qUtf8Printable(request.method));
status(100, "Invalid request type"); status(100, "Invalid request type");
} }
else if (!request.path.startsWith("/announce", Qt::CaseInsensitive)) { else if (!request.path.startsWith("/announce", Qt::CaseInsensitive)) {
qDebug("Tracker: Unrecognized path: %s", qPrintable(request.path)); qDebug("Tracker: Unrecognized path: %s", qUtf8Printable(request.path));
status(100, "Invalid request type"); status(100, "Invalid request type");
} }
else { else {
@ -146,7 +146,7 @@ void Tracker::respondToAnnounceRequest()
annonceReq.infoHash = gets.value("info_hash"); annonceReq.infoHash = gets.value("info_hash");
// info_hash cannot be longer than 20 bytes // info_hash cannot be longer than 20 bytes
/*if (annonce_req.info_hash.toLatin1().length() > 20) { /*if (annonce_req.info_hash.toLatin1().length() > 20) {
qDebug("Tracker: Info_hash is not 20 byte long: %s (%d)", qPrintable(annonce_req.info_hash), annonce_req.info_hash.toLatin1().length()); qDebug("Tracker: Info_hash is not 20 byte long: %s (%d)", qUtf8Printable(annonce_req.info_hash), annonce_req.info_hash.toLatin1().length());
status(150, "Invalid infohash"); status(150, "Invalid infohash");
return; return;
}*/ }*/
@ -160,7 +160,7 @@ void Tracker::respondToAnnounceRequest()
annonceReq.peer.peerId = gets.value("peer_id"); annonceReq.peer.peerId = gets.value("peer_id");
// peer_id cannot be longer than 20 bytes // peer_id cannot be longer than 20 bytes
/*if (annonce_req.peer.peer_id.length() > 20) { /*if (annonce_req.peer.peer_id.length() > 20) {
qDebug("Tracker: peer_id is not 20 byte long: %s", qPrintable(annonce_req.peer.peer_id)); qDebug("Tracker: peer_id is not 20 byte long: %s", qUtf8Printable(annonce_req.peer.peer_id));
status(151, "Invalid peerid"); status(151, "Invalid peerid");
return; return;
}*/ }*/
@ -183,7 +183,7 @@ void Tracker::respondToAnnounceRequest()
annonceReq.event = ""; annonceReq.event = "";
if (gets.contains("event")) { if (gets.contains("event")) {
annonceReq.event = gets.value("event"); annonceReq.event = gets.value("event");
qDebug("Tracker: event is %s", qPrintable(annonceReq.event)); qDebug("Tracker: event is %s", qUtf8Printable(annonceReq.event));
} }
// 5. Get numwant // 5. Get numwant

14
src/base/filesystemwatcher.cpp
Unescape View File

@ -71,7 +71,7 @@ void FileSystemWatcher::addPath(const QString &path)
// Check if the path points to a network file system or not // Check if the path points to a network file system or not
if (isNetworkFileSystem(path)) { if (isNetworkFileSystem(path)) {
// Network mode // Network mode
qDebug("Network folder detected: %s", qPrintable(path)); qDebug("Network folder detected: %s", qUtf8Printable(path));
qDebug("Using file polling mode instead of inotify..."); qDebug("Using file polling mode instead of inotify...");
m_watchedFolders << dir; m_watchedFolders << dir;
// Set up the watch timer // Set up the watch timer
@ -84,7 +84,7 @@ void FileSystemWatcher::addPath(const QString &path)
else { else {
#endif #endif
// Normal mode // Normal mode
qDebug("FS Watching is watching %s in normal mode", qPrintable(path)); qDebug("FS Watching is watching %s in normal mode", qUtf8Printable(path));
QFileSystemWatcher::addPath(path); QFileSystemWatcher::addPath(path);
scanLocalFolder(path); scanLocalFolder(path);
#if !defined Q_OS_WIN && !defined Q_OS_HAIKU #if !defined Q_OS_WIN && !defined Q_OS_HAIKU
@ -111,13 +111,13 @@ void FileSystemWatcher::removePath(const QString &path)
void FileSystemWatcher::scanLocalFolder(QString path) void FileSystemWatcher::scanLocalFolder(QString path)
{ {
qDebug("scanLocalFolder(%s) called", qPrintable(path)); qDebug("scanLocalFolder(%s) called", qUtf8Printable(path));
QStringList torrents; QStringList torrents;
// Local folders scan // Local folders scan
addTorrentsFromDir(QDir(path), torrents); addTorrentsFromDir(QDir(path), torrents);
// Report detected torrent files // Report detected torrent files
if (!torrents.empty()) { if (!torrents.empty()) {
qDebug("The following files are being reported: %s", qPrintable(torrents.join("\n"))); qDebug("The following files are being reported: %s", qUtf8Printable(torrents.join("\n")));
emit torrentsAdded(torrents); emit torrentsAdded(torrents);
} }
} }
@ -129,12 +129,12 @@ void FileSystemWatcher::scanNetworkFolders()
QStringList torrents; QStringList torrents;
// Network folders scan // Network folders scan
foreach (const QDir &dir, m_watchedFolders) { foreach (const QDir &dir, m_watchedFolders) {
//qDebug("FSWatcher: Polling manually folder %s", qPrintable(dir.path())); //qDebug("FSWatcher: Polling manually folder %s", qUtf8Printable(dir.path()));
addTorrentsFromDir(dir, torrents); addTorrentsFromDir(dir, torrents);
} }
// Report detected torrent files // Report detected torrent files
if (!torrents.empty()) { if (!torrents.empty()) {
qDebug("The following files are being reported: %s", qPrintable(torrents.join("\n"))); qDebug("The following files are being reported: %s", qUtf8Printable(torrents.join("\n")));
emit torrentsAdded(torrents); emit torrentsAdded(torrents);
} }
#endif #endif
@ -201,7 +201,7 @@ void FileSystemWatcher::addTorrentsFromDir(const QDir &dir, QStringList &torrent
torrents << fileAbsPath; torrents << fileAbsPath;
} }
else if (!m_partialTorrents.contains(fileAbsPath)) { else if (!m_partialTorrents.contains(fileAbsPath)) {
qDebug("Partial torrent detected at: %s", qPrintable(fileAbsPath)); qDebug("Partial torrent detected at: %s", qUtf8Printable(fileAbsPath));
qDebug("Delay the file's processing..."); qDebug("Delay the file's processing...");
m_partialTorrents.insert(fileAbsPath, 0); m_partialTorrents.insert(fileAbsPath, 0);
} }

8
src/base/net/downloadhandler.cpp
Unescape View File

@ -73,11 +73,11 @@ QString DownloadHandler::url() const
void DownloadHandler::processFinishedDownload() void DownloadHandler::processFinishedDownload()
{ {
QString url = m_reply->url().toString(); QString url = m_reply->url().toString();
qDebug("Download finished: %s", qPrintable(url)); qDebug("Download finished: %s", qUtf8Printable(url));
// Check if the request was successful // Check if the request was successful
if (m_reply->error() != QNetworkReply::NoError) { if (m_reply->error() != QNetworkReply::NoError) {
// Failure // Failure
qDebug("Download failure (%s), reason: %s", qPrintable(url), qPrintable(errorCodeToString(m_reply->error()))); qDebug("Download failure (%s), reason: %s", qUtf8Printable(url), qUtf8Printable(errorCodeToString(m_reply->error())));
emit downloadFailed(m_url, errorCodeToString(m_reply->error())); emit downloadFailed(m_url, errorCodeToString(m_reply->error()));
this->deleteLater(); this->deleteLater();
} }
@ -150,7 +150,7 @@ bool DownloadHandler::saveToFile(const QByteArray &replyData, QString &filePath)
tmpfile->setAutoRemove(false); tmpfile->setAutoRemove(false);
filePath = tmpfile->fileName(); filePath = tmpfile->fileName();
qDebug("Temporary filename is: %s", qPrintable(filePath)); qDebug("Temporary filename is: %s", qUtf8Printable(filePath));
if (m_reply->isOpen() || m_reply->open(QIODevice::ReadOnly)) { if (m_reply->isOpen() || m_reply->open(QIODevice::ReadOnly)) {
tmpfile->write(replyData); tmpfile->write(replyData);
tmpfile->close(); tmpfile->close();
@ -174,7 +174,7 @@ void DownloadHandler::handleRedirection(QUrl newUrl)
newUrl = m_reply->url().resolved(newUrl); newUrl = m_reply->url().resolved(newUrl);
const QString newUrlString = newUrl.toString(); const QString newUrlString = newUrl.toString();
qDebug("Redirecting from %s to %s", qPrintable(m_reply->url().toString()), qPrintable(newUrlString)); qDebug("Redirecting from %s to %s", qUtf8Printable(m_reply->url().toString()), qUtf8Printable(newUrlString));
// Redirect to magnet workaround // Redirect to magnet workaround
if (newUrlString.startsWith("magnet:", Qt::CaseInsensitive)) { if (newUrlString.startsWith("magnet:", Qt::CaseInsensitive)) {

2
src/base/net/downloadmanager.cpp
Unescape View File

@ -143,7 +143,7 @@ DownloadHandler *DownloadManager::downloadUrl(const QString &url, bool saveToFil
applyProxySettings(); applyProxySettings();
// Process download request // Process download request
qDebug("url is %s", qPrintable(url)); qDebug("url is %s", qUtf8Printable(url));
const QUrl qurl = QUrl(url); const QUrl qurl = QUrl(url);
QNetworkRequest request(qurl); QNetworkRequest request(qurl);

2
src/base/net/proxyconfigurationmanager.cpp
Unescape View File

@ -153,7 +153,7 @@ void ProxyConfigurationManager::configureProxy()
} }
qDebug("HTTP communications proxy string: %s" qDebug("HTTP communications proxy string: %s"
, qPrintable((m_config.type == ProxyType::SOCKS5) || (m_config.type == ProxyType::SOCKS5_PW) , qUtf8Printable((m_config.type == ProxyType::SOCKS5) || (m_config.type == ProxyType::SOCKS5_PW)
? proxyStrSOCK : proxyStrHTTP)); ? proxyStrSOCK : proxyStrHTTP));
} }

6
src/base/preferences.cpp
Unescape View File

@ -853,12 +853,12 @@ namespace {
delete[] lpSubkey; delete[] lpSubkey;
if (res == ERROR_SUCCESS) { if (res == ERROR_SUCCESS) {
qDebug("Detected possible Python v%s location", qPrintable(version)); qDebug("Detected possible Python v%s location", qUtf8Printable(version));
path = getRegValue(hkInstallPath); path = getRegValue(hkInstallPath);
::RegCloseKey(hkInstallPath); ::RegCloseKey(hkInstallPath);
if (!path.isEmpty() && QDir(path).exists("python.exe")) { if (!path.isEmpty() && QDir(path).exists("python.exe")) {
qDebug("Found python.exe at %s", qPrintable(path)); qDebug("Found python.exe at %s", qUtf8Printable(path));
found = true; found = true;
} }
} }
@ -931,7 +931,7 @@ bool Preferences::isMagnetLinkAssocSet()
if (exe_reg.indexIn(shell_command) < 0) if (exe_reg.indexIn(shell_command) < 0)
return false; return false;
QString assoc_exe = exe_reg.cap(1); QString assoc_exe = exe_reg.cap(1);
qDebug("exe: %s", qPrintable(assoc_exe)); qDebug("exe: %s", qUtf8Printable(assoc_exe));
if (assoc_exe.compare(Utils::Fs::toNativePath(qApp->applicationFilePath()), Qt::CaseInsensitive) != 0) if (assoc_exe.compare(Utils::Fs::toNativePath(qApp->applicationFilePath()), Qt::CaseInsensitive) != 0)
return false; return false;

2
src/base/profile.cpp
Unescape View File

@ -104,7 +104,7 @@ void Profile::ensureDirectoryExists(SpecialFolder folder)
{ {
QString locationPath = location(folder); QString locationPath = location(folder);
if (!locationPath.isEmpty() && !QDir().mkpath(locationPath)) if (!locationPath.isEmpty() && !QDir().mkpath(locationPath))
qFatal("Could not create required directory '%s'", qPrintable(locationPath)); qFatal("Could not create required directory '%s'", qUtf8Printable(locationPath));
} }
QString Profile::toPortablePath(const QString &absolutePath) const QString Profile::toPortablePath(const QString &absolutePath) const

6
src/base/scanfoldersmodel.cpp
Unescape View File

@ -353,7 +353,7 @@ void ScanFoldersModel::configure()
void ScanFoldersModel::addTorrentsToSession(const QStringList &pathList) void ScanFoldersModel::addTorrentsToSession(const QStringList &pathList)
{ {
foreach (const QString &file, pathList) { foreach (const QString &file, pathList) {
qDebug("File %s added", qPrintable(file)); qDebug("File %s added", qUtf8Printable(file));
BitTorrent::AddTorrentParams params; BitTorrent::AddTorrentParams params;
if (downloadInWatchFolder(file)) if (downloadInWatchFolder(file))
@ -372,7 +372,7 @@ void ScanFoldersModel::addTorrentsToSession(const QStringList &pathList)
Utils::Fs::forceRemove(file); Utils::Fs::forceRemove(file);
} }
else { else {
qDebug("Failed to open magnet file: %s", qPrintable(f.errorString())); qDebug("Failed to open magnet file: %s", qUtf8Printable(f.errorString()));
} }
} }
else { else {
@ -382,7 +382,7 @@ void ScanFoldersModel::addTorrentsToSession(const QStringList &pathList)
Utils::Fs::forceRemove(file); Utils::Fs::forceRemove(file);
} }
else { else {
qDebug("Ignoring incomplete torrent file: %s", qPrintable(file)); qDebug("Ignoring incomplete torrent file: %s", qUtf8Printable(file));
} }
} }
} }

6
src/base/searchengine.cpp
Unescape View File

@ -155,7 +155,7 @@ void SearchEngine::updatePlugin(const QString &name)
// Install or update plugin from file or url // Install or update plugin from file or url
void SearchEngine::installPlugin(const QString &source) void SearchEngine::installPlugin(const QString &source)
{ {
qDebug("Asked to install plugin at %s", qPrintable(source)); qDebug("Asked to install plugin at %s", qUtf8Printable(source));
if (Utils::Misc::isUrl(source)) { if (Utils::Misc::isUrl(source)) {
using namespace Net; using namespace Net;
@ -615,7 +615,7 @@ void SearchEngine::parseVersionInfo(const QByteArray &info)
dataCorrect = true; dataCorrect = true;
if (isUpdateNeeded(pluginName, version)) { if (isUpdateNeeded(pluginName, version)) {
qDebug("Plugin: %s is outdated", qPrintable(pluginName)); qDebug("Plugin: %s is outdated", qUtf8Printable(pluginName));
updateInfo[pluginName] = version; updateInfo[pluginName] = version;
} }
} }
@ -662,7 +662,7 @@ PluginVersion SearchEngine::getPluginVersion(QString filePath)
{ {
QFile plugin(filePath); QFile plugin(filePath);
if (!plugin.exists()) { if (!plugin.exists()) {
qDebug("%s plugin does not exist, returning 0.0", qPrintable(filePath)); qDebug("%s plugin does not exist, returning 0.0", qUtf8Printable(filePath));
return {}; return {};
} }

6
src/gui/addnewtorrentdialog.cpp
Unescape View File

@ -476,7 +476,7 @@ void AddNewTorrentDialog::renameSelectedFile()
const QString newFilePath = oldFilePath.leftRef(oldFilePath.size() - oldFileName.size()) + newName; const QString newFilePath = oldFilePath.leftRef(oldFilePath.size() - oldFileName.size()) + newName;
if (oldFileName == newName) { if (oldFileName == newName) {
qDebug("Name did not change: %s", qPrintable(oldFileName)); qDebug("Name did not change: %s", qUtf8Printable(oldFileName));
return; return;
} }
@ -491,7 +491,7 @@ void AddNewTorrentDialog::renameSelectedFile()
} }
} }
qDebug("Renaming %s to %s", qPrintable(oldFilePath), qPrintable(newFilePath)); qDebug("Renaming %s to %s", qUtf8Printable(oldFilePath), qUtf8Printable(newFilePath));
m_torrentInfo.renameFile(fileIndex, newFilePath); m_torrentInfo.renameFile(fileIndex, newFilePath);
m_contentModel->setData(modelIndex, newName); m_contentModel->setData(modelIndex, newName);
@ -535,7 +535,7 @@ void AddNewTorrentDialog::renameSelectedFile()
QString newName = currentName; QString newName = currentName;
newName.replace(0, oldPath.length(), newPath); newName.replace(0, oldPath.length(), newPath);
newName = Utils::Fs::expandPath(newName); newName = Utils::Fs::expandPath(newName);
qDebug("Rename %s to %s", qPrintable(currentName), qPrintable(newName)); qDebug("Rename %s to %s", qUtf8Printable(currentName), qUtf8Printable(newName));
m_torrentInfo.renameFile(i, newName); m_torrentInfo.renameFile(i, newName);
} }
} }

6
src/gui/mainwindow.cpp
Unescape View File

@ -1247,7 +1247,7 @@ void MainWindow::dropEvent(QDropEvent *event)
// Download torrents // Download torrents
const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled(); const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled();
foreach (const QString &file, torrentFiles) { foreach (const QString &file, torrentFiles) {
qDebug("Dropped file %s on download list", qPrintable(file)); qDebug("Dropped file %s on download list", qUtf8Printable(file));
if (useTorrentAdditionDialog) if (useTorrentAdditionDialog)
AddNewTorrentDialog::show(file, this); AddNewTorrentDialog::show(file, this);
else else
@ -1341,7 +1341,7 @@ void MainWindow::on_actionOpen_triggered()
const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled(); const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled();
if (!pathsList.isEmpty()) { if (!pathsList.isEmpty()) {
foreach (QString file, pathsList) { foreach (QString file, pathsList) {
qDebug("Dropped file %s on download list", qPrintable(file)); qDebug("Dropped file %s on download list", qUtf8Printable(file));
if (useTorrentAdditionDialog) if (useTorrentAdditionDialog)
AddNewTorrentDialog::show(file, this); AddNewTorrentDialog::show(file, this);
else else
@ -2027,7 +2027,7 @@ bool MainWindow::addPythonPathToEnv()
if (pathEnvar.isNull()) if (pathEnvar.isNull())
pathEnvar = ""; pathEnvar = "";
pathEnvar = pythonPath + ";" + pathEnvar; pathEnvar = pythonPath + ";" + pathEnvar;
qDebug("New PATH envvar is: %s", qPrintable(pathEnvar)); qDebug("New PATH envvar is: %s", qUtf8Printable(pathEnvar));
qputenv("PATH", Utils::Fs::toNativePath(pathEnvar).toLocal8Bit()); qputenv("PATH", Utils::Fs::toNativePath(pathEnvar).toLocal8Bit());
return true; return true;
} }

4
src/gui/optionsdlg.cpp
Unescape View File

@ -476,9 +476,9 @@ void OptionsDialog::saveOptions()
if (pref->getLocale() != locale) { if (pref->getLocale() != locale) {
QTranslator *translator = new QTranslator; QTranslator *translator = new QTranslator;
if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale))
qDebug("%s locale recognized, using translation.", qPrintable(locale)); qDebug("%s locale recognized, using translation.", qUtf8Printable(locale));
else else
qDebug("%s locale unrecognized, using default (en).", qPrintable(locale)); qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(locale));
qApp->installTranslator(translator); qApp->installTranslator(translator);
} }

4
src/gui/powermanagement/powermanagement_x11.cpp
Unescape View File

@ -136,7 +136,7 @@ void PowerManagementInhibitor::OnAsyncReply(QDBusPendingCallWatcher *call)
if (reply.isError()) if (reply.isError())
{ {
qDebug("D-Bus: Reply: Error: %s", qPrintable(reply.error().message())); qDebug("D-Bus: Reply: Error: %s", qUtf8Printable(reply.error().message()));
m_state = error; m_state = error;
} }
else else
@ -152,7 +152,7 @@ void PowerManagementInhibitor::OnAsyncReply(QDBusPendingCallWatcher *call)
if (reply.isError()) if (reply.isError())
{ {
qDebug("D-Bus: Reply: Error: %s", qPrintable(reply.error().message())); qDebug("D-Bus: Reply: Error: %s", qUtf8Printable(reply.error().message()));
if (!m_use_gsm) if (!m_use_gsm)
{ {

4
src/gui/programupdater.cpp
Unescape View File

@ -99,9 +99,9 @@ void ProgramUpdater::rssDownloadFinished(const QString &url, const QByteArray &d
else if (xml.isEndElement()) { else if (xml.isEndElement()) {
if (inItem && xml.name() == "item") { if (inItem && xml.name() == "item") {
if (type.compare(OS_TYPE, Qt::CaseInsensitive) == 0) { if (type.compare(OS_TYPE, Qt::CaseInsensitive) == 0) {
qDebug("The last update available is %s", qPrintable(version)); qDebug("The last update available is %s", qUtf8Printable(version));
if (!version.isEmpty()) { if (!version.isEmpty()) {
qDebug("Detected version is %s", qPrintable(version)); qDebug("Detected version is %s", qUtf8Printable(version));
if (isVersionMoreRecent(version)) if (isVersionMoreRecent(version))
m_updateUrl = updateLink; m_updateUrl = updateLink;
} }

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

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

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

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

6
src/gui/search/pluginselectdlg.cpp
Unescape View File

@ -128,7 +128,7 @@ void PluginSelectDlg::dropEvent(QDropEvent *event)
if (files.isEmpty()) return; if (files.isEmpty()) return;
foreach (QString file, files) { foreach (QString file, files) {
qDebug("dropped %s", qPrintable(file)); qDebug("dropped %s", qUtf8Printable(file));
startAsyncOp(); startAsyncOp();
m_pluginManager->installPlugin(file); m_pluginManager->installPlugin(file);
} }
@ -139,7 +139,7 @@ void PluginSelectDlg::dragEnterEvent(QDragEnterEvent *event)
{ {
QString mime; QString mime;
foreach (mime, event->mimeData()->formats()) { foreach (mime, event->mimeData()->formats()) {
qDebug("mimeData: %s", qPrintable(mime)); qDebug("mimeData: %s", qUtf8Printable(mime));
} }
if (event->mimeData()->hasFormat(QLatin1String("text/plain")) || event->mimeData()->hasFormat(QLatin1String("text/uri-list"))) { if (event->mimeData()->hasFormat(QLatin1String("text/plain")) || event->mimeData()->hasFormat(QLatin1String("text/uri-list"))) {
@ -413,7 +413,7 @@ void PluginSelectDlg::iconDownloaded(const QString &url, QString filePath)
void PluginSelectDlg::iconDownloadFailed(const QString &url, const QString &reason) void PluginSelectDlg::iconDownloadFailed(const QString &url, const QString &reason)
{ {
qDebug("Could not download favicon: %s, reason: %s", qPrintable(url), qPrintable(reason)); qDebug("Could not download favicon: %s, reason: %s", qUtf8Printable(url), qUtf8Printable(reason));
} }
void PluginSelectDlg::checkForUpdatesFinished(const QHash<QString, PluginVersion> &updateInfo) void PluginSelectDlg::checkForUpdatesFinished(const QHash<QString, PluginVersion> &updateInfo)

4
src/gui/search/searchwidget.cpp
Unescape View File

@ -153,7 +153,7 @@ void SearchWidget::fillCatCombobox()
std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (QString::localeAwareCompare(l.first, r.first) < 0); }); std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (QString::localeAwareCompare(l.first, r.first) < 0); });
foreach (const QStrPair &p, tmpList) { foreach (const QStrPair &p, tmpList) {
qDebug("Supported category: %s", qPrintable(p.second)); qDebug("Supported category: %s", qUtf8Printable(p.second));
m_ui->comboCategory->addItem(p.first, QVariant(p.second)); m_ui->comboCategory->addItem(p.first, QVariant(p.second));
} }
} }
@ -318,7 +318,7 @@ void SearchWidget::on_searchButton_clicked()
else if (selectedPlugin() == "multi") plugins = m_searchEngine->enabledPlugins(); else if (selectedPlugin() == "multi") plugins = m_searchEngine->enabledPlugins();
else plugins << selectedPlugin(); else plugins << selectedPlugin();
qDebug("Search with category: %s", qPrintable(selectedCategory())); qDebug("Search with category: %s", qUtf8Printable(selectedCategory()));
// Update SearchEngine widgets // Update SearchEngine widgets
m_noSearchResults = true; m_noSearchResults = true;

2
src/gui/torrentcontentmodel.cpp
Unescape View File

@ -280,7 +280,7 @@ bool TorrentContentModel::setData(const QModelIndex& index, const QVariant& valu
if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::CheckStateRole)) { if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::CheckStateRole)) {
TorrentContentModelItem *item = static_cast<TorrentContentModelItem*>(index.internalPointer()); TorrentContentModelItem *item = static_cast<TorrentContentModelItem*>(index.internalPointer());
qDebug("setData(%s, %d", qPrintable(item->name()), value.toInt()); qDebug("setData(%s, %d", qUtf8Printable(item->name()), value.toInt());
if (item->priority() != value.toInt()) { if (item->priority() != value.toInt()) {
if (value.toInt() == Qt::PartiallyChecked) if (value.toInt() == Qt::PartiallyChecked)
item->setPriority(prio::MIXED); item->setPriority(prio::MIXED);

10
src/gui/transferlistwidget.cpp
Unescape View File

@ -380,12 +380,12 @@ void TransferListWidget::setSelectedTorrentsLocation()
if (torrents.isEmpty()) return; if (torrents.isEmpty()) return;
const QString oldLocation = torrents[0]->savePath(); const QString oldLocation = torrents[0]->savePath();
qDebug("Old location is %s", qPrintable(oldLocation)); qDebug("Old location is %s", qUtf8Printable(oldLocation));
const QString newLocation = QFileDialog::getExistingDirectory(this, tr("Choose save path"), oldLocation, const QString newLocation = QFileDialog::getExistingDirectory(this, tr("Choose save path"), oldLocation,
QFileDialog::DontConfirmOverwrite | QFileDialog::ShowDirsOnly | QFileDialog::HideNameFilterDetails); QFileDialog::DontConfirmOverwrite | QFileDialog::ShowDirsOnly | QFileDialog::HideNameFilterDetails);
if (newLocation.isEmpty() || !QDir(newLocation).exists()) return; if (newLocation.isEmpty() || !QDir(newLocation).exists()) return;
qDebug("New location is %s", qPrintable(newLocation)); qDebug("New location is %s", qUtf8Printable(newLocation));
// Actually move storage // Actually move storage
foreach (BitTorrent::TorrentHandle *const torrent, torrents) { foreach (BitTorrent::TorrentHandle *const torrent, torrents) {
@ -592,7 +592,7 @@ void TransferListWidget::setDlLimitSelectedTorrents()
if (!ok) return; if (!ok) return;
foreach (BitTorrent::TorrentHandle *const torrent, TorrentsList) { foreach (BitTorrent::TorrentHandle *const torrent, TorrentsList) {
qDebug("Applying download speed limit of %ld Kb/s to torrent %s", (newLimit / 1024l), qPrintable(torrent->hash())); qDebug("Applying download speed limit of %ld Kb/s to torrent %s", (newLimit / 1024l), qUtf8Printable(torrent->hash()));
torrent->setDownloadLimit(newLimit); torrent->setDownloadLimit(newLimit);
} }
} }
@ -617,7 +617,7 @@ void TransferListWidget::setUpLimitSelectedTorrents()
if (!ok) return; if (!ok) return;
foreach (BitTorrent::TorrentHandle *const torrent, TorrentsList) { foreach (BitTorrent::TorrentHandle *const torrent, TorrentsList) {
qDebug("Applying upload speed limit of %ld Kb/s to torrent %s", (newLimit / 1024l), qPrintable(torrent->hash())); qDebug("Applying upload speed limit of %ld Kb/s to torrent %s", (newLimit / 1024l), qUtf8Printable(torrent->hash()));
torrent->setUploadLimit(newLimit); torrent->setUploadLimit(newLimit);
} }
} }
@ -1174,7 +1174,7 @@ void TransferListWidget::applyStatusFilter(int f)
nameFilterModel->setStatusFilter(static_cast<TorrentFilter::Type>(f)); nameFilterModel->setStatusFilter(static_cast<TorrentFilter::Type>(f));
// Select first item if nothing is selected // Select first item if nothing is selected
if (selectionModel()->selectedRows(0).empty() && nameFilterModel->rowCount() > 0) { if (selectionModel()->selectedRows(0).empty() && nameFilterModel->rowCount() > 0) {
qDebug("Nothing is selected, selecting first row: %s", qPrintable(nameFilterModel->index(0, TorrentModel::TR_NAME).data().toString())); qDebug("Nothing is selected, selecting first row: %s", qUtf8Printable(nameFilterModel->index(0, TorrentModel::TR_NAME).data().toString()));
selectionModel()->setCurrentIndex(nameFilterModel->index(0, TorrentModel::TR_NAME), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); selectionModel()->setCurrentIndex(nameFilterModel->index(0, TorrentModel::TR_NAME), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
} }
} }

4
src/webui/abstractwebapplication.cpp
Unescape View File

@ -143,7 +143,7 @@ Http::Response AbstractWebApplication::processRequest(const Http::Request &reque
void AbstractWebApplication::UnbanTimerEvent() void AbstractWebApplication::UnbanTimerEvent()
{ {
UnbanTimer* ubantimer = static_cast<UnbanTimer*>(sender()); UnbanTimer* ubantimer = static_cast<UnbanTimer*>(sender());
qDebug("Ban period has expired for %s", qPrintable(ubantimer->peerIp().toString())); qDebug("Ban period has expired for %s", qUtf8Printable(ubantimer->peerIp().toString()));
clientFailedAttempts_.remove(ubantimer->peerIp()); clientFailedAttempts_.remove(ubantimer->peerIp());
ubantimer->deleteLater(); ubantimer->deleteLater();
} }
@ -201,7 +201,7 @@ bool AbstractWebApplication::readFile(const QString& path, QByteArray &data, QSt
else { else {
QFile file(path); QFile file(path);
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
qDebug("File %s was not found!", qPrintable(path)); qDebug("File %s was not found!", qUtf8Printable(path));
return false; return false;
} }

10
src/webui/prefjson.cpp
Unescape View File

@ -226,10 +226,10 @@ void prefjson::setPreferences(const QString& json)
if (ec == ScanFoldersModel::Ok) { if (ec == ScanFoldersModel::Ok) {
scanDirs.insert(folder, (downloadType == ScanFoldersModel::CUSTOM_LOCATION) ? QVariant(downloadPath) : QVariant(downloadType)); scanDirs.insert(folder, (downloadType == ScanFoldersModel::CUSTOM_LOCATION) ? QVariant(downloadPath) : QVariant(downloadType));
qDebug("New watched folder: %s to %s", qPrintable(folder), qPrintable(downloadPath)); qDebug("New watched folder: %s to %s", qUtf8Printable(folder), qUtf8Printable(downloadPath));
} }
else { else {
qDebug("Watched folder %s failed with error %d", qPrintable(folder), ec); qDebug("Watched folder %s failed with error %d", qUtf8Printable(folder), ec);
} }
} }
@ -238,7 +238,7 @@ void prefjson::setPreferences(const QString& json)
QString folder = folderVariant.toString(); QString folder = folderVariant.toString();
if (!scanDirs.contains(folder)) { if (!scanDirs.contains(folder)) {
model->removePath(folder); model->removePath(folder);
qDebug("Removed watched folder %s", qPrintable(folder)); qDebug("Removed watched folder %s", qUtf8Printable(folder));
} }
} }
pref->setScanDirs(scanDirs); pref->setScanDirs(scanDirs);
@ -387,9 +387,9 @@ void prefjson::setPreferences(const QString& json)
if (pref->getLocale() != locale) { if (pref->getLocale() != locale) {
QTranslator *translator = new QTranslator; QTranslator *translator = new QTranslator;
if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) { if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) {
qDebug("%s locale recognized, using translation.", qPrintable(locale)); qDebug("%s locale recognized, using translation.", qUtf8Printable(locale));
}else{ }else{
qDebug("%s locale unrecognized, using default (en).", qPrintable(locale)); qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(locale));
} }
qApp->installTranslator(translator); qApp->installTranslator(translator);

2
src/webui/webapplication.cpp
Unescape View File

@ -195,7 +195,7 @@ void WebApplication::action_public_login()
else { else {
QString addr = env().clientAddress.toString(); QString addr = env().clientAddress.toString();
increaseFailedAttempts(); increaseFailedAttempts();
qDebug("client IP: %s (%d failed attempts)", qPrintable(addr), failedAttempts()); qDebug("client IP: %s (%d failed attempts)", qUtf8Printable(addr), failedAttempts());
print(QByteArray("Fails."), Http::CONTENT_TYPE_TXT); print(QByteArray("Fails."), Http::CONTENT_TYPE_TXT);
} }
} }

Write Preview
Loading…
Cancel
Save