Replace boost::scoped_ptr with std::unique_ptr (2/2)
This commit is contained in:
parent
1ffb70f670
commit
21e70d28cc
@ -27,8 +27,6 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <boost/scoped_ptr.hpp>
|
|
||||||
|
|
||||||
#include "pbd/error.h"
|
#include "pbd/error.h"
|
||||||
#include "pbd/failed_constructor.h"
|
#include "pbd/failed_constructor.h"
|
||||||
#include "pbd/locale_guard.h"
|
#include "pbd/locale_guard.h"
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <boost/scoped_ptr.hpp>
|
|
||||||
|
|
||||||
#include <gtkmm/box.h>
|
#include <gtkmm/box.h>
|
||||||
#include <gtkmm/button.h>
|
#include <gtkmm/button.h>
|
||||||
#include <gtkmm/label.h>
|
#include <gtkmm/label.h>
|
||||||
@ -88,10 +86,10 @@ protected:
|
|||||||
// Must initialize all the shared_ptrs below
|
// Must initialize all the shared_ptrs below
|
||||||
virtual void init_components ();
|
virtual void init_components ();
|
||||||
|
|
||||||
boost::scoped_ptr<ExportPresetSelector> preset_selector;
|
std::unique_ptr<ExportPresetSelector> preset_selector;
|
||||||
boost::scoped_ptr<ExportTimespanSelector> timespan_selector;
|
std::unique_ptr<ExportTimespanSelector> timespan_selector;
|
||||||
boost::scoped_ptr<ExportChannelSelector> channel_selector;
|
std::unique_ptr<ExportChannelSelector> channel_selector;
|
||||||
boost::scoped_ptr<ExportFileNotebook> file_notebook;
|
std::unique_ptr<ExportFileNotebook> file_notebook;
|
||||||
|
|
||||||
std::shared_ptr<SoundcloudExportSelector> soundcloud_selector;
|
std::shared_ptr<SoundcloudExportSelector> soundcloud_selector;
|
||||||
|
|
||||||
|
@ -30,8 +30,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
#include <boost/smart_ptr/scoped_ptr.hpp>
|
|
||||||
|
|
||||||
#include <gtkmm/separator.h>
|
#include <gtkmm/separator.h>
|
||||||
|
|
||||||
#include "pbd/error.h"
|
#include "pbd/error.h"
|
||||||
@ -164,7 +162,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
|
|||||||
set_tooltip (inactive_label, _("This track is inactive. (right-click to activate)"));
|
set_tooltip (inactive_label, _("This track is inactive. (right-click to activate)"));
|
||||||
|
|
||||||
{
|
{
|
||||||
boost::scoped_ptr<Gtk::Entry> an_entry (new FocusEntry);
|
const std::unique_ptr<Gtk::Entry> an_entry (new FocusEntry);
|
||||||
an_entry->set_name (X_("TrackNameEditor"));
|
an_entry->set_name (X_("TrackNameEditor"));
|
||||||
Gtk::Requisition req = an_entry->size_request ();
|
Gtk::Requisition req = an_entry->size_request ();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user