d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 13:04:23 +00:00
Code Issues Projects Releases Wiki Activity

Code clean up

Browse Source
This commit is contained in:
Chocobo1 2020-08-27 00:06:54 +08:00
parent 4539c679d9
commit 307ca61c86
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/base/utils/string.h
View File

@ -30,7 +30,7 @@
#ifndef UTILS_STRING_H #ifndef UTILS_STRING_H
#define UTILS_STRING_H #define UTILS_STRING_H
#include <QLatin1String> #include <QChar>
#include <QVector> #include <QVector>
class QString; class QString;
@ -54,13 +54,13 @@ namespace Utils
QString wildcardToRegex(const QString &pattern); QString wildcardToRegex(const QString &pattern);
template <typename T> template <typename T>
T unquote(const T &str, const QString &quotes = QLatin1String("\"")) T unquote(const T &str, const QString &quotes = QChar('"'))
{ {
if (str.length() < 2) return str; if (str.length() < 2) return str;
for (const auto &quote : quotes) { for (const QChar quote : quotes) {
if (str.startsWith(quote) && str.endsWith(quote)) if (str.startsWith(quote) && str.endsWith(quote))
return str.mid(1, str.length() - 2); return str.mid(1, (str.length() - 2));
} }
return str; return str;

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

@ -517,7 +517,7 @@ void PropertiesWidget::loadUrlSeeds()
} }
} }
void PropertiesWidget::openDoubleClickedFile(const QModelIndex &index) void PropertiesWidget::openDoubleClickedFile(const QModelIndex &index) const
{ {
if (!index.isValid() || !m_torrent || !m_torrent->hasMetadata()) return; if (!index.isValid() || !m_torrent || !m_torrent->hasMetadata()) return;
@ -527,7 +527,7 @@ void PropertiesWidget::openDoubleClickedFile(const QModelIndex &index)
openFolder(index, false); openFolder(index, false);
} }
void PropertiesWidget::openFile(const QModelIndex &index) void PropertiesWidget::openFile(const QModelIndex &index) const
{ {
int i = m_propListModel->getFileIndex(index); int i = m_propListModel->getFileIndex(index);
const QDir saveDir(m_torrent->savePath(true)); const QDir saveDir(m_torrent->savePath(true));
@ -539,14 +539,13 @@ void PropertiesWidget::openFile(const QModelIndex &index)
Utils::Gui::openPath(filePath); Utils::Gui::openPath(filePath);
} }
void PropertiesWidget::openFolder(const QModelIndex &index, bool containingFolder) void PropertiesWidget::openFolder(const QModelIndex &index, const bool containingFolder) const
{ {
QString absolutePath; QString absolutePath;
// FOLDER // FOLDER
if (m_propListModel->itemType(index) == TorrentContentModelItem::FolderType) { if (m_propListModel->itemType(index) == TorrentContentModelItem::FolderType) {
// Generate relative path to selected folder // Generate relative path to selected folder
QStringList pathItems; QStringList pathItems {index.data().toString()};
pathItems << index.data().toString();
QModelIndex parent = m_propListModel->parent(index); QModelIndex parent = m_propListModel->parent(index);
while (parent.isValid()) { while (parent.isValid()) {
pathItems.prepend(parent.data().toString()); pathItems.prepend(parent.data().toString());
@ -554,12 +553,13 @@ void PropertiesWidget::openFolder(const QModelIndex &index, bool containingFolde
} }
if (pathItems.isEmpty()) if (pathItems.isEmpty())
return; return;
const QDir saveDir(m_torrent->savePath(true)); const QDir saveDir(m_torrent->savePath(true));
const QString relativePath = pathItems.join('/'); const QString relativePath = pathItems.join('/');
absolutePath = Utils::Fs::expandPath(saveDir.absoluteFilePath(relativePath)); absolutePath = Utils::Fs::expandPath(saveDir.absoluteFilePath(relativePath));
} }
else { else {
int i = m_propListModel->getFileIndex(index); const int i = m_propListModel->getFileIndex(index);
const QDir saveDir(m_torrent->savePath(true)); const QDir saveDir(m_torrent->savePath(true));
const QString relativePath = m_torrent->filePath(i); const QString relativePath = m_torrent->filePath(i);
absolutePath = Utils::Fs::expandPath(saveDir.absoluteFilePath(relativePath)); absolutePath = Utils::Fs::expandPath(saveDir.absoluteFilePath(relativePath));
@ -569,7 +569,7 @@ void PropertiesWidget::openFolder(const QModelIndex &index, bool containingFolde
m_torrent->flushCache(); m_torrent->flushCache();
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
Q_UNUSED(containingFolder); Q_UNUSED(containingFolder);
MacUtils::openFiles(QSet<QString>{absolutePath}); MacUtils::openFiles(QSet<QString> {absolutePath});
#else #else
if (containingFolder) if (containingFolder)
Utils::Gui::openFolderSelect(absolutePath); Utils::Gui::openFolderSelect(absolutePath);

6
src/gui/properties/propertieswidget.h
View File

@ -82,7 +82,7 @@ public slots:
void readSettings(); void readSettings();
void saveSettings(); void saveSettings();
void reloadPreferences(); void reloadPreferences();
void openDoubleClickedFile(const QModelIndex &); void openDoubleClickedFile(const QModelIndex &index) const;
void loadTrackers(BitTorrent::TorrentHandle *const torrent); void loadTrackers(BitTorrent::TorrentHandle *const torrent);
protected slots: protected slots:
@ -107,8 +107,8 @@ private slots:
private: private:
QPushButton *getButtonFromIndex(int index); QPushButton *getButtonFromIndex(int index);
void applyPriorities(); void applyPriorities();
void openFile(const QModelIndex &index); void openFile(const QModelIndex &index) const;
void openFolder(const QModelIndex &index, bool containingFolder); void openFolder(const QModelIndex &index, bool containingFolder) const;
Ui::PropertiesWidget *m_ui; Ui::PropertiesWidget *m_ui;
BitTorrent::TorrentHandle *m_torrent; BitTorrent::TorrentHandle *m_torrent;