cpename -> cpeid

diff --git a/zypp/ResObject.cc b/zypp/ResObject.cc
index 44b0334d6bc4c30cb3ec15e16ba1f9c74a1e8bcb..7b2a2f7181a145dc33706b00a63bb50ef58dad16 100644 (file)
--- 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 21794f2fd19ae99bae887f8a236154e3d2d7a707..514ee155666feedfb497dc18432e058abac5d9ad 100644 (file)
--- 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 09641a08e20c674029a0f395fedcd04ac4ffd2c3..a2988f904e4a752300992f28d630e6a9b39b2442 100644 (file)
--- 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 8a8405f1e0da41a2874534f1eb4b5420207638e9..8484fb28a2de573f8d2ff9413e8b125c58d166de 100644 (file)
--- 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 */