diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h
index a4f52e5e82..9852315be6 100644
--- a/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h
+++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h
@@ -163,7 +163,7 @@ public:
                     return getAppSettings().swatchColours [index];
                 }
 
-                void setSwatchColour (int index, const Colour& newColour) const override
+                void setSwatchColour (int index, const Colour& newColour) override
                 {
                     getAppSettings().swatchColours.set (index, newColour);
                 }
diff --git a/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp b/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
index fb849d4a9f..e542e59c73 100644
--- a/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
+++ b/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
@@ -208,7 +208,7 @@ Colour StoredSettings::ColourSelectorWithSwatches::getSwatchColour (int index) c
     return getAppSettings().swatchColours [index];
 }
 
-void StoredSettings::ColourSelectorWithSwatches::setSwatchColour (int index, const Colour& newColour) const
+void StoredSettings::ColourSelectorWithSwatches::setSwatchColour (int index, const Colour& newColour)
 {
     getAppSettings().swatchColours.set (index, newColour);
 }
diff --git a/extras/Projucer/Source/Utility/jucer_StoredSettings.h b/extras/Projucer/Source/Utility/jucer_StoredSettings.h
index a5782c5003..14b9428d6e 100644
--- a/extras/Projucer/Source/Utility/jucer_StoredSettings.h
+++ b/extras/Projucer/Source/Utility/jucer_StoredSettings.h
@@ -57,7 +57,7 @@ public:
 
         int getNumSwatches() const override;
         Colour getSwatchColour (int index) const override;
-        void setSwatchColour (int index, const Colour& newColour) const override;
+        void setSwatchColour (int index, const Colour& newColour) override;
     };
 
     //==============================================================================
diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp
index af45e04c46..83fe4e7510 100644
--- a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp
+++ b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp
@@ -429,7 +429,7 @@ void ColourSelector::paint (Graphics& g)
 
     if ((flags & showColourAtTop) != 0)
     {
-        const Colour currentColour (getCurrentColour());
+        auto currentColour = getCurrentColour();
 
         g.fillCheckerBoard (previewArea, 10, 10,
                             Colour (0xffdddddd).overlaidWith (currentColour),
@@ -446,14 +446,11 @@ void ColourSelector::paint (Graphics& g)
         g.setColour (findColour (labelTextColourId));
         g.setFont (11.0f);
 
-        for (int i = 4; --i >= 0;)
-        {
-            if (sliders[i]->isVisible())
-                g.drawText (sliders[i]->getName() + ":",
-                            0, sliders[i]->getY(),
-                            sliders[i]->getX() - 8, sliders[i]->getHeight(),
+        for (auto* s : sliders)
+            if (s->isVisible())
+                g.drawText (s->getName() + ":",
+                            0, s->getY(), s->getX() - 8, s->getHeight(),
                             Justification::centredRight, false);
-        }
     }
 }
 
@@ -515,7 +512,7 @@ void ColourSelector::resized()
 
             for (int i = 0; i < numSwatches; ++i)
             {
-                SwatchComponent* const sc = new SwatchComponent (*this, i);
+                auto* sc = new SwatchComponent (*this, i);
                 swatchComponents.add (sc);
                 addAndMakeVisible (sc);
             }
@@ -566,7 +563,7 @@ Colour ColourSelector::getSwatchColour (const int) const
     return Colours::black;
 }
 
-void ColourSelector::setSwatchColour (const int, const Colour&) const
+void ColourSelector::setSwatchColour (int, const Colour&)
 {
     jassertfalse; // if you've overridden getNumSwatches(), you also need to implement this method
 }
diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.h b/modules/juce_gui_extra/misc/juce_ColourSelector.h
index 9d4307bc95..7530278e9e 100644
--- a/modules/juce_gui_extra/misc/juce_ColourSelector.h
+++ b/modules/juce_gui_extra/misc/juce_ColourSelector.h
@@ -110,7 +110,7 @@ public:
         setSwatchColour(), to return the number of colours you want, and to set and retrieve
         their values.
     */
-    virtual void setSwatchColour (int index, const Colour& newColour) const;
+    virtual void setSwatchColour (int index, const Colour& newColour);
 
 
     //==============================================================================