1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00

Delete or un-inline some constructors, assignments, others...

... Which will be needed for various reasons for Windows builds of certain
modularizations, which will otherwise complain that they can no longer
generate them as inlines.

In one case, deleted copies require explicitly defaulted moves, but they will
work as generated inline.
This commit is contained in:
Paul Licameli 2020-09-29 08:54:22 -04:00 committed by Paul Licameli
parent 3060530b4f
commit fbfccf1393
15 changed files with 62 additions and 17 deletions

View File

@ -79,6 +79,8 @@ AudacityLogger::AudacityLogger()
mUpdated = false; mUpdated = false;
} }
AudacityLogger::~AudacityLogger() = default;
void AudacityLogger::Flush() void AudacityLogger::Flush()
{ {
if (mUpdated && mFrame && mFrame->IsShown()) { if (mUpdated && mFrame && mFrame->IsShown()) {

View File

@ -32,6 +32,8 @@ class AudacityLogger final : public wxEvtHandler,
{ {
public: public:
~AudacityLogger() override;
// Get the singleton instance or null // Get the singleton instance or null
static AudacityLogger *Get(); static AudacityLogger *Get();

View File

@ -107,6 +107,8 @@ private:
// I'm a singleton class // I'm a singleton class
ModuleManager(); ModuleManager();
~ModuleManager(); ~ModuleManager();
ModuleManager(const ModuleManager&) PROHIBITED;
ModuleManager &operator=(const ModuleManager&) PROHIBITED;
void InitializeBuiltins(); void InitializeBuiltins();
ModuleInterface *LoadModule(const PluginPath & path); ModuleInterface *LoadModule(const PluginPath & path);

View File

@ -131,6 +131,7 @@ namespace Registry {
GroupItem( const Identifier &internalName, BaseItemPtrs &&items_ ) GroupItem( const Identifier &internalName, BaseItemPtrs &&items_ )
: BaseItem{ internalName }, items{ std::move( items_ ) } : BaseItem{ internalName }, items{ std::move( items_ ) }
{} {}
GroupItem( const GroupItem& ) PROHIBITED;
~GroupItem() override = 0; ~GroupItem() override = 0;
// Whether the item is non-significant for path naming // Whether the item is non-significant for path naming

View File

@ -16,6 +16,8 @@
#include "CommandSignature.h" #include "CommandSignature.h"
CommandSignature::CommandSignature() = default;
CommandSignature::~CommandSignature() CommandSignature::~CommandSignature()
{ {
} }

View File

@ -30,9 +30,10 @@ class CommandSignature
private: private:
ParamValueMap mDefaults; ParamValueMap mDefaults;
ValidatorMap mValidators; ValidatorMap mValidators;
explicit CommandSignature(const CommandSignature & WXUNUSED(other)) { } CommandSignature(const CommandSignature &) PROHIBITED;
CommandSignature& operator=(const CommandSignature &) PROHIBITED;
public: public:
explicit CommandSignature() { } explicit CommandSignature();
~CommandSignature(); ~CommandSignature();
// Add a parameter to the signature. // Add a parameter to the signature.

View File

@ -98,6 +98,9 @@ public:
Importer(); Importer();
~Importer(); ~Importer();
Importer( const Importer& ) PROHIBITED;
Importer &operator=( Importer& ) PROHIBITED;
/** /**
* Return instance reference * Return instance reference
*/ */
@ -156,7 +159,7 @@ public:
* Returns a pointer to internal items array. * Returns a pointer to internal items array.
* External objects are allowed to change the array contents. * External objects are allowed to change the array contents.
*/ */
ExtImportItems &GetImportItems() { return mExtImportItems; }; ExtImportItems &GetImportItems() { return mExtImportItems; }
/** /**
* Allocates NEW ExtImportItem, fills it with default data * Allocates NEW ExtImportItem, fills it with default data

View File

@ -15,6 +15,24 @@ Paul Licameli split from Import.cpp
#include "../widgets/ProgressDialog.h" #include "../widgets/ProgressDialog.h"
#include "../prefs/QualityPrefs.h" #include "../prefs/QualityPrefs.h"
ImportPlugin::ImportPlugin(FileExtensions supportedExtensions):
mExtensions( std::move( supportedExtensions ) )
{
}
ImportPlugin::~ImportPlugin() = default;
FileExtensions ImportPlugin::GetSupportedExtensions()
{
return mExtensions;
}
bool ImportPlugin::SupportsExtension(const FileExtension &extension)
{
// Case-insensitive check if extension is supported
return mExtensions.Index(extension, false) != wxNOT_FOUND;
}
ImportFileHandle::ImportFileHandle(const FilePath & filename) ImportFileHandle::ImportFileHandle(const FilePath & filename)
: mFilename(filename) : mFilename(filename)
{ {

View File

@ -77,16 +77,9 @@ public:
// Get a list of extensions this plugin expects to be able to // Get a list of extensions this plugin expects to be able to
// import. If a filename matches any of these extensions, // import. If a filename matches any of these extensions,
// this importer will get first dibs on importing it. // this importer will get first dibs on importing it.
virtual FileExtensions GetSupportedExtensions() virtual FileExtensions GetSupportedExtensions();
{
return mExtensions;
}
bool SupportsExtension(const FileExtension &extension) bool SupportsExtension(const FileExtension &extension);
{
// Case-insensitive check if extension is supported
return mExtensions.Index(extension, false) != wxNOT_FOUND;
}
// Open the given file, returning true if it is in a recognized // Open the given file, returning true if it is in a recognized
// format, false otherwise. This puts the importer into the open // format, false otherwise. This puts the importer into the open
@ -94,14 +87,11 @@ public:
virtual std::unique_ptr<ImportFileHandle> Open( virtual std::unique_ptr<ImportFileHandle> Open(
const FilePath &Filename, AudacityProject*) = 0; const FilePath &Filename, AudacityProject*) = 0;
virtual ~ImportPlugin() { } virtual ~ImportPlugin();
protected: protected:
ImportPlugin(FileExtensions supportedExtensions): ImportPlugin(FileExtensions supportedExtensions);
mExtensions( std::move( supportedExtensions ) )
{
}
const FileExtensions mExtensions; const FileExtensions mExtensions;
}; };

View File

@ -111,6 +111,8 @@ void ClipMoveState::DoHorizontalOffset( double offset )
} }
} }
TrackShifter::TrackShifter() = default;
TrackShifter::~TrackShifter() = default; TrackShifter::~TrackShifter() = default;
void TrackShifter::UnfixIntervals( void TrackShifter::UnfixIntervals(

View File

@ -30,6 +30,10 @@ class ViewInfo;
//! Abstract base class for policies to manipulate a track type with the Time Shift tool //! Abstract base class for policies to manipulate a track type with the Time Shift tool
class TrackShifter { class TrackShifter {
public: public:
TrackShifter();
TrackShifter(const TrackShifter&) PROHIBITED;
TrackShifter &operator=(const TrackShifter&) PROHIBITED;
virtual ~TrackShifter() = 0; virtual ~TrackShifter() = 0;
//! There is always an associated track //! There is always an associated track
virtual Track &GetTrack() const = 0; virtual Track &GetTrack() const = 0;
@ -196,6 +200,14 @@ using MakeTrackShifter = AttachedVirtualFunction<
class ViewInfo; class ViewInfo;
struct ClipMoveState { struct ClipMoveState {
ClipMoveState() = default;
ClipMoveState(const ClipMoveState&) PROHIBITED;
ClipMoveState& operator =(const ClipMoveState&) PROHIBITED;
ClipMoveState(ClipMoveState&&) = default;
ClipMoveState& operator =(ClipMoveState&&) = default;
using ShifterMap = std::unordered_map<Track*, std::unique_ptr<TrackShifter>>; using ShifterMap = std::unordered_map<Track*, std::unique_ptr<TrackShifter>>;
//! Will associate a TrackShifter with each track in the list //! Will associate a TrackShifter with each track in the list

View File

@ -102,6 +102,10 @@
#include <wx/dcclient.h> #include <wx/dcclient.h>
#include <wx/image.h> #include <wx/image.h>
ImageRoll::ImageRoll(const ImageRoll&) = default;
ImageRoll &ImageRoll::operator =(const ImageRoll&) = default;
ImageRoll::~ImageRoll() = default;
// static // static
ImageArray ImageRoll::SplitH(const wxImage &src, wxColour magicColor) ImageArray ImageRoll::SplitH(const wxImage &src, wxColour magicColor)
{ {

View File

@ -38,6 +38,9 @@ class ImageRoll
ImageRoll(); ImageRoll();
ImageRoll(const wxImage &src); ImageRoll(const wxImage &src);
ImageRoll(RollType type, const wxImage &src, wxColour magicColor); ImageRoll(RollType type, const wxImage &src, wxColour magicColor);
ImageRoll(const ImageRoll&);
ImageRoll &operator =(const ImageRoll&);
~ImageRoll();
bool Ok() const; bool Ok() const;

View File

@ -938,6 +938,8 @@ void NumericConverter::PrintDebugInfo()
wxPrintf("\n"); wxPrintf("\n");
} }
NumericConverter::NumericConverter(const NumericConverter&) = default;
NumericConverter::~NumericConverter() NumericConverter::~NumericConverter()
{ {
} }

View File

@ -85,6 +85,7 @@ public:
const NumericFormatSymbol & formatName = {}, const NumericFormatSymbol & formatName = {},
double value = 0.0f, double value = 0.0f,
double sampleRate = 1.0f /* to prevent div by 0 */); double sampleRate = 1.0f /* to prevent div by 0 */);
NumericConverter(const NumericConverter&);
virtual ~NumericConverter(); virtual ~NumericConverter();