From 189853720ae2587c46ca6c82affe251ce3a8600d Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 10 Mar 2016 17:20:15 +0000 Subject: [PATCH] Cleaned up a few uses of Image::null --- modules/juce_graphics/colour/juce_FillType.cpp | 4 ++-- modules/juce_graphics/images/juce_ImageCache.cpp | 4 ++-- modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm | 2 +- .../juce_gui_basics/filebrowser/juce_FileListComponent.cpp | 2 +- .../filebrowser/juce_ImagePreviewComponent.cpp | 2 +- modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h | 2 +- modules/juce_gui_basics/native/juce_ios_Windowing.mm | 2 +- modules/juce_gui_basics/native/juce_linux_Windowing.cpp | 4 ++-- modules/juce_gui_basics/native/juce_win32_Windowing.cpp | 4 ++-- modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp | 2 +- modules/juce_gui_basics/windows/juce_CallOutBox.cpp | 2 +- modules/juce_gui_extra/misc/juce_ColourSelector.cpp | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/juce_graphics/colour/juce_FillType.cpp b/modules/juce_graphics/colour/juce_FillType.cpp index 34d6da9c6d..6c166689e3 100644 --- a/modules/juce_graphics/colour/juce_FillType.cpp +++ b/modules/juce_graphics/colour/juce_FillType.cpp @@ -104,7 +104,7 @@ bool FillType::operator!= (const FillType& other) const void FillType::setColour (Colour newColour) noexcept { gradient = nullptr; - image = Image::null; + image = Image(); colour = newColour; } @@ -116,7 +116,7 @@ void FillType::setGradient (const ColourGradient& newGradient) } else { - image = Image::null; + image = Image(); gradient = new ColourGradient (newGradient); colour = Colours::black; } diff --git a/modules/juce_graphics/images/juce_ImageCache.cpp b/modules/juce_graphics/images/juce_ImageCache.cpp index 797c796b24..9d65739365 100644 --- a/modules/juce_graphics/images/juce_ImageCache.cpp +++ b/modules/juce_graphics/images/juce_ImageCache.cpp @@ -47,7 +47,7 @@ public: return item->image; } - return Image::null; + return Image(); } void addImageToCache (const Image& image, const int64 hashCode) @@ -128,7 +128,7 @@ Image ImageCache::getFromHashCode (const int64 hashCode) if (Pimpl::getInstanceWithoutCreating() != nullptr) return Pimpl::getInstanceWithoutCreating()->getFromHashCode (hashCode); - return Image::null; + return Image(); } void ImageCache::addImageToCache (const Image& image, const int64 hashCode) diff --git a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm index 2aa0ffa05f..4da4d55110 100644 --- a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm +++ b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm @@ -863,7 +863,7 @@ Image juce_loadWithCoreImage (InputStream& input) } } - return Image::null; + return Image(); } #endif diff --git a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp index f75e80e68d..d12dd41afa 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp @@ -153,7 +153,7 @@ public: file = newFile; fileSize = newFileSize; modTime = newModTime; - icon = Image::null; + icon = Image(); isDirectory = fileInfo != nullptr && fileInfo->isDirectory; repaint(); diff --git a/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp index d679089795..1b6265a59f 100644 --- a/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp @@ -57,7 +57,7 @@ void ImagePreviewComponent::timerCallback() { stopTimer(); - currentThumbnail = Image::null; + currentThumbnail = Image(); currentDetails.clear(); repaint(); diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h index 0b050237af..faf9b6b76b 100644 --- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h +++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h @@ -86,7 +86,7 @@ public: */ void startDragging (const var& sourceDescription, Component* sourceComponent, - Image dragImage = Image::null, + Image dragImage = Image(), bool allowDraggingToOtherJuceWindows = false, const Point* imageOffsetFromMouse = nullptr); diff --git a/modules/juce_gui_basics/native/juce_ios_Windowing.mm b/modules/juce_gui_basics/native/juce_ios_Windowing.mm index 07bdc3f9b9..86fdccccef 100644 --- a/modules/juce_gui_basics/native/juce_ios_Windowing.mm +++ b/modules/juce_gui_basics/native/juce_ios_Windowing.mm @@ -351,7 +351,7 @@ bool juce_areThereAnyAlwaysOnTopWindows() //============================================================================== Image juce_createIconForFile (const File&) { - return Image::null; + return Image(); } //============================================================================== diff --git a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp index 49b214663f..4332f6aae9 100644 --- a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp @@ -2568,7 +2568,7 @@ private: else if (Time::getApproximateMillisecondCounter() > lastTimeImageUsed + 3000) { stopTimer(); - image = Image::null; + image = Image(); } } @@ -4080,7 +4080,7 @@ void MouseCursor::showInAllWindows() const //============================================================================== Image juce_createIconForFile (const File& /* file */) { - return Image::null; + return Image(); } //============================================================================== diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index 4dd23d3796..1935715057 100644 --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -531,7 +531,7 @@ namespace IconConverters } } - return Image::null; + return Image(); } HICON createHICONFromImage (const Image& image, const BOOL isIcon, int hotspotX, int hotspotY) @@ -1186,7 +1186,7 @@ private: void timerCallback() override { stopTimer(); - image = Image::null; + image = Image(); } private: diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp index c11cec139d..a385c5a1b1 100644 --- a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp @@ -70,7 +70,7 @@ public: if (DragAndDropContainer* const dnd = DragAndDropContainer::findParentDragContainerFor (this)) { - dnd->startDragging (Toolbar::toolbarDragDescriptor, getParentComponent(), Image::null, true); + dnd->startDragging (Toolbar::toolbarDragDescriptor, getParentComponent(), Image(), true); if (ToolbarItemComponent* const tc = getToolbarItemComponent()) { diff --git a/modules/juce_gui_basics/windows/juce_CallOutBox.cpp b/modules/juce_gui_basics/windows/juce_CallOutBox.cpp index 296a37cbef..55bf420245 100644 --- a/modules/juce_gui_basics/windows/juce_CallOutBox.cpp +++ b/modules/juce_gui_basics/windows/juce_CallOutBox.cpp @@ -230,7 +230,7 @@ void CallOutBox::updatePosition (const Rectangle& newAreaToPointTo, const R void CallOutBox::refreshPath() { repaint(); - background = Image::null; + background = Image(); outline.clear(); const float gap = 4.5f; diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp index 50a1d2856c..ed34f1ec34 100644 --- a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp +++ b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp @@ -125,7 +125,7 @@ public: if (lastHue != h) { lastHue = h; - colours = Image::null; + colours = Image(); repaint(); } @@ -134,7 +134,7 @@ public: void resized() override { - colours = Image::null; + colours = Image(); updateMarker(); }