Imported Upstream version 16.3.2

[platform/upstream/libzypp.git] / zypp / Resolvable.cc

diff --git a/zypp/Resolvable.cc b/zypp/Resolvable.cc
index 55d3785..db3fb80 100644 (file)
--- a/zypp/Resolvable.cc
+++ b/zypp/Resolvable.cc
@@ -10,68 +10,26 @@
  *
 */
 #include "zypp/Resolvable.h"
-#include "zypp/detail/ResolvableImpl.h"
-
-using namespace std;
+#include "zypp/ResObject.h"
+#include "zypp/PoolItem.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
-{ /////////////////////////////////////////////////////////////////
-  IMPL_PTR_TYPE(Resolvable)
+{
+  IMPL_PTR_TYPE(Resolvable);
 
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : Resolvable::Resolvable
-  //   METHOD TYPE : Ctor
-  //
-  Resolvable::Resolvable( detail::ResolvableImplPtr impl_r )
-  : _pimpl( impl_r )
+  Resolvable::Resolvable( const sat::Solvable & solvable_r )
+  : _solvable( solvable_r )
   {}
 
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : Resolvable::~Resolvable
-  //   METHOD TYPE : Dtor
-  //
   Resolvable::~Resolvable()
   {}
 
-  const ResKind & Resolvable::kind() const
-  { return _pimpl->kind(); }
-
-  const std::string & Resolvable::name() const
-  { return _pimpl->name(); }
-
-  const Edition & Resolvable::edition() const
-  { return _pimpl->edition(); }
-
-  const Arch & Resolvable::arch() const
-  { return _pimpl->arch(); }
-
-  const Dependencies & Resolvable::deps() const
-  { return _pimpl->deps(); }
-
-  void Resolvable::setDeps( const Dependencies & val_r )
-  { _pimpl->setDeps( val_r ); }
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : Resolvable::~Resolvable
-  //   METHOD TYPE : Dtor
-  //
-  detail::constResolvableImplPtr Resolvable::sayFriend() const
-  { return _pimpl; }
+  PoolItem Resolvable::poolItem() const
+  { return PoolItem( *this ); }
 
-  /******************************************************************
-  **
-  **   FUNCTION NAME : operator<<
-  **   FUNCTION TYPE : std::ostream &
-  */
-  std::ostream & operator<<( std::ostream & str, const Resolvable & obj )
-  {
-    return str << *obj.sayFriend();
-  }
+  std::ostream & Resolvable::dumpOn( std::ostream & str ) const
+  { return str << satSolvable(); }
 
-  /////////////////////////////////////////////////////////////////
 } // namespace zypp
 ///////////////////////////////////////////////////////////////////