diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index e4236dd805..47953eb7e6 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -1873,7 +1873,7 @@ HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; - OTHER_CPLUSPLUSFLAGS = "-W -Wall -Wshadow -Wno-missing-field-initializers -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32 -Wstrict-aliasing"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing"; INSTALL_PATH = "$(HOME)/Applications"; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -1894,7 +1894,7 @@ HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 3; INFOPLIST_FILE = Info.plist; - OTHER_CPLUSPLUSFLAGS = "-W -Wall -Wshadow -Wno-missing-field-initializers -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32 -Wstrict-aliasing"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing"; INSTALL_PATH = "$(HOME)/Applications"; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; MACOSX_DEPLOYMENT_TARGET = 10.5; diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer index 25445d3f0e..d30648ee9a 100644 --- a/extras/Introjucer/Introjucer.jucer +++ b/extras/Introjucer/Introjucer.jucer @@ -15,7 +15,7 @@ + bigIcon="rVgowdy" extraCompilerFlags="-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing"> diff --git a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj index 64d04c95da..77f66ef572 100644 --- a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj @@ -2071,7 +2071,7 @@ HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wshadow -Wshorten-64-to-32"; INSTALL_PATH = "$(HOME)/Applications"; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -2093,7 +2093,7 @@ HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wshadow -Wshorten-64-to-32"; INSTALL_PATH = "$(HOME)/Applications"; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; MACOSX_DEPLOYMENT_TARGET = 10.5; diff --git a/extras/JuceDemo/Juce Demo.jucer b/extras/JuceDemo/Juce Demo.jucer index 979d06d7da..60de0dc1a9 100644 --- a/extras/JuceDemo/Juce Demo.jucer +++ b/extras/JuceDemo/Juce Demo.jucer @@ -12,7 +12,7 @@ + extraCompilerFlags="-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wshadow -Wshorten-64-to-32"> & contentArea) + void contentAreaChanged (const Rectangle& newArea) { - comboBox.setSize (contentArea.getWidth() - 2, - jmin (contentArea.getHeight() - 2, 22)); + comboBox.setSize (newArea.getWidth() - 2, + jmin (newArea.getHeight() - 2, 22)); - comboBox.setCentrePosition (contentArea.getCentreX(), contentArea.getCentreY()); + comboBox.setCentrePosition (newArea.getCentreX(), newArea.getCentreY()); } private: diff --git a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h index afa5b3e087..706584700a 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h +++ b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h @@ -350,8 +350,8 @@ public: /** Creates a pointer from some raw data in the appropriate format with the specified number of interleaved channels. For non-interleaved data, use the other constructor. */ - Pointer (typename Constness::VoidType* sourceData, int numInterleavedChannels) noexcept - : InterleavingType (numInterleavedChannels), data (Constness::toVoidPtr (sourceData)) + Pointer (typename Constness::VoidType* sourceData, int numInterleaved) noexcept + : InterleavingType (numInterleaved), data (Constness::toVoidPtr (sourceData)) { } diff --git a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp index 1687ea9aac..cc5f1025b5 100644 --- a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp @@ -792,8 +792,8 @@ private: class MemoryMappedAiffReader : public MemoryMappedAudioFormatReader { public: - MemoryMappedAiffReader (const File& file, const AiffAudioFormatReader& reader) - : MemoryMappedAudioFormatReader (file, reader, reader.dataChunkStart, + MemoryMappedAiffReader (const File& f, const AiffAudioFormatReader& reader) + : MemoryMappedAudioFormatReader (f, reader, reader.dataChunkStart, reader.bytesPerFrame * reader.lengthInSamples, reader.bytesPerFrame), littleEndian (reader.littleEndian) { diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp b/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp index 2a5f7cf7d3..08527fae2b 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp +++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp @@ -188,9 +188,9 @@ class AudioFormatWriter::ThreadedWriter::Buffer : public AbstractFifo, private TimeSliceClient { public: - Buffer (TimeSliceThread& tst, AudioFormatWriter* w, int channels, int bufferSize) - : AbstractFifo (bufferSize), - buffer (channels, bufferSize), + Buffer (TimeSliceThread& tst, AudioFormatWriter* w, int channels, int numSamples) + : AbstractFifo (numSamples), + buffer (channels, numSamples), timeSliceThread (tst), writer (w), receiver (nullptr), diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp index e90518ddba..a400614e3c 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp +++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp @@ -25,12 +25,12 @@ PluginListComponent::PluginListComponent (AudioPluginFormatManager& manager, KnownPluginList& listToEdit, const File& deadMansPedal, - PropertiesFile* const properties) + PropertiesFile* const props) : formatManager (manager), list (listToEdit), deadMansPedalFile (deadMansPedal), optionsButton ("Options..."), - propertiesToUse (properties), + propertiesToUse (props), numThreads (0) { listBox.setModel (this); diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp index 00dc417ecc..0e1d5a52c3 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp @@ -460,14 +460,14 @@ public: } #if JUCE_DEBUG || JUCE_LOG_ASSERTIONS - void componentBeingDeleted (Component& component) override + void componentBeingDeleted (Component& c) override { /* You must call detach() or delete your OpenGLContext to remove it from a component BEFORE deleting the component that it is using! */ jassertfalse; - ComponentMovementWatcher::componentBeingDeleted (component); + ComponentMovementWatcher::componentBeingDeleted (c); } #endif diff --git a/modules/juce_opengl/opengl/juce_OpenGLImage.cpp b/modules/juce_opengl/opengl/juce_OpenGLImage.cpp index 256caa0c3a..5738fa55ec 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLImage.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLImage.cpp @@ -25,8 +25,8 @@ class OpenGLFrameBufferImage : public ImagePixelData { public: - OpenGLFrameBufferImage (OpenGLContext& context_, int width, int height) - : ImagePixelData (Image::ARGB, width, height), + OpenGLFrameBufferImage (OpenGLContext& context_, int w, int h) + : ImagePixelData (Image::ARGB, w, h), context (context_), pixelStride (4), lineStride (width * pixelStride)