From faa847f443e911239344f3c92fdb708aec6f3e12 Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Wed, 13 Dec 2017 11:05:22 +0000
Subject: [PATCH] Added a method OptionalScopedPointer::reset()

---
 modules/juce_core/memory/juce_OptionalScopedPointer.h | 11 +++++++----
 .../filebrowser/juce_FileTreeComponent.cpp            |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/juce_core/memory/juce_OptionalScopedPointer.h b/modules/juce_core/memory/juce_OptionalScopedPointer.h
index d1eab793b2..11f69bc3af 100644
--- a/modules/juce_core/memory/juce_OptionalScopedPointer.h
+++ b/modules/juce_core/memory/juce_OptionalScopedPointer.h
@@ -79,7 +79,7 @@ public:
     {
         if (object != objectToTransferFrom.object)
         {
-            clear();
+            reset();
             object = objectToTransferFrom.object;
         }
 
@@ -93,7 +93,7 @@ public:
     */
     ~OptionalScopedPointer()
     {
-        clear();
+        reset();
     }
 
     //==============================================================================
@@ -118,12 +118,15 @@ public:
     /** Resets this pointer to null, possibly deleting the object that it holds, if it has
         ownership of it.
     */
-    void clear()
+    void reset()
     {
         if (! shouldDelete)
             object.release();
     }
 
+    /** Does the same thing as reset(). */
+    void clear()                                                    { reset(); }
+
     /** Makes this OptionalScopedPointer point at a new object, specifying whether the
         OptionalScopedPointer will take ownership of the object.
 
@@ -135,7 +138,7 @@ public:
     {
         if (object != newObject)
         {
-            clear();
+            reset();
             object = newObject;
         }
 
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp
index e56020f231..c4a7722ec0 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp
+++ b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp
@@ -110,7 +110,7 @@ public:
         if (subContentsList != nullptr)
         {
             subContentsList->removeChangeListener (this);
-            subContentsList.clear();
+            subContentsList.reset();
         }
     }