Merge "use modern construct 'nullptr' instead of 'NULL' or '0'" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 8 Sep 2020 10:47:39 +0000 (10:47 +0000)
committerGerrit Code Review <gerrit@review>
Tue, 8 Sep 2020 10:47:39 +0000 (10:47 +0000)
12 files changed:
1  2 
dali/integration-api/bitmap.h
dali/internal/event/common/property-metadata.h
dali/internal/event/events/hit-test-algorithm-impl.cpp
dali/internal/event/events/hover-event-processor.cpp
dali/internal/event/images/bitmap-packed-pixel.h
dali/internal/render/renderers/render-renderer.cpp
dali/internal/update/manager/transform-manager-property.h
dali/internal/update/manager/update-manager.cpp
dali/internal/update/nodes/node.h
dali/internal/update/nodes/scene-graph-layer.h
dali/public-api/actors/custom-actor-impl.h
dali/public-api/images/native-image-interface.h

Simple merge
index 2ed616caa4dab481d6e31312fd9fabf6474d7032,9c2ef6992fce3ca0e3f475539fed77bb891ca7c5..df39386d4c08777fda95f42622dc47dbf8945d52
@@@ -46,11 -46,11 +46,11 @@@ public
     * Constructor
     * @param[in] discardable Flag to tell the bitmap if it can delete the buffer with the pixel data.
     */
-   BitmapPackedPixel( ResourcePolicy::Discardable discardable = ResourcePolicy::OWNED_RETAIN, Dali::Integration::PixelBuffer* pixBuf = 0 );
+   BitmapPackedPixel( ResourcePolicy::Discardable discardable = ResourcePolicy::OWNED_RETAIN, Dali::Integration::PixelBuffer* pixBuf = nullptr );
  
  public:
 -  virtual const Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() const { return this; }
 -  virtual Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() { return this; }
 +  const Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() const override { return this; }
 +  Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() override { return this; }
  
    /**
     * (Re-)Allocate pixel buffer for the Bitmap. Any previously allocated pixel buffer is deleted.
Simple merge