From 2c328dfedc103b8964ee1d603ce04f515fe59661 Mon Sep 17 00:00:00 2001
From: Julian Storer <jules@rawmaterialsoftware.com>
Date: Fri, 19 Aug 2011 21:34:34 +0100
Subject: [PATCH] Changed some return types from being const objects to
 non-const objects (for better c++11 compliance in future). This may mean that
 you need to remove the 'const' from your own code if you override the virtual
 methods that have changed.

---
 .../Source/Utility/jucer_StoredSettings.h          |  2 +-
 .../src/model/components/jucer_ButtonHandler.h     |  4 ++--
 .../src/model/components/jucer_ComboBoxHandler.h   |  6 +++---
 .../model/components/jucer_ComponentNameProperty.h |  6 +++---
 .../components/jucer_ComponentTypeHandler.cpp      |  4 ++--
 .../components/jucer_GenericComponentHandler.h     |  4 ++--
 .../model/components/jucer_GroupComponentHandler.h |  2 +-
 .../components/jucer_HyperlinkButtonHandler.h      |  2 +-
 .../model/components/jucer_ImageButtonHandler.h    |  2 +-
 .../model/components/jucer_JucerComponentHandler.h |  4 ++--
 .../src/model/components/jucer_LabelHandler.h      | 10 ++++------
 .../src/model/components/jucer_SliderHandler.h     |  6 +++---
 .../components/jucer_TabbedComponentHandler.h      | 14 +++++++-------
 .../src/model/components/jucer_TextEditorHandler.h |  2 +-
 .../src/model/components/jucer_ViewportHandler.h   |  4 ++--
 .../model/paintelements/jucer_ColouredElement.cpp  |  2 +-
 .../paintelements/jucer_PaintElementEllipse.h      |  2 +-
 .../model/paintelements/jucer_PaintElementGroup.h  |  2 +-
 .../model/paintelements/jucer_PaintElementImage.h  |  2 +-
 .../model/paintelements/jucer_PaintElementPath.cpp |  2 +-
 .../paintelements/jucer_PaintElementRectangle.h    |  2 +-
 .../jucer_PaintElementRoundedRectangle.h           |  2 +-
 .../model/paintelements/jucer_PaintElementText.h   |  8 ++++----
 .../src/properties/jucer_ColourPropertyComponent.h |  4 ++--
 .../src/properties/jucer_ComponentColourProperty.h |  2 +-
 .../src/properties/jucer_FontPropertyComponent.h   |  2 +-
 .../src/properties/jucer_PositionPropertyBase.h    |  2 +-
 .../the jucer/src/ui/jucer_JucerDocumentHolder.cpp | 12 ++++++------
 .../the jucer/src/ui/jucer_PaintRoutinePanel.cpp   |  2 +-
 .../src/utility/jucer_ColourEditorComponent.h      |  4 ++--
 .../gui/juce_MidiKeyboardComponent.cpp             |  2 +-
 .../gui/juce_MidiKeyboardComponent.h               |  2 +-
 .../contexts/juce_GraphicsContext.cpp              |  2 +-
 .../juce_graphics/contexts/juce_GraphicsContext.h  |  2 +-
 .../contexts/juce_LowLevelGraphicsContext.h        |  2 +-
 .../juce_LowLevelGraphicsPostScriptRenderer.cpp    |  2 +-
 .../juce_LowLevelGraphicsPostScriptRenderer.h      |  2 +-
 .../juce_LowLevelGraphicsSoftwareRenderer.cpp      |  2 +-
 .../juce_LowLevelGraphicsSoftwareRenderer.h        |  2 +-
 modules/juce_graphics/images/juce_Image.h          |  2 +-
 .../native/juce_android_GraphicsContext.cpp        |  2 +-
 .../native/juce_mac_CoreGraphicsContext.h          |  2 +-
 .../native/juce_mac_CoreGraphicsContext.mm         |  2 +-
 .../native/juce_win32_Direct2DGraphicsContext.cpp  |  2 +-
 .../juce_gui_basics/components/juce_Component.cpp  |  2 +-
 .../juce_gui_basics/components/juce_Component.h    |  2 +-
 .../juce_DirectoryContentsDisplayComponent.h       |  2 +-
 .../filebrowser/juce_FileListComponent.cpp         |  2 +-
 .../filebrowser/juce_FileListComponent.h           |  2 +-
 .../filebrowser/juce_FileTreeComponent.cpp         |  2 +-
 .../filebrowser/juce_FileTreeComponent.h           |  2 +-
 .../keyboard/juce_TextInputTarget.h                |  6 +++---
 .../layout/juce_ResizableBorderComponent.cpp       |  2 +-
 .../layout/juce_ResizableBorderComponent.h         |  2 +-
 .../lookandfeel/juce_LookAndFeel.cpp               |  2 +-
 .../juce_gui_basics/lookandfeel/juce_LookAndFeel.h |  2 +-
 .../properties/juce_ButtonPropertyComponent.h      |  2 +-
 .../properties/juce_TextPropertyComponent.cpp      |  2 +-
 .../properties/juce_TextPropertyComponent.h        |  2 +-
 modules/juce_gui_basics/widgets/juce_ListBox.cpp   |  2 +-
 modules/juce_gui_basics/widgets/juce_ListBox.h     |  2 +-
 .../widgets/juce_TableHeaderComponent.cpp          |  2 +-
 .../widgets/juce_TableHeaderComponent.h            |  2 +-
 .../juce_gui_basics/widgets/juce_TextEditor.cpp    |  6 +++---
 modules/juce_gui_basics/widgets/juce_TextEditor.h  |  6 +++---
 .../code_editor/juce_CPlusPlusCodeTokeniser.cpp    |  2 +-
 .../code_editor/juce_CPlusPlusCodeTokeniser.h      |  2 +-
 .../code_editor/juce_CodeEditorComponent.cpp       | 10 +++++-----
 .../code_editor/juce_CodeEditorComponent.h         | 12 ++++++------
 .../code_editor/juce_CodeTokeniser.h               |  2 +-
 .../juce_gui_extra/misc/juce_ColourSelector.cpp    |  4 ++--
 modules/juce_gui_extra/misc/juce_ColourSelector.h  |  4 ++--
 .../juce_opengl/native/juce_ios_OpenGLComponent.mm |  2 +-
 .../native/juce_linux_OpenGLComponent.cpp          |  2 +-
 .../juce_opengl/native/juce_mac_OpenGLComponent.mm |  2 +-
 .../native/juce_win32_OpenGLComponent.cpp          |  2 +-
 .../juce_opengl/opengl/juce_OpenGLComponent.cpp    |  2 +-
 modules/juce_opengl/opengl/juce_OpenGLComponent.h  |  2 +-
 modules/juce_opengl/opengl/juce_OpenGLContext.h    |  2 +-
 79 files changed, 126 insertions(+), 128 deletions(-)

diff --git a/extras/Introjucer/Source/Utility/jucer_StoredSettings.h b/extras/Introjucer/Source/Utility/jucer_StoredSettings.h
index 3bc522f381..6b99043817 100644
--- a/extras/Introjucer/Source/Utility/jucer_StoredSettings.h
+++ b/extras/Introjucer/Source/Utility/jucer_StoredSettings.h
@@ -64,7 +64,7 @@ public:
         ColourSelectorWithSwatches() {}
 
         int getNumSwatches() const                                      { return StoredSettings::getInstance()->swatchColours.size(); }
-        const Colour getSwatchColour (int index) const                  { return StoredSettings::getInstance()->swatchColours [index]; }
+        Colour getSwatchColour (int index) const                        { return StoredSettings::getInstance()->swatchColours [index]; }
         void setSwatchColour (int index, const Colour& newColour) const { StoredSettings::getInstance()->swatchColours.set (index, newColour); }
     };
 
diff --git a/extras/the jucer/src/model/components/jucer_ButtonHandler.h b/extras/the jucer/src/model/components/jucer_ButtonHandler.h
index cb3a42dc95..80d974c9cb 100644
--- a/extras/the jucer/src/model/components/jucer_ButtonHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_ButtonHandler.h	
@@ -193,7 +193,7 @@ private:
                               "Change button text");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getButtonText();
         }
@@ -290,7 +290,7 @@ private:
                               "Change radio group ID");
         }
 
-        const String getText() const
+        String getText() const
         {
             return String (component->getRadioGroupId());
         }
diff --git a/extras/the jucer/src/model/components/jucer_ComboBoxHandler.h b/extras/the jucer/src/model/components/jucer_ComboBoxHandler.h
index 4d46902f2a..844eb0dd5d 100644
--- a/extras/the jucer/src/model/components/jucer_ComboBoxHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_ComboBoxHandler.h	
@@ -301,7 +301,7 @@ private:
                               "Change combo box items");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getProperties() ["items"];
         }
@@ -354,7 +354,7 @@ private:
                               "Change combo box text when nothing selected");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getTextWhenNothingSelected();
         }
@@ -405,7 +405,7 @@ private:
                               "Change combo box 'no items' text");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getTextWhenNoChoicesAvailable();
         }
diff --git a/extras/the jucer/src/model/components/jucer_ComponentNameProperty.h b/extras/the jucer/src/model/components/jucer_ComponentNameProperty.h
index 49a0b06259..b3e0961d7e 100644
--- a/extras/the jucer/src/model/components/jucer_ComponentNameProperty.h	
+++ b/extras/the jucer/src/model/components/jucer_ComponentNameProperty.h	
@@ -53,7 +53,7 @@ public:
                           "Change component name");
     }
 
-    const String getText() const
+    String getText() const
     {
         return component->getName();
     }
@@ -113,7 +113,7 @@ public:
                           "Change component member name");
     }
 
-    const String getText() const
+    String getText() const
     {
         return document.getComponentLayout()->getComponentMemberVariableName (component);
     }
@@ -172,7 +172,7 @@ public:
                           "Change component virtual class name");
     }
 
-    const String getText() const
+    String getText() const
     {
         return document.getComponentLayout()->getComponentVirtualClassName (component);
     }
diff --git a/extras/the jucer/src/model/components/jucer_ComponentTypeHandler.cpp b/extras/the jucer/src/model/components/jucer_ComponentTypeHandler.cpp
index 043e1e1399..e07acffb3b 100644
--- a/extras/the jucer/src/model/components/jucer_ComponentTypeHandler.cpp	
+++ b/extras/the jucer/src/model/components/jucer_ComponentTypeHandler.cpp	
@@ -268,7 +268,7 @@ public:
     {
     }
 
-    const String getText() const
+    String getText() const
     {
         SettableTooltipClient* ttc = dynamic_cast <SettableTooltipClient*> (component);
         return ttc->getTooltip();
@@ -372,7 +372,7 @@ public:
     {
     }
 
-    const String getText() const
+    String getText() const
     {
         return String (component->getExplicitFocusOrder());
     }
diff --git a/extras/the jucer/src/model/components/jucer_GenericComponentHandler.h b/extras/the jucer/src/model/components/jucer_GenericComponentHandler.h
index d7109b31b9..df3a817fde 100644
--- a/extras/the jucer/src/model/components/jucer_GenericComponentHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_GenericComponentHandler.h	
@@ -156,7 +156,7 @@ private:
                               "Change generic component class");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->actualClassName;
         }
@@ -206,7 +206,7 @@ private:
                               "Change generic component class");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->constructorParams;
         }
diff --git a/extras/the jucer/src/model/components/jucer_GroupComponentHandler.h b/extras/the jucer/src/model/components/jucer_GroupComponentHandler.h
index fd820442bc..9a93fc21ba 100644
--- a/extras/the jucer/src/model/components/jucer_GroupComponentHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_GroupComponentHandler.h	
@@ -133,7 +133,7 @@ private:
                               "Change group title");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getText();
         }
diff --git a/extras/the jucer/src/model/components/jucer_HyperlinkButtonHandler.h b/extras/the jucer/src/model/components/jucer_HyperlinkButtonHandler.h
index 0761f0465d..c3f7b9dd5d 100644
--- a/extras/the jucer/src/model/components/jucer_HyperlinkButtonHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_HyperlinkButtonHandler.h	
@@ -119,7 +119,7 @@ private:
                               "Change hyperlink URL");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getURL().toString (false);
         }
diff --git a/extras/the jucer/src/model/components/jucer_ImageButtonHandler.h b/extras/the jucer/src/model/components/jucer_ImageButtonHandler.h
index ebc29c6df6..eca7fb2542 100644
--- a/extras/the jucer/src/model/components/jucer_ImageButtonHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_ImageButtonHandler.h	
@@ -501,7 +501,7 @@ public:
             setImageColour (layout, owner, role, newColour, true);
         }
 
-        const Colour getColour() const
+        Colour getColour() const
         {
             return getImageColour (owner, role);
         }
diff --git a/extras/the jucer/src/model/components/jucer_JucerComponentHandler.h b/extras/the jucer/src/model/components/jucer_JucerComponentHandler.h
index 66fbb9133e..64c8e969b9 100644
--- a/extras/the jucer/src/model/components/jucer_JucerComponentHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_JucerComponentHandler.h	
@@ -217,7 +217,7 @@ private:
                 mw->openFile (component->findFile());
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "Open file for editing";
         }
@@ -241,7 +241,7 @@ private:
                               "Change Viewport content constructor params");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getConstructorParams();
         }
diff --git a/extras/the jucer/src/model/components/jucer_LabelHandler.h b/extras/the jucer/src/model/components/jucer_LabelHandler.h
index 8f85677995..fc80a82f67 100644
--- a/extras/the jucer/src/model/components/jucer_LabelHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_LabelHandler.h	
@@ -213,7 +213,7 @@ private:
                               "Change Label text");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getText();
         }
@@ -314,8 +314,7 @@ private:
     class LabelLossOfFocusProperty   : public ComponentChoiceProperty <Label>
     {
     public:
-        LabelLossOfFocusProperty (Label* component_,
-                                  JucerDocument& document_)
+        LabelLossOfFocusProperty (Label* component_, JucerDocument& document_)
            : ComponentChoiceProperty <Label> ("focus", component_, document_)
         {
             choices.add ("loss of focus discards changes");
@@ -438,8 +437,7 @@ private:
                               public ChangeListener
     {
     public:
-        FontNameProperty (Label* const label_,
-                          JucerDocument& document_)
+        FontNameProperty (Label* const label_, JucerDocument& document_)
             : FontPropertyComponent ("font"),
               label (label_),
               document (document_)
@@ -458,7 +456,7 @@ private:
                               "Change Label typeface");
         }
 
-        const String getTypefaceName() const
+        String getTypefaceName() const
         {
             return label->getProperties().getWithDefault ("typefaceName", FontPropertyComponent::defaultFont);
         }
diff --git a/extras/the jucer/src/model/components/jucer_SliderHandler.h b/extras/the jucer/src/model/components/jucer_SliderHandler.h
index eeb022bded..abc68dbae3 100644
--- a/extras/the jucer/src/model/components/jucer_SliderHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_SliderHandler.h	
@@ -421,7 +421,7 @@ private:
                               "Change Slider textbox size");
         }
 
-        const String getText() const
+        String getText() const
         {
             return String (isWidth ? component->getTextBoxWidth()
                                    : component->getTextBoxHeight());
@@ -507,7 +507,7 @@ private:
                               "Change Slider range");
         }
 
-        const String getText() const
+        String getText() const
         {
             Slider* s = dynamic_cast <Slider*> (component);
             jassert (s != 0);
@@ -586,7 +586,7 @@ private:
                               "Change Slider skew");
         }
 
