From e3503e5ba05a26c030b08de8400a5c8cebc034ed Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 6 Nov 2020 20:59:04 +0000 Subject: fixed memory leak git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9555 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/library/library.cpp | 2 +- src/qmmpui/fileloader.cpp | 2 +- src/qmmpui/playlisttask.cpp | 5 +++-- src/qmmpui/playlisttrack.cpp | 2 +- src/qmmpui/playlisttrack.h | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/plugins/General/library/library.cpp b/src/plugins/General/library/library.cpp index 3f24d1a85..0964e14b5 100644 --- a/src/plugins/General/library/library.cpp +++ b/src/plugins/General/library/library.cpp @@ -255,7 +255,7 @@ QList Library::processFile(const QString &path, QStringList *ig QList tracks; const QList infoList = MetaDataManager::instance()->createPlayList(path, TrackInfo::AllParts, ignoredPaths); - for(TrackInfo *info : qAsConst(infoList)) + for(const TrackInfo *info : qAsConst(infoList)) { tracks.append(new PlayListTrack(info)); } diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp index 11f682b83..bb5d92f31 100644 --- a/src/qmmpui/fileloader.cpp +++ b/src/qmmpui/fileloader.cpp @@ -47,7 +47,7 @@ QList FileLoader::processFile(const QString &path, QStringList QList tracks; const QList infoList = MetaDataManager::instance()->createPlayList(path, m_parts, ignoredPaths); - for(TrackInfo *info : qAsConst(infoList)) + for(const TrackInfo *info : qAsConst(infoList)) { tracks.append(new PlayListTrack(info)); } diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp index 0ff0eecc2..86cf5247e 100644 --- a/src/qmmpui/playlisttask.cpp +++ b/src/qmmpui/playlisttask.cpp @@ -460,12 +460,13 @@ void PlayListTask::run() //create new playlist tracks QStringList ignoredFiles; TrackInfo::Parts parts = QmmpUiSettings::instance()->useMetaData() ? TrackInfo::AllParts : TrackInfo::Parts(); - for(const QFileInfo &info : qAsConst(l)) + for(const QFileInfo &i : qAsConst(l)) { QStringList ignored; - for(TrackInfo *info : mm->createPlayList(info.canonicalFilePath(), parts, &ignored)) + for(TrackInfo *info : mm->createPlayList(i.canonicalFilePath(), parts, &ignored)) { m_new_tracks << new PlayListTrack(info); + delete info; } ignoredFiles.append(ignored); } diff --git a/src/qmmpui/playlisttrack.cpp b/src/qmmpui/playlisttrack.cpp index 0f89314e6..7cb698b65 100644 --- a/src/qmmpui/playlisttrack.cpp +++ b/src/qmmpui/playlisttrack.cpp @@ -45,7 +45,7 @@ PlayListTrack::PlayListTrack(const PlayListTrack &other) : TrackInfo(other), m_formattedLength = other.m_formattedLength; } -PlayListTrack::PlayListTrack(TrackInfo *info) : TrackInfo(*info), +PlayListTrack::PlayListTrack(const TrackInfo *info) : TrackInfo(*info), PlayListItem() { m_settings = QmmpUiSettings::instance(); diff --git a/src/qmmpui/playlisttrack.h b/src/qmmpui/playlisttrack.h index 2d878e176..78d0801c0 100644 --- a/src/qmmpui/playlisttrack.h +++ b/src/qmmpui/playlisttrack.h @@ -48,7 +48,7 @@ public: * Constructs plalist item with given metadata. * @param info Media file information. */ - PlayListTrack(TrackInfo *info); + PlayListTrack(const TrackInfo *info); /*! * Object destructor. */ -- cgit v1.2.3-13-gbd6f