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

Use std::make_unique

Browse Source
This commit is contained in:
Jonas Kvinge
2021-06-21 15:40:25 +02:00
parent 99ba2c2e8b
commit ed09627fdb
21 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/deviceview.cpp
View File

@@ -222,7 +222,7 @@ void DeviceView::SetApplication(Application *app) {
properties_dialog_->SetDeviceManager(app_->device_manager());
organize_dialog_.reset(new OrganizeDialog(app_->task_manager(), nullptr, this));
organize_dialog_ = std::make_unique<OrganizeDialog>(app_->task_manager(), nullptr, this);
organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model());
}

3
src/device/mtploader.cpp
View File

@@ -25,6 +25,7 @@
#include <QObject>
#include <QUrl>
#include <memory>
#include "core/taskmanager.h"
#include "core/song.h"
@@ -61,7 +62,7 @@ void MtpLoader::LoadDatabase() {
bool MtpLoader::TryLoad() {
connection_.reset(new MtpConnection(url_));
connection_ = std::make_unique<MtpConnection>(url_);
if (!connection_ || !connection_->is_valid()) {
emit Error(tr("Error connecting MTP device %1").arg(url_.toString()));

4
src/device/udisks2lister.cpp
View File

@@ -21,6 +21,8 @@
#include "config.h"
#include <memory>
#include <dbus/objectmanager.h>
#include <dbus/udisks2block.h>
#include <dbus/udisks2drive.h>
@@ -179,7 +181,7 @@ void Udisks2Lister::UpdateDeviceFreeSpace(const QString &id) {
bool Udisks2Lister::Init() {
udisks2_interface_.reset(new OrgFreedesktopDBusObjectManagerInterface(udisks2_service_, "/org/freedesktop/UDisks2", QDBusConnection::systemBus()));
udisks2_interface_ = std::make_unique<OrgFreedesktopDBusObjectManagerInterface>(udisks2_service_, "/org/freedesktop/UDisks2", QDBusConnection::systemBus());
QDBusPendingReply<ManagedObjectList> reply = udisks2_interface_->GetManagedObjects();
reply.waitForFinished();