From 723a15c7a060a361db98b652182e6b9ce02189ce Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 14 Aug 2017 13:10:40 +0100 Subject: [PATCH] Removed a few more old compiler workarounds --- .../components/jucer_LabelHandler.h | 2 +- .../Source/Utility/jucer_JucerTreeViewBase.cpp | 2 +- .../Source/Utility/jucer_SVGPathDataComponent.h | 2 +- .../Projucer/Source/Utility/jucer_UTF8Component.h | 2 +- modules/juce_gui_basics/buttons/juce_Button.cpp | 2 +- .../properties/juce_ChoicePropertyComponent.cpp | 2 +- modules/juce_gui_basics/widgets/juce_ComboBox.h | 2 +- modules/juce_gui_basics/widgets/juce_Label.h | 4 ++-- modules/juce_gui_basics/widgets/juce_Slider.cpp | 2 +- .../juce_gui_basics/widgets/juce_TextEditor.cpp | 14 +++++++------- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extras/Projucer/Source/ComponentEditor/components/jucer_LabelHandler.h b/extras/Projucer/Source/ComponentEditor/components/jucer_LabelHandler.h index 361e845de9..87a8b165de 100644 --- a/extras/Projucer/Source/ComponentEditor/components/jucer_LabelHandler.h +++ b/extras/Projucer/Source/ComponentEditor/components/jucer_LabelHandler.h @@ -152,7 +152,7 @@ public: if (needsCallback (component)) { - String& callback = code.getCallbackCode ("public LabelListener", + String& callback = code.getCallbackCode ("public Label::Listener", "void", "labelTextChanged (Label* labelThatHasChanged)", true); diff --git a/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.cpp b/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.cpp index 0163cd5ea1..0ffc16123a 100644 --- a/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.cpp +++ b/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.cpp @@ -134,7 +134,7 @@ Component* JucerTreeViewBase::createItemComponent() //============================================================================== class RenameTreeItemCallback : public ModalComponentManager::Callback, - public TextEditorListener + public TextEditor::Listener { public: RenameTreeItemCallback (JucerTreeViewBase& ti, Component& parent, const Rectangle& bounds) diff --git a/extras/Projucer/Source/Utility/jucer_SVGPathDataComponent.h b/extras/Projucer/Source/Utility/jucer_SVGPathDataComponent.h index 522e54f1d3..2229374ec8 100644 --- a/extras/Projucer/Source/Utility/jucer_SVGPathDataComponent.h +++ b/extras/Projucer/Source/Utility/jucer_SVGPathDataComponent.h @@ -25,7 +25,7 @@ */ class SVGPathDataComponent : public Component, - private TextEditorListener + private TextEditor::Listener { public: SVGPathDataComponent() diff --git a/extras/Projucer/Source/Utility/jucer_UTF8Component.h b/extras/Projucer/Source/Utility/jucer_UTF8Component.h index a10a46d875..8dc6391041 100644 --- a/extras/Projucer/Source/Utility/jucer_UTF8Component.h +++ b/extras/Projucer/Source/Utility/jucer_UTF8Component.h @@ -25,7 +25,7 @@ */ class UTF8Component : public Component, - private TextEditorListener + private TextEditor::Listener { public: UTF8Component() diff --git a/modules/juce_gui_basics/buttons/juce_Button.cpp b/modules/juce_gui_basics/buttons/juce_Button.cpp index 5d7c47def2..9ece5dd0c6 100644 --- a/modules/juce_gui_basics/buttons/juce_Button.cpp +++ b/modules/juce_gui_basics/buttons/juce_Button.cpp @@ -26,7 +26,7 @@ class Button::CallbackHelper : public Timer, public ApplicationCommandManagerListener, - public ValueListener, + public Value::Listener, public KeyListener { public: diff --git a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp index 50437b5996..7c26d26362 100644 --- a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp @@ -25,7 +25,7 @@ */ class ChoicePropertyComponent::RemapperValueSource : public Value::ValueSource, - private ValueListener + private Value::Listener { public: RemapperValueSource (const Value& source, const Array& map) diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.h b/modules/juce_gui_basics/widgets/juce_ComboBox.h index d918302bf0..09d02984f9 100644 --- a/modules/juce_gui_basics/widgets/juce_ComboBox.h +++ b/modules/juce_gui_basics/widgets/juce_ComboBox.h @@ -45,7 +45,7 @@ class JUCE_API ComboBox : public Component, public SettableTooltipClient, public Label::Listener, - public ValueListener, + public Value::Listener, private AsyncUpdater { public: diff --git a/modules/juce_gui_basics/widgets/juce_Label.h b/modules/juce_gui_basics/widgets/juce_Label.h index 05abf0dc43..7b0aa30d63 100644 --- a/modules/juce_gui_basics/widgets/juce_Label.h +++ b/modules/juce_gui_basics/widgets/juce_Label.h @@ -34,9 +34,9 @@ */ class JUCE_API Label : public Component, public SettableTooltipClient, - protected TextEditorListener, + protected TextEditor::Listener, private ComponentListener, - private ValueListener + private Value::Listener { public: //============================================================================== diff --git a/modules/juce_gui_basics/widgets/juce_Slider.cpp b/modules/juce_gui_basics/widgets/juce_Slider.cpp index 71616a80a8..b3d6dac21d 100644 --- a/modules/juce_gui_basics/widgets/juce_Slider.cpp +++ b/modules/juce_gui_basics/widgets/juce_Slider.cpp @@ -27,7 +27,7 @@ class Slider::Pimpl : public AsyncUpdater, public Button::Listener, public Label::Listener, - public ValueListener + public Value::Listener { public: Pimpl (Slider& s, SliderStyle sliderStyle, TextEntryBoxPosition textBoxPosition) diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp index 21fd56ea88..bb78a03dd4 100644 --- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp +++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp @@ -794,7 +794,7 @@ private: //============================================================================== class TextEditor::TextHolderComponent : public Component, public Timer, - public ValueListener + public Value::Listener { public: TextHolderComponent (TextEditor& ed) : owner (ed) @@ -1249,8 +1249,8 @@ void TextEditor::textChanged() void TextEditor::returnPressed() { postCommandMessage (TextEditorDefs::returnKeyMessageId); } void TextEditor::escapePressed() { postCommandMessage (TextEditorDefs::escapeKeyMessageId); } -void TextEditor::addListener (TextEditorListener* const l) { listeners.add (l); } -void TextEditor::removeListener (TextEditorListener* const l) { listeners.remove (l); } +void TextEditor::addListener (Listener* l) { listeners.add (l); } +void TextEditor::removeListener (Listener* l) { listeners.remove (l); } //============================================================================== void TextEditor::timerCallbackInt() @@ -2108,20 +2108,20 @@ void TextEditor::handleCommandMessage (const int commandId) switch (commandId) { case TextEditorDefs::textChangeMessageId: - listeners.callChecked (checker, &TextEditorListener::textEditorTextChanged, (TextEditor&) *this); + listeners.callChecked (checker, &Listener::textEditorTextChanged, (TextEditor&) *this); break; case TextEditorDefs::returnKeyMessageId: - listeners.callChecked (checker, &TextEditorListener::textEditorReturnKeyPressed, (TextEditor&) *this); + listeners.callChecked (checker, &Listener::textEditorReturnKeyPressed, (TextEditor&) *this); break; case TextEditorDefs::escapeKeyMessageId: - listeners.callChecked (checker, &TextEditorListener::textEditorEscapeKeyPressed, (TextEditor&) *this); + listeners.callChecked (checker, &Listener::textEditorEscapeKeyPressed, (TextEditor&) *this); break; case TextEditorDefs::focusLossMessageId: updateValueFromText(); - listeners.callChecked (checker, &TextEditorListener::textEditorFocusLost, (TextEditor&) *this); + listeners.callChecked (checker, &Listener::textEditorFocusLost, (TextEditor&) *this); break; default: