mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-11-29 05:48:47 +03:00
Use a regular pointer instead of a QSharedPointer to fix Qt 4.4 compatibility
This commit is contained in:
parent
b2545bb709
commit
33f868144b
2 changed files with 5 additions and 6 deletions
|
@ -76,7 +76,7 @@ QVariant ScanFoldersModel::data(const QModelIndex &index, int role) const {
|
|||
if (!index.isValid() || index.row() >= rowCount())
|
||||
return QVariant();
|
||||
|
||||
const QSharedPointer<PathData> &pathData = m_pathList.at(index.row());
|
||||
const PathData* pathData = m_pathList.at(index.row());
|
||||
if (index.column() == PathColumn && role == Qt::DisplayRole)
|
||||
return pathData->path;
|
||||
if (index.column() == DownloadAtTorrentColumn && role == Qt::CheckStateRole)
|
||||
|
@ -122,7 +122,7 @@ ScanFoldersModel::PathStatus ScanFoldersModel::addPath(const QString &path) {
|
|||
connect(m_fsWatcher, SIGNAL(torrentsAdded(QStringList&)), this, SIGNAL(torrentsAdded(QStringList&)));
|
||||
}
|
||||
beginInsertRows(QModelIndex(), rowCount(), rowCount());
|
||||
m_pathList << QSharedPointer<PathData>(new PathData(canonicalPath));
|
||||
m_pathList << new PathData(canonicalPath);
|
||||
endInsertRows();
|
||||
m_fsWatcher->addPath(canonicalPath);
|
||||
return Ok;
|
||||
|
@ -169,7 +169,7 @@ bool ScanFoldersModel::downloadInTorrentFolder(const QString &filePath) const {
|
|||
|
||||
int ScanFoldersModel::findPathData(const QString &path) const {
|
||||
for (int i = 0; i < m_pathList.count(); ++i) {
|
||||
const QSharedPointer<PathData> &pathData = m_pathList.at(i);
|
||||
const PathData* pathData = m_pathList.at(i);
|
||||
if (pathData->path == path)
|
||||
return i;
|
||||
}
|
||||
|
@ -180,7 +180,7 @@ int ScanFoldersModel::findPathData(const QString &path) const {
|
|||
void ScanFoldersModel::makePersistent(QSettings &settings) {
|
||||
QStringList paths;
|
||||
QList<QVariant> downloadInFolderInfo;
|
||||
foreach (const QSharedPointer<PathData> &pathData, m_pathList) {
|
||||
foreach (const PathData* pathData, m_pathList) {
|
||||
paths << pathData->path;
|
||||
downloadInFolderInfo << pathData->downloadAtPath;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
|
||||
#include <QAbstractTableModel>
|
||||
#include <QList>
|
||||
#include <QSharedPointer>
|
||||
#include <QStringList>
|
||||
|
||||
class FileSystemWatcher;
|
||||
|
@ -75,7 +74,7 @@ private:
|
|||
class PathData;
|
||||
int findPathData(const QString &path) const;
|
||||
|
||||
QList<QSharedPointer<PathData> > m_pathList;
|
||||
QList<PathData*> m_pathList;
|
||||
FileSystemWatcher *m_fsWatcher;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue