From: Duncan Mac-Vicar P Date: Wed, 1 Oct 2008 11:21:57 +0000 (+0000) Subject: cpename -> cpeid X-Git-Tag: 6.6.0~440 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=036f2b216aa8b31580bfd8edac1548e312874723;p=platform%2Fupstream%2Flibzypp.git cpename -> cpeid --- diff --git a/zypp/ResObject.cc b/zypp/ResObject.cc index 44b0334d6..7b2a2f718 100644 --- a/zypp/ResObject.cc +++ b/zypp/ResObject.cc @@ -73,8 +73,8 @@ namespace zypp std::string ResObject::distribution() const { return lookupStrAttribute( sat::SolvAttr::distribution ); } - std::string ResObject::cpeName() const - { return lookupStrAttribute( sat::SolvAttr::cpename ); } + std::string ResObject::cpeId() const + { return lookupStrAttribute( sat::SolvAttr::cpeid ); } ByteCount ResObject::installSize() const { return ByteCount( lookupNumAttribute( sat::SolvAttr::installsize ), ByteCount::K ); } diff --git a/zypp/ResObject.h b/zypp/ResObject.h index 21794f2fd..514ee1556 100644 --- a/zypp/ResObject.h +++ b/zypp/ResObject.h @@ -149,7 +149,7 @@ namespace zypp * * See http://cpe.mitre.org */ - std::string cpeName() const; + std::string cpeId() const; /** Installed size. */ ByteCount installSize() const; diff --git a/zypp/sat/SolvAttr.cc b/zypp/sat/SolvAttr.cc index 09641a08e..a2988f904 100644 --- a/zypp/sat/SolvAttr.cc +++ b/zypp/sat/SolvAttr.cc @@ -42,7 +42,7 @@ namespace sat const SolvAttr SolvAttr::insnotify ( SOLVABLE_MESSAGEINS ); // translated const SolvAttr SolvAttr::delnotify ( SOLVABLE_MESSAGEDEL ); // translated const SolvAttr SolvAttr::eula ( SOLVABLE_EULA ); // translated - const SolvAttr SolvAttr::cpename ( SOLVABLE_CPE_NAME ); + const SolvAttr SolvAttr::cpeid ( SOLVABLE_CPE_ID ); const SolvAttr SolvAttr::installtime ( SOLVABLE_INSTALLTIME ); const SolvAttr SolvAttr::buildtime ( SOLVABLE_BUILDTIME ); const SolvAttr SolvAttr::installsize ( SOLVABLE_INSTALLSIZE ); diff --git a/zypp/sat/SolvAttr.h b/zypp/sat/SolvAttr.h index 8a8405f1e..8484fb28a 100644 --- a/zypp/sat/SolvAttr.h +++ b/zypp/sat/SolvAttr.h @@ -64,7 +64,7 @@ namespace sat static const SolvAttr installsize; static const SolvAttr downloadsize; static const SolvAttr diskusage; - static const SolvAttr cpename; + static const SolvAttr cpeid; //@} /** \name package */