Added method String::clear(), and used it to replace a few uses of String::empty.

extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp

@@ -152,7 +152,7 @@ String BinaryResources::browseForResource (const String& title,
                                          TRANS("Adding Resource"),
                                          TRANS("Failed to load the file!"));
 
-            name = String::empty;
+            name.clear();
         }
 
         return name;

extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp

@@ -469,7 +469,7 @@ void JucerDocument::fillInGeneratedCode (GeneratedCode& code) const
             String baseClassToAdd (baseClasses[i]);
 
             if (baseClassToAdd == "Component" || baseClassToAdd == "Button")
-                baseClassToAdd = String::empty;
+                baseClassToAdd.clear();
 
             String& s = code.getCallbackCode (baseClassToAdd, returnValues[i], methods[i], false);
 

extras/Introjucer/Source/ComponentEditor/paintelements/jucer_FillType.h

@@ -329,7 +329,7 @@ private:
         gradPos2 = RelativePositionedRectangle();
         gradPos2.rect = PositionedRectangle ("100 100");
 
-        imageResourceName = String::empty;
+        imageResourceName.clear();
         imageOpacity = 1.0;
         imageAnchor = RelativePositionedRectangle();
         imageAnchor.rect = PositionedRectangle ("0 0");

modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp

@@ -361,8 +361,8 @@ void AudioDeviceManager::getAudioDeviceSetup (AudioDeviceSetup& setup)
 void AudioDeviceManager::deleteCurrentDevice()
 {
     currentAudioDevice = nullptr;
-    currentSetup.inputDeviceName = String::empty;
-    currentSetup.outputDeviceName = String::empty;
+    currentSetup.inputDeviceName.clear();
+    currentSetup.outputDeviceName.clear();
 }
 
 void AudioDeviceManager::setCurrentAudioDeviceType (const String& type,

modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h

@@ -190,7 +190,7 @@ public:
                        int numOutputChannelsNeeded,
                        const XmlElement* savedState,
                        bool selectDefaultDeviceOnFailure,
-                       const String& preferredDefaultDeviceName = String::empty,
+                       const String& preferredDefaultDeviceName = String(),
                        const AudioDeviceSetup* preferredSetupOptions = 0);
 
     /** Returns some XML representing the current state of the manager.

modules/juce_audio_devices/native/juce_android_Audio.cpp

@@ -159,7 +159,7 @@ public:
         if (sampleRate != (int) requestedSampleRate)
             return "Sample rate not allowed";
 
-        lastError = String::empty;
+        lastError.clear();
         int preferredBufferSize = (bufferSize <= 0) ? getDefaultBufferSize() : bufferSize;
 
         numDeviceInputChannels = 0;

modules/juce_audio_devices/native/juce_android_OpenSL.cpp

@@ -105,7 +105,7 @@ public:
     {
         close();
 
-        lastError = String::empty;
+        lastError.clear();
         sampleRate = (int) requestedSampleRate;
 
         int preferredBufferSize = (bufferSize <= 0) ? getDefaultBufferSize() : bufferSize;

modules/juce_audio_devices/native/juce_ios_Audio.cpp

@@ -80,7 +80,7 @@ public:
     {
         close();
 
-        lastError = String::empty;
+        lastError.clear();
         preferredBufferSize = (bufferSize <= 0) ? getDefaultBufferSize() : bufferSize;
 
         //  xxx set up channel mapping

modules/juce_audio_devices/native/juce_linux_ALSA.cpp

@@ -482,7 +482,7 @@ public:
     {
         close();
 
-        error = String::empty;
+        error.clear();
         sampleRate = newSampleRate;
         bufferSize = newBufferSize;
 

modules/juce_audio_devices/native/juce_linux_JackAudio.cpp

@@ -235,7 +235,7 @@ public:
             return lastError;
         }
 
-        lastError = String::empty;
+        lastError.clear();
         close();
 
         juce::jack_set_process_callback (client, processCallback, this);

modules/juce_audio_devices/native/juce_win32_ASIO.cpp

@@ -456,7 +456,7 @@ public:
         updateClockSources();
         currentSampleRate = getSampleRate();
 
-        error = String::empty;
+        error.clear();
         buffersCreated = false;
 
         setSampleRate (sampleRate);
@@ -617,7 +617,7 @@ public:
 
     void close()
     {
-        error = String::empty;
+        error.clear();
         stopTimer();
         stop();
 
@@ -1181,7 +1181,7 @@ private:
         numActiveOutputChans = 0;
         currentCallback = nullptr;
 
-        error = String::empty;
+        error.clear();
 
         if (getName().isEmpty())
             return error;

modules/juce_audio_devices/native/juce_win32_WASAPI.cpp

@@ -924,7 +924,7 @@ public:
                  double sampleRate, int bufferSizeSamples)
     {
         close();
-        lastError = String::empty;
+        lastError.clear();
 
         if (sampleRates.size() == 0 && inputDevice != nullptr && outputDevice != nullptr)
         {

modules/juce_browser_plugin_client/wrapper/juce_ActiveX_GlueCode.cpp

@@ -803,7 +803,7 @@ extern "C" BOOL WINAPI DllMain (HANDLE instance, DWORD reason, LPVOID)
 
     case DLL_PROCESS_DETACH:
         log ("DLL_PROCESS_DETACH");
-        browserVersionDesc = String::empty;
+        browserVersionDesc.clear();
 
         // IE has a tendency to leak our objects, so although none of this should be
         // necessary, it's best to make sure..

modules/juce_browser_plugin_client/wrapper/juce_NPAPI_GlueCode.cpp

@@ -1031,7 +1031,7 @@ NPError NPP_Destroy (NPP npp, NPSavedData** save)
         {
             log ("shutdownJuce_GUI()");
             shutdownJuce_GUI();
-            browserVersionDesc = String::empty;
+            browserVersionDesc.clear();
         }
     }
 

modules/juce_core/files/juce_File.h

@@ -741,7 +741,7 @@ public:
 
         @see revealToUser
     */
