Imported Upstream version 14.45.0

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

diff --git a/zypp/Resolvable.cc b/zypp/Resolvable.cc
index 22f5c36..aa8ccad 100644 (file)
--- a/zypp/Resolvable.cc
+++ b/zypp/Resolvable.cc
@@ -9,25 +9,23 @@
 /** \file zypp/Resolvable.cc
  *
 */
-#include <iostream>
-
 #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);
+
   ///////////////////////////////////////////////////////////////////
   //
   //   METHOD NAME : Resolvable::Resolvable
   //   METHOD TYPE : Ctor
   //
-  Resolvable::Resolvable( const Kind & kind_r,
-                          const NVRAD & nvrad_r )
-  : _pimpl( new Impl( kind_r, nvrad_r ) )
+  Resolvable::Resolvable( const sat::Solvable & solvable_r )
+  : sat::Solvable( solvable_r )
   {}
 
   ///////////////////////////////////////////////////////////////////
@@ -40,49 +38,19 @@ namespace zypp
 
   ///////////////////////////////////////////////////////////////////
   //
-  //   METHOD NAME : Resolvable::dumpOn
-  //   METHOD TYPE : std::ostream
+  //   METHOD NAME : Resolvable::poolItem
+  //   METHOD TYPE : PoolItem
   //
-  std::ostream & Resolvable::dumpOn( std::ostream & str ) const
-  {
-    return str << '[' << kind() << ']'
-    << name() << '-' << edition() << '.' << arch();
-  }
+  PoolItem Resolvable::poolItem() const
+  { return PoolItem( *this ); }
 
   ///////////////////////////////////////////////////////////////////
   //
-  //   Resolvable interface forwarded to implementation
+  //   METHOD NAME : Resolvable::dumpOn
+  //   METHOD TYPE : std::ostream &
   //
-  ///////////////////////////////////////////////////////////////////
-
-  const Resolvable::Kind & 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 CapSet & Resolvable::dep( Dep which_r ) const
-  { return _pimpl->deps()[which_r]; }
-
-  const Dependencies & Resolvable::deps() const
-  { return _pimpl->deps(); }
-
-
-  void Resolvable::injectProvides( const Capability & cap_r )
-  { return _pimpl->injectProvides( cap_r ); }
-
-  void Resolvable::injectRequires( const Capability & cap_r )
-  { return _pimpl->injectRequires( cap_r ); }
-
-
-  void Resolvable::deprecatedSetDeps( const Dependencies & val_r )
-  { _pimpl->deprecatedSetDeps( val_r ); }
+  std::ostream & Resolvable::dumpOn( std::ostream & str ) const
+  { return str << satSolvable(); }
 
   /////////////////////////////////////////////////////////////////
 } // namespace zypp