movable_ptr(_with_deleter) -> std::unique_ptr

src/export/Export.cpp

@@ -325,7 +325,7 @@ int Exporter::FindFormatIndex(int exportindex)
    return 0;
 }
 
-void Exporter::RegisterPlugin(movable_ptr<ExportPlugin> &&ExportPlugin)
+void Exporter::RegisterPlugin(std::unique_ptr<ExportPlugin> &&ExportPlugin)
 {
    mPlugins.push_back(std::move(ExportPlugin));
 }

src/export/Export.h

@@ -146,7 +146,7 @@ private:
    std::vector<FormatInfo> mFormatInfos;
 };
 
-using ExportPluginArray = std::vector < movable_ptr< ExportPlugin > > ;
+using ExportPluginArray = std::vector < std::unique_ptr< ExportPlugin > > ;
 WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxWindow *, WindowPtrArray, class AUDACITY_DLL_API);
 
 //----------------------------------------------------------------------------
@@ -161,7 +161,7 @@ public:
 
    void SetFileDialogTitle( const wxString & DialogTitle );
    void SetDefaultFormat( const wxString & Format ){ mFormatName = Format;};
-   void RegisterPlugin(movable_ptr<ExportPlugin> &&plugin);
+   void RegisterPlugin(std::unique_ptr<ExportPlugin> &&plugin);
 
    bool Process(AudacityProject *project, bool selectedOnly,
                 double t0, double t1);

src/export/ExportCL.cpp

@@ -545,7 +545,7 @@ wxWindow *ExportCL::OptionsCreate(wxWindow *parent, int format)
    return safenew ExportCLOptions(parent, format);
 }
 
-movable_ptr<ExportPlugin> New_ExportCL()
+std::unique_ptr<ExportPlugin> New_ExportCL()
 {
    return std::make_unique<ExportCL>();
 }

src/export/ExportCL.h

@@ -19,6 +19,6 @@ class ExportPlugin;
  * factory method New_ExportCL() which creates a NEW ExportCL object and
  * returns a pointer to it. The rest of the class declaration is in ExportCL.cpp
  */
-movable_ptr<ExportPlugin> New_ExportCL();
+std::unique_ptr<ExportPlugin> New_ExportCL();
 
 #endif

src/export/ExportFFmpeg.cpp

@@ -1095,7 +1095,7 @@ wxWindow *ExportFFmpeg::OptionsCreate(wxWindow *parent, int format)
    return ExportPlugin::OptionsCreate(parent, format);
 }
 
-movable_ptr<ExportPlugin> New_ExportFFmpeg()
+std::unique_ptr<ExportPlugin> New_ExportFFmpeg()
 {
    return std::make_unique<ExportFFmpeg>();
 }

src/export/ExportFFmpeg.h

@@ -18,6 +18,6 @@ class ExportPlugin;
  * factory method New_ExportFFmpeg() which creates a NEW ExportFFmpeg object and
  * returns a pointer to it. The rest of the class declaration is in ExportFFmpeg.cpp
  */
-movable_ptr<ExportPlugin> New_ExportFFmpeg();
+std::unique_ptr<ExportPlugin> New_ExportFFmpeg();
 
 #endif

src/export/ExportFLAC.cpp

@@ -450,7 +450,7 @@ bool ExportFLAC::GetMetadata(AudacityProject *project, const Tags *tags)
    return true;
 }
 
-movable_ptr<ExportPlugin> New_ExportFLAC()
+std::unique_ptr<ExportPlugin> New_ExportFLAC()
 {
    return std::make_unique<ExportFLAC>();
 }

src/export/ExportFLAC.h

@@ -18,7 +18,7 @@ class ExportPlugin;
  * factory method New_ExportFLAC() which creates a NEW ExportFLAC object and
  * returns a pointer to it. The rest of the class declaration is in ExportFLAC.cpp
  */
-movable_ptr<ExportPlugin> New_ExportFLAC();
+std::unique_ptr<ExportPlugin> New_ExportFLAC();
 
 #endif
 

src/export/ExportMP2.cpp

@@ -464,7 +464,7 @@ void ExportMP2::AddFrame(struct id3_tag *tp, const wxString & n, const wxString
 }
 #endif
 
-movable_ptr<ExportPlugin> New_ExportMP2()
+std::unique_ptr<ExportPlugin> New_ExportMP2()
 {
    return std::make_unique<ExportMP2>();
 }

src/export/ExportMP2.h

@@ -19,7 +19,7 @@ class ExportPlugin;
  * factory method New_ExportMP2() which creates a NEW ExportMP2 object and
  * returns a pointer to it. The rest of the class declaration is in ExportMP2.cpp
  */
-movable_ptr<ExportPlugin> New_ExportMP2();
+std::unique_ptr<ExportPlugin> New_ExportMP2();
 
 #endif
 

src/export/ExportMP3.cpp

@@ -2158,7 +2158,7 @@ void ExportMP3::AddFrame(struct id3_tag *tp, const wxString & n, const wxString
 }
 #endif
 
-movable_ptr<ExportPlugin> New_ExportMP3()
+std::unique_ptr<ExportPlugin> New_ExportMP3()
 {
    return std::make_unique<ExportMP3>();
 }

src/export/ExportMP3.h

@@ -20,7 +20,7 @@ class wxWindow;
 /** Factory method New_ExportMP3() which creates a NEW ExportMP3 object and
  * returns a pointer to it. The rest of the class declaration is in ExportMP3.cpp
  */
-movable_ptr<ExportPlugin> New_ExportMP3();
+std::unique_ptr<ExportPlugin> New_ExportMP3();
 
 //----------------------------------------------------------------------------
 // Get MP3 library versioqn

src/export/ExportOGG.cpp

@@ -400,7 +400,7 @@ bool ExportOGG::FillComment(AudacityProject *project, vorbis_comment *comment, c
    return true;
 }
 
-movable_ptr<ExportPlugin> New_ExportOGG()
+std::unique_ptr<ExportPlugin> New_ExportOGG()
 {
    return std::make_unique<ExportOGG>();
 }

src/export/ExportOGG.h

@@ -18,7 +18,7 @@ class ExportPlugin;
  * factory method New_ExportOGG() which creates a NEW ExportOGG object and
  * returns a pointer to it. The rest of the class declaration is in ExportOGG.cpp
  */
-movable_ptr<ExportPlugin> New_ExportOGG();
+std::unique_ptr<ExportPlugin> New_ExportOGG();
 
 #endif
 

src/export/ExportPCM.cpp

@@ -909,7 +909,7 @@ bool ExportPCM::CheckFileName(wxFileName &filename, int format)
    return ExportPlugin::CheckFileName(filename, format);
 }
 
-movable_ptr<ExportPlugin> New_ExportPCM()
+std::unique_ptr<ExportPlugin> New_ExportPCM()
 {
    return std::make_unique<ExportPCM>();
 }

src/export/ExportPCM.h

@@ -18,7 +18,7 @@ class ExportPlugin;
  * factory method New_ExportPCM() which creates a NEW ExportPCM object and
  * returns a pointer to it. The rest of the class declaration is in ExportPCM.cpp
  */
-movable_ptr<ExportPlugin> New_ExportPCM();
+std::unique_ptr<ExportPlugin> New_ExportPCM();
 
 #endif