diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-16 11:12:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-16 13:53:39 +0200 |
commit | 26b0e86405b27a0342a5b42f82a944559f3a1358 (patch) | |
tree | c5b68ca6fd52f467243c53c53feaa1ed5da105a1 | |
parent | de409aeed2e1efad47a25794d7a1ffba0272e35c (diff) |
inline InteractionContinuation_Impl
since it only contains one field, and does nothing special with it
Change-Id: Ie1c099a4507a6b99af28be5852793ccaa557aa72
-rw-r--r-- | include/ucbhelper/interactionrequest.hxx | 4 | ||||
-rw-r--r-- | ucbhelper/source/provider/interactionrequest.cxx | 17 |
2 files changed, 3 insertions, 18 deletions
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 4bf10bcab250..f0d3fec4bd3e 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -139,8 +139,6 @@ public: }; -struct InteractionContinuation_Impl; - /** * This class is the base for implementations of the interface * XInteractionContinuation. Classes derived from this bas class work together @@ -152,7 +150,7 @@ struct InteractionContinuation_Impl; */ class UCBHELPER_DLLPUBLIC InteractionContinuation : public cppu::OWeakObject { - std::unique_ptr<InteractionContinuation_Impl> m_pImpl; + InteractionRequest* m_pRequest; protected: /** diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 52bc3b496bec..c8d0858bea18 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -187,23 +187,10 @@ InteractionRequest::getContinuations() // InteractionContinuation Implementation. -namespace ucbhelper -{ - -struct InteractionContinuation_Impl -{ - InteractionRequest * m_pRequest; - - explicit InteractionContinuation_Impl( InteractionRequest * pRequest ) - : m_pRequest( pRequest ) {} -}; - -} - InteractionContinuation::InteractionContinuation( InteractionRequest * pRequest ) -: m_pImpl( new InteractionContinuation_Impl( pRequest ) ) +: m_pRequest( pRequest ) { } @@ -216,7 +203,7 @@ InteractionContinuation::~InteractionContinuation() void InteractionContinuation::recordSelection() { - m_pImpl->m_pRequest->setSelection( this ); + m_pRequest->setSelection( this ); } |