From d36156c620c03246f9ec00d2c5cf66fc5fce238c Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 21 Apr 2017 11:15:07 +0100 Subject: [PATCH] Removed some extraneous semicolons --- .../audio_play_head/juce_AudioPlayHead.h | 8 ++++---- .../processors/juce_AudioProcessor.h | 6 +++--- modules/juce_core/containers/juce_Variant.cpp | 16 ++++++++-------- modules/juce_core/text/juce_StringPairArray.h | 2 +- .../juce_gui_basics/components/juce_Component.h | 6 +++--- .../drawables/juce_DrawableShape.h | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h b/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h index 8289be5aaf..73e3ab22fe 100644 --- a/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h +++ b/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h @@ -141,14 +141,14 @@ public: virtual bool getCurrentPosition (CurrentPositionInfo& result) = 0; /** Returns true if this object can control the transport. */ - virtual bool canControlTransport() { return false; }; + virtual bool canControlTransport() { return false; } /** Starts or stops the audio. */ - virtual void transportPlay (bool shouldStartPlaying) { ignoreUnused (shouldStartPlaying); }; + virtual void transportPlay (bool shouldStartPlaying) { ignoreUnused (shouldStartPlaying); } /** Starts or stops recording the audio. */ - virtual void transportRecord (bool shouldStartRecording) { ignoreUnused (shouldStartRecording); }; + virtual void transportRecord (bool shouldStartRecording) { ignoreUnused (shouldStartRecording); } /** Rewinds the audio. */ - virtual void transportRewind() {}; + virtual void transportRewind() {} }; diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h index 5903e38f5e..281203958e 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h @@ -1309,8 +1309,8 @@ public: These functions are deprecated: use the methods provided in the AudioChannelSet class. */ - JUCE_DEPRECATED_WITH_BODY (const String getInputSpeakerArrangement() const noexcept, { return cachedInputSpeakerArrString; }); - JUCE_DEPRECATED_WITH_BODY (const String getOutputSpeakerArrangement() const noexcept, { return cachedOutputSpeakerArrString; }); + JUCE_DEPRECATED_WITH_BODY (const String getInputSpeakerArrangement() const noexcept, { return cachedInputSpeakerArrString; }) + JUCE_DEPRECATED_WITH_BODY (const String getOutputSpeakerArrangement() const noexcept, { return cachedOutputSpeakerArrString; }) /** Returns the name of one of the processor's input channels. @@ -1558,7 +1558,7 @@ private: void processBypassed (AudioBuffer&, MidiBuffer&); // This method is no longer used - you can delete it from your AudioProcessor classes. - JUCE_DEPRECATED_WITH_BODY (virtual bool silenceInProducesSilenceOut() const, { return false; }); + JUCE_DEPRECATED_WITH_BODY (virtual bool silenceInProducesSilenceOut() const, { return false; }) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioProcessor) }; diff --git a/modules/juce_core/containers/juce_Variant.cpp b/modules/juce_core/containers/juce_Variant.cpp index 2e1a479b58..29c8706527 100644 --- a/modules/juce_core/containers/juce_Variant.cpp +++ b/modules/juce_core/containers/juce_Variant.cpp @@ -113,8 +113,8 @@ public: VariantType_Int() noexcept {} static const VariantType_Int instance; - int toInt (const ValueUnion& data) const noexcept override { return data.intValue; }; - int64 toInt64 (const ValueUnion& data) const noexcept override { return (int64) data.intValue; }; + int toInt (const ValueUnion& data) const noexcept override { return data.intValue; } + int64 toInt64 (const ValueUnion& data) const noexcept override { return (int64) data.intValue; } double toDouble (const ValueUnion& data) const noexcept override { return (double) data.intValue; } String toString (const ValueUnion& data) const override { return String (data.intValue); } bool toBool (const ValueUnion& data) const noexcept override { return data.intValue != 0; } @@ -143,8 +143,8 @@ public: VariantType_Int64() noexcept {} static const VariantType_Int64 instance; - int toInt (const ValueUnion& data) const noexcept override { return (int) data.int64Value; }; - int64 toInt64 (const ValueUnion& data) const noexcept override { return data.int64Value; }; + int toInt (const ValueUnion& data) const noexcept override { return (int) data.int64Value; } + int64 toInt64 (const ValueUnion& data) const noexcept override { return data.int64Value; } double toDouble (const ValueUnion& data) const noexcept override { return (double) data.int64Value; } String toString (const ValueUnion& data) const override { return String (data.int64Value); } bool toBool (const ValueUnion& data) const noexcept override { return data.int64Value != 0; } @@ -173,8 +173,8 @@ public: VariantType_Double() noexcept {} static const VariantType_Double instance; - int toInt (const ValueUnion& data) const noexcept override { return (int) data.doubleValue; }; - int64 toInt64 (const ValueUnion& data) const noexcept override { return (int64) data.doubleValue; }; + int toInt (const ValueUnion& data) const noexcept override { return (int) data.doubleValue; } + int64 toInt64 (const ValueUnion& data) const noexcept override { return (int64) data.doubleValue; } double toDouble (const ValueUnion& data) const noexcept override { return data.doubleValue; } String toString (const ValueUnion& data) const override { return String (data.doubleValue, 20); } bool toBool (const ValueUnion& data) const noexcept override { return data.doubleValue != 0; } @@ -200,8 +200,8 @@ public: VariantType_Bool() noexcept {} static const VariantType_Bool instance; - int toInt (const ValueUnion& data) const noexcept override { return data.boolValue ? 1 : 0; }; - int64 toInt64 (const ValueUnion& data) const noexcept override { return data.boolValue ? 1 : 0; }; + int toInt (const ValueUnion& data) const noexcept override { return data.boolValue ? 1 : 0; } + int64 toInt64 (const ValueUnion& data) const noexcept override { return data.boolValue ? 1 : 0; } double toDouble (const ValueUnion& data) const noexcept override { return data.boolValue ? 1.0 : 0.0; } String toString (const ValueUnion& data) const override { return String::charToString (data.boolValue ? (juce_wchar) '1' : (juce_wchar) '0'); } bool toBool (const ValueUnion& data) const noexcept override { return data.boolValue; } diff --git a/modules/juce_core/text/juce_StringPairArray.h b/modules/juce_core/text/juce_StringPairArray.h index f222f99bdc..a47747c36b 100644 --- a/modules/juce_core/text/juce_StringPairArray.h +++ b/modules/juce_core/text/juce_StringPairArray.h @@ -96,7 +96,7 @@ public: const StringArray& getAllValues() const noexcept { return values; } /** Returns the number of strings in the array */ - inline int size() const noexcept { return keys.size(); }; + inline int size() const noexcept { return keys.size(); } //============================================================================== diff --git a/modules/juce_gui_basics/components/juce_Component.h b/modules/juce_gui_basics/components/juce_Component.h index 8f91a31451..9c4827401b 100644 --- a/modules/juce_gui_basics/components/juce_Component.h +++ b/modules/juce_gui_basics/components/juce_Component.h @@ -2228,18 +2228,18 @@ public: /** Returns the object that was set by setCachedComponentImage(). @see setCachedComponentImage */ - CachedComponentImage* getCachedComponentImage() const noexcept { return cachedImage; } + CachedComponentImage* getCachedComponentImage() const noexcept { return cachedImage; } /** Sets a flag to indicate whether mouse drag events on this Component should be ignored when it is inside a Viewport with drag-to-scroll functionality enabled. This is useful for Components such as sliders that should not move their parent Viewport when dragged. */ - void setViewportIgnoreDragFlag (bool ignoreDrag) noexcept { flags.viewportIgnoreDragFlag = ignoreDrag; }; + void setViewportIgnoreDragFlag (bool ignoreDrag) noexcept { flags.viewportIgnoreDragFlag = ignoreDrag; } /** Retrieves the current state of the Viewport drag-to-scroll functionality flag. @see setViewportIgnoreDragFlag */ - bool getViewportIgnoreDragFlag() const noexcept { return flags.viewportIgnoreDragFlag; } + bool getViewportIgnoreDragFlag() const noexcept { return flags.viewportIgnoreDragFlag; } //============================================================================== // These methods are deprecated - use localPointToGlobal, getLocalPoint, getLocalPoint, etc instead. diff --git a/modules/juce_gui_basics/drawables/juce_DrawableShape.h b/modules/juce_gui_basics/drawables/juce_DrawableShape.h index 7e8d6eed55..d29438d21e 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableShape.h +++ b/modules/juce_gui_basics/drawables/juce_DrawableShape.h @@ -125,7 +125,7 @@ public: void setDashLengths (const Array& newDashLengths); /** Returns the set of dash lengths that the path is using. */ - const Array& getDashLengths() const noexcept { return dashLengths; }; + const Array& getDashLengths() const noexcept { return dashLengths; } //============================================================================== /** @internal */