From 208bb02fc3df5ae8f25045fa1cde6d8d0ca7cad1 Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Fri, 4 May 2012 17:15:59 -0400 Subject: [PATCH] desktop: fixed Evolution3 class pointer return override --- desktop/src/CUI_Evolution.cc | 10 ++++++++++ desktop/src/CUI_Evolution.h | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/desktop/src/CUI_Evolution.cc b/desktop/src/CUI_Evolution.cc index 27c7791a..2b73f9ba 100644 --- a/desktop/src/CUI_Evolution.cc +++ b/desktop/src/CUI_Evolution.cc @@ -126,6 +126,11 @@ void EvolutionPtrBase::AcquirePlugin(plugin_ptr old_plugin) m_container.reset( m_evolution ); } +OpenSync::Config::Evolution* EvolutionPtrBase::GetEvolutionPtr() +{ + return m_evolution; +} + void EvolutionPtrBase::Clear() { m_container.reset(); @@ -357,6 +362,11 @@ void Evolution3::AcquirePlugin(plugin_ptr old_plugin) m_container.reset( m_evolution3 ); } +OpenSync::Config::Evolution* Evolution3::GetEvolutionPtr() +{ + return m_evolution3; +} + void Evolution3::Clear() { m_container.reset(); diff --git a/desktop/src/CUI_Evolution.h b/desktop/src/CUI_Evolution.h index 73359b81..ea29e53d 100644 --- a/desktop/src/CUI_Evolution.h +++ b/desktop/src/CUI_Evolution.h @@ -43,7 +43,7 @@ protected: // by default, creates Evolution object... override for others virtual void AcquirePlugin(plugin_ptr old_plugin); - virtual OpenSync::Config::Evolution* GetEvolutionPtr() { return m_evolution; } + virtual OpenSync::Config::Evolution* GetEvolutionPtr(); virtual void Clear(); public: @@ -81,6 +81,7 @@ private: protected: virtual void AcquirePlugin(plugin_ptr old_plugin); + virtual OpenSync::Config::Evolution* GetEvolutionPtr(); virtual void Clear(); public: -- 2.11.4.GIT