From c46927d580aef035da4dfd3e4b8221612f5a19d1 Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 23 May 2014 21:50:43 +0100 Subject: [PATCH] Minor clean-ups --- .../Source/Application/jucer_AppearanceSettings.cpp | 4 ++-- extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h | 4 ++-- modules/juce_gui_basics/windows/juce_TopLevelWindow.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp index 76fca05cd5..78474dba4f 100644 --- a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp +++ b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp @@ -445,12 +445,12 @@ struct AppearanceEditor public: FontNameValueSource (const Value& source) : ValueSourceFilter (source) {} - var getValue() const + var getValue() const override { return Font::fromString (sourceValue.toString()).getTypefaceName(); } - void setValue (const var& newValue) + void setValue (const var& newValue) override { Font font (Font::fromString (sourceValue.toString())); font.setTypefaceName (newValue.toString().isEmpty() ? Font::getDefaultMonospacedFontName() diff --git a/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h b/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h index 7744103998..bc57889c3f 100644 --- a/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h +++ b/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h @@ -35,12 +35,12 @@ class NumericValueSource : public ValueSourceFilter public: NumericValueSource (const Value& source) : ValueSourceFilter (source) {} - var getValue() const + var getValue() const override { return (Type) sourceValue.getValue(); } - void setValue (const var& newValue) + void setValue (const var& newValue) override { const Type newVal = static_cast (newValue); diff --git a/modules/juce_gui_basics/windows/juce_TopLevelWindow.h b/modules/juce_gui_basics/windows/juce_TopLevelWindow.h index 790e718bf1..b9822301bd 100644 --- a/modules/juce_gui_basics/windows/juce_TopLevelWindow.h +++ b/modules/juce_gui_basics/windows/juce_TopLevelWindow.h @@ -155,7 +155,7 @@ private: bool useDropShadow, useNativeTitleBar, isCurrentlyActive; ScopedPointer shadower; - void setWindowActive (bool isNowActive); + void setWindowActive (bool); JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TopLevelWindow) };