-        const String getText() const
+        String getText() const
         {
             Slider* s = dynamic_cast <Slider*> (component);
             jassert (s != 0);
diff --git a/extras/the jucer/src/model/components/jucer_TabbedComponentHandler.h b/extras/the jucer/src/model/components/jucer_TabbedComponentHandler.h
index b2a519ab6a..d3f809bd4b 100644
--- a/extras/the jucer/src/model/components/jucer_TabbedComponentHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_TabbedComponentHandler.h	
@@ -653,7 +653,7 @@ private:
                               "Add a new tab");
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "Create a new tab";
         }
@@ -719,7 +719,7 @@ private:
             }
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "Delete a tab...";
         }
@@ -780,7 +780,7 @@ private:
                               "Change tab name");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getTabNames() [tabIndex];
         }
@@ -848,7 +848,7 @@ private:
                               "Change tab colour");
         }
 
-        const Colour getColour() const
+        Colour getColour() const
         {
             return component->getTabBackgroundColour (tabIndex);
         }
@@ -1047,7 +1047,7 @@ private:
                               "Change TabbedComponent content class");
         }
 
-        const String getText() const
+        String getText() const
         {
             return getTabClassName (component, tabIndex);
         }
@@ -1105,7 +1105,7 @@ private:
                               "Change TabbedComponent content constructor param");
         }
 
-        const String getText() const
+        String getText() const
         {
             return getTabConstructorParams (component, tabIndex);
         }
@@ -1177,7 +1177,7 @@ private:
             }
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "Move this tab...";
         }
diff --git a/extras/the jucer/src/model/components/jucer_TextEditorHandler.h b/extras/the jucer/src/model/components/jucer_TextEditorHandler.h
index fe89c6d55f..e3d293eaef 100644
--- a/extras/the jucer/src/model/components/jucer_TextEditorHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_TextEditorHandler.h	
@@ -400,7 +400,7 @@ private:
                               "Change TextEditor initial text");
         }
 
-        const String getText() const
+        String getText() const
         {
             return component->getProperties() ["initialText"];
         }
diff --git a/extras/the jucer/src/model/components/jucer_ViewportHandler.h b/extras/the jucer/src/model/components/jucer_ViewportHandler.h
index 5ea2678171..13ae1cdf76 100644
--- a/extras/the jucer/src/model/components/jucer_ViewportHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_ViewportHandler.h	
@@ -576,7 +576,7 @@ private:
                               "Change Viewport content class");
         }
 
-        const String getText() const
+        String getText() const
         {
             return getViewportGenericComponentClass (component);
         }
@@ -629,7 +629,7 @@ private:
                               "Change Viewport content constructor params");
         }
 
-        const String getText() const
+        String getText() const
         {
             return getViewportConstructorParams (component);
         }
diff --git a/extras/the jucer/src/model/paintelements/jucer_ColouredElement.cpp b/extras/the jucer/src/model/paintelements/jucer_ColouredElement.cpp
index 0ab160482b..0f820be682 100644
--- a/extras/the jucer/src/model/paintelements/jucer_ColouredElement.cpp	
+++ b/extras/the jucer/src/model/paintelements/jucer_ColouredElement.cpp	
@@ -179,7 +179,7 @@ public:
             owner->setStrokeFill (fill, true);
     }
 
-    const Colour getColour() const
+    Colour getColour() const
     {
         const JucerFillType fill (isForStroke ? owner->getStrokeType().fill
                                               : owner->getFillType());
diff --git a/extras/the jucer/src/model/paintelements/jucer_PaintElementEllipse.h b/extras/the jucer/src/model/paintelements/jucer_PaintElementEllipse.h
index 01c8106c4a..aac9beb803 100644
--- a/extras/the jucer/src/model/paintelements/jucer_PaintElementEllipse.h	
+++ b/extras/the jucer/src/model/paintelements/jucer_PaintElementEllipse.h	
@@ -153,7 +153,7 @@ private:
             element->convertToPath();
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "convert to a path";
         }
diff --git a/extras/the jucer/src/model/paintelements/jucer_PaintElementGroup.h b/extras/the jucer/src/model/paintelements/jucer_PaintElementGroup.h
index 4054d7b21e..553e7fa9a1 100644
--- a/extras/the jucer/src/model/paintelements/jucer_PaintElementGroup.h	
+++ b/extras/the jucer/src/model/paintelements/jucer_PaintElementGroup.h	
@@ -240,7 +240,7 @@ private:
             element->ungroup (true);
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "Ungroup";
         }
diff --git a/extras/the jucer/src/model/paintelements/jucer_PaintElementImage.h b/extras/the jucer/src/model/paintelements/jucer_PaintElementImage.h
index 0cd262847c..bec10068f8 100644
--- a/extras/the jucer/src/model/paintelements/jucer_PaintElementImage.h	
+++ b/extras/the jucer/src/model/paintelements/jucer_PaintElementImage.h	
@@ -514,7 +514,7 @@ private:
             element->resetToImageSize();
         }
 
-        const String getButtonText() const          { return "reset to image size"; }
+        String getButtonText() const          { return "reset to image size"; }
 
     private:
         PaintElementImage* const element;
diff --git a/extras/the jucer/src/model/paintelements/jucer_PaintElementPath.cpp b/extras/the jucer/src/model/paintelements/jucer_PaintElementPath.cpp
index ccc730a30a..18e9384f1d 100644
--- a/extras/the jucer/src/model/paintelements/jucer_PaintElementPath.cpp	
+++ b/extras/the jucer/src/model/paintelements/jucer_PaintElementPath.cpp	
@@ -1379,7 +1379,7 @@ public:
         owner->addPoint (index, true);
     }
 
-    const String getButtonText() const      { return "Add new point"; }
+    String getButtonText() const      { return "Add new point"; }
 
 private:
     PaintElementPath* const owner;
diff --git a/extras/the jucer/src/model/paintelements/jucer_PaintElementRectangle.h b/extras/the jucer/src/model/paintelements/jucer_PaintElementRectangle.h
index b381e7a586..abc556592e 100644
--- a/extras/the jucer/src/model/paintelements/jucer_PaintElementRectangle.h	
+++ b/extras/the jucer/src/model/paintelements/jucer_PaintElementRectangle.h	
@@ -160,7 +160,7 @@ private:
             element->convertToPath();
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "convert to a path";
         }
diff --git a/extras/the jucer/src/model/paintelements/jucer_PaintElementRoundedRectangle.h b/extras/the jucer/src/model/paintelements/jucer_PaintElementRoundedRectangle.h
index e29eba8931..ec562dca48 100644
--- a/extras/the jucer/src/model/paintelements/jucer_PaintElementRoundedRectangle.h	
+++ b/extras/the jucer/src/model/paintelements/jucer_PaintElementRoundedRectangle.h	
@@ -247,7 +247,7 @@ private:
             element->convertToPath();
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "convert to a path";
         }
diff --git a/extras/the jucer/src/model/paintelements/jucer_PaintElementText.h b/extras/the jucer/src/model/paintelements/jucer_PaintElementText.h
index ae1f40dfff..d63d42b1b8 100644
--- a/extras/the jucer/src/model/paintelements/jucer_PaintElementText.h	
+++ b/extras/the jucer/src/model/paintelements/jucer_PaintElementText.h	
@@ -284,7 +284,7 @@ public:
         }
     }
 
-    const String getTypefaceName() const throw()                    { return typefaceName; }
+    String getTypefaceName() const throw()                          { return typefaceName; }
 
     //==============================================================================
     const Justification& getJustification() const throw()           { return justification; }
@@ -382,7 +382,7 @@ private:
         }
 
         void setText (const String& newText)    { element->setText (newText, true); }
-        const String getText() const            { return element->getText(); }
+        String getText() const                  { return element->getText(); }
 
         void changeListenerCallback (ChangeBroadcaster*)     { refresh(); }
 
@@ -408,7 +408,7 @@ private:
         }
 
         void setTypefaceName (const String& newFontName)    { element->setTypefaceName (newFontName, true); }
-        const String getTypefaceName() const                { return element->getTypefaceName(); }
+        String getTypefaceName() const                      { return element->getTypefaceName(); }
 
         void changeListenerCallback (ChangeBroadcaster*)                 { refresh(); }
 
@@ -552,7 +552,7 @@ private:
             element->convertToPath();
         }
 
-        const String getButtonText() const
+        String getButtonText() const
         {
             return "convert text to a path";
         }
diff --git a/extras/the jucer/src/properties/jucer_ColourPropertyComponent.h b/extras/the jucer/src/properties/jucer_ColourPropertyComponent.h
index 92f44f541a..9400346b11 100644
--- a/extras/the jucer/src/properties/jucer_ColourPropertyComponent.h	
+++ b/extras/the jucer/src/properties/jucer_ColourPropertyComponent.h	
@@ -50,7 +50,7 @@ public:
 
     //==============================================================================
     virtual void setColour (const Colour& newColour) = 0;
-    virtual const Colour getColour() const = 0;
+    virtual Colour getColour() const = 0;
     virtual void resetToDefault() = 0;
 
     void refresh()
@@ -77,7 +77,7 @@ private:
             owner->setColour (newColour);
         }
 
-        const Colour getColour() const
+        Colour getColour() const
         {
             return owner->getColour();
         }
diff --git a/extras/the jucer/src/properties/jucer_ComponentColourProperty.h b/extras/the jucer/src/properties/jucer_ComponentColourProperty.h
index 678adbed42..ae8af004ce 100644
--- a/extras/the jucer/src/properties/jucer_ComponentColourProperty.h	
+++ b/extras/the jucer/src/properties/jucer_ComponentColourProperty.h	
@@ -86,7 +86,7 @@ public:
     }
 
     //==============================================================================
-    const Colour getColour() const
+    Colour getColour() const
     {
         return component->findColour (colourId);
     }
diff --git a/extras/the jucer/src/properties/jucer_FontPropertyComponent.h b/extras/the jucer/src/properties/jucer_FontPropertyComponent.h
index 5660e52179..392e6e9a81 100644
--- a/extras/the jucer/src/properties/jucer_FontPropertyComponent.h	
+++ b/extras/the jucer/src/properties/jucer_FontPropertyComponent.h	
@@ -45,7 +45,7 @@ public:
     static void preloadAllFonts();
 
     virtual void setTypefaceName (const String& newFontName) = 0;
-    virtual const String getTypefaceName() const = 0;
+    virtual String getTypefaceName() const = 0;
 
     static const Font applyNameToFont (const String& typefaceName, const Font& font);
     static const String getTypefaceNameCode (const String& typefaceName);
diff --git a/extras/the jucer/src/properties/jucer_PositionPropertyBase.h b/extras/the jucer/src/properties/jucer_PositionPropertyBase.h
index 3d51a8b62e..e625cdd767 100644
--- a/extras/the jucer/src/properties/jucer_PositionPropertyBase.h	
+++ b/extras/the jucer/src/properties/jucer_PositionPropertyBase.h	
@@ -72,7 +72,7 @@ public:
         deleteAllChildren();
     }
 
-    const String getText() const
+    String getText() const
     {
         RelativePositionedRectangle rpr (getPosition());
         PositionedRectangle& p = rpr.rect;
diff --git a/extras/the jucer/src/ui/jucer_JucerDocumentHolder.cpp b/extras/the jucer/src/ui/jucer_JucerDocumentHolder.cpp
index 7e44e08ad1..35543cedca 100644
--- a/extras/the jucer/src/ui/jucer_JucerDocumentHolder.cpp	
+++ b/extras/the jucer/src/ui/jucer_JucerDocumentHolder.cpp	
@@ -194,7 +194,7 @@ private:
         {}
 
         void setText (const String& newText)    { document.setClassName (newText); }
-        const String getText() const            { return document.getClassName(); }
+        String getText() const                  { return document.getClassName(); }
     };
 
     //==============================================================================
@@ -206,7 +206,7 @@ private:
         {}
 
         void setText (const String& newText)    { document.setComponentName (newText); }
-        const String getText() const            { return document.getComponentName(); }
+        String getText() const                  { return document.getComponentName(); }
     };
 
     //==============================================================================
@@ -218,7 +218,7 @@ private:
         {}
 
         void setText (const String& newText)    { document.setParentClasses (newText); }
-        const String getText() const            { return document.getParentClassString(); }
+        String getText() const                  { return document.getParentClassString(); }
     };
 
     //==============================================================================
@@ -230,7 +230,7 @@ private:
         {}
 
         void setText (const String& newText)    { document.setConstructorParams (newText); }
-        const String getText() const            { return document.getConstructorParams(); }
+        String getText() const                  { return document.getConstructorParams(); }
     };
 
     //==============================================================================
@@ -244,7 +244,7 @@ private:
         }
 
         void setText (const String& newText)    { document.setVariableInitialisers (newText); }
-        const String getText() const            { return document.getVariableInitialisers(); }
+        String getText() const                  { return document.getVariableInitialisers(); }
     };
 
 
@@ -266,7 +266,7 @@ private:
                 document.setInitialSize  (document.getInitialWidth(), newText.getIntValue());
         }
 
-        const String getText() const
+        String getText() const
         {
             return String (isWidth ? document.getInitialWidth()
                                    : document.getInitialHeight());
diff --git a/extras/the jucer/src/ui/jucer_PaintRoutinePanel.cpp b/extras/the jucer/src/ui/jucer_PaintRoutinePanel.cpp
index 8abe8c0fdd..9df497b75b 100644
--- a/extras/the jucer/src/ui/jucer_PaintRoutinePanel.cpp	
+++ b/extras/the jucer/src/ui/jucer_PaintRoutinePanel.cpp	
@@ -54,7 +54,7 @@ public:
     }
 
     void setColour (const Colour& newColour)    { routine.setBackgroundColour (newColour); }
-    const Colour getColour() const              { return routine.getBackgroundColour(); }
+    Colour getColour() const                    { return routine.getBackgroundColour(); }
 
     void resetToDefault()
     {
diff --git a/extras/the jucer/src/utility/jucer_ColourEditorComponent.h b/extras/the jucer/src/utility/jucer_ColourEditorComponent.h
index 4d14733380..0ebee35c5e 100644
--- a/extras/the jucer/src/utility/jucer_ColourEditorComponent.h	
+++ b/extras/the jucer/src/utility/jucer_ColourEditorComponent.h	
@@ -59,7 +59,7 @@ public:
 
     virtual void setColour (const Colour& newColour) = 0;
     virtual void resetToDefault() = 0;
-    virtual const Colour getColour() const = 0;
+    virtual Colour getColour() const = 0;
 
     void refresh()
     {
@@ -148,7 +148,7 @@ private:
                 return StoredSettings::getInstance()->swatchColours.size();
             }
 
-            const Colour getSwatchColour (int index) const
+            Colour getSwatchColour (int index) const
             {
                 return StoredSettings::getInstance()->swatchColours [index];
             }
diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp
index cd3eebf821..133798d2fa 100644
--- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp
+++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp
@@ -527,7 +527,7 @@ void MidiKeyboardComponent::setOctaveForMiddleC (const int octaveNumForMiddleC_)
     repaint();
 }
 
-const String MidiKeyboardComponent::getWhiteNoteText (const int midiNoteNumber)
+String MidiKeyboardComponent::getWhiteNoteText (const int midiNoteNumber)
 {
     if (keyWidth > 14.0f && midiNoteNumber % 12 == 0)
         return MidiMessage::getMidiNoteName (midiNoteNumber, true, true, octaveNumForMiddleC);
diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h
index df3d16b464..215560e1eb 100644
--- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h
+++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h
@@ -333,7 +333,7 @@ protected:
 
         @see setOctaveForMiddleC
     */
-    virtual const String getWhiteNoteText (const int midiNoteNumber);
+    virtual String getWhiteNoteText (const int midiNoteNumber);
 
     /** Draws the up and down buttons that change the base note. */
     virtual void drawUpDownButton (Graphics& g, int w, int h,
diff --git a/modules/juce_graphics/contexts/juce_GraphicsContext.cpp b/modules/juce_graphics/contexts/juce_GraphicsContext.cpp
index 547ab7a8e8..19301240d1 100644
--- a/modules/juce_graphics/contexts/juce_GraphicsContext.cpp
+++ b/modules/juce_graphics/contexts/juce_GraphicsContext.cpp
@@ -123,7 +123,7 @@ bool Graphics::isClipEmpty() const
     return context->isClipEmpty();
 }
 
-const Rectangle<int> Graphics::getClipBounds() const
+Rectangle<int> Graphics::getClipBounds() const
 {
     return context->getClipBounds();
 }
diff --git a/modules/juce_graphics/contexts/juce_GraphicsContext.h b/modules/juce_graphics/contexts/juce_GraphicsContext.h
index 59038249b7..e7f9e3a95e 100644
--- a/modules/juce_graphics/contexts/juce_GraphicsContext.h
+++ b/modules/juce_graphics/contexts/juce_GraphicsContext.h
@@ -547,7 +547,7 @@ public:
 
         @see getClipRegion, clipRegionIntersects
     */
-    const Rectangle<int> getClipBounds() const;
+    Rectangle<int> getClipBounds() const;
 
     /** Checks whether a rectangle overlaps the context's clipping region.
 
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
index f573473a93..72650b2f05 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
@@ -76,7 +76,7 @@ public:
     virtual void clipToImageAlpha (const Image& sourceImage, const AffineTransform& transform) = 0;
 
     virtual bool clipRegionIntersects (const Rectangle<int>& r) = 0;
-    virtual const Rectangle<int> getClipBounds() const = 0;
+    virtual Rectangle<int> getClipBounds() const = 0;
     virtual bool isClipEmpty() const = 0;
 
     virtual void saveState() = 0;
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp
index 9fb7fa5fcf..11c31deeec 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp
@@ -153,7 +153,7 @@ bool LowLevelGraphicsPostScriptRenderer::clipRegionIntersects (const Rectangle<i
     return stateStack.getLast()->clip.intersectsRectangle (r.translated (stateStack.getLast()->xOffset, stateStack.getLast()->yOffset));
 }
 
-const Rectangle<int> LowLevelGraphicsPostScriptRenderer::getClipBounds() const
+Rectangle<int> LowLevelGraphicsPostScriptRenderer::getClipBounds() const
 {
     return stateStack.getLast()->clip.getBounds().translated (-stateStack.getLast()->xOffset,
                                                               -stateStack.getLast()->yOffset);
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
index 889be4a95b..0afb338b3b 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
@@ -65,7 +65,7 @@ public:
     void endTransparencyLayer();
 
     bool clipRegionIntersects (const Rectangle<int>& r);
-    const Rectangle<int> getClipBounds() const;
+    Rectangle<int> getClipBounds() const;
     bool isClipEmpty() const;
 
     //==============================================================================
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp
index 6c91bbc3a1..78f9421211 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp
@@ -2281,7 +2281,7 @@ bool LowLevelGraphicsSoftwareRenderer::clipRegionIntersects (const Rectangle<int
     return currentState->clipRegionIntersects (r);
 }
 
-const Rectangle<int> LowLevelGraphicsSoftwareRenderer::getClipBounds() const
+Rectangle<int> LowLevelGraphicsSoftwareRenderer::getClipBounds() const
 {
     return currentState->getClipBounds();
 }
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
index cffd88ecea..ebf6f6c829 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
@@ -59,7 +59,7 @@ public:
     void clipToImageAlpha (const Image& sourceImage, const AffineTransform& transform);
 
     bool clipRegionIntersects (const Rectangle<int>& r);
-    const Rectangle<int> getClipBounds() const;
+    Rectangle<int> getClipBounds() const;
     bool isClipEmpty() const;
 
     void saveState();
diff --git a/modules/juce_graphics/images/juce_Image.h b/modules/juce_graphics/images/juce_Image.h
index ce0941c919..fe9ec2a121 100644
--- a/modules/juce_graphics/images/juce_Image.h
+++ b/modules/juce_graphics/images/juce_Image.h
@@ -410,7 +410,7 @@ public:
         static SharedImage* createNativeImage (PixelFormat format, int width, int height, bool clearImage);
         static SharedImage* createSoftwareImage (PixelFormat format, int width, int height, bool clearImage);
 
-        const PixelFormat getPixelFormat() const noexcept   { return format; }
+        PixelFormat getPixelFormat() const noexcept         { return format; }
         int getWidth() const noexcept                       { return width; }
         int getHeight() const noexcept                      { return height; }
 
diff --git a/modules/juce_graphics/native/juce_android_GraphicsContext.cpp b/modules/juce_graphics/native/juce_android_GraphicsContext.cpp
index b71a6b70ad..71929aa15d 100644
--- a/modules/juce_graphics/native/juce_android_GraphicsContext.cpp
+++ b/modules/juce_graphics/native/juce_android_GraphicsContext.cpp
@@ -400,7 +400,7 @@ public:
         return getClipBounds().intersects (r);
     }
 
-    const Rectangle<int> getClipBounds() const
+    Rectangle<int> getClipBounds() const
     {
         JNIEnv* env = getEnv();
         jobject rect = getCanvas().callObjectMethod (Canvas.getClipBounds2);
diff --git a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h
index 78c9043fcf..dfa3c63b88 100644
--- a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h
+++ b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h
@@ -45,7 +45,7 @@ public:
     void clipToPath (const Path& path, const AffineTransform& transform);
     void clipToImageAlpha (const Image& sourceImage, const AffineTransform& transform);
     bool clipRegionIntersects (const Rectangle<int>& r);
-    const Rectangle<int> getClipBounds() const;
+    Rectangle<int> getClipBounds() const;
     bool isClipEmpty() const;
 
     //==============================================================================
diff --git a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm
index c9ae631f49..4429ad9aea 100644
--- a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm
+++ b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm
@@ -272,7 +272,7 @@ bool CoreGraphicsContext::clipRegionIntersects (const Rectangle<int>& r)
     return getClipBounds().intersects (r);
 }
 
-const Rectangle<int> CoreGraphicsContext::getClipBounds() const
+Rectangle<int> CoreGraphicsContext::getClipBounds() const
 {
     if (! lastClipRectIsValid)
     {
diff --git a/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp b/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp
index 6abad6e014..85634f3b6e 100644
--- a/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp
+++ b/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp
@@ -160,7 +160,7 @@ public:
         return currentState->clipRect.intersects (r2);
     }
 
-    const Rectangle<int> getClipBounds() const
+    Rectangle<int> getClipBounds() const
     {
         // xxx could this take into account complex clip regions?
         return currentState->clipRect - currentState->origin;
diff --git a/modules/juce_gui_basics/components/juce_Component.cpp b/modules/juce_gui_basics/components/juce_Component.cpp
index e639f463f6..a654c8e07c 100644
--- a/modules/juce_gui_basics/components/juce_Component.cpp
+++ b/modules/juce_gui_basics/components/juce_Component.cpp
@@ -1646,7 +1646,7 @@ void Component::setMouseCursor (const MouseCursor& newCursor)
     }
 }
 
-const MouseCursor Component::getMouseCursor()
+MouseCursor Component::getMouseCursor()
 {
     return cursor;
 }
diff --git a/modules/juce_gui_basics/components/juce_Component.h b/modules/juce_gui_basics/components/juce_Component.h
index 27b753d11c..988a3ad339 100644
--- a/modules/juce_gui_basics/components/juce_Component.h
+++ b/modules/juce_gui_basics/components/juce_Component.h
@@ -1406,7 +1406,7 @@ public:
 
         @see MouseCursor
     */
-    virtual const MouseCursor getMouseCursor();
+    virtual MouseCursor getMouseCursor();
 
     /** Forces the current mouse cursor to be updated.
 
diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h
index 156165a0b1..0f231b7c80 100644
--- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h
@@ -57,7 +57,7 @@ public:
         The index should be in the range 0 to (getNumSelectedFiles() - 1).
         @see getNumSelectedFiles
     */
-    virtual const File getSelectedFile (int index) const = 0;
+    virtual File getSelectedFile (int index) const = 0;
 
     /** Deselects any selected files. */
     virtual void deselectAllFiles() = 0;
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp
index 028dfadf0e..d292a5f1fc 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp
+++ b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp
@@ -47,7 +47,7 @@ int FileListComponent::getNumSelectedFiles() const
     return getNumSelectedRows();
 }
 
-const File FileListComponent::getSelectedFile (int index) const
+File FileListComponent::getSelectedFile (int index) const
 {
     return fileList.getFile (getSelectedRow (index));
 }
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.h
index 91b19b0541..54256530cc 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.h
@@ -68,7 +68,7 @@ public:
         The index should be in the range 0 to (getNumSelectedFiles() - 1).
         @see getNumSelectedFiles
     */
-    const File getSelectedFile (int index = 0) const;
+    File getSelectedFile (int index = 0) const;
 
     /** Deselects any files that are currently selected. */
     void deselectAllFiles();
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp
index 6dd24ce576..290636e32f 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp
+++ b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp
@@ -227,7 +227,7 @@ FileTreeComponent::~FileTreeComponent()
 }
 
 //==============================================================================
-const File FileTreeComponent::getSelectedFile (const int index) const
+File FileTreeComponent::getSelectedFile (const int index) const
 {
     const FileListTreeItem* const item = dynamic_cast <const FileListTreeItem*> (getSelectedItem (index));
 
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.h
index d09e730e22..6c256e7030 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.h
@@ -64,7 +64,7 @@ public:
         The index should be in the range 0 to (getNumSelectedFiles() - 1).
         @see getNumSelectedFiles
     */
-    const File getSelectedFile (int index = 0) const;
+    File getSelectedFile (int index = 0) const;
 
     /** Deselects any files that are currently selected. */
     void deselectAllFiles();
diff --git a/modules/juce_gui_basics/keyboard/juce_TextInputTarget.h b/modules/juce_gui_basics/keyboard/juce_TextInputTarget.h
index 5d2adb2a00..192368cbd4 100644
--- a/modules/juce_gui_basics/keyboard/juce_TextInputTarget.h
+++ b/modules/juce_gui_basics/keyboard/juce_TextInputTarget.h
@@ -54,7 +54,7 @@ public:
     /** Returns the extents of the selected text region, or an empty range if
         nothing is selected,
     */
-    virtual const Range<int> getHighlightedRegion() const = 0;
+    virtual Range<int> getHighlightedRegion() const = 0;
 
     /** Sets the currently-selected text region. */
     virtual void setHighlightedRegion (const Range<int>& newRange) = 0;
@@ -65,13 +65,13 @@ public:
     virtual void setTemporaryUnderlining (const Array <Range<int> >& underlinedRegions) = 0;
 
     /** Returns a specified sub-section of the text. */
-    virtual const String getTextInRange (const Range<int>& range) const = 0;
+    virtual String getTextInRange (const Range<int>& range) const = 0;
 
     /** Inserts some text, overwriting the selected text region, if there is one. */
     virtual void insertTextAtCaret (const String& textToInsert) = 0;
 
     /** Returns the position of the caret, relative to the component's origin. */
-    virtual const Rectangle<int> getCaretRectangle() = 0;
+    virtual Rectangle<int> getCaretRectangle() = 0;
 };
 
 
diff --git a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp
index aecb2ae2ca..17692b7ebf 100644
--- a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp
+++ b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp
@@ -68,7 +68,7 @@ const ResizableBorderComponent::Zone ResizableBorderComponent::Zone::fromPositio
     return Zone (z);
 }
 
-const MouseCursor ResizableBorderComponent::Zone::getMouseCursor() const noexcept
+MouseCursor ResizableBorderComponent::Zone::getMouseCursor() const noexcept
 {
     MouseCursor::StandardCursorType mc = MouseCursor::NormalCursor;
 
diff --git a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h
index 8f94087231..2033808f28 100644
--- a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h
+++ b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h
@@ -122,7 +122,7 @@ public:
                                                 const Point<int>& position);
 
         /** Returns an appropriate mouse-cursor for this resize zone. */
-        const MouseCursor getMouseCursor() const noexcept;
+        MouseCursor getMouseCursor() const noexcept;
 
         /** Returns true if dragging this zone will move the enire object without resizing it. */
         bool isDraggingWholeObject() const noexcept     { return zone == centre; }
diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp
index e6ee0b8138..075e8d1379 100644
--- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp
+++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp
@@ -327,7 +327,7 @@ void LookAndFeel::setDefaultSansSerifTypefaceName (const String& newName)
 }
 
 //==============================================================================
-const MouseCursor LookAndFeel::getMouseCursorFor (Component& component)
+MouseCursor LookAndFeel::getMouseCursorFor (Component& component)
 {
     return component.getMouseCursor();
 }
diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h
index ba192bdffa..c1eb7a2a9a 100644
--- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h
+++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h
@@ -142,7 +142,7 @@ public:
     /** Override this to get the chance to swap a component's mouse cursor for a
         customised one.
     */
-    virtual const MouseCursor getMouseCursorFor (Component& component);
+    virtual MouseCursor getMouseCursorFor (Component& component);
 
     //==============================================================================
     /** Draws the lozenge-shaped background for a standard button. */
diff --git a/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h b/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h
index 0f23b4501d..913bd38102 100644
--- a/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h
+++ b/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h
@@ -64,7 +64,7 @@ public:
 
         If you need to change this string, call refresh() to update the component.
     */
-    virtual const String getButtonText() const = 0;
+    virtual String getButtonText() const = 0;
 
     //==============================================================================
     /** @internal */
diff --git a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
index c9669d92f8..4b41e1fe2b 100644
--- a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
+++ b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
@@ -96,7 +96,7 @@ void TextPropertyComponent::setText (const String& newText)
     textEditor->setText (newText, true);
 }
 
-const String TextPropertyComponent::getText() const
+String TextPropertyComponent::getText() const
 {
     return textEditor->getText();
 }
diff --git a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.h b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.h
index 7f42d9086d..ca78a1ccf5 100644
--- a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.h
+++ b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.h
@@ -77,7 +77,7 @@ public:
 
     /** Returns the text that should be shown in the text editor.
     */
-    virtual const String getText() const;
+    virtual String getText() const;
 
 
     //==============================================================================
diff --git a/modules/juce_gui_basics/widgets/juce_ListBox.cpp b/modules/juce_gui_basics/widgets/juce_ListBox.cpp
index 90a65376a5..50db21fcb9 100644
--- a/modules/juce_gui_basics/widgets/juce_ListBox.cpp
+++ b/modules/juce_gui_basics/widgets/juce_ListBox.cpp
@@ -861,7 +861,7 @@ void ListBox::repaintRow (const int rowNumber) noexcept
     repaint (getRowPosition (rowNumber, true));
 }
 
-const Image ListBox::createSnapshotOfSelectedRows (int& imageX, int& imageY)
+Image ListBox::createSnapshotOfSelectedRows (int& imageX, int& imageY)
 {
     Rectangle<int> imageArea;
     const int firstRow = getRowContainingPosition (0, 0);
diff --git a/modules/juce_gui_basics/widgets/juce_ListBox.h b/modules/juce_gui_basics/widgets/juce_ListBox.h
index 8c7b77b8c8..a44e5dae9e 100644
--- a/modules/juce_gui_basics/widgets/juce_ListBox.h
+++ b/modules/juce_gui_basics/widgets/juce_ListBox.h
@@ -524,7 +524,7 @@ public:
 
         @see Component::createComponentSnapshot
     */
-    virtual const Image createSnapshotOfSelectedRows (int& x, int& y);
+    virtual Image createSnapshotOfSelectedRows (int& x, int& y);
 
     /** Returns the viewport that this ListBox uses.
 
diff --git a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp
index f58af0d0ff..5e409d9cf0 100644
--- a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp
@@ -779,7 +779,7 @@ void TableHeaderComponent::mouseUp (const MouseEvent& e)
     dragOverlayComp = nullptr;
 }
 
-const MouseCursor TableHeaderComponent::getMouseCursor()
+MouseCursor TableHeaderComponent::getMouseCursor()
 {
     if (columnIdBeingResized != 0 || (getResizeDraggerAt (getMouseXYRelative().getX()) != 0 && ! isMouseButtonDown()))
         return MouseCursor (MouseCursor::LeftRightResizeCursor);
diff --git a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h
index 8b77562254..ea8f58b21a 100644
--- a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h
+++ b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h
@@ -389,7 +389,7 @@ public:
     /** @internal */
     void mouseUp (const MouseEvent&);
     /** @internal */
-    const MouseCursor getMouseCursor();
+    MouseCursor getMouseCursor();
 
     /** Can be overridden for more control over the pop-up menu behaviour. */
     virtual void showColumnChooserMenu (int columnIdClicked);
diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
index 502c82e270..660e864f94 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
@@ -892,7 +892,7 @@ public:
         owner.timerCallbackInt();
     }
 
-    const MouseCursor getMouseCursor()
+    MouseCursor getMouseCursor()
     {
         return owner.getMouseCursor();
     }
@@ -1417,7 +1417,7 @@ void TextEditor::scrollEditorToPositionCaret (const int desiredCaretX,
     viewport->setViewPosition (vx, vy);
 }
 
-const Rectangle<int> TextEditor::getCaretRectangle()
+Rectangle<int> TextEditor::getCaretRectangle()
 {
     float cursorX, cursorY;
     float cursorHeight = currentFont.getHeight(); // (in case the text is empty and the call below doesn't set this value)
@@ -2462,7 +2462,7 @@ String TextEditor::getText() const
     return mo.toString();
 }
 
-const String TextEditor::getTextInRange (const Range<int>& range) const
+String TextEditor::getTextInRange (const Range<int>& range) const
 {
     if (range.isEmpty())
         return String::empty;
diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.h b/modules/juce_gui_basics/widgets/juce_TextEditor.h
index 24c1ece7cf..309b695520 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.h
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.h
@@ -335,7 +335,7 @@ public:
     String getText() const;
 
     /** Returns a section of the contents of the editor. */
-    const String getTextInRange (const Range<int>& textRange) const;
+    String getTextInRange (const Range<int>& textRange) const;
 
     /** Returns true if there are no characters in the editor.
 
@@ -428,7 +428,7 @@ public:
         The rectangle returned is relative to the component's top-left corner.
         @see scrollEditorToPositionCaret
     */
-    const Rectangle<int> getCaretRectangle();
+    Rectangle<int> getCaretRectangle();
 
     /** Selects a section of the text. */
     void setHighlightedRegion (const Range<int>& newSelection);
@@ -437,7 +437,7 @@ public:
         If nothing is selected, this will return an empty range.
         @see setHighlightedRegion
     */
-    const Range<int> getHighlightedRegion() const                   { return selection; }
+    Range<int> getHighlightedRegion() const                   { return selection; }
 
     /** Returns the section of text that is currently selected. */
     String getHighlightedText() const;
diff --git a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.cpp b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.cpp
index 029f6156f9..3f3bbeaecf 100644
--- a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.cpp
+++ b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.cpp
@@ -582,7 +582,7 @@ StringArray CPlusPlusCodeTokeniser::getTokenTypes()
     return StringArray (types);
 }
 
-const Colour CPlusPlusCodeTokeniser::getDefaultColour (const int tokenType)
+Colour CPlusPlusCodeTokeniser::getDefaultColour (const int tokenType)
 {
     const uint32 colours[] =
     {
diff --git a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
index b501c47c0e..b1abb0bf99 100644
--- a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
+++ b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
@@ -61,7 +61,7 @@ public:
     //==============================================================================
     int readNextToken (CodeDocument::Iterator& source);
     StringArray getTokenTypes();
-    const Colour getDefaultColour (int tokenType);
+    Colour getDefaultColour (int tokenType);
 
     /** This is a handy method for checking whether a string is a c++ reserved keyword. */
     static bool isReservedKeyword (const String& token) noexcept;
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp
index 54143be7cf..f678ee3561 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp
+++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp
@@ -306,7 +306,7 @@ void CodeEditorComponent::setTemporaryUnderlining (const Array <Range<int> >&)
     jassertfalse; // TODO Windows IME not yet supported for this comp..
 }
 
-const Rectangle<int> CodeEditorComponent::getCaretRectangle()
+Rectangle<int> CodeEditorComponent::getCaretRectangle()
 {
     return getLocalArea (caret, caret->getLocalBounds());
 }
@@ -568,7 +568,7 @@ void CodeEditorComponent::scrollToKeepCaretOnScreen()
         scrollToColumn (column);
 }
 
-const Rectangle<int> CodeEditorComponent::getCharacterBounds (const CodeDocument::Position& pos) const
+Rectangle<int> CodeEditorComponent::getCharacterBounds (const CodeDocument::Position& pos) const
 {
     return Rectangle<int> (roundToInt ((gutter - xOffset * charWidth) + indexToColumn (pos.getLineNumber(), pos.getIndexInLine()) * charWidth),
                            (pos.getLineNumber() - firstLineOnScreen) * lineHeight,
@@ -576,7 +576,7 @@ const Rectangle<int> CodeEditorComponent::getCharacterBounds (const CodeDocument
                            lineHeight);
 }
 
-const CodeDocument::Position CodeEditorComponent::getPositionAt (int x, int y)
+CodeDocument::Position CodeEditorComponent::getPositionAt (int x, int y)
 {
     const int line = y / lineHeight + firstLineOnScreen;
     const int column = roundToInt ((x - (gutter - xOffset * charWidth)) / charWidth);
@@ -879,7 +879,7 @@ void CodeEditorComponent::timerCallback()
 }
 
 //==============================================================================
-const Range<int> CodeEditorComponent::getHighlightedRegion() const
+Range<int> CodeEditorComponent::getHighlightedRegion() const
 {
     return Range<int> (selectionStart.getPosition(), selectionEnd.getPosition());
 }
@@ -890,7 +890,7 @@ void CodeEditorComponent::setHighlightedRegion (const Range<int>& newRange)
     moveCaretTo (CodeDocument::Position (&document, newRange.getEnd()), true);
 }
 
-const String CodeEditorComponent::getTextInRange (const Range<int>& range) const
+String CodeEditorComponent::getTextInRange (const Range<int>& range) const
 {
     return document.getTextBetween (CodeDocument::Position (&document, range.getStart()),
                                     CodeDocument::Position (&document, range.getEnd()));
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
index 5187b4e906..82f74ceb4e 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
@@ -89,10 +89,10 @@ public:
     int getNumColumnsOnScreen() const noexcept                  { return columnsOnScreen; }
 
     /** Returns the current caret position. */
-    const CodeDocument::Position getCaretPos() const            { return caretPos; }
+    CodeDocument::Position getCaretPos() const                  { return caretPos; }
 
     /** Returns the position of the caret, relative to the editor's origin. */
-    const Rectangle<int> getCaretRectangle();
+    Rectangle<int> getCaretRectangle();
 
     /** Moves the caret.
         If selecting is true, the section of the document between the current
@@ -104,12 +104,12 @@ public:
     /** Returns the on-screen position of a character in the document.
         The rectangle returned is relative to this component's top-left origin.
     */
-    const Rectangle<int> getCharacterBounds (const CodeDocument::Position& pos) const;
+    Rectangle<int> getCharacterBounds (const CodeDocument::Position& pos) const;
 
     /** Finds the character at a given on-screen position.
         The co-ordinates are relative to this component's top-left origin.
     */
-    const CodeDocument::Position getPositionAt (int x, int y);
+    CodeDocument::Position getPositionAt (int x, int y);
 
     //==============================================================================
     bool moveCaretLeft (bool moveInWholeWordSteps, bool selecting);
@@ -144,9 +144,9 @@ public:
     void insertTabAtCaret();
 
     //==============================================================================
-    const Range<int> getHighlightedRegion() const;
+    Range<int> getHighlightedRegion() const;
     void setHighlightedRegion (const Range<int>& newRange);
-    const String getTextInRange (const Range<int>& range) const;
+    String getTextInRange (const Range<int>& range) const;
 
     //==============================================================================
     /** Changes the current tab settings.
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h b/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
index 5b118e4bdd..4f83e6bbce 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
@@ -60,7 +60,7 @@ public:
     /** Returns a suggested syntax highlighting colour for a specified
         token type.
     */
-    virtual const Colour getDefaultColour (int tokenType) = 0;
+    virtual Colour getDefaultColour (int tokenType) = 0;
 
 
 private:
diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp
index 1402407fba..2145c4d3b5 100644
--- a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp
+++ b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp
@@ -360,7 +360,7 @@ ColourSelector::~ColourSelector()
 }
 
 //==============================================================================
-const Colour ColourSelector::getCurrentColour() const
+Colour ColourSelector::getCurrentColour() const
 {
     return ((flags & showAlphaChannel) != 0) ? colour
                                              : colour.withAlpha ((uint8) 0xff);
@@ -570,7 +570,7 @@ int ColourSelector::getNumSwatches() const
     return 0;
 }
 
-const Colour ColourSelector::getSwatchColour (const int) const
+Colour ColourSelector::getSwatchColour (const int) const
 {
     jassertfalse; // if you've overridden getNumSwatches(), you also need to implement this method
     return Colours::black;
diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.h b/modules/juce_gui_extra/misc/juce_ColourSelector.h
index 012a4aa785..91f39272c0 100644
--- a/modules/juce_gui_extra/misc/juce_ColourSelector.h
+++ b/modules/juce_gui_extra/misc/juce_ColourSelector.h
@@ -78,7 +78,7 @@ public:
 
         @see setCurrentColour
     */
-    const Colour getCurrentColour() const;
+    Colour getCurrentColour() const;
 
     /** Changes the colour that is currently being shown.
     */
@@ -101,7 +101,7 @@ public:
         setSwatchColour(), to return the number of colours you want, and to set and retrieve
         their values.
     */
-    virtual const Colour getSwatchColour (int index) const;
+    virtual Colour getSwatchColour (int index) const;
 
     /** Called by the selector when the user puts a new colour into one of the swatches.
 
diff --git a/modules/juce_opengl/native/juce_ios_OpenGLComponent.mm b/modules/juce_opengl/native/juce_ios_OpenGLComponent.mm
index 07c4ec11c4..f1744ebf99 100644
--- a/modules/juce_opengl/native/juce_ios_OpenGLComponent.mm
+++ b/modules/juce_opengl/native/juce_ios_OpenGLComponent.mm
@@ -112,7 +112,7 @@ public:
         return [EAGLContext currentContext] == context;
     }
 
-    const OpenGLPixelFormat getPixelFormat() const  { return pixelFormat; }
+    OpenGLPixelFormat getPixelFormat() const        { return pixelFormat; }
     void* getRawContext() const noexcept            { return glLayer; }
 
     void updateWindowPosition (const Rectangle<int>& bounds)
diff --git a/modules/juce_opengl/native/juce_linux_OpenGLComponent.cpp b/modules/juce_opengl/native/juce_linux_OpenGLComponent.cpp
index b58ced6f15..2774be70ca 100644
--- a/modules/juce_opengl/native/juce_linux_OpenGLComponent.cpp
+++ b/modules/juce_opengl/native/juce_linux_OpenGLComponent.cpp
@@ -132,7 +132,7 @@ public:
         return glXGetCurrentContext() == renderContext;
     }
 
-    const OpenGLPixelFormat getPixelFormat() const
+    OpenGLPixelFormat getPixelFormat() const
     {
         return pixelFormat;
     }
diff --git a/modules/juce_opengl/native/juce_mac_OpenGLComponent.mm b/modules/juce_opengl/native/juce_mac_OpenGLComponent.mm
index 958d36e209..56f99b3102 100644
--- a/modules/juce_opengl/native/juce_mac_OpenGLComponent.mm
+++ b/modules/juce_opengl/native/juce_mac_OpenGLComponent.mm
@@ -205,7 +205,7 @@ public:
         return [NSOpenGLContext currentContext] == renderContext;
     }
 
-    const OpenGLPixelFormat getPixelFormat() const  { return pixelFormat; }
+    OpenGLPixelFormat getPixelFormat() const        { return pixelFormat; }
     void* getRawContext() const noexcept            { return renderContext; }
 
     void updateWindowPosition (const Rectangle<int>&) {}
diff --git a/modules/juce_opengl/native/juce_win32_OpenGLComponent.cpp b/modules/juce_opengl/native/juce_win32_OpenGLComponent.cpp
index 9f68bdb1f2..09ea84f2af 100644
--- a/modules/juce_opengl/native/juce_win32_OpenGLComponent.cpp
+++ b/modules/juce_opengl/native/juce_win32_OpenGLComponent.cpp
@@ -143,7 +143,7 @@ public:
         return wglGetCurrentContext() == renderContext;
     }
 
-    const OpenGLPixelFormat getPixelFormat() const
+    OpenGLPixelFormat getPixelFormat() const
     {
         OpenGLPixelFormat pf;
 
diff --git a/modules/juce_opengl/opengl/juce_OpenGLComponent.cpp b/modules/juce_opengl/opengl/juce_OpenGLComponent.cpp
index bef929ddcd..53e4bc6e99 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLComponent.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLComponent.cpp
@@ -241,7 +241,7 @@ OpenGLComponent::~OpenGLComponent()
     componentWatcher = nullptr;
 }
 
-const OpenGLPixelFormat OpenGLComponent::getPixelFormat() const
+OpenGLPixelFormat OpenGLComponent::getPixelFormat() const
 {
     OpenGLPixelFormat pf;
 
diff --git a/modules/juce_opengl/opengl/juce_OpenGLComponent.h b/modules/juce_opengl/opengl/juce_OpenGLComponent.h
index fa3225b35c..ec534c1e91 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLComponent.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLComponent.h
@@ -78,7 +78,7 @@ public:
     void setPixelFormat (const OpenGLPixelFormat& formatToUse);
 
     /** Returns the pixel format that this component is currently using. */
-    const OpenGLPixelFormat getPixelFormat() const;
+    OpenGLPixelFormat getPixelFormat() const;
 
     /** Specifies an OpenGL context which should be shared with the one that this
         component is using.
diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.h b/modules/juce_opengl/opengl/juce_OpenGLContext.h
index df0ee99c19..be1c4f6e53 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLContext.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLContext.h
@@ -70,7 +70,7 @@ public:
 
     //==============================================================================
     /** Returns the pixel format being used by this context. */
-    virtual const OpenGLPixelFormat getPixelFormat() const = 0;
+    virtual OpenGLPixelFormat getPixelFormat() const = 0;
 
     /** For windowed contexts, this moves the context within the bounds of
         its parent window.