- fixed ZYpp::keyRing() to return KeyRing_Ptr (smart Ptr not *)

diff --git a/zypp/ZYpp.cc b/zypp/ZYpp.cc
index 67484fae60912eacf2f2e99dfd2d36ad2f8c14f0..735f14c953851e877798004210c7db76f6f20750 100644 (file)
--- a/zypp/ZYpp.cc
+++ b/zypp/ZYpp.cc
@@ -69,7 +69,7 @@ namespace zypp
   Resolver_Ptr ZYpp::resolver() const
   { return _pimpl->resolver(); }
 
-  KeyRing* ZYpp::keyRing() const
+  KeyRing_Ptr ZYpp::keyRing() const
   { return _pimpl->keyRing(); }
 
   ///////////////////////////////////////////////////////////////////

diff --git a/zypp/ZYpp.h b/zypp/ZYpp.h
index 8bb3af502829f358632f5f0aef8cf17397b4d8b2..d7a303f091f0f1b315506a8014328c6e663f94cd 100644 (file)
--- a/zypp/ZYpp.h
+++ b/zypp/ZYpp.h
@@ -19,6 +19,7 @@
 #include "zypp/base/PtrTypes.h"
 #include "zypp/Target.h"
 #include "zypp/Resolver.h"
+#include "zypp/KeyRing.h"
 #include "zypp/DiskUsageCounter.h"
 
 ///////////////////////////////////////////////////////////////////
@@ -109,7 +110,7 @@ namespace zypp
   public:
     /** */
     Resolver_Ptr resolver() const;
-    KeyRing* keyRing() const;
+    KeyRing_Ptr keyRing() const;
   public:
     /** Set the preferd locale for translated labels, descriptions,
      *  etc. passed to the UI.

diff --git a/zypp/zypp_detail/ZYppImpl.cc b/zypp/zypp_detail/ZYppImpl.cc
index 5fcc032556cee46235ab8ce6bfacb00bd19450d5..2a5576bb535c48f153fe68a82f099d789198a947 100644 (file)
--- a/zypp/zypp_detail/ZYppImpl.cc
+++ b/zypp/zypp_detail/ZYppImpl.cc
@@ -129,9 +129,7 @@ namespace zypp
     // METHOD TYPE : Destructor
     //
     ZYppImpl::~ZYppImpl()
-    {
-      delete _keyring;
-    }
+    {}
 
     //------------------------------------------------------------------------
     // add/remove resolvables

diff --git a/zypp/zypp_detail/ZYppImpl.h b/zypp/zypp_detail/ZYppImpl.h
index c10743ab99c29c125738c18d44a29ad2ce340461..8d4f89d44557b5f9de5aea5a4635d5e7923b1dab 100644 (file)
--- a/zypp/zypp_detail/ZYppImpl.h
+++ b/zypp/zypp_detail/ZYppImpl.h
@@ -60,7 +60,7 @@ namespace zypp
       { return _sourceFeed; }
 
       /** */
-      KeyRing* keyRing() const
+      KeyRing_Ptr keyRing() const
       { return _keyring; }
 
 
@@ -142,7 +142,7 @@ namespace zypp
       /** */
       Resolver_Ptr _resolver;
 
-      KeyRing *_keyring;
+      KeyRing_Ptr _keyring;
       /** */
       Arch _architecture;
       /** */