From 9da4d4131ca42adb1ec7b4b741e1c8cf38e63769 Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 14 Jun 2018 14:54:32 +0100 Subject: [PATCH] Increased shadowing warning level, and fixed a few warnings that were generated --- .../DemoRunner.xcodeproj/project.pbxproj | 4 +- examples/DemoRunner/DemoRunner.jucer | 2 +- .../MacOSX/Projucer.xcodeproj/project.pbxproj | 4 +- extras/Projucer/Projucer.jucer | 2 +- .../Components/jucer_ImageButtonHandler.h | 60 ++++++++----------- .../UnitTestRunner.xcodeproj/project.pbxproj | 4 +- extras/UnitTestRunner/UnitTestRunner.jucer | 2 +- .../properties/juce_TextPropertyComponent.cpp | 18 ++---- 8 files changed, 41 insertions(+), 55 deletions(-) diff --git a/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj b/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj index e9797ae5d8..1d4b060492 100644 --- a/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj +++ b/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj @@ -259,7 +259,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.demorunner; PRODUCT_NAME = "DemoRunner"; SDKROOT_ppc = macosx10.5; @@ -298,7 +298,7 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.demorunner; PRODUCT_NAME = "DemoRunner"; SDKROOT_ppc = macosx10.5; diff --git a/examples/DemoRunner/DemoRunner.jucer b/examples/DemoRunner/DemoRunner.jucer index 0b9b47eb54..485deb0533 100644 --- a/examples/DemoRunner/DemoRunner.jucer +++ b/examples/DemoRunner/DemoRunner.jucer @@ -30,7 +30,7 @@ diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index bc90023c6c..d4d0a0771a 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -833,7 +833,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; PRODUCT_NAME = "Projucer"; SDKROOT_ppc = macosx10.5; @@ -870,7 +870,7 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; PRODUCT_NAME = "Projucer"; SDKROOT_ppc = macosx10.5; diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index 98e27284f6..a4b6acd5da 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -8,7 +8,7 @@ diff --git a/extras/Projucer/Source/ComponentEditor/Components/jucer_ImageButtonHandler.h b/extras/Projucer/Source/ComponentEditor/Components/jucer_ImageButtonHandler.h index 7220377b3f..7e425d2386 100644 --- a/extras/Projucer/Source/ComponentEditor/Components/jucer_ImageButtonHandler.h +++ b/extras/Projucer/Source/ComponentEditor/Components/jucer_ImageButtonHandler.h @@ -170,11 +170,11 @@ public: } //============================================================================== - class ImageButtonResourceProperty : public ImageResourceProperty + class ImageButtonResourceProperty : public ImageResourceProperty { public: ImageButtonResourceProperty (ComponentLayout& layout_, ImageButton* const owner_, const ImageRole role_, const String& name) - : ImageResourceProperty (*layout_.getDocument(), owner_, name, true), + : ImageResourceProperty (*layout_.getDocument(), owner_, name, true), role (role_), layout (layout_) { @@ -195,29 +195,28 @@ public: ComponentLayout& layout; }; - class SetImageResourceAction : public ComponentUndoableAction + class SetImageResourceAction : public ComponentUndoableAction { public: SetImageResourceAction (ImageButton* const button, ComponentLayout& layout_, const ImageRole role_, const String& newResource_) - : ComponentUndoableAction (button, layout_), + : ComponentUndoableAction (button, layout_), newResource (newResource_), - role (role_), - layout (layout_) + role (role_) { oldResource = ImageButtonHandler::getImageResource (button, role_); } - bool perform() + bool perform() override { showCorrectTab(); ImageButtonHandler::setImageResource (layout, getComponent(), role, newResource, false); return true; } - bool undo() + bool undo() override { showCorrectTab(); ImageButtonHandler::setImageResource (layout, getComponent(), role, oldResource, false); @@ -227,7 +226,6 @@ public: private: String newResource, oldResource; const ImageRole role; - ComponentLayout& layout; }; //============================================================================== @@ -258,27 +256,26 @@ public: } //============================================================================== - class SetImageKeepsPropAction : public ComponentUndoableAction + class SetImageKeepsPropAction : public ComponentUndoableAction { public: SetImageKeepsPropAction (ImageButton* const button, ComponentLayout& layout_, const bool newState_) - : ComponentUndoableAction (button, layout_), - newState (newState_), - layout (layout_) + : ComponentUndoableAction (button, layout_), + newState (newState_) { oldState = ImageButtonHandler::doesImageKeepProportions (button); } - bool perform() + bool perform() override { showCorrectTab(); ImageButtonHandler::setImageKeepProportions (layout, getComponent(), newState, false); return true; } - bool undo() + bool undo() override { showCorrectTab(); ImageButtonHandler::setImageKeepProportions (layout, getComponent(), oldState, false); @@ -287,7 +284,6 @@ public: private: bool newState, oldState; - ComponentLayout& layout; }; static bool doesImageKeepProportions (ImageButton* button) @@ -309,12 +305,12 @@ public: } } - class ImageButtonProportionProperty : public ComponentBooleanProperty + class ImageButtonProportionProperty : public ComponentBooleanProperty { public: ImageButtonProportionProperty (ComponentLayout& layout_, ImageButton* const owner_) - : ComponentBooleanProperty ("proportional", "maintain image proportions", "scale to fit", - owner_, *layout_.getDocument()), + : ComponentBooleanProperty ("proportional", "maintain image proportions", "scale to fit", + owner_, *layout_.getDocument()), layout (layout_) { } @@ -334,29 +330,28 @@ public: }; //============================================================================== - class SetImageOpacityAction : public ComponentUndoableAction + class SetImageOpacityAction : public ComponentUndoableAction { public: SetImageOpacityAction (ImageButton* const button, ComponentLayout& layout_, const ImageRole role_, const float newState_) - : ComponentUndoableAction (button, layout_), + : ComponentUndoableAction (button, layout_), role (role_), - newState (newState_), - layout (layout_) + newState (newState_) { oldState = ImageButtonHandler::getImageOpacity (button, role_); } - bool perform() + bool perform() override { showCorrectTab(); ImageButtonHandler::setImageOpacity (layout, getComponent(), role, newState, false); return true; } - bool undo() + bool undo() override { showCorrectTab(); ImageButtonHandler::setImageOpacity (layout, getComponent(), role, oldState, false); @@ -366,7 +361,6 @@ public: private: const ImageRole role; float newState, oldState; - ComponentLayout& layout; }; static float getImageOpacity (ImageButton* button, const ImageRole role) @@ -400,12 +394,12 @@ public: { } - void setValue (double newValue) + void setValue (double newValue) override { setImageOpacity (layout, owner, role, (float) newValue, true); } - double getValue() const + double getValue() const override { return getImageOpacity (owner, role); } @@ -417,7 +411,7 @@ public: }; //============================================================================== - class SetImageColourAction : public ComponentUndoableAction + class SetImageColourAction : public ComponentUndoableAction { public: SetImageColourAction (ImageButton* const button, @@ -426,20 +420,19 @@ public: Colour newState_) : ComponentUndoableAction (button, layout_), role (role_), - newState (newState_), - layout (layout_) + newState (newState_) { oldState = ImageButtonHandler::getImageColour (button, role_); } - bool perform() + bool perform() override { showCorrectTab(); ImageButtonHandler::setImageColour (layout, getComponent(), role, newState, false); return true; } - bool undo() + bool undo() override { showCorrectTab(); ImageButtonHandler::setImageColour (layout, getComponent(), role, oldState, false); @@ -449,7 +442,6 @@ public: private: const ImageRole role; Colour newState, oldState; - ComponentLayout& layout; }; static Colour getImageColour (ImageButton* button, const ImageRole role) diff --git a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj index 9f56abe0d8..ed3ed3514b 100644 --- a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj +++ b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj @@ -200,7 +200,7 @@ INSTALL_PATH = "/usr/bin"; MACOSX_DEPLOYMENT_TARGET = 10.10; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; PRODUCT_BUNDLE_IDENTIFIER = com.roli.UnitTestRunner; PRODUCT_NAME = "UnitTestRunner"; SDKROOT_ppc = macosx10.5; @@ -236,7 +236,7 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.10; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; PRODUCT_BUNDLE_IDENTIFIER = com.roli.UnitTestRunner; PRODUCT_NAME = "UnitTestRunner"; SDKROOT_ppc = macosx10.5; diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer index 1d1f36b3ed..c919765f91 100644 --- a/extras/UnitTestRunner/UnitTestRunner.jucer +++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -9,7 +9,7 @@ - getTextValue().referTo (valueToControl); } -TextPropertyComponent::TextPropertyComponent (ValueWithDefault& valueToControl, - const String& name, - int maxNumChars, - bool isMultiLine, - bool isEditable) - : TextPropertyComponent (name, maxNumChars, isMultiLine, isEditable) +TextPropertyComponent::TextPropertyComponent (ValueWithDefault& valueToControl, const String& name, + int maxNumChars, bool multiLine, bool isEditable) + : TextPropertyComponent (name, maxNumChars, multiLine, isEditable) { textEditor->getTextValue().referTo (Value (new RemapperValueSourceWithDefault (valueToControl))); textEditor->setTextToDisplayWhenEmpty (valueToControl.getDefault(), 0.5f);