Author: mlandres Date: Fri Aug 8 10:52:13 2008 New Revision: 10796 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10796&view=rev Log: replace ResTraits<>::kind by ResKind Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=10796&r1=10795&r2=10796&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Fri Aug 8 10:52:13 2008 @@ -45,7 +45,6 @@ #include "zypp/ZYpp.h" #include "zypp/ZYppFactory.h" #include "zypp/ResObjects.h" -#include "zypp/ResTraits.h" #include "zypp/ResPool.h" #include "zypp/PoolItem.h" #include "zypp/Capability.h" @@ -148,7 +147,7 @@ Package::constPtr pkg = asKind<Package>(res); if (pkg) str << "[" << pkg->mediaNr() << "]"; } - if (r->kind() != ResTraitszypp::Package::kind) + if (r->kind() != ResKind::package) str << r->kind() << ':'; str << r->name() << '-' << r->edition(); if (r->arch() != "") { @@ -169,19 +168,19 @@ Resolvable::Kind string2kind (const std::string & str) { - Resolvable::Kind kind = ResTraitszypp::Package::kind; + Resolvable::Kind kind = ResKind::package; if (!str.empty()) { if (str == "package") { // empty } else if (str == "patch") { - kind = ResTraitszypp::Patch::kind; + kind = ResKind::patch; } else if (str == "pattern") { - kind = ResTraitszypp::Pattern::kind; + kind = ResKind::pattern; } else if (str == "product") { - kind = ResTraitszypp::Product::kind; + kind = ResKind::product; } else { cerr << "get_poolItem unknown kind '" << str << "'" << endl; @@ -387,7 +386,7 @@ void isSatisfied (const string & kind_name) { if (kind_name.empty()) { - IsStatisfied info (ResTraitszypp::Package::kind); + IsStatisfied info (ResKind::package); invokeOnEach( God->pool().begin( ), God->pool().end ( ), functor::functorRef (info) ); @@ -882,7 +881,7 @@ poolItem = get_poolItem( source_alias, name, kind_name, version, release, architecture ); if (poolItem) { RESULT << "Installing " - << ((poolItem->kind() != ResTraitszypp::Package::kind) ? (poolItem->kind().asString() + ":") : "") + << ((poolItem->kind() != ResKind::package) ? (poolItem->kind().asString() + ":") : "") << name << (version.empty()?"":(string("-")+poolItem->edition().version())) << (release.empty()?"":(string("-")+poolItem->edition().release())) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org