replace ResTraits>::kind by ResKind

diff --git a/src/Zypper.cc b/src/Zypper.cc
index 7111d50..71e0d05 100644 (file)
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -3087,9 +3087,9 @@ void Zypper::doCommand()
       }
     }
     else if (globalOpts().is_rug_compatible)
-      kinds.insert(ResTraits<Package>::kind);
+      kinds.insert(ResKind::package);
     else
-      kinds.insert(ResTraits<Patch>::kind);
+      kinds.insert(ResKind::patch);
 
     bool best_effort = copts.count( "best-effort" );
 
@@ -3257,13 +3257,13 @@ void Zypper::doCommand()
     switch (command().toEnum())
     {
     case ZypperCommand::RUG_PATCH_INFO_e:
-      kind =  ResTraits<Patch>::kind;
+      kind =  ResKind::patch;
       break;
     case ZypperCommand::RUG_PATTERN_INFO_e:
-      kind =  ResTraits<Pattern>::kind;
+      kind =  ResKind::pattern;
       break;
     case ZypperCommand::RUG_PRODUCT_INFO_e:
-      kind =  ResTraits<Product>::kind;
+      kind =  ResKind::product;
       break;
     default:
     case ZypperCommand::INFO_e:

diff --git a/src/info.cc b/src/info.cc
index 2f26ead..d98db18 100644 (file)
--- a/src/info.cc
+++ b/src/info.cc
@@ -89,13 +89,13 @@ void printInfo(const Zypper & zypper, const ResKind & kind)
 
       cout << endl << endl;
 
-      if (kind == ResTraits<Package>::kind)
+      if (kind == ResKind::package)
         printPkgInfo(zypper, *s);
-      else if (kind == ResTraits<Patch>::kind)
+      else if (kind == ResKind::patch)
         printPatchInfo(zypper, *s);
-      else if (kind == ResTraits<Pattern>::kind)
+      else if (kind == ResKind::pattern)
         printPatternInfo(zypper, *s);
-      else if (kind == ResTraits<Product>::kind)
+      else if (kind == ResKind::product)
         printProductInfo(zypper, *s);
       else
         // TranslatorExplanation %s = resolvable type (package, patch, pattern, etc - untranslated).

diff --git a/src/misc.cc b/src/misc.cc
index ea2a724..ed23a7f 100644 (file)
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -38,15 +38,15 @@ ResKind string_to_kind (const string &skind)
   ResObject::Kind empty;
   string lskind = str::toLower (skind);
   if (lskind == "package")
-    return ResTraits<Package>::kind;
+    return ResKind::package;
   if (lskind == "pattern")
-    return ResTraits<Pattern>::kind;
+    return ResKind::pattern;
   if (lskind == "product")
-    return ResTraits<Product>::kind;
+    return ResKind::product;
   if (lskind == "patch")
-    return ResTraits<Patch>::kind;
+    return ResKind::patch;
   if (lskind == "srcpackage")
-    return ResTraits<SrcPackage>::kind;
+    return ResKind::srcpackage;
   // not recognized
   return empty;
 }
@@ -278,7 +278,7 @@ void build_deps_install(Zypper & zypper)
         God->resolver()->addRequire(*itc);
         DBG << "added req: " << *itc << endl;
       }*/
-      God->resolver()->addRequire(Capability(srcpkg->name(), Rel::EQ, srcpkg->edition(), ResTraits<SrcPackage>::kind));
+      God->resolver()->addRequire(Capability(srcpkg->name(), Rel::EQ, srcpkg->edition(), ResKind::srcpackage));
       //installer.item.status().setToBeInstalled( zypp::ResStatus::USER );
     }
     else

diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index 44b4050..7d7d429 100755 (executable)
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -548,7 +548,7 @@ static int summary(Zypper & zypper)
     ResObject::constPtr res = it->resolvable();
     if ( it->status().isToBeInstalled() || it->status().isToBeUninstalled() )
     {
-      if (it->resolvable()->kind() == ResTraits<Patch>::kind)
+      if (it->resolvable()->kind() == ResKind::patch)
       {
         Patch::constPtr patch = asKind<Patch>(it->resolvable());
 
@@ -689,7 +689,7 @@ static int summary(Zypper & zypper)
 
   for (list<SrcPackage::constPtr>::const_iterator it = zypper.runtimeData().srcpkgs_to_install.begin();
       it != zypper.runtimeData().srcpkgs_to_install.end(); ++it)
-    toinstall[ResTraits<SrcPackage>::kind].insert(*it);
+    toinstall[ResKind::srcpackage].insert(*it);
 
   if (!toremove.empty() && (
       zypper.command() == ZypperCommand::INSTALL ||

diff --git a/src/update.cc b/src/update.cc
index de44d1b..5060692 100755 (executable)
--- a/src/update.cc
+++ b/src/update.cc
@@ -299,13 +299,13 @@ find_updates( const ResKindSet & kinds, Candidates & candidates )
 
 string i18n_kind_updates(const ResKind & kind)
 {
-  if (kind == ResTraits<Package>::kind)
+  if (kind == ResKind::package)
     return _("Package updates");
-  else if (kind == ResTraits<Patch>::kind)
+  else if (kind == ResKind::patch)
     return _("Patches");
-  else if (kind == ResTraits<Pattern>::kind)
+  else if (kind == ResKind::pattern)
     return _("Pattern updates");
-  else if (kind == ResTraits<Product>::kind)
+  else if (kind == ResKind::product)
     return _("Product updates");
 
   return boost::str(format("%s updates") % kind);

diff --git a/src/utils/misc.cc b/src/utils/misc.cc
index 1f22214..b667c3e 100644 (file)
--- a/src/utils/misc.cc
+++ b/src/utils/misc.cc
@@ -15,7 +15,7 @@
 #include "zypp/base/Logger.h"
 #include "zypp/base/String.h"
 #include "zypp/media/MediaManager.h"
-#include "zypp/parser/xml_escape_parser.hpp"
+#include "zypp/parser/xml/XmlEscape.h"
 #include "zypp/Capability.h"
 
 #include "main.h"
@@ -80,15 +80,15 @@ bool is_changeable_media(const zypp::Url & url)
 
 string kind_to_string_localized(const Resolvable::Kind & kind, unsigned long count)
 {
-  if (kind == ResTraits<Package>::kind)
+  if (kind == ResKind::package)
     return _PL("package", "packages", count);
-  if (kind == ResTraits<Pattern>::kind)
+  if (kind == ResKind::pattern)
     return _PL("pattern", "patterns", count);
-  if (kind == ResTraits<Product>::kind)
+  if (kind == ResKind::product)
     return _PL("product", "product", count);
-  if (kind == ResTraits<Patch>::kind)
+  if (kind == ResKind::patch)
     return _PL("patch", "patches", count);
-  if (kind == ResTraits<SrcPackage>::kind)
+  if (kind == ResKind::srcpackage)
     return _PL("srcpackage", "srcpackages", count);
   // default
   return _PL("resolvable", "resolvables", count);
@@ -245,8 +245,7 @@ Pathname cache_rpm(const string & rpm_uri_str, const string & cache_dir)
 
 string xml_encode(const string & text)
 {
-  iobind::parser::xml_escape_parser parser;
-  return parser.escape(text);
+  return zypp::xml::escape(text);
 }
 
 std::string & indent(std::string & text, int columns)