-    bool startAsProcess (const String& parameters = String::empty) const;
+    bool startAsProcess (const String& parameters = String()) const;
 
     /** Opens Finder, Explorer, or whatever the OS uses, to show the user this file's location.
         @see startAsProcess

modules/juce_core/network/juce_Socket.cpp

@@ -386,7 +386,7 @@ void StreamingSocket::close()
         ::close (handle);
    #endif
 
-    hostName = String::empty;
+    hostName.clear();
     portNumber = 0;
     handle = -1;
     isListener = false;
@@ -506,7 +506,7 @@ void DatagramSocket::close()
     ::close (handle);
    #endif
 
-    hostName = String::empty;
+    hostName.clear();
     portNumber = 0;
     handle = -1;
 }

modules/juce_core/text/juce_String.cpp

@@ -259,6 +259,12 @@ void String::swapWith (String& other) noexcept
     std::swap (text, other.text);
 }
 
+void String::clear() noexcept
+{
+    StringHolder::release (text);
+    text = &(emptyString.text);
+}
+
 String& String::operator= (const String& other) noexcept
 {
     StringHolder::retain (other.text);

modules/juce_core/text/juce_String.h

@@ -307,6 +307,9 @@ public:
     */
     inline bool isNotEmpty() const noexcept                 { return text[0] != 0; }
 
+    /** Resets this string to be empty. */
+    void clear() noexcept;
+
     /** Case-insensitive comparison with another string. */
     bool equalsIgnoreCase (const String& other) const noexcept;
 

modules/juce_core/xml/juce_XmlDocument.cpp

@@ -210,7 +210,7 @@ XmlElement* XmlDocument::parseDocumentElement (String::CharPointerType textToPar
     }
     else
     {
-        lastError = String::empty;
+        lastError.clear();
 
         ScopedPointer<XmlElement> result (readNextElement (! onlyReadOuterDocumentElement));
 

modules/juce_graphics/fonts/juce_AttributedString.cpp

@@ -166,7 +166,7 @@ void AttributedString::append (const AttributedString& other)
 
 void AttributedString::clear()
 {
-    text = String::empty;
+    text.clear();
     attributes.clear();
 }
 

modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp

@@ -58,7 +58,7 @@ void ImagePreviewComponent::timerCallback()
     stopTimer();
 
     currentThumbnail = Image::null;
-    currentDetails = String::empty;
+    currentDetails.clear();
     repaint();
 
     ScopedPointer<FileInputStream> in (fileToLoad.createInputStream());

modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm

@@ -1452,7 +1452,7 @@ private:
             if (target != nullptr)
                 [(NSView*) self interpretKeyEvents: [NSArray arrayWithObject: ev]];
             else
-                owner->stringBeingComposed = String::empty;
+                owner->stringBeingComposed.clear();
 
             if ((! owner->textWasInserted) && (owner == nullptr || ! owner->redirectKeyDown (ev)))
             {
@@ -1490,7 +1490,7 @@ private:
                 }
             }
 
