Skip to content

Commit 61a2159

Browse files
committed
Replace a QScopedPointer with the nicer std::unique_ptr
1 parent 503de80 commit 61a2159

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

src/library/library.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,11 @@ Library::Library(
7171
m_pTrackCollectionManager(pTrackCollectionManager),
7272
m_pSidebarModel(make_parented<SidebarModel>(this)),
7373
m_pLibraryControl(make_parented<LibraryControl>(this)),
74-
m_pLibraryWidget(nullptr) {
74+
m_pLibraryWidget(nullptr),
75+
m_pKeyNotation(std::make_unique<ControlObject>(
76+
mixxx::library::prefs::kKeyNotationConfigKey)) {
7577
qRegisterMetaType<LibraryRemovalType>("LibraryRemovalType");
7678

77-
m_pKeyNotation.reset(
78-
new ControlObject(mixxx::library::prefs::kKeyNotationConfigKey));
79-
8079
connect(m_pTrackCollectionManager,
8180
&TrackCollectionManager::libraryScanFinished,
8281
this,

src/library/library.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,5 @@ class Library: public QObject {
204204
QFont m_trackTableFont;
205205
int m_iTrackTableRowHeight;
206206
bool m_editMetadataSelectedClick;
207-
QScopedPointer<ControlObject> m_pKeyNotation;
207+
std::unique_ptr<ControlObject> m_pKeyNotation;
208208
};

0 commit comments

Comments
 (0)