From da3838db8a1ce18168eb6593bd6e8f0087afde57 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 21 Aug 2013 21:03:31 +0100
Subject: [PATCH] Minor clean-ups.

---
 modules/juce_graphics/images/juce_Image.cpp         |  5 ++++-
 .../layout/juce_ComponentBuilder.cpp                |  7 ++++---
 modules/juce_opengl/opengl/juce_OpenGLImage.cpp     | 13 +++++++------
 .../juce_opengl/opengl/juce_OpenGLShaderProgram.cpp |  4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/modules/juce_graphics/images/juce_Image.cpp b/modules/juce_graphics/images/juce_Image.cpp
index e007adbd99..644d33d1ff 100644
--- a/modules/juce_graphics/images/juce_Image.cpp
+++ b/modules/juce_graphics/images/juce_Image.cpp
@@ -256,7 +256,10 @@ void Image::duplicateIfShared()
 
 Image Image::createCopy() const
 {
-    return Image (image != nullptr ? image->clone() : nullptr);
+    if (image != nullptr)
+        return Image (image->clone());
+
+    return Image();
 }
 
 Image Image::rescaled (const int newWidth, const int newHeight, const Graphics::ResamplingQuality quality) const
diff --git a/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp b/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp
index b91a10ca77..82519ea5f0 100644
--- a/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp
+++ b/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp
@@ -131,10 +131,11 @@ Component* ComponentBuilder::createComponent()
 {
     jassert (types.size() > 0);  // You need to register all the necessary types before you can load a component!
 
-    TypeHandler* const type = getHandlerForState (state);
-    jassert (type != nullptr); // trying to create a component from an unknown type of ValueTree
+    if (TypeHandler* const type = getHandlerForState (state))
+        return ComponentBuilderHelpers::createNewComponent (*type, state, nullptr);
 
-    return type != nullptr ? ComponentBuilderHelpers::createNewComponent (*type, state, nullptr) : nullptr;
+    jassertfalse; // trying to create a component from an unknown type of ValueTree
+    return nullptr;
 }
 
 void ComponentBuilder::registerTypeHandler (ComponentBuilder::TypeHandler* const type)
diff --git a/modules/juce_opengl/opengl/juce_OpenGLImage.cpp b/modules/juce_opengl/opengl/juce_OpenGLImage.cpp
index 5738fa55ec..97f66de4b8 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLImage.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLImage.cpp
@@ -25,9 +25,9 @@
 class OpenGLFrameBufferImage   : public ImagePixelData
 {
 public:
-    OpenGLFrameBufferImage (OpenGLContext& context_, int w, int h)
+    OpenGLFrameBufferImage (OpenGLContext& c, int w, int h)
         : ImagePixelData (Image::ARGB, w, h),
-          context (context_),
+          context (c),
           pixelStride (4),
           lineStride (width * pixelStride)
     {
@@ -116,8 +116,8 @@ private:
 
     struct Writer
     {
-        Writer (OpenGLFrameBuffer& frameBuffer_, int x, int y, int w, int h) noexcept
-            : frameBuffer (frameBuffer_), area (x, y, w, h)
+        Writer (OpenGLFrameBuffer& fb, int x, int y, int w, int h) noexcept
+            : frameBuffer (fb), area (x, y, w, h)
         {}
 
         void write (const PixelARGB* const data) const noexcept
@@ -195,7 +195,8 @@ ImagePixelData::Ptr OpenGLImageType::create (Image::PixelFormat, int width, int
 
 OpenGLFrameBuffer* OpenGLImageType::getFrameBufferFrom (const Image& image)
 {
-    OpenGLFrameBufferImage* const glImage = dynamic_cast<OpenGLFrameBufferImage*> (image.getPixelData());
+    if (OpenGLFrameBufferImage* const glImage = dynamic_cast<OpenGLFrameBufferImage*> (image.getPixelData()))
+        return &(glImage->frameBuffer);
 
-    return glImage != nullptr ? &(glImage->frameBuffer) : nullptr;
+    return nullptr;
 }
diff --git a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp
index 85a0ed5841..8de767d664 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp
@@ -24,8 +24,8 @@
 
 #if JUCE_USE_OPENGL_SHADERS
 
-OpenGLShaderProgram::OpenGLShaderProgram (const OpenGLContext& context_) noexcept
-    : context (context_)
+OpenGLShaderProgram::OpenGLShaderProgram (const OpenGLContext& c) noexcept
+    : context (c)
 {
     // This object can only be created and used when the current thread has an active OpenGL context.
     jassert (OpenGLHelpers::isContextActive());