From f73f2679974b8b22aea19bf1378f1f80490e7169 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Mon, 27 Aug 2012 21:11:54 +0300 Subject: [PATCH] TorrentContentModel clean up --- src/torrentcontentmodel.cpp | 8 ++++++-- src/torrentcontentmodelfile.cpp | 3 --- src/torrentcontentmodelfolder.cpp | 3 --- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/torrentcontentmodel.cpp b/src/torrentcontentmodel.cpp index 0cba82c9b..03988d0e0 100644 --- a/src/torrentcontentmodel.cpp +++ b/src/torrentcontentmodel.cpp @@ -291,12 +291,16 @@ void TorrentContentModel::setupModelData(const libtorrent::torrent_info& t) if (pathPart == ".unwanted") continue; TorrentContentModelFolder* new_parent = current_parent->childFolderWithName(pathPart); - if (!new_parent) + if (!new_parent) { new_parent = new TorrentContentModelFolder(pathPart, current_parent); + current_parent->appendChild(new_parent); + } current_parent = new_parent; } // Actually create the file - m_filesIndex.push_back(new TorrentContentModelFile(fentry, current_parent, i)); + TorrentContentModelFile* fileItem = new TorrentContentModelFile(fentry, current_parent, i); + current_parent->appendChild(fileItem); + m_filesIndex.push_back(fileItem); } emit layoutChanged(); } diff --git a/src/torrentcontentmodelfile.cpp b/src/torrentcontentmodelfile.cpp index e25103884..de6bcacd2 100644 --- a/src/torrentcontentmodelfile.cpp +++ b/src/torrentcontentmodelfile.cpp @@ -52,9 +52,6 @@ TorrentContentModelFile::TorrentContentModelFile(const libtorrent::file_entry& f m_name.chop(4); m_size = (qulonglong)f.size; - - // Add to parent - m_parentItem->appendChild(this); } int TorrentContentModelFile::fileIndex() const diff --git a/src/torrentcontentmodelfolder.cpp b/src/torrentcontentmodelfolder.cpp index bb35adb91..9d02174f7 100644 --- a/src/torrentcontentmodelfolder.cpp +++ b/src/torrentcontentmodelfolder.cpp @@ -38,9 +38,6 @@ TorrentContentModelFolder::TorrentContentModelFolder(const QString& name, Torren // Do not display incomplete extensions if (m_name.endsWith(".!qB")) m_name.chop(4); - - // Add to parent - m_parentItem->appendChild(this); } TorrentContentModelFolder::TorrentContentModelFolder(const QList& data)