From fc0f6b1f2f2e88d757407aa273d68d6532df4ee3 Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 1 Dec 2021 13:05:06 +0000 Subject: [PATCH] Tidy up --- modules/juce_audio_basics/midi/juce_MidiFile.cpp | 1 - modules/juce_audio_basics/midi/juce_MidiFile.h | 3 --- modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp | 4 ---- modules/juce_audio_basics/midi/juce_MidiKeyboardState.h | 1 - .../juce_audio_basics/midi/juce_MidiMessageSequence.cpp | 5 ----- modules/juce_audio_basics/midi/juce_MidiMessageSequence.h | 6 ------ modules/juce_audio_devices/native/juce_win32_Midi.cpp | 2 +- modules/juce_core/containers/juce_AbstractFifo.cpp | 2 -- modules/juce_core/containers/juce_AbstractFifo.h | 3 --- modules/juce_core/files/juce_FileSearchPath.cpp | 3 --- modules/juce_core/files/juce_FileSearchPath.h | 8 ++++---- modules/juce_core/maths/juce_BigInteger.cpp | 4 ---- modules/juce_core/maths/juce_BigInteger.h | 2 +- modules/juce_core/text/juce_LocalisedStrings.cpp | 4 ---- modules/juce_core/text/juce_LocalisedStrings.h | 2 +- modules/juce_core/text/juce_StringArray.cpp | 4 ---- modules/juce_core/text/juce_StringArray.h | 2 +- modules/juce_core/text/juce_StringPairArray.cpp | 4 ---- modules/juce_core/text/juce_StringPairArray.h | 2 +- modules/juce_core/text/juce_StringPool.cpp | 1 - modules/juce_core/text/juce_StringPool.h | 3 --- .../app_properties/juce_ApplicationProperties.cpp | 4 ---- .../app_properties/juce_ApplicationProperties.h | 2 +- modules/juce_events/messages/juce_MessageManager.h | 2 +- .../filebrowser/juce_FileSearchPathListComponent.cpp | 4 ---- .../filebrowser/juce_FileSearchPathListComponent.h | 3 --- modules/juce_gui_basics/native/juce_win32_Windowing.cpp | 2 +- 27 files changed, 12 insertions(+), 71 deletions(-) diff --git a/modules/juce_audio_basics/midi/juce_MidiFile.cpp b/modules/juce_audio_basics/midi/juce_MidiFile.cpp index 270f4f9a7e..dd1c4329f6 100644 --- a/modules/juce_audio_basics/midi/juce_MidiFile.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiFile.cpp @@ -264,7 +264,6 @@ namespace MidiFileHelpers //============================================================================== MidiFile::MidiFile() : timeFormat ((short) (unsigned short) 0xe728) {} -MidiFile::~MidiFile() {} MidiFile::MidiFile (const MidiFile& other) : timeFormat (other.timeFormat) { diff --git a/modules/juce_audio_basics/midi/juce_MidiFile.h b/modules/juce_audio_basics/midi/juce_MidiFile.h index de043ed9a2..95f0e3ab10 100644 --- a/modules/juce_audio_basics/midi/juce_MidiFile.h +++ b/modules/juce_audio_basics/midi/juce_MidiFile.h @@ -45,9 +45,6 @@ public: /** Creates an empty MidiFile object. */ MidiFile(); - /** Destructor. */ - ~MidiFile(); - /** Creates a copy of another MidiFile. */ MidiFile (const MidiFile&); diff --git a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp index de83ae8514..2a34076d79 100644 --- a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp @@ -28,10 +28,6 @@ MidiKeyboardState::MidiKeyboardState() zerostruct (noteStates); } -MidiKeyboardState::~MidiKeyboardState() -{ -} - //============================================================================== void MidiKeyboardState::reset() { diff --git a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h index 61011dd611..35c46fa421 100644 --- a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h +++ b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h @@ -43,7 +43,6 @@ class JUCE_API MidiKeyboardState public: //============================================================================== MidiKeyboardState(); - ~MidiKeyboardState(); //============================================================================== /** Resets the state of the object. diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp index a2cea50d02..c9df3ee394 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp @@ -25,7 +25,6 @@ namespace juce MidiMessageSequence::MidiEventHolder::MidiEventHolder (const MidiMessage& mm) : message (mm) {} MidiMessageSequence::MidiEventHolder::MidiEventHolder (MidiMessage&& mm) : message (std::move (mm)) {} -MidiMessageSequence::MidiEventHolder::~MidiEventHolder() {} //============================================================================== MidiMessageSequence::MidiMessageSequence() @@ -63,10 +62,6 @@ MidiMessageSequence& MidiMessageSequence::operator= (MidiMessageSequence&& other return *this; } -MidiMessageSequence::~MidiMessageSequence() -{ -} - void MidiMessageSequence::swapWith (MidiMessageSequence& other) noexcept { list.swapWith (other.list); diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h index 80403ae7d1..698da7443f 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h +++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h @@ -53,9 +53,6 @@ public: /** Move assignment operator */ MidiMessageSequence& operator= (MidiMessageSequence&&) noexcept; - /** Destructor. */ - ~MidiMessageSequence(); - //============================================================================== /** Structure used to hold midi events in the sequence. @@ -68,9 +65,6 @@ public: { public: //============================================================================== - /** Destructor. */ - ~MidiEventHolder(); - /** The message itself, whose timestamp is used to specify the event's time. */ MidiMessage message; diff --git a/modules/juce_audio_devices/native/juce_win32_Midi.cpp b/modules/juce_audio_devices/native/juce_win32_Midi.cpp index 3ecd75eec8..0ac9bfe533 100644 --- a/modules/juce_audio_devices/native/juce_win32_Midi.cpp +++ b/modules/juce_audio_devices/native/juce_win32_Midi.cpp @@ -258,7 +258,7 @@ private: struct MidiHeader { - MidiHeader() {} + MidiHeader() = default; void prepare (HMIDIIN device) { diff --git a/modules/juce_core/containers/juce_AbstractFifo.cpp b/modules/juce_core/containers/juce_AbstractFifo.cpp index c4db8d76ee..ec7871a62c 100644 --- a/modules/juce_core/containers/juce_AbstractFifo.cpp +++ b/modules/juce_core/containers/juce_AbstractFifo.cpp @@ -28,8 +28,6 @@ AbstractFifo::AbstractFifo (int capacity) noexcept : bufferSize (capacity) jassert (bufferSize > 0); } -AbstractFifo::~AbstractFifo() {} - int AbstractFifo::getTotalSize() const noexcept { return bufferSize; } int AbstractFifo::getFreeSpace() const noexcept { return bufferSize - getNumReady() - 1; } diff --git a/modules/juce_core/containers/juce_AbstractFifo.h b/modules/juce_core/containers/juce_AbstractFifo.h index ddf78e1ce2..0cb31ae9a8 100644 --- a/modules/juce_core/containers/juce_AbstractFifo.h +++ b/modules/juce_core/containers/juce_AbstractFifo.h @@ -76,9 +76,6 @@ public: /** Creates a FIFO to manage a buffer with the specified capacity. */ AbstractFifo (int capacity) noexcept; - /** Destructor */ - ~AbstractFifo(); - //============================================================================== /** Returns the total size of the buffer being managed. */ int getTotalSize() const noexcept; diff --git a/modules/juce_core/files/juce_FileSearchPath.cpp b/modules/juce_core/files/juce_FileSearchPath.cpp index a316bddf02..c5e92508e4 100644 --- a/modules/juce_core/files/juce_FileSearchPath.cpp +++ b/modules/juce_core/files/juce_FileSearchPath.cpp @@ -23,9 +23,6 @@ namespace juce { -FileSearchPath::FileSearchPath() {} -FileSearchPath::~FileSearchPath() {} - FileSearchPath::FileSearchPath (const String& path) { init (path); diff --git a/modules/juce_core/files/juce_FileSearchPath.h b/modules/juce_core/files/juce_FileSearchPath.h index 4da5907dc7..4ed1e97fa8 100644 --- a/modules/juce_core/files/juce_FileSearchPath.h +++ b/modules/juce_core/files/juce_FileSearchPath.h @@ -36,7 +36,10 @@ class JUCE_API FileSearchPath public: //============================================================================== /** Creates an empty search path. */ - FileSearchPath(); + FileSearchPath() = default; + + /** Destructor. */ + ~FileSearchPath() = default; /** Creates a search path from a string of pathnames. @@ -53,9 +56,6 @@ public: /** Copies another search path. */ FileSearchPath& operator= (const FileSearchPath&); - /** Destructor. */ - ~FileSearchPath(); - /** Uses a string containing a list of pathnames to re-initialise this list. This search path is cleared and the semicolon- or comma-separated folders diff --git a/modules/juce_core/maths/juce_BigInteger.cpp b/modules/juce_core/maths/juce_BigInteger.cpp index 5f23c78ec2..0e27ea915a 100644 --- a/modules/juce_core/maths/juce_BigInteger.cpp +++ b/modules/juce_core/maths/juce_BigInteger.cpp @@ -130,10 +130,6 @@ BigInteger& BigInteger::operator= (BigInteger&& other) noexcept return *this; } -BigInteger::~BigInteger() -{ -} - void BigInteger::swapWith (BigInteger& other) noexcept { for (int i = 0; i < numPreallocatedInts; ++i) diff --git a/modules/juce_core/maths/juce_BigInteger.h b/modules/juce_core/maths/juce_BigInteger.h index 323c053e24..d616a39105 100644 --- a/modules/juce_core/maths/juce_BigInteger.h +++ b/modules/juce_core/maths/juce_BigInteger.h @@ -69,7 +69,7 @@ public: BigInteger& operator= (BigInteger&&) noexcept; /** Destructor. */ - ~BigInteger(); + ~BigInteger() = default; //============================================================================== /** Copies another BigInteger onto this one. */ diff --git a/modules/juce_core/text/juce_LocalisedStrings.cpp b/modules/juce_core/text/juce_LocalisedStrings.cpp index c0a7a4596a..fcff32e09f 100644 --- a/modules/juce_core/text/juce_LocalisedStrings.cpp +++ b/modules/juce_core/text/juce_LocalisedStrings.cpp @@ -48,10 +48,6 @@ LocalisedStrings& LocalisedStrings::operator= (const LocalisedStrings& other) return *this; } -LocalisedStrings::~LocalisedStrings() -{ -} - //============================================================================== String LocalisedStrings::translate (const String& text) const { diff --git a/modules/juce_core/text/juce_LocalisedStrings.h b/modules/juce_core/text/juce_LocalisedStrings.h index 04b2c348fb..c62f82fa73 100644 --- a/modules/juce_core/text/juce_LocalisedStrings.h +++ b/modules/juce_core/text/juce_LocalisedStrings.h @@ -90,7 +90,7 @@ public: LocalisedStrings& operator= (const LocalisedStrings&); /** Destructor. */ - ~LocalisedStrings(); + ~LocalisedStrings() = default; //============================================================================== /** Selects the current set of mappings to be used by the system. diff --git a/modules/juce_core/text/juce_StringArray.cpp b/modules/juce_core/text/juce_StringArray.cpp index 5dc50eb9c3..5f18ff5c68 100644 --- a/modules/juce_core/text/juce_StringArray.cpp +++ b/modules/juce_core/text/juce_StringArray.cpp @@ -89,10 +89,6 @@ StringArray& StringArray::operator= (StringArray&& other) noexcept return *this; } -StringArray::~StringArray() -{ -} - bool StringArray::operator== (const StringArray& other) const noexcept { return strings == other.strings; diff --git a/modules/juce_core/text/juce_StringArray.h b/modules/juce_core/text/juce_StringArray.h index 4421d5cc0e..b1e87dbb65 100644 --- a/modules/juce_core/text/juce_StringArray.h +++ b/modules/juce_core/text/juce_StringArray.h @@ -99,7 +99,7 @@ public: StringArray (const wchar_t* const* strings, int numberOfStrings); /** Destructor. */ - ~StringArray(); + ~StringArray() = default; /** Copies the contents of another string array into this one */ StringArray& operator= (const StringArray&); diff --git a/modules/juce_core/text/juce_StringPairArray.cpp b/modules/juce_core/text/juce_StringPairArray.cpp index b1b12f92b5..91cc078525 100644 --- a/modules/juce_core/text/juce_StringPairArray.cpp +++ b/modules/juce_core/text/juce_StringPairArray.cpp @@ -34,10 +34,6 @@ StringPairArray::StringPairArray (const StringPairArray& other) { } -StringPairArray::~StringPairArray() -{ -} - StringPairArray& StringPairArray::operator= (const StringPairArray& other) { keys = other.keys; diff --git a/modules/juce_core/text/juce_StringPairArray.h b/modules/juce_core/text/juce_StringPairArray.h index 16b9a99c1e..9f105e75d7 100644 --- a/modules/juce_core/text/juce_StringPairArray.h +++ b/modules/juce_core/text/juce_StringPairArray.h @@ -42,7 +42,7 @@ public: StringPairArray (const StringPairArray& other); /** Destructor. */ - ~StringPairArray(); + ~StringPairArray() = default; /** Copies the contents of another string array into this one */ StringPairArray& operator= (const StringPairArray& other); diff --git a/modules/juce_core/text/juce_StringPool.cpp b/modules/juce_core/text/juce_StringPool.cpp index e4caa7991a..54c11bef55 100644 --- a/modules/juce_core/text/juce_StringPool.cpp +++ b/modules/juce_core/text/juce_StringPool.cpp @@ -28,7 +28,6 @@ static const uint32 garbageCollectionInterval = 30000; StringPool::StringPool() noexcept : lastGarbageCollectionTime (0) {} -StringPool::~StringPool() {} struct StartEndString { diff --git a/modules/juce_core/text/juce_StringPool.h b/modules/juce_core/text/juce_StringPool.h index ef37da7891..b7d3135744 100644 --- a/modules/juce_core/text/juce_StringPool.h +++ b/modules/juce_core/text/juce_StringPool.h @@ -43,9 +43,6 @@ public: /** Creates an empty pool. */ StringPool() noexcept; - /** Destructor */ - ~StringPool(); - //============================================================================== /** Returns a pointer to a shared copy of the string that is passed in. The pool will always return the same String object when asked for a string that matches it. diff --git a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.cpp b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.cpp index c770d1902d..0b93639b4f 100644 --- a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.cpp +++ b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.cpp @@ -26,10 +26,6 @@ namespace juce { -ApplicationProperties::ApplicationProperties() -{ -} - ApplicationProperties::~ApplicationProperties() { closeFiles(); diff --git a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h index d1e487e5c3..80f6650d10 100644 --- a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h +++ b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h @@ -57,7 +57,7 @@ public: Before using it, you must call setStorageParameters() to give it the info it needs to create the property files. */ - ApplicationProperties(); + ApplicationProperties() = default; /** Destructor. */ ~ApplicationProperties(); diff --git a/modules/juce_events/messages/juce_MessageManager.h b/modules/juce_events/messages/juce_MessageManager.h index a2f63d244c..1d8bd60d7a 100644 --- a/modules/juce_events/messages/juce_MessageManager.h +++ b/modules/juce_events/messages/juce_MessageManager.h @@ -203,7 +203,7 @@ public: Creates a new critical section to exclusively access methods which can only be called when the message manager is locked. - Unlike CrititcalSection, multiple instances of this lock class provide + Unlike CriticalSection, multiple instances of this lock class provide exclusive access to a single resource - the MessageManager. */ Lock(); diff --git a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp index 74677f403b..66b0c96a76 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.cpp @@ -81,10 +81,6 @@ FileSearchPathListComponent::FileSearchPathListComponent() updateButtons(); } -FileSearchPathListComponent::~FileSearchPathListComponent() -{ -} - void FileSearchPathListComponent::updateButtons() { const bool anythingSelected = listBox.getNumSelectedRows() > 0; diff --git a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h index a1a52fa16f..1c40ea6ca5 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h +++ b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h @@ -45,9 +45,6 @@ public: /** Creates an empty FileSearchPathListComponent. */ FileSearchPathListComponent(); - /** Destructor. */ - ~FileSearchPathListComponent() override; - //============================================================================== /** Returns the path as it is currently shown. */ const FileSearchPath& getPath() const noexcept { return path; } diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index 048fc9f70b..3b0c6dd3ff 100644 --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -1430,7 +1430,7 @@ private: //============================================================================== struct ComBaseModule { - ComBaseModule() {} + ComBaseModule() = default; ComBaseModule (LPCWSTR libraryName) : h (::LoadLibrary (libraryName)) {} ComBaseModule (ComBaseModule&& o) : h (o.h) { o.h = nullptr; } ~ComBaseModule() { release(); }