-            owner->stringBeingComposed = String::empty;
+            owner->stringBeingComposed.clear();
         }
     }
 
@@ -1525,7 +1525,7 @@ private:
                     owner->textWasInserted = true;
                 }
 
-                owner->stringBeingComposed = String::empty;
+                owner->stringBeingComposed.clear();
             }
         }
     }

modules/juce_gui_basics/native/juce_win32_FileChooser.cpp

@@ -183,7 +183,7 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
         if (! SHGetPathFromIDListW (list, files))
         {
             files[0] = 0;
-            info.returnedString = String::empty;
+            info.returnedString.clear();
         }
 
         LPMALLOC al;

modules/juce_gui_basics/windows/juce_ComponentPeer.h

@@ -310,7 +310,7 @@ public:
         Point<int> position;
 
         bool isEmpty() const noexcept       { return files.size() == 0 && text.isEmpty(); }
-        void clear() noexcept               { files.clear(); text = String::empty; }
+        void clear() noexcept               { files.clear(); text.clear(); }
     };
 
     bool handleDragMove (const DragInfo&);

modules/juce_gui_basics/windows/juce_TooltipWindow.cpp

@@ -115,7 +115,7 @@ String TooltipWindow::getTipFor (Component* const c)
 
 void TooltipWindow::hideTip()
 {
-    tipShowing = String::empty;
+    tipShowing.clear();
     removeFromDesktop();
     setVisible (false);
 }

modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp

@@ -60,14 +60,14 @@ void WebBrowserComponent::stop()
 
 void WebBrowserComponent::goBack()
 {
-    lastURL = String::empty;
+    lastURL.clear();
     blankPageShown = false;
 
 }
 
 void WebBrowserComponent::goForward()
 {
-    lastURL = String::empty;
+    lastURL.clear();
 
 }
 
@@ -90,7 +90,7 @@ void WebBrowserComponent::reloadLastURL()
     if (lastURL.isNotEmpty())
     {
         goToURL (lastURL, &lastHeaders, &lastPostData);
-        lastURL = String::empty;
+        lastURL.clear();
     }
 }
 

modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp

@@ -65,14 +65,14 @@ void WebBrowserComponent::stop()
 
 void WebBrowserComponent::goBack()
 {
-    lastURL = String::empty;
+    lastURL.clear();
     blankPageShown = false;
 
 }
 
 void WebBrowserComponent::goForward()
 {
-    lastURL = String::empty;
+    lastURL.clear();
 
 }
 
@@ -95,7 +95,7 @@ void WebBrowserComponent::reloadLastURL()
     if (lastURL.isNotEmpty())
     {
         goToURL (lastURL, &lastHeaders, &lastPostData);
-        lastURL = String::empty;
+        lastURL.clear();
     }
 }
 

modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm

@@ -279,14 +279,14 @@ void WebBrowserComponent::stop()
 
 void WebBrowserComponent::goBack()
 {
-    lastURL = String::empty;
+    lastURL.clear();
     blankPageShown = false;
     browser->goBack();
 }
 
 void WebBrowserComponent::goForward()
 {
-    lastURL = String::empty;
+    lastURL.clear();
     browser->goForward();
 }
 
@@ -328,7 +328,7 @@ void WebBrowserComponent::reloadLastURL()
     if (lastURL.isNotEmpty())
     {
         goToURL (lastURL, &lastHeaders, &lastPostData);
-        lastURL = String::empty;
+        lastURL.clear();
     }
 }
 

modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp

@@ -225,7 +225,7 @@ void WebBrowserComponent::stop()
 
 void WebBrowserComponent::goBack()
 {
-    lastURL = String::empty;
+    lastURL.clear();
     blankPageShown = false;
 
     if (browser->browser != nullptr)
@@ -234,7 +234,7 @@ void WebBrowserComponent::goBack()
 
 void WebBrowserComponent::goForward()
 {
-    lastURL = String::empty;
+    lastURL.clear();
 
     if (browser->browser != nullptr)
         browser->browser->GoForward();
@@ -287,7 +287,7 @@ void WebBrowserComponent::reloadLastURL()
     if (lastURL.isNotEmpty())
     {
         goToURL (lastURL, &lastHeaders, &lastPostData);
-        lastURL = String::empty;
+        lastURL.clear();
     }
 }
 

modules/juce_video/native/juce_win32_DirectShowComponent.cpp

@@ -840,7 +840,7 @@ void DirectShowComponent::closeMovie()
         context->release();
 
     videoLoaded = false;
-    videoPath = String::empty;
+    videoPath.clear();
 }
 
 //======================================================================