diff --git a/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h index 8dffc98b05..c14e79c5d2 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h +++ b/extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.h @@ -33,7 +33,7 @@ */ class ProjectInformationComponent : public Component, public ChangeListener, - public Button::Listener + public ButtonListener { public: //============================================================================== diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index 7385f3436d..bd295f72b6 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -2902,7 +2902,8 @@ FileSearchPath VSTPluginFormat::getDefaultLocationsToSearch() #elif JUCE_WINDOWS const String programFiles (File::getSpecialLocation (File::globalApplicationsDirectory).getFullPathName()); - return FileSearchPath (programFiles + "\\Steinberg\\VstPlugins"); + return FileSearchPath (PlatformUtilities::getRegistryValue ("HKLM\\Software\\VST\\VSTPluginsPath", + programFiles + "\\Steinberg\\VstPlugins")); #elif JUCE_LINUX return FileSearchPath ("/usr/lib/vst"); #endif @@ -2912,7 +2913,5 @@ FileSearchPath VSTPluginFormat::getDefaultLocationsToSearch() END_JUCE_NAMESPACE #endif - #undef log - #endif diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp index 9b661c4e8a..62c4424024 100644 --- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp @@ -561,7 +561,7 @@ void MidiKeyboardComponent::drawUpDownButton (Graphics& g, int w, int h, case horizontalKeyboard: angle = movesOctavesUp ? 0.0f : 0.5f; break; case verticalKeyboardFacingLeft: angle = movesOctavesUp ? 0.25f : 0.75f; break; case verticalKeyboardFacingRight: angle = movesOctavesUp ? 0.75f : 0.25f; break; - default: break; + default: jassertfalse; angle = 0; break; } Path path; diff --git a/modules/juce_core/containers/juce_Array.h b/modules/juce_core/containers/juce_Array.h index c92deef95e..65203e7c68 100644 --- a/modules/juce_core/containers/juce_Array.h +++ b/modules/juce_core/containers/juce_Array.h @@ -142,7 +142,9 @@ public: #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS Array& operator= (Array&& other) noexcept { - swapWithArray (other); + data = static_cast &&> (other.data); + numUsed = other.numUsed; + other.numUsed = 0; return *this; } #endif diff --git a/modules/juce_core/containers/juce_ArrayAllocationBase.h b/modules/juce_core/containers/juce_ArrayAllocationBase.h index 5e34c03b45..7c72c939b3 100644 --- a/modules/juce_core/containers/juce_ArrayAllocationBase.h +++ b/modules/juce_core/containers/juce_ArrayAllocationBase.h @@ -53,7 +53,7 @@ public: } /** Destructor. */ - ~ArrayAllocationBase() + ~ArrayAllocationBase() noexcept { } diff --git a/modules/juce_core/containers/juce_OwnedArray.h b/modules/juce_core/containers/juce_OwnedArray.h index 8092dbfcb0..b5a0345d5c 100644 --- a/modules/juce_core/containers/juce_OwnedArray.h +++ b/modules/juce_core/containers/juce_OwnedArray.h @@ -73,6 +73,23 @@ public: clear (true); } + #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS + OwnedArray (OwnedArray&& other) noexcept + : data (static_cast &&> (other.data)), + numUsed (other.numUsed) + { + other.numUsed = 0; + } + + OwnedArray& operator= (OwnedArray&& other) noexcept + { + data = static_cast &&> (other.data); + numUsed = other.numUsed; + other.numUsed = 0; + return *this; + } + #endif + //============================================================================== /** Clears the array, optionally deleting the objects inside it first. */ void clear (const bool deleteObjects = true) diff --git a/modules/juce_core/text/juce_CharPointer_UTF8.h b/modules/juce_core/text/juce_CharPointer_UTF8.h index 07e6234edb..504b90b78d 100644 --- a/modules/juce_core/text/juce_CharPointer_UTF8.h +++ b/modules/juce_core/text/juce_CharPointer_UTF8.h @@ -446,16 +446,6 @@ public: return CharacterFunctions::compareIgnoreCaseUpTo (*this, other, maxChars); } - /** Compares this string with another one, up to a specified number of characters. */ - int compareIgnoreCaseUpTo (const CharPointer_UTF8& other, const int maxChars) const noexcept - { - #if JUCE_WINDOWS - return strnicmp (data, other.data, (size_t) maxChars); - #else - return strncasecmp (data, other.data, maxChars); - #endif - } - /** Returns the character index of a substring, or -1 if it isn't found. */ template int indexOf (const CharPointer& stringToFind) const noexcept diff --git a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp index 50d224fd6b..42c3de4b80 100644 --- a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp +++ b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp @@ -232,7 +232,7 @@ void FileChooser::showPlatformDialog (Array& results, const String& title_ HeapBlock filters; filters.calloc (filterSpaceNumChars); const int bytesWritten = filter.copyToUTF16 (filters.getData(), filterSpaceNumChars * sizeof (WCHAR)); - filter.copyToUTF16 (filters + (bytesWritten / sizeof (WCHAR)) + 1, + filter.copyToUTF16 (filters + (bytesWritten / sizeof (WCHAR)), (int) ((filterSpaceNumChars - 1) * sizeof (WCHAR) - bytesWritten)); OPENFILENAMEW of = { 0 };