Merge pull request #10982 from Chocobo1/cleanup

Code base cleanup
This commit is contained in:
Mike Tzou
2019-07-31 14:24:42 +08:00
committed by GitHub
31 changed files with 639 additions and 484 deletions

View File

@@ -1801,7 +1801,7 @@ void TorrentHandle::handleSaveResumeDataFailedAlert(const lt::save_resume_data_f
}
else {
LogMsg(tr("Save resume data failed. Torrent: \"%1\", error: \"%2\"")
.arg(name(), QString::fromStdString(p->error.message())), Log::CRITICAL);
.arg(name(), QString::fromLocal8Bit(p->error.message().c_str())), Log::CRITICAL);
m_session->handleTorrentResumeDataFailed(this);
}
}
@@ -1871,7 +1871,7 @@ void TorrentHandle::handleFileRenameFailedAlert(const lt::file_rename_failed_ale
{
LogMsg(tr("File rename failed. Torrent: \"%1\", file: \"%2\", reason: \"%3\"")
.arg(name(), filePath(LTUnderlyingType<LTFileIndex> {p->index})
, QString::fromStdString(p->error.message())), Log::WARNING);
, QString::fromLocal8Bit(p->error.message().c_str())), Log::WARNING);
m_oldPath[p->index].removeFirst();
if (m_oldPath[p->index].isEmpty())