dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Application: Use shared pointers

Browse Source 
Fixes #1239
This commit is contained in:
Jonas Kvinge
2023-07-21 05:55:24 +02:00
parent d6b53f78ab
commit 2e61235403
316 changed files with 2170 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/fileview.cpp
View File

@@ -18,6 +18,8 @@
*
*/
#include <memory>
#include <QWidget>
#include <QUndoStack>
#include <QDir>
@@ -34,6 +36,7 @@
#include <QToolButton>
#include <QtEvents>
#include "core/shared_ptr.h"
#include "core/deletefiles.h"
#include "core/filesystemmusicstorage.h"
#include "core/iconloader.h"
@@ -45,6 +48,8 @@
#include "organize/organizeerrordialog.h"
#include "settings/appearancesettingspage.h"
using std::make_unique;
const char *FileView::kFileFilter =
"*.wav *.flac *.wv *.ogg *.oga *.opus *.spx *.ape *.mpc "
"*.mp2 *.mp3 *.m4a *.mp4 *.aac *.asf *.asx *.wma "
@@ -124,7 +129,7 @@ void FileView::SetPath(const QString &path) {
}
void FileView::SetTaskManager(TaskManager *task_manager) {
void FileView::SetTaskManager(SharedPtr<TaskManager> task_manager) {
task_manager_ = task_manager;
}
@@ -268,8 +273,8 @@ void FileView::showEvent(QShowEvent *e) {
model_ = new QFileSystemModel(this);
if (!model_->iconProvider() || model_->iconProvider()->icon(QFileIconProvider::Folder).isNull()) {
file_icon_provider_ = std::make_unique<QFileIconProvider>();
model_->setIconProvider(file_icon_provider_.get());
file_icon_provider_ = make_unique<QFileIconProvider>();
model_->setIconProvider(&*file_icon_provider_);
}
model_->setNameFilters(filter_list_);