Author: mlandres Date: Tue Jan 15 10:52:03 2008 New Revision: 8284 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8284&view=rev Log: backup Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/IdStr.h branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolMember.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/IdStr.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/IdStr.h?rev=8284&r1=8283&r2=8284&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/IdStr.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/IdStr.h Tue Jan 15 10:52:03 2008 @@ -215,6 +215,10 @@ ///////////////////////////////////////////////////////////////// } // namespace sat /////////////////////////////////////////////////////////////////// + + /** Drag into namespace zypp*/ + using sat::IdStr; + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc?rev=8284&r1=8283&r2=8284&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc Tue Jan 15 10:52:03 2008 @@ -131,23 +131,24 @@ return Edition( _solvable->evr ); } - ArchId Solvable::arch() const + Arch Solvable::arch() const { - NO_SOLVABLE_RETURN( ArchId() ); + NO_SOLVABLE_RETURN( Arch_noarch ); //ArchId() ); switch ( _solvable->arch ) { case ARCH_SRC: case ARCH_NOSRC: - return ArchId( ARCH_NOARCH ); + return Arch_noarch; //ArchId( ARCH_NOARCH ); break; } - return ArchId( _solvable->arch ); + return Arch( IdStr(_solvable->arch).asString() ); + //return ArchId( _solvable->arch ); } - VendorId Solvable::vendor() const + IdStr Solvable::vendor() const { - NO_SOLVABLE_RETURN( VendorId() ); - return VendorId( _solvable->vendor ); + NO_SOLVABLE_RETURN( IdStr() ); + return IdStr( _solvable->vendor ); } Capabilities Solvable::operator[]( Dep which_r ) const Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h?rev=8284&r1=8283&r2=8284&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h Tue Jan 15 10:52:03 2008 @@ -23,6 +23,7 @@ #include "zypp/ResTraits.h" #include "zypp/Edition.h" +#include "zypp/Arch.h" #include "zypp/Dep.h" /////////////////////////////////////////////////////////////////// @@ -77,11 +78,13 @@ public: IdStr ident() const; + ResKind kind() const; std::string name() const; Edition edition() const; - ArchId arch() const; - VendorId vendor() const; + Arch arch() const; + + IdStr vendor() const; public: Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolMember.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolMember.h?rev=8284&r1=8283&r2=8284&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolMember.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolMember.h Tue Jan 15 10:52:03 2008 @@ -105,11 +105,6 @@ } // namespace detail /////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - typedef IdStr ArchId; - typedef IdStr VendorId; - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// } // namespace sat /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org