mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2026-01-10 01:22:31 -06:00
Rename "fromNativePath" to "toUniformPath"
Unlike "toNativePath" which name clearly reflects the function result "fromNativePath" has no such clear meaning. Since this function converts path into uniform format "toUniformPath" is better name.
This commit is contained in:
@@ -172,7 +172,7 @@ namespace
|
||||
|
||||
QString normalizePath(const QString &path)
|
||||
{
|
||||
QString tmp = Utils::Fs::fromNativePath(path.trimmed());
|
||||
QString tmp = Utils::Fs::toUniformPath(path.trimmed());
|
||||
if (!tmp.isEmpty() && !tmp.endsWith('/'))
|
||||
return tmp + '/';
|
||||
return tmp;
|
||||
@@ -182,7 +182,7 @@ namespace
|
||||
{
|
||||
path = path.trimmed();
|
||||
if (path.isEmpty())
|
||||
path = Utils::Fs::fromNativePath(defaultPath.trimmed());
|
||||
path = Utils::Fs::toUniformPath(defaultPath.trimmed());
|
||||
|
||||
return normalizePath(path);
|
||||
}
|
||||
@@ -610,36 +610,36 @@ void Session::setPreallocationEnabled(const bool enabled)
|
||||
|
||||
QString Session::torrentExportDirectory() const
|
||||
{
|
||||
return Utils::Fs::fromNativePath(m_torrentExportDirectory);
|
||||
return Utils::Fs::toUniformPath(m_torrentExportDirectory);
|
||||
}
|
||||
|
||||
void Session::setTorrentExportDirectory(QString path)
|
||||
{
|
||||
path = Utils::Fs::fromNativePath(path);
|
||||
path = Utils::Fs::toUniformPath(path);
|
||||
if (path != torrentExportDirectory())
|
||||
m_torrentExportDirectory = path;
|
||||
}
|
||||
|
||||
QString Session::finishedTorrentExportDirectory() const
|
||||
{
|
||||
return Utils::Fs::fromNativePath(m_finishedTorrentExportDirectory);
|
||||
return Utils::Fs::toUniformPath(m_finishedTorrentExportDirectory);
|
||||
}
|
||||
|
||||
void Session::setFinishedTorrentExportDirectory(QString path)
|
||||
{
|
||||
path = Utils::Fs::fromNativePath(path);
|
||||
path = Utils::Fs::toUniformPath(path);
|
||||
if (path != finishedTorrentExportDirectory())
|
||||
m_finishedTorrentExportDirectory = path;
|
||||
}
|
||||
|
||||
QString Session::defaultSavePath() const
|
||||
{
|
||||
return Utils::Fs::fromNativePath(m_defaultSavePath);
|
||||
return Utils::Fs::toUniformPath(m_defaultSavePath);
|
||||
}
|
||||
|
||||
QString Session::tempPath() const
|
||||
{
|
||||
return Utils::Fs::fromNativePath(m_tempPath);
|
||||
return Utils::Fs::toUniformPath(m_tempPath);
|
||||
}
|
||||
|
||||
QString Session::torrentTempPath(const TorrentInfo &torrentInfo) const
|
||||
@@ -2672,12 +2672,12 @@ void Session::setIPFilteringEnabled(const bool enabled)
|
||||
|
||||
QString Session::IPFilterFile() const
|
||||
{
|
||||
return Utils::Fs::fromNativePath(m_IPFilterFile);
|
||||
return Utils::Fs::toUniformPath(m_IPFilterFile);
|
||||
}
|
||||
|
||||
void Session::setIPFilterFile(QString path)
|
||||
{
|
||||
path = Utils::Fs::fromNativePath(path);
|
||||
path = Utils::Fs::toUniformPath(path);
|
||||
if (path != IPFilterFile()) {
|
||||
m_IPFilterFile = path;
|
||||
m_IPFilteringChanged = true;
|
||||
@@ -4345,7 +4345,7 @@ namespace
|
||||
if (ec || (fast.type() != lt::bdecode_node::dict_t)) return false;
|
||||
|
||||
torrentParams.savePath = Profile::instance().fromPortablePath(
|
||||
Utils::Fs::fromNativePath(fromLTString(fast.dict_find_string_value("qBt-savePath"))));
|
||||
Utils::Fs::toUniformPath(fromLTString(fast.dict_find_string_value("qBt-savePath"))));
|
||||
|
||||
LTString ratioLimitString = fast.dict_find_string_value("qBt-ratioLimit");
|
||||
if (ratioLimitString.empty())
|
||||
|
||||
@@ -313,9 +313,9 @@ QString TorrentHandle::currentTracker() const
|
||||
QString TorrentHandle::savePath(bool actual) const
|
||||
{
|
||||
if (actual)
|
||||
return Utils::Fs::fromNativePath(nativeActualSavePath());
|
||||
return Utils::Fs::toUniformPath(nativeActualSavePath());
|
||||
else
|
||||
return Utils::Fs::fromNativePath(m_savePath);
|
||||
return Utils::Fs::toUniformPath(m_savePath);
|
||||
}
|
||||
|
||||
QString TorrentHandle::rootPath(bool actual) const
|
||||
@@ -1296,7 +1296,7 @@ void TorrentHandle::move(QString path)
|
||||
m_useAutoTMM = false;
|
||||
m_session->handleTorrentSavingModeChanged(this);
|
||||
|
||||
path = Utils::Fs::fromNativePath(path.trimmed());
|
||||
path = Utils::Fs::toUniformPath(path.trimmed());
|
||||
if (path.isEmpty())
|
||||
path = m_session->defaultSavePath();
|
||||
if (!path.endsWith('/'))
|
||||
@@ -1758,7 +1758,7 @@ void TorrentHandle::handleFileRenamedAlert(const lt::file_renamed_alert *p)
|
||||
// for example renaming "a/b/c" to "d/b/c", then folders "a/b" and "a" will
|
||||
// be removed if they are empty
|
||||
const QString oldFilePath = m_oldPath[LTFileIndex {p->index}].takeFirst();
|
||||
const QString newFilePath = Utils::Fs::fromNativePath(p->new_name());
|
||||
const QString newFilePath = Utils::Fs::toUniformPath(p->new_name());
|
||||
|
||||
if (m_oldPath[LTFileIndex {p->index}].isEmpty())
|
||||
m_oldPath.remove(LTFileIndex {p->index});
|
||||
|
||||
@@ -227,7 +227,7 @@ int TorrentInfo::piecesCount() const
|
||||
QString TorrentInfo::filePath(const int index) const
|
||||
{
|
||||
if (!isValid()) return {};
|
||||
return Utils::Fs::fromNativePath(
|
||||
return Utils::Fs::toUniformPath(
|
||||
QString::fromStdString(m_nativeInfo->files().file_path(LTFileIndex {index})));
|
||||
}
|
||||
|
||||
@@ -248,7 +248,7 @@ QString TorrentInfo::fileName(const int index) const
|
||||
QString TorrentInfo::origFilePath(const int index) const
|
||||
{
|
||||
if (!isValid()) return {};
|
||||
return Utils::Fs::fromNativePath(
|
||||
return Utils::Fs::toUniformPath(
|
||||
QString::fromStdString(m_nativeInfo->orig_files().file_path(LTFileIndex {index})));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user