mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-27 08:19:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc: Remove duplicate function to branch a path

Browse Source
This commit is contained in:
Christophe Dumez 2012-02-16 21:32:18 +02:00
parent 0d0c7559bf
commit 60d9bfe077
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc.cpp
View File

@ -888,6 +888,10 @@ bool misc::isValidTorrentFile(const QString &torrent_path) {
return true;
}
/**
* Returns a path constructed from all the elements of file_path except the last.
* A typical use is to obtain the parent path for a path supplied by the user.
*/
QString misc::branchPath(QString file_path, bool uses_slashes)
{
if(!uses_slashes)

8
src/misc.h
View File

@ -80,14 +80,6 @@ public:
static void chmod644(const QDir& folder);
static inline QString removeLastPathPart(QString path) {
if(path.isEmpty()) return path;
path.replace("\\", "/");
QStringList tmp = path.split("/");
tmp.removeLast();
return tmp.join("/");
}
static inline QString file_extension(const QString &filename) {
QString extension;
int point_index = filename.lastIndexOf(".");

4
src/torrentcreator/torrentcreatordlg.cpp
View File

@ -88,7 +88,7 @@ void TorrentCreatorDlg::on_addFile_button_clicked(){
QString last_path = settings.value("CreateTorrent/last_add_path", QDir::homePath()).toString();
QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), last_path);
if(!file.isEmpty()) {
settings.setValue("CreateTorrent/last_add_path", misc::removeLastPathPart(file));
settings.setValue("CreateTorrent/last_add_path", misc::branchPath(file));
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
file.replace("/", "\\");
#endif
@ -121,7 +121,7 @@ void TorrentCreatorDlg::on_createButton_clicked(){
QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), last_path, tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
if(!destination.isEmpty()) {
settings.setValue("CreateTorrent/last_save_path", misc::removeLastPathPart(destination));
settings.setValue("CreateTorrent/last_save_path", misc::branchPath(destination));
if(!destination.toUpper().endsWith(".TORRENT"))
destination += QString::fromUtf8(".torrent");
} else {