commit 324377ada2513031e211f1d38a842859b6f094a2
author Michael Meeks <michael.meeks@collabora.com> Mon Apr 13 21:19:21 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Mon Apr 13 21:25:36 2015 +0100
tree 1b42a93451be85c93c47eac794481eed284dcfdf
parent 5245021a806ccdd0d569d5cee7b95167892e9aab

VclPtr - add a templatized ::Create method for better readability.

Change-Id: I2437198709ba4848d975efd1ebb4df1071c6c8f1

include/vcl/vclptr.hxx

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index c4c210b..d97124d 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -125,6 +125,20 @@ public:
    {
    }

    /**
     * A construction helper for VclPtr. Since VclPtr types are created
     * with a reference-count of one - to help fit into the existing
     * code-flow; this helps us to construct them easily.
     *
     * For more details on the design please see vcl/README.lifecycle
     *
     * @param reference_type must be a subclass of vcl::Window
     */
    template<typename... Arg> static VclPtr< reference_type > Create(Arg &&... arg)
    {
        return VclPtr< reference_type >( new reference_type(std::forward<Arg>(arg)...), SAL_NO_ACQUIRE );
    }

    /** Probably most common used: handle->someBodyOp().
     */
    inline reference_type * SAL_CALL operator->() const
@@ -224,9 +238,10 @@ public:
}; // class VclPtr

/**
 * A construction helper for VclPtr. Since VclPtr types are created
 * with a reference-count of one - to help fit into the existing
 * code-flow; this helps us to construct them easily.
 * A construction helper for a temporary VclPtr. Since VclPtr types
 * are created with a reference-count of one - to help fit into
 * the existing code-flow; this helps us to construct them easily.
 * see also VclPtr::Create and ScopedVclPtr
 *
 * For more details on the design please see vcl/README.lifecycle
 *
@@ -295,6 +310,7 @@ public:
        VclPtr<reference_type>::disposeAndClear();
        assert(VclPtr<reference_type>::get() == nullptr); // make sure there are no lingering references
    }

private:
    // Most likely we don't want this default copy-construtor.
    ScopedVclPtr (const ScopedVclPtr<reference_type> &) SAL_DELETED_FUNCTION;

vcl/qa/cppunit/lifecycle.cxx

diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index b505088..4a0bebf 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -59,7 +59,7 @@ void LifecycleTest::testCast()

void LifecycleTest::testVirtualDevice()
{
    VclPtrInstance< VirtualDevice > pVDev;
    VclPtr<VirtualDevice> pVDev = VclPtr< VirtualDevice >::Create();
    ScopedVclPtrInstance< VirtualDevice > pVDev2;
    VclPtrInstance<VirtualDevice> pVDev3;
    VclPtrInstance<VirtualDevice> pVDev4( 1 );