diff --git a/extras/AudioPluginHost/JuceLibraryCode/BinaryData.cpp b/extras/AudioPluginHost/JuceLibraryCode/BinaryData.cpp index 07ae322ad1..de10104fc5 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/BinaryData.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/BinaryData.cpp @@ -660,7 +660,8 @@ const char* JUCEAppIcon_png = (const char*) temp_binary_data_0; const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) { unsigned int hash = 0; - if (resourceNameUTF8 != 0) + + if (resourceNameUTF8 != nullptr) while (*resourceNameUTF8 != 0) hash = 31 * hash + (unsigned int) *resourceNameUTF8++; diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/BinaryData.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/BinaryData.cpp index b2aadd3b0e..40913a3d38 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/BinaryData.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/BinaryData.cpp @@ -660,7 +660,8 @@ const char* juce_icon_png = (const char*) temp_binary_data_0; const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) { unsigned int hash = 0; - if (resourceNameUTF8 != 0) + + if (resourceNameUTF8 != nullptr) while (*resourceNameUTF8 != 0) hash = 31 * hash + (unsigned int) *resourceNameUTF8++; diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index e6a03e5f26..fafb894a96 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -3233,7 +3233,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - 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"; + 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 -Wzero-as-null-pointer-constant"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; PRODUCT_NAME = "Projucer"; SDKROOT_ppc = macosx10.5; @@ -3280,7 +3280,7 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - 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"; + 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 -Wzero-as-null-pointer-constant"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; PRODUCT_NAME = "Projucer"; SDKROOT_ppc = macosx10.5; diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp index 2d3d297e11..c05afdfc17 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp @@ -7773,7 +7773,8 @@ const char* RecentFilesMenuTemplate_nib = (const char*) temp_binary_data_61; const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) { unsigned int hash = 0; - if (resourceNameUTF8 != 0) + + if (resourceNameUTF8 != nullptr) while (*resourceNameUTF8 != 0) hash = 31 * hash + (unsigned int) *resourceNameUTF8++; diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index 48fa11dd26..22b65a3121 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -8,7 +8,7 @@ diff --git a/extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.cpp b/extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.cpp index 45624392fa..249bdb83ed 100644 --- a/extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.cpp +++ b/extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.cpp @@ -200,7 +200,7 @@ bool ComponentTypeHandler::restoreFromXml (const XmlElement& xml, RelativePositionedRectangle rpr; rpr.restoreFromXml (xml, currentPos); - jassert (layout != 0); + jassert (layout != nullptr); setComponentPosition (comp, rpr, layout); if (SettableTooltipClient* const ttc = dynamic_cast (comp)) diff --git a/extras/Projucer/Source/ComponentEditor/Components/jucer_JucerComponentHandler.h b/extras/Projucer/Source/ComponentEditor/Components/jucer_JucerComponentHandler.h index 9a5827bdae..cceb7735ef 100644 --- a/extras/Projucer/Source/ComponentEditor/Components/jucer_JucerComponentHandler.h +++ b/extras/Projucer/Source/ComponentEditor/Components/jucer_JucerComponentHandler.h @@ -43,7 +43,7 @@ public: Component* createNewComponent (JucerDocument* doc) override { - return new TestComponent (doc, 0, false); + return new TestComponent (doc, nullptr, false); } String getXmlTagName() const noexcept override { return "JUCERCOMP"; } @@ -61,7 +61,7 @@ public: bool restoreFromXml (const XmlElement& xml, Component* comp, const ComponentLayout* layout) override { - TestComponent* const tc = dynamic_cast (comp); + auto tc = dynamic_cast (comp); if (! ComponentTypeHandler::restoreFromXml (xml, comp, layout)) return false; @@ -74,11 +74,11 @@ public: String getClassName (Component* comp) const override { - TestComponent* const tc = dynamic_cast (comp); + auto tc = dynamic_cast (comp); String jucerCompClassName; - if (tc->getDocument() != 0) + if (tc->getDocument() != nullptr) jucerCompClassName = tc->getDocument()->getClassName(); if (jucerCompClassName.isEmpty()) @@ -95,7 +95,7 @@ public: if (multipleSelected) return; - if (auto* const tc = dynamic_cast (component)) + if (auto tc = dynamic_cast (component)) { props.add (new JucerCompFileProperty (tc, document)); props.add (new ConstructorParamsProperty (tc, document)); @@ -112,7 +112,7 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - if (TestComponent* const tc = dynamic_cast (component)) + if (auto tc = dynamic_cast (component)) code.includeFilesH.add (tc->findFile().withFileExtension (".h")); else jassertfalse; diff --git a/extras/Projucer/Source/ComponentEditor/Components/jucer_SliderHandler.h b/extras/Projucer/Source/ComponentEditor/Components/jucer_SliderHandler.h index 25c5fc7307..1b9ac348e7 100644 --- a/extras/Projucer/Source/ComponentEditor/Components/jucer_SliderHandler.h +++ b/extras/Projucer/Source/ComponentEditor/Components/jucer_SliderHandler.h @@ -614,8 +614,8 @@ private: String getText() const override { - Slider* s = dynamic_cast (component); - jassert (s != 0); + auto s = dynamic_cast (component); + jassert (s != nullptr); return String (s->getSkewFactor()); } diff --git a/extras/Projucer/Source/ComponentEditor/Components/jucer_TabbedComponentHandler.h b/extras/Projucer/Source/ComponentEditor/Components/jucer_TabbedComponentHandler.h index b7e97d4d8b..2472bda42d 100644 --- a/extras/Projucer/Source/ComponentEditor/Components/jucer_TabbedComponentHandler.h +++ b/extras/Projucer/Source/ComponentEditor/Components/jucer_TabbedComponentHandler.h @@ -264,15 +264,15 @@ public: //============================================================================== static bool isTabUsingJucerComp (TabbedComponent* tc, int tabIndex) { - TabDemoContentComp* const tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); + auto tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); jassert (tdc != nullptr); - return tdc != 0 && tdc->isUsingJucerComp; + return tdc != nullptr && tdc->isUsingJucerComp; } static void setTabUsingJucerComp (TabbedComponent* tc, int tabIndex, const bool b) { - TabDemoContentComp* const tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); + auto tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); jassert (tdc != nullptr); if (tdc != nullptr) @@ -284,10 +284,10 @@ public: static String getTabClassName (TabbedComponent* tc, int tabIndex) { - TabDemoContentComp* const tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); + auto tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); jassert (tdc != nullptr); - return tdc != 0 ? tdc->contentClassName : String(); + return tdc != nullptr ? tdc->contentClassName : String(); } static void setTabClassName (TabbedComponent* tc, int tabIndex, const String& newName) @@ -304,15 +304,15 @@ public: static String getTabConstructorParams (TabbedComponent* tc, int tabIndex) { - TabDemoContentComp* const tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); + auto tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); jassert (tdc != nullptr); - return tdc != 0 ? tdc->constructorParams : String(); + return tdc != nullptr ? tdc->constructorParams : String(); } static void setTabConstructorParams (TabbedComponent* tc, int tabIndex, const String& newParams) { - TabDemoContentComp* const tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); + auto tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); jassert (tdc != nullptr); if (tdc != nullptr) @@ -324,15 +324,15 @@ public: static String getTabJucerFile (TabbedComponent* tc, int tabIndex) { - TabDemoContentComp* const tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); + auto tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); jassert (tdc != nullptr); - return tdc != 0 ? tdc->jucerComponentFile : String(); + return tdc != nullptr ? tdc->jucerComponentFile : String(); } static void setTabJucerFile (TabbedComponent* tc, int tabIndex, const String& newFile) { - TabDemoContentComp* const tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); + auto tdc = dynamic_cast (tc->getTabContentComponent (tabIndex)); jassert (tdc != nullptr); if (tdc != nullptr) @@ -380,7 +380,7 @@ private: { jucerComp.reset(); - jucerComp.reset (new TestComponent (ComponentTypeHandler::findParentDocument (this), 0, false)); + jucerComp.reset (new TestComponent (ComponentTypeHandler::findParentDocument (this), nullptr, false)); jucerComp->setFilename (jucerComponentFile); jucerComp->setToInitialSize(); diff --git a/extras/Projucer/Source/ComponentEditor/Components/jucer_TextEditorHandler.h b/extras/Projucer/Source/ComponentEditor/Components/jucer_TextEditorHandler.h index 550d0d85f0..0298e53618 100644 --- a/extras/Projucer/Source/ComponentEditor/Components/jucer_TextEditorHandler.h +++ b/extras/Projucer/Source/ComponentEditor/Components/jucer_TextEditorHandler.h @@ -115,8 +115,8 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - TextEditor* const te = dynamic_cast (component); - jassert (te != 0); + auto te = dynamic_cast (component); + jassert (te != nullptr); String s; s << memberVariableName << "->setMultiLine (" << CodeHelpers::boolLiteral (te->isMultiLine()) << ");\n" diff --git a/extras/Projucer/Source/ComponentEditor/Components/jucer_ViewportHandler.h b/extras/Projucer/Source/ComponentEditor/Components/jucer_ViewportHandler.h index 955cc19e74..167706dbae 100644 --- a/extras/Projucer/Source/ComponentEditor/Components/jucer_ViewportHandler.h +++ b/extras/Projucer/Source/ComponentEditor/Components/jucer_ViewportHandler.h @@ -188,7 +188,7 @@ public: if (getViewportContentType (vp) == 1) { JucerDocument* doc = findParentDocument (vp); - TestComponent* tc = new TestComponent (doc, 0, false); + auto tc = new TestComponent (doc, nullptr, false); tc->setFilename (getViewportJucerComponentFile (vp)); tc->setToInitialSize(); diff --git a/extras/Projucer/Source/ComponentEditor/Documents/jucer_ButtonDocument.h b/extras/Projucer/Source/ComponentEditor/Documents/jucer_ButtonDocument.h index 106788736b..6bb89e486c 100644 --- a/extras/Projucer/Source/ComponentEditor/Documents/jucer_ButtonDocument.h +++ b/extras/Projucer/Source/ComponentEditor/Documents/jucer_ButtonDocument.h @@ -50,7 +50,7 @@ public: int chooseBestEnabledPaintRoutine (int paintRoutineWanted) const; - ComponentLayout* getComponentLayout() const { return 0; } + ComponentLayout* getComponentLayout() const { return nullptr; } void addExtraClassProperties (PropertyPanel&); diff --git a/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementPath.cpp b/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementPath.cpp index 35384cbe26..feaeff4400 100644 --- a/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementPath.cpp +++ b/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementPath.cpp @@ -328,7 +328,7 @@ void PaintElementPath::mouseDrag (const MouseEvent& e) void PaintElementPath::mouseUp (const MouseEvent& e) { - if (points [mouseDownOnSegment] == 0) + if (points[mouseDownOnSegment] == nullptr) ColouredElement::mouseUp (e); else owner->getSelectedPoints().addToSelectionOnMouseUp (points [mouseDownOnSegment], diff --git a/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementUndoableAction.h b/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementUndoableAction.h index 16a322e796..6421dba1bf 100644 --- a/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementUndoableAction.h +++ b/extras/Projucer/Source/ComponentEditor/PaintElements/jucer_PaintElementUndoableAction.h @@ -38,7 +38,7 @@ public: : routine (*element->getOwner()), elementIndex (element->getOwner()->indexOfElement (element)) { - jassert (element != 0); + jassert (element != nullptr); if (elementIndex < 0) findGroupIndices (element->getOwner(), element); @@ -50,28 +50,27 @@ public: { if (containerGroups.size() > 0) { - PaintElementGroup* group = 0; - group = dynamic_cast (routine.getElement (containerGroups.getFirst())); + auto group = dynamic_cast (routine.getElement (containerGroups.getFirst())); - if (group == 0) - return 0; + if (group == nullptr) + return nullptr; for (int i = 1; i < containerGroups.size(); ++i) { group = dynamic_cast (group->getElement (containerGroups.getUnchecked(i))); - if (group == 0) - return 0; + if (group == nullptr) + return nullptr; } - ElementType* const e = dynamic_cast (group->getElement (elementIndex)); - jassert (e != 0); + auto e = dynamic_cast (group->getElement (elementIndex)); + jassert (e != nullptr); return e; } else { - ElementType* const e = dynamic_cast (routine.getElement (elementIndex)); - jassert (e != 0); + auto e = dynamic_cast (routine.getElement (elementIndex)); + jassert (e != nullptr); return e; } } @@ -104,12 +103,13 @@ private: { for (int i = pr->getNumElements(); --i >= 0;) { - PaintElementGroup* const pg = dynamic_cast (pr->getElement (i)); - - if (pg != 0 && pg->containsElement (element)) + if (auto pg = dynamic_cast (pr->getElement (i))) { - containerGroups.add (i); - findGroupIndices (pg, element); + if (pg->containsElement (element)) + { + containerGroups.add (i); + findGroupIndices (pg, element); + } } } } @@ -122,12 +122,13 @@ private: { for (int i = group->getNumElements(); --i >= 0;) { - PaintElementGroup* pg = dynamic_cast (group->getElement (i)); - - if (pg != 0 && pg->containsElement (element)) + if (auto pg = dynamic_cast (group->getElement (i))) { - containerGroups.add (i); - findGroupIndices (pg, element); + if (pg->containsElement (element)) + { + containerGroups.add (i); + findGroupIndices (pg, element); + } } } } diff --git a/extras/Projucer/Source/ComponentEditor/Properties/jucer_PositionPropertyBase.h b/extras/Projucer/Source/ComponentEditor/Properties/jucer_PositionPropertyBase.h index 3c3cbd4044..f497314a41 100644 --- a/extras/Projucer/Source/ComponentEditor/Properties/jucer_PositionPropertyBase.h +++ b/extras/Projucer/Source/ComponentEditor/Properties/jucer_PositionPropertyBase.h @@ -343,9 +343,9 @@ public: Rectangle parentArea; - if (component->findParentComponentOfClass() != 0) + if (component->findParentComponentOfClass() != nullptr) parentArea.setSize (component->getParentWidth(), component->getParentHeight()); - else if (PaintRoutineEditor* pre = dynamic_cast (component->getParentComponent())) + else if (auto pre = dynamic_cast (component->getParentComponent())) parentArea = pre->getComponentArea(); else jassertfalse; diff --git a/extras/Projucer/Source/ComponentEditor/UI/jucer_ComponentLayoutEditor.cpp b/extras/Projucer/Source/ComponentEditor/UI/jucer_ComponentLayoutEditor.cpp index 1895f5d441..4b079ecdc2 100644 --- a/extras/Projucer/Source/ComponentEditor/UI/jucer_ComponentLayoutEditor.cpp +++ b/extras/Projucer/Source/ComponentEditor/UI/jucer_ComponentLayoutEditor.cpp @@ -220,16 +220,16 @@ void ComponentLayoutEditor::refreshAllComponents() for (int i = layout.getNumComponents(); --i >= 0;) { - Component* const c = layout.getComponent (i); + auto c = layout.getComponent (i); jassert (c != nullptr); - ComponentOverlayComponent* overlay = getOverlayCompFor (c); + auto overlay = getOverlayCompFor (c); bool isNewOverlay = false; - if (overlay == 0) + if (overlay == nullptr) { - ComponentTypeHandler* const handler = ComponentTypeHandler::getHandlerFor (*c); + auto handler = ComponentTypeHandler::getHandlerFor (*c); jassert (handler != nullptr); overlay = handler->createOverlayComponent (c, layout); @@ -272,7 +272,7 @@ void ComponentLayoutEditor::mouseDown (const MouseEvent& e) { if (e.mods.isPopupMenu()) { - ApplicationCommandManager* commandManager = &ProjucerApplication::getCommandManager(); + auto commandManager = &ProjucerApplication::getCommandManager(); PopupMenu m; diff --git a/extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp b/extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp index 9aab594341..b75b38d52c 100644 --- a/extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp +++ b/extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp @@ -197,7 +197,7 @@ private: { public: ComponentClassNameProperty (JucerDocument& doc) - : ComponentTextProperty ("Class name", 128, false, 0, doc) + : ComponentTextProperty ("Class name", 128, false, nullptr, doc) {} void setText (const String& newText) override { document.setClassName (newText); } @@ -209,7 +209,7 @@ private: { public: ComponentCompNameProperty (JucerDocument& doc) - : ComponentTextProperty ("Component name", 200, false, 0, doc) + : ComponentTextProperty ("Component name", 200, false, nullptr, doc) {} void setText (const String& newText) override { document.setComponentName (newText); } @@ -221,7 +221,7 @@ private: { public: ComponentParentClassesProperty (JucerDocument& doc) - : ComponentTextProperty ("Parent classes", 512, false, 0, doc) + : ComponentTextProperty ("Parent classes", 512, false, nullptr, doc) {} void setText (const String& newText) override { document.setParentClasses (newText); } @@ -233,7 +233,7 @@ private: { public: ComponentConstructorParamsProperty (JucerDocument& doc) - : ComponentTextProperty ("Constructor params", 2048, false, 0, doc) + : ComponentTextProperty ("Constructor params", 2048, false, nullptr, doc) {} void setText (const String& newText) override { document.setConstructorParams (newText); } @@ -245,7 +245,7 @@ private: { public: ComponentInitialisersProperty (JucerDocument& doc) - : ComponentTextProperty ("Member initialisers", 16384, true, 0, doc) + : ComponentTextProperty ("Member initialisers", 16384, true, nullptr, doc) { preferredHeight = 24 * 3; } @@ -260,9 +260,9 @@ private: { public: ComponentInitialSizeProperty (JucerDocument& doc, const bool isWidth_) - : ComponentTextProperty (isWidth_ ? "Initial width" - : "Initial height", - 10, false, 0, doc), + : ComponentTextProperty (isWidth_ ? "Initial width" + : "Initial height", + 10, false, nullptr, doc), isWidth (isWidth_) {} @@ -289,7 +289,7 @@ private: { public: FixedSizeProperty (JucerDocument& doc) - : ComponentChoiceProperty ("Fixed size", 0, doc) + : ComponentChoiceProperty ("Fixed size", nullptr, doc) { choices.add ("Resize component to fit workspace"); choices.add ("Keep component size fixed"); @@ -304,7 +304,7 @@ private: { public: TemplateFileProperty (JucerDocument& doc) - : ComponentTextProperty ("Template file", 2048, false, 0, doc) + : ComponentTextProperty ("Template file", 2048, false, nullptr, doc) {} void setText (const String& newText) override { document.setTemplateFile (newText); } @@ -394,7 +394,7 @@ void JucerDocumentEditor::updateTabs() for (int i = tabbedComponent.getNumTabs(); --i >= 0;) { - if (dynamic_cast (tabbedComponent.getTabContentComponent (i)) != 0 + if (dynamic_cast (tabbedComponent.getTabContentComponent (i)) != nullptr && ! paintRoutineNames.contains (tabbedComponent.getTabNames() [i])) { tabbedComponent.removeTab (i); @@ -485,11 +485,11 @@ void JucerDocumentEditor::showLayout() void JucerDocumentEditor::showGraphics (PaintRoutine* routine) { - if (getCurrentPaintRoutine() != routine || routine == 0) + if (getCurrentPaintRoutine() != routine || routine == nullptr) { for (int i = 0; i < tabbedComponent.getNumTabs(); ++i) { - if (PaintRoutinePanel* pr = dynamic_cast (tabbedComponent.getTabContentComponent (i))) + if (auto pr = dynamic_cast (tabbedComponent.getTabContentComponent (i))) { if (routine == &(pr->getPaintRoutine()) || routine == nullptr) { @@ -1029,7 +1029,7 @@ bool JucerDocumentEditor::perform (const InvocationInfo& info) break; case JucerCommandIDs::editCompGraphics: - showGraphics (0); + showGraphics (nullptr); break; case JucerCommandIDs::zoomIn: setZoom (snapToIntegerZoom (getZoom() * 2.0)); break; diff --git a/extras/Projucer/Source/ComponentEditor/UI/jucer_RelativePositionedRectangle.h b/extras/Projucer/Source/ComponentEditor/UI/jucer_RelativePositionedRectangle.h index 3c82b60837..545d4327d7 100644 --- a/extras/Projucer/Source/ComponentEditor/UI/jucer_RelativePositionedRectangle.h +++ b/extras/Projucer/Source/ComponentEditor/UI/jucer_RelativePositionedRectangle.h @@ -240,7 +240,7 @@ public: */ void updateFromComponent (const Component& comp) noexcept { - if (comp.getParentComponent() == 0 && ! comp.isOnDesktop()) + if (comp.getParentComponent() == nullptr && ! comp.isOnDesktop()) updateFrom (comp.getBounds(), Rectangle()); else updateFrom (comp.getBounds(), Rectangle (comp.getParentWidth(), comp.getParentHeight())); @@ -627,12 +627,12 @@ struct RelativePositionedRectangle int& x, int& xw, int& y, int& yh, int& w, int& h) const { - Component* rx = 0; - Component* ry = 0; - Component* rw = 0; - Component* rh = 0; + Component* rx = {}; + Component* ry = {}; + Component* rw = {}; + Component* rh = {}; - if (layout != 0) + if (layout != nullptr) { rx = layout->findComponentWithId (relativeToX); ry = layout->findComponentWithId (relativeToY); @@ -640,12 +640,12 @@ struct RelativePositionedRectangle rh = layout->findComponentWithId (relativeToH); } - x = parentArea.getX() + (rx != 0 ? rx->getX() : 0); - y = parentArea.getY() + (ry != 0 ? ry->getY() : 0); - w = rw != 0 ? rw->getWidth() : parentArea.getWidth(); - h = rh != 0 ? rh->getHeight() : parentArea.getHeight(); - xw = rx != 0 ? rx->getWidth() : parentArea.getWidth(); - yh = ry != 0 ? ry->getHeight() : parentArea.getHeight(); + x = parentArea.getX() + (rx != nullptr ? rx->getX() : 0); + y = parentArea.getY() + (ry != nullptr ? ry->getY() : 0); + w = rw != nullptr ? rw->getWidth() : parentArea.getWidth(); + h = rh != nullptr ? rh->getHeight() : parentArea.getHeight(); + xw = rx != nullptr ? rx->getWidth() : parentArea.getWidth(); + yh = ry != nullptr ? ry->getHeight() : parentArea.getHeight(); } Rectangle getRectangle (const Rectangle& parentArea, diff --git a/extras/Projucer/Source/ComponentEditor/jucer_ComponentLayout.cpp b/extras/Projucer/Source/ComponentEditor/jucer_ComponentLayout.cpp index 1d7b0bf97a..f3516b189b 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_ComponentLayout.cpp +++ b/extras/Projucer/Source/ComponentEditor/jucer_ComponentLayout.cpp @@ -502,11 +502,11 @@ void ComponentLayout::setComponentRelativeTarget (Component* comp, int whichDime jassert (comp != nullptr); jassert (pe != nullptr || components.contains (comp)); - jassert (compToBeRelativeTo == 0 || components.contains (compToBeRelativeTo)); - jassert (compToBeRelativeTo == 0 || ! dependsOnComponentForRelativePos (compToBeRelativeTo, comp)); + jassert (compToBeRelativeTo == nullptr || components.contains (compToBeRelativeTo)); + jassert (compToBeRelativeTo == nullptr || ! dependsOnComponentForRelativePos (compToBeRelativeTo, comp)); if (compToBeRelativeTo != getComponentRelativePosTarget (comp, whichDimension) - && (compToBeRelativeTo == 0 || ! dependsOnComponentForRelativePos (compToBeRelativeTo, comp))) + && (compToBeRelativeTo == nullptr || ! dependsOnComponentForRelativePos (compToBeRelativeTo, comp))) { const int64 compId = ComponentTypeHandler::getComponentId (compToBeRelativeTo); @@ -560,9 +560,9 @@ PopupMenu ComponentLayout::getRelativeTargetMenu (Component* comp, int whichDime { PopupMenu m; - Component* const current = getComponentRelativePosTarget (comp, whichDimension); + auto current = getComponentRelativePosTarget (comp, whichDimension); - m.addItem (menuIdBase, "Relative to parent component", true, current == 0); + m.addItem (menuIdBase, "Relative to parent component", true, current == nullptr); m.addSeparator(); for (int i = 0; i < components.size(); ++i) diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 1570373389..fe23945a41 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -179,7 +179,7 @@ void Project::initialiseMainGroup() if (! projectRoot.getChildWithName (Ids::MAINGROUP).isValid()) { Item mainGroup (*this, ValueTree (Ids::MAINGROUP), false); - projectRoot.addChild (mainGroup.state, 0, 0); + projectRoot.addChild (mainGroup.state, 0, nullptr); } getMainGroup().initialiseMissingProperties(); diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp index 2024ddd0de..b7caad55fb 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp @@ -743,7 +743,7 @@ void ProjectExporter::addNewConfigurationFromExisting (const BuildConfiguration& ValueTree newConfig (Ids::CONFIGURATION); newConfig = configToCopy.config.createCopy(); - newConfig.setProperty (Ids::name, configToCopy.getName(), 0); + newConfig.setProperty (Ids::name, configToCopy.getName(), nullptr); configs.appendChild (newConfig, project.getUndoManagerFor (configs)); } diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp index 68b28eca78..deb7c1f7a7 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp +++ b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp @@ -99,7 +99,7 @@ namespace CodeHelpers words.addTokens (s.retainCharacters (allowedChars), false); words.trim(); - String n (words[0]); + auto n = words[0]; if (capitalise) n = n.toLowerCase(); @@ -176,7 +176,7 @@ namespace CodeHelpers { for (int i = 0; i < lines.size(); ++i) { - String& line = lines.getReference (i); + auto& line = lines.getReference (i); if (line.length() > maxLineLength) { @@ -259,7 +259,7 @@ namespace CodeHelpers #define COL(col) #col, #include "jucer_Colours.h" #undef COL - 0 + nullptr }; for (int i = 0; i < numElementsInArray (colourNames) - 1; ++i) @@ -301,7 +301,7 @@ namespace CodeHelpers { const int maxCharsOnLine = 250; - const unsigned char* data = (const unsigned char*) mb.getData(); + auto data = (const unsigned char*) mb.getData(); int charsOnLine = 0; bool canUseStringLiteral = mb.getSize() < 32768; // MS compilers can't handle big string literals.. @@ -312,7 +312,8 @@ namespace CodeHelpers for (size_t i = 0; i < mb.getSize(); ++i) { - const unsigned int num = (unsigned int) data[i]; + auto num = (unsigned int) data[i]; + if (! ((num >= 32 && num < 127) || num == '\t' || num == '\r' || num == '\n')) { if (++numEscaped > mb.getSize() / 4) @@ -330,7 +331,7 @@ namespace CodeHelpers for (size_t i = 0; i < mb.getSize(); ++i) { - const int num = (int) (unsigned int) data[i]; + auto num = (int) (unsigned int) data[i]; out << num << ','; charsOnLine += 2; @@ -364,8 +365,9 @@ namespace CodeHelpers //============================================================================== static unsigned int calculateHash (const String& s, const unsigned int hashMultiplier) { - const char* t = s.toUTF8(); + auto t = s.toUTF8(); unsigned int hash = 0; + while (*t != 0) hash = hashMultiplier * hash + (unsigned int) *t++; @@ -378,11 +380,13 @@ namespace CodeHelpers for (;;) { - SortedSet hashes; + SortedSet hashes; bool collision = false; + for (int i = strings.size(); --i >= 0;) { - const unsigned int hash = calculateHash (strings[i], v); + auto hash = calculateHash (strings[i], v); + if (hashes.contains (hash)) { collision = true; @@ -405,11 +409,12 @@ namespace CodeHelpers const StringArray& strings, const StringArray& codeToExecute, const int indentLevel) { jassert (strings.size() == codeToExecute.size()); - const String indent (String::repeatedString (" ", indentLevel)); - const unsigned int hashMultiplier = findBestHashMultiplier (strings); + auto indent = String::repeatedString (" ", indentLevel); + auto hashMultiplier = findBestHashMultiplier (strings); out << indent << "unsigned int hash = 0;" << newLine - << indent << "if (" << utf8PointerVariable << " != 0)" << newLine + << newLine + << indent << "if (" << utf8PointerVariable << " != nullptr)" << newLine << indent << " while (*" << utf8PointerVariable << " != 0)" << newLine << indent << " hash = " << (int) hashMultiplier << " * hash + (unsigned int) *" << utf8PointerVariable << "++;" << newLine << newLine @@ -461,8 +466,8 @@ namespace CodeHelpers { pos = pos.movedByLines (-1); - const String line (pos.getLineText()); - const String trimmedLine (line.trimStart()); + auto line = pos.getLineText(); + auto trimmedLine = line.trimStart(); braceCount += getBraceCount (trimmedLine.getCharPointer()); diff --git a/modules/juce_core/maths/juce_Expression.cpp b/modules/juce_core/maths/juce_Expression.cpp index f7a3615efd..2e0526b258 100644 --- a/modules/juce_core/maths/juce_Expression.cpp +++ b/modules/juce_core/maths/juce_Expression.cpp @@ -145,7 +145,7 @@ struct Expression::Helpers Type getType() const noexcept { return operatorType; } int getNumInputs() const { return 2; } - Term* getInput (int index) const { return index == 0 ? left.get() : (index == 1 ? right.get() : 0); } + Term* getInput (int index) const { return index == 0 ? left.get() : (index == 1 ? right.get() : nullptr); } virtual double performFunction (double left, double right) const = 0; virtual void writeOperator (String& dest) const = 0; diff --git a/modules/juce_core/memory/juce_Atomic.h b/modules/juce_core/memory/juce_Atomic.h index 41a981981c..a6682dc0d7 100644 --- a/modules/juce_core/memory/juce_Atomic.h +++ b/modules/juce_core/memory/juce_Atomic.h @@ -43,7 +43,7 @@ struct Atomic final using DiffType = typename AtomicHelpers::DiffTypeHelper::Type; /** Creates a new value, initialised to zero. */ - Atomic() noexcept : value (0) {} + Atomic() noexcept : value (Type()) {} /** Creates a new value, with a given initial value. */ Atomic (Type initialValue) noexcept : value (initialValue) {} diff --git a/modules/juce_core/native/juce_mac_Files.mm b/modules/juce_core/native/juce_mac_Files.mm index d787d33c7c..55e2a4eeca 100644 --- a/modules/juce_core/native/juce_mac_Files.mm +++ b/modules/juce_core/native/juce_mac_Files.mm @@ -65,7 +65,7 @@ namespace MacFileHelpers { const String type (buf.f_fstypename); - while (*types != 0) + while (*types != nullptr) if (type.equalsIgnoreCase (*types++)) return true; } @@ -105,14 +105,14 @@ namespace MacFileHelpers #else static bool launchExecutable (const String& pathAndArguments) { - const int cpid = fork(); + auto cpid = fork(); if (cpid == 0) { - const char* const argv[4] = { "/bin/sh", "-c", pathAndArguments.toUTF8(), 0 }; + const char* const argv[4] = { "/bin/sh", "-c", pathAndArguments.toUTF8(), nullptr }; // Child process - if (execve (argv[0], (char**) argv, 0) < 0) + if (execve (argv[0], (char**) argv, nullptr) < 0) exit (0); } else diff --git a/modules/juce_core/native/juce_mac_Strings.mm b/modules/juce_core/native/juce_mac_Strings.mm index 61f30118cd..40be0e8a19 100644 --- a/modules/juce_core/native/juce_mac_Strings.mm +++ b/modules/juce_core/native/juce_mac_Strings.mm @@ -25,7 +25,7 @@ namespace juce String String::fromCFString (CFStringRef cfString) { - if (cfString == 0) + if (cfString == nullptr) return {}; CFRange range = { 0, CFStringGetLength (cfString) }; @@ -72,7 +72,7 @@ String String::convertToPrecomposedUnicode() const map.mappingVersion = kUnicodeUseLatestMapping; - UnicodeToTextInfo conversionInfo = 0; + UnicodeToTextInfo conversionInfo = {}; String result; if (CreateUnicodeToTextInfo (&map, &conversionInfo) == noErr) @@ -88,7 +88,7 @@ String String::convertToPrecomposedUnicode() const if (ConvertFromUnicodeToText (conversionInfo, bytesNeeded, (ConstUniCharArrayPtr) toUTF16().getAddress(), kUnicodeDefaultDirectionMask, - 0, 0, 0, 0, + 0, {}, {}, {}, bytesNeeded, &bytesRead, &outputBufferSize, tempOut) == noErr) { diff --git a/modules/juce_core/native/juce_mac_SystemStats.mm b/modules/juce_core/native/juce_mac_SystemStats.mm index 549c48b223..4fc323d89e 100644 --- a/modules/juce_core/native/juce_mac_SystemStats.mm +++ b/modules/juce_core/native/juce_mac_SystemStats.mm @@ -190,7 +190,7 @@ int SystemStats::getMemorySizeInMegabytes() uint64 mem = 0; size_t memSize = sizeof (mem); int mib[] = { CTL_HW, HW_MEMSIZE }; - sysctl (mib, 2, &mem, &memSize, 0, 0); + sysctl (mib, 2, &mem, &memSize, nullptr, 0); return (int) (mem / (1024 * 1024)); } @@ -224,7 +224,7 @@ int SystemStats::getCpuSpeedInMegahertz() uint64 speedHz = 0; size_t speedSize = sizeof (speedHz); int mib[] = { CTL_HW, HW_CPU_FREQ }; - sysctl (mib, 2, &speedHz, &speedSize, 0, 0); + sysctl (mib, 2, &speedHz, &speedSize, nullptr, 0); #if JUCE_BIG_ENDIAN if (speedSize == 4) diff --git a/modules/juce_core/native/juce_mac_Threads.mm b/modules/juce_core/native/juce_mac_Threads.mm index 25b16f7eb7..36943c77a9 100644 --- a/modules/juce_core/native/juce_mac_Threads.mm +++ b/modules/juce_core/native/juce_mac_Threads.mm @@ -86,7 +86,7 @@ JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger() noexcept struct kinfo_proc info; int m[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; size_t sz = sizeof (info); - sysctl (m, 4, &info, &sz, 0, 0); + sysctl (m, 4, &info, &sz, nullptr, 0); return (info.kp_proc.p_flag & P_TRACED) != 0; } diff --git a/modules/juce_core/native/juce_posix_NamedPipe.cpp b/modules/juce_core/native/juce_posix_NamedPipe.cpp index d07db9cd26..af8b39646a 100644 --- a/modules/juce_core/native/juce_posix_NamedPipe.cpp +++ b/modules/juce_core/native/juce_posix_NamedPipe.cpp @@ -180,7 +180,7 @@ private: FD_ZERO (&rset); FD_SET (handle, &rset); - select (handle + 1, &rset, nullptr, 0, &timeout); + select (handle + 1, &rset, nullptr, nullptr, &timeout); } JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Pimpl) diff --git a/modules/juce_core/native/juce_posix_SharedCode.h b/modules/juce_core/native/juce_posix_SharedCode.h index c3bbac98d8..3786b2caaa 100644 --- a/modules/juce_core/native/juce_posix_SharedCode.h +++ b/modules/juce_core/native/juce_posix_SharedCode.h @@ -44,7 +44,7 @@ void CriticalSection::exit() const noexcept { pthread_mutex_unlock (&loc WaitableEvent::WaitableEvent (bool useManualReset) noexcept : triggered (false), manualReset (useManualReset) { - pthread_cond_init (&condition, 0); + pthread_cond_init (&condition, {}); pthread_mutexattr_t atts; pthread_mutexattr_init (&atts); @@ -78,7 +78,7 @@ bool WaitableEvent::wait (int timeOutMillisecs) const noexcept else { struct timeval now; - gettimeofday (&now, 0); + gettimeofday (&now, nullptr); struct timespec time; time.tv_sec = now.tv_sec + (timeOutMillisecs / 1000); @@ -469,7 +469,7 @@ Result File::createDirectoryInternal (const String& fileName) const //============================================================================== int64 juce_fileSetPosition (void* handle, int64 pos) { - if (handle != 0 && lseek (getFD (handle), (off_t) pos, SEEK_SET) == pos) + if (handle != nullptr && lseek (getFD (handle), (off_t) pos, SEEK_SET) == pos) return pos; return -1; @@ -487,7 +487,7 @@ void FileInputStream::openHandle() FileInputStream::~FileInputStream() { - if (fileHandle != 0) + if (fileHandle != nullptr) close (getFD (fileHandle)); } @@ -495,7 +495,7 @@ size_t FileInputStream::readInternal (void* buffer, size_t numBytes) { ssize_t result = 0; - if (fileHandle != 0) + if (fileHandle != nullptr) { result = ::read (getFD (fileHandle), buffer, numBytes); @@ -548,16 +548,16 @@ void FileOutputStream::openHandle() void FileOutputStream::closeHandle() { - if (fileHandle != 0) + if (fileHandle != nullptr) { close (getFD (fileHandle)); - fileHandle = 0; + fileHandle = nullptr; } } ssize_t FileOutputStream::writeInternal (const void* data, size_t numBytes) { - if (fileHandle == 0) + if (fileHandle == nullptr) return 0; auto result = ::write (getFD (fileHandle), data, numBytes); @@ -571,14 +571,14 @@ ssize_t FileOutputStream::writeInternal (const void* data, size_t numBytes) #ifndef JUCE_ANDROID void FileOutputStream::flushInternal() { - if (fileHandle != 0 && fsync (getFD (fileHandle)) == -1) + if (fileHandle != nullptr && fsync (getFD (fileHandle)) == -1) status = getResultForErrno(); } #endif Result FileOutputStream::truncate() { - if (fileHandle == 0) + if (fileHandle == nullptr) return status; flush(); @@ -610,10 +610,10 @@ void MemoryMappedFile::openInternal (const File& file, AccessMode mode, bool exc if (fileHandle != -1) { - void* m = mmap (0, (size_t) range.getLength(), - mode == readWrite ? (PROT_READ | PROT_WRITE) : PROT_READ, - exclusive ? MAP_PRIVATE : MAP_SHARED, fileHandle, - (off_t) range.getStart()); + auto m = mmap (nullptr, (size_t) range.getLength(), + mode == readWrite ? (PROT_READ | PROT_WRITE) : PROT_READ, + exclusive ? MAP_PRIVATE : MAP_SHARED, fileHandle, + (off_t) range.getStart()); if (m != MAP_FAILED) { @@ -944,8 +944,8 @@ void Thread::launchThread() } #endif - threadHandle = 0; - pthread_t handle = 0; + threadHandle = {}; + pthread_t handle = {}; pthread_attr_t attr; pthread_attr_t* attrPtr = nullptr; @@ -968,13 +968,13 @@ void Thread::launchThread() void Thread::closeThreadHandle() { - threadId = 0; - threadHandle = 0; + threadId = {}; + threadHandle = {}; } void Thread::killThread() { - if (threadHandle.get() != 0) + if (threadHandle.get() != nullptr) { #if JUCE_ANDROID jassertfalse; // pthread_cancel not available! @@ -1304,7 +1304,7 @@ struct HighResolutionTimer::Pimpl { isRunning = false; - if (thread == 0) + if (thread == pthread_t()) return; if (thread == pthread_self()) @@ -1321,7 +1321,7 @@ struct HighResolutionTimer::Pimpl pthread_mutex_unlock (&timerMutex); pthread_join (thread, nullptr); - thread = 0; + thread = {}; } HighResolutionTimer& owner; diff --git a/modules/juce_core/network/juce_Socket.cpp b/modules/juce_core/network/juce_Socket.cpp index a36ec0d875..8196391e36 100644 --- a/modules/juce_core/network/juce_Socket.cpp +++ b/modules/juce_core/network/juce_Socket.cpp @@ -264,7 +264,7 @@ namespace SocketHelpers } else { - timeoutp = 0; + timeoutp = nullptr; } fd_set rset, wset; @@ -282,7 +282,8 @@ namespace SocketHelpers #else { int result; - while ((result = select (h + 1, prset, pwset, 0, timeoutp)) < 0 + + while ((result = select (h + 1, prset, pwset, nullptr, timeoutp)) < 0 && errno == EINTR) { } diff --git a/modules/juce_core/threads/juce_ReadWriteLock.cpp b/modules/juce_core/threads/juce_ReadWriteLock.cpp index 27347d5f40..af607b7fa0 100644 --- a/modules/juce_core/threads/juce_ReadWriteLock.cpp +++ b/modules/juce_core/threads/juce_ReadWriteLock.cpp @@ -24,9 +24,6 @@ namespace juce { ReadWriteLock::ReadWriteLock() noexcept - : numWaitingWriters (0), - numWriters (0), - writerThreadId (0) { readerThreads.ensureStorageAllocated (16); } @@ -141,7 +138,7 @@ void ReadWriteLock::exitWrite() const noexcept if (--numWriters == 0) { - writerThreadId = 0; + writerThreadId = {}; waitEvent.signal(); } } diff --git a/modules/juce_core/threads/juce_ReadWriteLock.h b/modules/juce_core/threads/juce_ReadWriteLock.h index 7bb2eeea0c..c954a87496 100644 --- a/modules/juce_core/threads/juce_ReadWriteLock.h +++ b/modules/juce_core/threads/juce_ReadWriteLock.h @@ -127,8 +127,8 @@ private: //============================================================================== SpinLock accessLock; WaitableEvent waitEvent; - mutable int numWaitingWriters, numWriters; - mutable Thread::ThreadID writerThreadId; + mutable int numWaitingWriters = 0, numWriters = 0; + mutable Thread::ThreadID writerThreadId = {}; struct ThreadRecursionCount { diff --git a/modules/juce_core/threads/juce_Thread.cpp b/modules/juce_core/threads/juce_Thread.cpp index 2e7cce85c9..b37208d8a0 100644 --- a/modules/juce_core/threads/juce_Thread.cpp +++ b/modules/juce_core/threads/juce_Thread.cpp @@ -195,7 +195,7 @@ bool Thread::currentThreadShouldExit() bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const { // Doh! So how exactly do you expect this thread to wait for itself to stop?? - jassert (getThreadId() != getCurrentThreadId() || getCurrentThreadId() == 0); + jassert (getThreadId() != getCurrentThreadId() || getCurrentThreadId() == ThreadID()); auto timeoutEnd = Time::getMillisecondCounter() + (uint32) timeOutMilliseconds; @@ -236,7 +236,7 @@ bool Thread::stopThread (const int timeOutMilliseconds) killThread(); threadHandle = nullptr; - threadId = 0; + threadId = {}; return false; } } @@ -288,7 +288,7 @@ bool Thread::setPriority (int newPriority) bool Thread::setCurrentThreadPriority (const int newPriority) { - return setThreadPriority (0, newPriority); + return setThreadPriority ({}, newPriority); } void Thread::setAffinityMask (const uint32 newAffinityMask) diff --git a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp index ee1855a62e..16290c0083 100644 --- a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp +++ b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp @@ -36,6 +36,9 @@ namespace zlibNamespace #pragma clang diagnostic ignored "-Wconversion" #pragma clang diagnostic ignored "-Wshadow" #pragma clang diagnostic ignored "-Wdeprecated-register" + #if __has_warning("-Wzero-as-null-pointer-constant") + #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" + #endif #if __has_warning("-Wcomma") #pragma clang diagnostic ignored "-Wcomma" #endif diff --git a/modules/juce_cryptography/encryption/juce_Primes.h b/modules/juce_cryptography/encryption/juce_Primes.h index 7988a5fb24..a0bc3504b0 100644 --- a/modules/juce_cryptography/encryption/juce_Primes.h +++ b/modules/juce_cryptography/encryption/juce_Primes.h @@ -52,7 +52,7 @@ public: */ static BigInteger createProbablePrime (int bitLength, int certainty, - const int* randomSeeds = 0, + const int* randomSeeds = nullptr, int numRandomSeeds = 0); /** Tests a number to see if it's prime. diff --git a/modules/juce_cryptography/encryption/juce_RSAKey.cpp b/modules/juce_cryptography/encryption/juce_RSAKey.cpp index 7e7735a7d1..8e5eb77db2 100644 --- a/modules/juce_cryptography/encryption/juce_RSAKey.cpp +++ b/modules/juce_cryptography/encryption/juce_RSAKey.cpp @@ -123,7 +123,7 @@ void RSAKey::createKeyPair (RSAKey& publicKey, RSAKey& privateKey, jassert (numRandomSeeds == 0 || numRandomSeeds >= 2); // you need to provide plenty of seeds here! BigInteger p (Primes::createProbablePrime (numBits / 2, 30, randomSeeds, numRandomSeeds / 2)); - BigInteger q (Primes::createProbablePrime (numBits - numBits / 2, 30, randomSeeds == nullptr ? 0 : (randomSeeds + numRandomSeeds / 2), numRandomSeeds - numRandomSeeds / 2)); + BigInteger q (Primes::createProbablePrime (numBits - numBits / 2, 30, randomSeeds == nullptr ? nullptr : (randomSeeds + numRandomSeeds / 2), numRandomSeeds - numRandomSeeds / 2)); const BigInteger n (p * q); const BigInteger m (--p * --q); diff --git a/modules/juce_events/messages/juce_ApplicationBase.cpp b/modules/juce_events/messages/juce_ApplicationBase.cpp index 5f8ab68257..bd10c17023 100644 --- a/modules/juce_events/messages/juce_ApplicationBase.cpp +++ b/modules/juce_events/messages/juce_ApplicationBase.cpp @@ -23,7 +23,7 @@ namespace juce { -JUCEApplicationBase::CreateInstanceFunction JUCEApplicationBase::createInstance = 0; +JUCEApplicationBase::CreateInstanceFunction JUCEApplicationBase::createInstance = nullptr; JUCEApplicationBase* JUCEApplicationBase::appInstance = nullptr; #if JUCE_IOS diff --git a/modules/juce_events/messages/juce_MessageManager.cpp b/modules/juce_events/messages/juce_MessageManager.cpp index c162aba8a9..13cf34d5d5 100644 --- a/modules/juce_events/messages/juce_MessageManager.cpp +++ b/modules/juce_events/messages/juce_MessageManager.cpp @@ -349,7 +349,7 @@ void MessageManager::Lock::exit() const noexcept lockGained.set (0); if (mm != nullptr) - mm->threadWithLock = 0; + mm->threadWithLock = {}; if (blockingMessage != nullptr) { diff --git a/modules/juce_graphics/geometry/juce_PathStrokeType.cpp b/modules/juce_graphics/geometry/juce_PathStrokeType.cpp index d1b3d177e3..c24afbdc6c 100644 --- a/modules/juce_graphics/geometry/juce_PathStrokeType.cpp +++ b/modules/juce_graphics/geometry/juce_PathStrokeType.cpp @@ -654,10 +654,10 @@ namespace PathStrokeHelpers } void PathStrokeType::createStrokedPath (Path& destPath, const Path& sourcePath, - const AffineTransform& transform, const float extraAccuracy) const + const AffineTransform& transform, float extraAccuracy) const { PathStrokeHelpers::createStroke (thickness, jointStyle, endStyle, destPath, sourcePath, - transform, extraAccuracy, 0); + transform, extraAccuracy, nullptr); } void PathStrokeType::createDashedStroke (Path& destPath, @@ -665,7 +665,7 @@ void PathStrokeType::createDashedStroke (Path& destPath, const float* dashLengths, int numDashLengths, const AffineTransform& transform, - const float extraAccuracy) const + float extraAccuracy) const { jassert (extraAccuracy > 0); diff --git a/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp b/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp index 9f8c4daec2..780558433e 100644 --- a/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp +++ b/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp @@ -43,6 +43,9 @@ namespace jpeglibNamespace #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wconversion" #pragma clang diagnostic ignored "-Wdeprecated-register" + #if __has_warning("-Wzero-as-null-pointer-constant") + #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" + #endif #if __has_warning("-Wcomma") #pragma clang diagnostic ignored "-Wcomma" #endif diff --git a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp index 5a2a376ede..b772e46b7b 100644 --- a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp +++ b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp @@ -66,6 +66,9 @@ namespace pnglibNamespace #if JUCE_CLANG #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wsign-conversion" + #if __has_warning("-Wzero-as-null-pointer-constant") + #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" + #endif #if __has_warning("-Wcomma") #pragma clang diagnostic ignored "-Wcomma" #endif @@ -520,23 +523,23 @@ Image PNGImageFormat::decodeImage (InputStream& in) bool PNGImageFormat::writeImageToStream (const Image& image, OutputStream& out) { using namespace pnglibNamespace; - const int width = image.getWidth(); - const int height = image.getHeight(); + auto width = image.getWidth(); + auto height = image.getHeight(); - png_structp pngWriteStruct = png_create_write_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + auto pngWriteStruct = png_create_write_struct (PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); if (pngWriteStruct == nullptr) return false; - png_infop pngInfoStruct = png_create_info_struct (pngWriteStruct); + auto pngInfoStruct = png_create_info_struct (pngWriteStruct); if (pngInfoStruct == nullptr) { - png_destroy_write_struct (&pngWriteStruct, (png_infopp) nullptr); + png_destroy_write_struct (&pngWriteStruct, nullptr); return false; } - png_set_write_fn (pngWriteStruct, &out, PNGHelpers::writeDataCallback, 0); + png_set_write_fn (pngWriteStruct, &out, PNGHelpers::writeDataCallback, nullptr); png_set_IHDR (pngWriteStruct, pngInfoStruct, (png_uint_32) width, (png_uint_32) height, 8, image.hasAlphaChannel() ? PNG_COLOR_TYPE_RGB_ALPHA diff --git a/modules/juce_graphics/image_formats/pnglib/png.c b/modules/juce_graphics/image_formats/pnglib/png.c index 75e610521f..a0b8451bf5 100644 --- a/modules/juce_graphics/image_formats/pnglib/png.c +++ b/modules/juce_graphics/image_formats/pnglib/png.c @@ -28,7 +28,7 @@ png_set_sig_bytes(png_structrp png_ptr, int num_bytes) { png_debug(1, "in png_set_sig_bytes"); - if (png_ptr == NULL) +if (png_ptr == NULL) return; if (num_bytes > 8) diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h index b09ea9f0b5..39e46dbd06 100644 --- a/modules/juce_graphics/native/juce_RenderingHelpers.h +++ b/modules/juce_graphics/native/juce_RenderingHelpers.h @@ -1725,9 +1725,9 @@ struct ClipRegions auto imageY = ((ty + 128) >> 8); if (image.getFormat() == Image::ARGB) - straightClipImage (srcData, imageX, imageY, (PixelARGB*) 0); + straightClipImage (srcData, imageX, imageY, (PixelARGB*) nullptr); else - straightClipImage (srcData, imageX, imageY, (PixelAlpha*) 0); + straightClipImage (srcData, imageX, imageY, (PixelAlpha*) nullptr); return edgeTable.isEmpty() ? Ptr() : Ptr (*this); } @@ -1746,9 +1746,9 @@ struct ClipRegions if (! edgeTable.isEmpty()) { if (image.getFormat() == Image::ARGB) - transformedClipImage (srcData, transform, quality, (PixelARGB*) 0); + transformedClipImage (srcData, transform, quality, (PixelARGB*) nullptr); else - transformedClipImage (srcData, transform, quality, (PixelAlpha*) 0); + transformedClipImage (srcData, transform, quality, (PixelAlpha*) nullptr); } return edgeTable.isEmpty() ? Ptr() : Ptr (*this); @@ -2640,9 +2640,9 @@ public: switch (destData.pixelFormat) { - case Image::ARGB: EdgeTableFillers::renderSolidFill (iter, destData, colour, replaceContents, (PixelARGB*) 0); break; - case Image::RGB: EdgeTableFillers::renderSolidFill (iter, destData, colour, replaceContents, (PixelRGB*) 0); break; - default: EdgeTableFillers::renderSolidFill (iter, destData, colour, replaceContents, (PixelAlpha*) 0); break; + case Image::ARGB: EdgeTableFillers::renderSolidFill (iter, destData, colour, replaceContents, (PixelARGB*) nullptr); break; + case Image::RGB: EdgeTableFillers::renderSolidFill (iter, destData, colour, replaceContents, (PixelRGB*) nullptr); break; + default: EdgeTableFillers::renderSolidFill (iter, destData, colour, replaceContents, (PixelAlpha*) nullptr); break; } } @@ -2657,9 +2657,9 @@ public: switch (destData.pixelFormat) { - case Image::ARGB: EdgeTableFillers::renderGradient (iter, destData, gradient, trans, lookupTable, numLookupEntries, isIdentity, (PixelARGB*) 0); break; - case Image::RGB: EdgeTableFillers::renderGradient (iter, destData, gradient, trans, lookupTable, numLookupEntries, isIdentity, (PixelRGB*) 0); break; - default: EdgeTableFillers::renderGradient (iter, destData, gradient, trans, lookupTable, numLookupEntries, isIdentity, (PixelAlpha*) 0); break; + case Image::ARGB: EdgeTableFillers::renderGradient (iter, destData, gradient, trans, lookupTable, numLookupEntries, isIdentity, (PixelARGB*) nullptr); break; + case Image::RGB: EdgeTableFillers::renderGradient (iter, destData, gradient, trans, lookupTable, numLookupEntries, isIdentity, (PixelRGB*) nullptr); break; + default: EdgeTableFillers::renderGradient (iter, destData, gradient, trans, lookupTable, numLookupEntries, isIdentity, (PixelAlpha*) nullptr); break; } } diff --git a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm index 9d41590fce..8a34406c1c 100644 --- a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm +++ b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm @@ -86,7 +86,7 @@ class CoreGraphicsImage : public ImagePixelData { public: CoreGraphicsImage (const Image::PixelFormat format, int w, int h, bool clearImage) - : ImagePixelData (format, w, h), cachedImageRef (0) + : ImagePixelData (format, w, h) { pixelStride = format == Image::RGB ? 3 : ((format == Image::ARGB) ? 4 : 1); lineStride = (pixelStride * jmax (1, width) + 3) & ~3; @@ -156,7 +156,7 @@ public: { auto cgim = dynamic_cast (juceImage.getPixelData()); - if (cgim != nullptr && cgim->cachedImageRef != 0) + if (cgim != nullptr && cgim->cachedImageRef != nullptr) { CGImageRetain (cgim->cachedImageRef); return cgim->cachedImageRef; @@ -180,13 +180,13 @@ public: if (mustOutliveSource) { - CFDataRef data = CFDataCreate (0, (const UInt8*) srcData.data, (CFIndex) ((size_t) srcData.lineStride * (size_t) srcData.height)); + CFDataRef data = CFDataCreate (nullptr, (const UInt8*) srcData.data, (CFIndex) ((size_t) srcData.lineStride * (size_t) srcData.height)); provider = CGDataProviderCreateWithCFData (data); CFRelease (data); } else { - provider = CGDataProviderCreateWithData (0, srcData.data, (size_t) srcData.lineStride * (size_t) srcData.height, 0); + provider = CGDataProviderCreateWithData (nullptr, srcData.data, (size_t) srcData.lineStride * (size_t) srcData.height, nullptr); } CGImageRef imageRef = CGImageCreate ((size_t) srcData.width, @@ -195,7 +195,7 @@ public: (size_t) srcData.pixelStride * 8, (size_t) srcData.lineStride, colourSpace, getCGImageFlags (juceImage.getFormat()), provider, - 0, true, kCGRenderingIntentDefault); + nullptr, true, kCGRenderingIntentDefault); CGDataProviderRelease (provider); return imageRef; @@ -203,17 +203,17 @@ public: //============================================================================== CGContextRef context; - CGImageRef cachedImageRef; + CGImageRef cachedImageRef = {}; HeapBlock imageData; int pixelStride, lineStride; private: void freeCachedImageRef() { - if (cachedImageRef != 0) + if (cachedImageRef != CGImageRef()) { CGImageRelease (cachedImageRef); - cachedImageRef = 0; + cachedImageRef = {}; } } @@ -439,7 +439,7 @@ void CoreGraphicsContext::beginTransparencyLayer (float opacity) { saveState(); CGContextSetAlpha (context, opacity); - CGContextBeginTransparencyLayer (context, 0); + CGContextBeginTransparencyLayer (context, nullptr); } void CoreGraphicsContext::endTransparencyLayer() @@ -581,7 +581,7 @@ void CoreGraphicsContext::drawImage (const Image& sourceImage, const AffineTrans #else // There's a bug in CGContextDrawTiledImage that makes it incredibly slow // if it's doing a transformation - it's quicker to just draw lots of images manually - if (&CGContextDrawTiledImage != 0 && transform.isOnlyTranslation()) + if (&CGContextDrawTiledImage != nullptr && transform.isOnlyTranslation()) { CGContextDrawTiledImage (context, imageRect, image); } @@ -657,7 +657,7 @@ void CoreGraphicsContext::setFont (const Font& newFont) { if (state->font != newFont) { - state->fontRef = 0; + state->fontRef = nullptr; state->font = newFont; if (auto osxTypeface = dynamic_cast (state->font.getTypeface())) @@ -680,7 +680,7 @@ const Font& CoreGraphicsContext::getFont() void CoreGraphicsContext::drawGlyph (int glyphNumber, const AffineTransform& transform) { - if (state->fontRef != 0 && state->fillType.isColour()) + if (state->fontRef != nullptr && state->fillType.isColour()) { #if JUCE_CLANG #pragma clang diagnostic push @@ -741,13 +741,13 @@ CoreGraphicsContext::SavedState::SavedState (const SavedState& other) : fillType (other.fillType), font (other.font), fontRef (other.fontRef), fontTransform (other.fontTransform), gradient (other.gradient) { - if (gradient != 0) + if (gradient != nullptr) CGGradientRetain (gradient); } CoreGraphicsContext::SavedState::~SavedState() { - if (gradient != 0) + if (gradient != nullptr) CGGradientRelease (gradient); } @@ -755,10 +755,10 @@ void CoreGraphicsContext::SavedState::setFill (const FillType& newFill) { fillType = newFill; - if (gradient != 0) + if (gradient != nullptr) { CGGradientRelease (gradient); - gradient = 0; + gradient = nullptr; } } @@ -800,7 +800,7 @@ void CoreGraphicsContext::drawGradient() state->fillType.transform.transformPoints (p1.x, p1.y, p2.x, p2.y); - if (state->gradient == 0) + if (state->gradient == nullptr) state->gradient = createGradient (g, rgbColourSpace); if (g.isRadial) @@ -898,19 +898,19 @@ Image juce_loadWithCoreImage (InputStream& input) CGImageRef loadedImage = uiImage.CGImage; #else - CGDataProviderRef provider = CGDataProviderCreateWithData (0, data.getData(), data.getSize(), 0); - CGImageSourceRef imageSource = CGImageSourceCreateWithDataProvider (provider, 0); + auto provider = CGDataProviderCreateWithData (nullptr, data.getData(), data.getSize(), nullptr); + auto imageSource = CGImageSourceCreateWithDataProvider (provider, nullptr); CGDataProviderRelease (provider); - if (imageSource != 0) + if (imageSource != nullptr) { - CGImageRef loadedImage = CGImageSourceCreateImageAtIndex (imageSource, 0, 0); + auto loadedImage = CGImageSourceCreateImageAtIndex (imageSource, 0, nullptr); CFRelease (imageSource); #endif - if (loadedImage != 0) + if (loadedImage != nullptr) { - CGImageAlphaInfo alphaInfo = CGImageGetAlphaInfo (loadedImage); + auto alphaInfo = CGImageGetAlphaInfo (loadedImage); const bool hasAlphaChan = (alphaInfo != kCGImageAlphaNone && alphaInfo != kCGImageAlphaNoneSkipLast && alphaInfo != kCGImageAlphaNoneSkipFirst); @@ -992,8 +992,8 @@ CGContextRef juce_getImageContext (const Image& image) auto requiredSize = NSMakeSize (image.getWidth() / scaleFactor, image.getHeight() / scaleFactor); [im setSize: requiredSize]; - CGColorSpaceRef colourSpace = CGColorSpaceCreateDeviceRGB(); - CGImageRef imageRef = juce_createCoreGraphicsImage (image, colourSpace, true); + auto colourSpace = CGColorSpaceCreateDeviceRGB(); + auto imageRef = juce_createCoreGraphicsImage (image, colourSpace, true); CGColorSpaceRelease (colourSpace); NSBitmapImageRep* imageRep = [[NSBitmapImageRep alloc] initWithCGImage: imageRef]; diff --git a/modules/juce_graphics/native/juce_mac_Fonts.mm b/modules/juce_graphics/native/juce_mac_Fonts.mm index 5d6277a86c..0780c33fef 100644 --- a/modules/juce_graphics/native/juce_mac_Fonts.mm +++ b/modules/juce_graphics/native/juce_mac_Fonts.mm @@ -239,7 +239,7 @@ namespace CoreTextTypeLayout { extraKerning *= attr.font.getHeight(); - auto numberRef = CFNumberCreate (0, kCFNumberFloatType, &extraKerning); + auto numberRef = CFNumberCreate (nullptr, kCFNumberFloatType, &extraKerning); CFAttributedStringSetAttribute (attribString, range, kCTKernAttributeName, numberRef); CFRelease (numberRef); } @@ -540,7 +540,7 @@ public: fontHeightToPointsFactor = referenceFontSize / ctTotalHeight; const short zero = 0; - auto numberRef = CFNumberCreate (0, kCFNumberShortType, &zero); + auto numberRef = CFNumberCreate (nullptr, kCFNumberShortType, &zero); CFStringRef keys[] = { kCTFontAttributeName, kCTLigatureAttributeName }; CFTypeRef values[] = { ctFontRef, numberRef }; diff --git a/modules/juce_gui_basics/native/juce_mac_Windowing.mm b/modules/juce_gui_basics/native/juce_mac_Windowing.mm index f3434c9f9e..0f9f7fb47a 100644 --- a/modules/juce_gui_basics/native/juce_mac_Windowing.mm +++ b/modules/juce_gui_basics/native/juce_mac_Windowing.mm @@ -465,12 +465,12 @@ struct DisplaySettingsChangeCallback : private DeletedAtShutdown { DisplaySettingsChangeCallback() { - CGDisplayRegisterReconfigurationCallback (displayReconfigurationCallBack, 0); + CGDisplayRegisterReconfigurationCallback (displayReconfigurationCallBack, nullptr); } ~DisplaySettingsChangeCallback() { - CGDisplayRemoveReconfigurationCallback (displayReconfigurationCallBack, 0); + CGDisplayRemoveReconfigurationCallback (displayReconfigurationCallBack, nullptr); clearSingletonInstance(); } diff --git a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp index 3c57bd9c34..a81e0dec9e 100644 --- a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp @@ -156,7 +156,7 @@ void TableHeaderComponent::moveColumn (const int columnId, int newIndex) auto currentIndex = getIndexOfColumnId (columnId, false); newIndex = visibleIndexToTotalIndex (newIndex); - if (columns [currentIndex] != 0 && currentIndex != newIndex) + if (columns[currentIndex] != nullptr && currentIndex != newIndex) { columns.move (currentIndex, newIndex); sendColumnsChanged(); diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp index f7363eb6c8..7c4e1faa40 100644 --- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp +++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp @@ -711,13 +711,13 @@ struct TextEditor::InsertAction : public UndoableAction bool perform() override { - owner.insert (text, insertIndex, font, colour, 0, newCaretPos); + owner.insert (text, insertIndex, font, colour, nullptr, newCaretPos); return true; } bool undo() override { - owner.remove ({ insertIndex, insertIndex + text.length() }, 0, oldCaretPos); + owner.remove ({ insertIndex, insertIndex + text.length() }, nullptr, oldCaretPos); return true; } @@ -751,7 +751,7 @@ struct TextEditor::RemoveAction : public UndoableAction bool perform() override { - owner.remove (range, 0, newCaretPos); + owner.remove (range, nullptr, newCaretPos); return true; } @@ -1171,7 +1171,7 @@ void TextEditor::setText (const String& newText, bool sendTextChangeMessage) bool cursorWasAtEnd = oldCursorPos >= getTotalNumChars(); clearInternal (nullptr); - insert (newText, 0, currentFont, findColour (textColourId), 0, caretPosition); + insert (newText, 0, currentFont, findColour (textColourId), nullptr, caretPosition); // if you're adding text with line-feeds to a single-line text editor, it // ain't gonna look right! diff --git a/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp b/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp index ab6372054e..2a3bcf84a4 100644 --- a/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp @@ -212,7 +212,7 @@ void DocumentWindow::paint (Graphics& g) titleBarArea.getHeight(), titleSpaceX1, jmax (1, titleSpaceX2 - titleSpaceX1), - titleBarIcon.isValid() ? &titleBarIcon : 0, + titleBarIcon.isValid() ? &titleBarIcon : nullptr, ! drawTitleTextCentred); } diff --git a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h index 706024efc5..6fce1baa79 100644 --- a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h +++ b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h @@ -101,7 +101,7 @@ struct CppTokeniserFunctions break; } - for (int i = 0; k[i] != 0; ++i) + for (int i = 0; k[i] != nullptr; ++i) if (token.compare (CharPointer_ASCII (k[i])) == 0) return true; diff --git a/modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.cpp b/modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.cpp index 91c0b55608..b8e7d0b284 100644 --- a/modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.cpp +++ b/modules/juce_gui_extra/code_editor/juce_LuaCodeTokeniser.cpp @@ -68,7 +68,7 @@ struct LuaTokeniserFunctions break; } - for (int i = 0; k[i] != 0; ++i) + for (int i = 0; k[i] != nullptr; ++i) if (token.compare (CharPointer_ASCII (k[i])) == 0) return true; diff --git a/modules/juce_gui_extra/native/juce_mac_AppleRemote.mm b/modules/juce_gui_extra/native/juce_mac_AppleRemote.mm index bc07d33172..78550f6fb9 100644 --- a/modules/juce_gui_extra/native/juce_mac_AppleRemote.mm +++ b/modules/juce_gui_extra/native/juce_mac_AppleRemote.mm @@ -142,22 +142,22 @@ bool AppleRemoteDevice::isActive() const bool AppleRemoteDevice::open (const bool openInExclusiveMode) { - Array cookies; + Array cookies; CFArrayRef elements; - IOHIDDeviceInterface122** const device122 = (IOHIDDeviceInterface122**) device; + auto device122 = (IOHIDDeviceInterface122**) device; - if ((*device122)->copyMatchingElements (device122, 0, &elements) != kIOReturnSuccess) + if ((*device122)->copyMatchingElements (device122, nullptr, &elements) != kIOReturnSuccess) return false; for (int i = 0; i < CFArrayGetCount (elements); ++i) { - CFDictionaryRef element = (CFDictionaryRef) CFArrayGetValueAtIndex (elements, i); + auto element = (CFDictionaryRef) CFArrayGetValueAtIndex (elements, i); // get the cookie CFTypeRef object = CFDictionaryGetValue (element, CFSTR (kIOHIDElementCookieKey)); - if (object == 0 || CFGetTypeID (object) != CFNumberGetTypeID()) + if (object == nullptr || CFGetTypeID (object) != CFNumberGetTypeID()) continue; long number; @@ -176,7 +176,7 @@ bool AppleRemoteDevice::open (const bool openInExclusiveMode) { queue = (*(IOHIDDeviceInterface**) device)->allocQueue ((IOHIDDeviceInterface**) device); - if (queue != 0) + if (queue != nullptr) { (*(IOHIDQueueInterface**) queue)->create ((IOHIDQueueInterface**) queue, 0, 12); @@ -192,7 +192,7 @@ bool AppleRemoteDevice::open (const bool openInExclusiveMode) ->createAsyncEventSource ((IOHIDQueueInterface**) queue, &eventSource) == KERN_SUCCESS) { if ((*(IOHIDQueueInterface**) queue)->setEventCallout ((IOHIDQueueInterface**) queue, - appleRemoteQueueCallback, this, 0) == KERN_SUCCESS) + appleRemoteQueueCallback, this, nullptr) == KERN_SUCCESS) { CFRunLoopAddSource (CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode); diff --git a/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm b/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm index 50f46ce967..7f9d96c19e 100644 --- a/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm +++ b/modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm @@ -436,7 +436,7 @@ void WebBrowserComponent::checkWindowAssociation() // page to avoid this, (and send it back when it's made visible again). blankPageShown = true; - browser->goToURL ("about:blank", 0, 0); + browser->goToURL ("about:blank", nullptr, nullptr); } } }