From ec3c9cdf100a41e0f9738a49b75944d4115ab944 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Sun, 11 Mar 2018 09:07:00 -0700 Subject: [PATCH] Only `use` specific `std::` items we need. Also, fix `using std::unique_ptr` to `using std::make_unique` in stdshims.h --- include/stdshims.h | 2 +- src/core/ComboBoxModel.cpp | 3 ++- src/gui/editors/PianoRoll.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/stdshims.h b/include/stdshims.h index 86e355d04..456d31607 100644 --- a/include/stdshims.h +++ b/include/stdshims.h @@ -9,7 +9,7 @@ #if (__cplusplus >= 201402L) #warning "This file should now be removed! The functions it provides are part of the C++14 standard." -using std::unique_ptr; +using std::make_unique; #else diff --git a/src/core/ComboBoxModel.cpp b/src/core/ComboBoxModel.cpp index 62c673aad..7fa905abe 100644 --- a/src/core/ComboBoxModel.cpp +++ b/src/core/ComboBoxModel.cpp @@ -25,7 +25,8 @@ #include "ComboBoxModel.h" #include "embed.h" -using namespace std; +using std::unique_ptr; +using std::move; void ComboBoxModel::addItem( QString item, unique_ptr loader ) { diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 7813e1926..4a044891e 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -67,7 +67,7 @@ #define MiddleButton MidButton #endif -using namespace std; +using std::move; typedef AutomationPattern::timeMap timeMap;