Fixed inappropriate use of "zypp::KindOf<zypp::Resolvable>" instead of

"zypp::Resolvable::Kind".

diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index 1d606b8..1382fec 100644 (file)
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -578,7 +578,7 @@ bool show_problems(Zypper & zypper)
   return retry;
 }
 
-typedef map<KindOf<Resolvable>,set<ResObject::constPtr> > KindToResObjectSet;
+typedef map<Resolvable::Kind,set<ResObject::constPtr> > KindToResObjectSet;
 
 void show_summary_resolvable_list(const string & label,
                                   KindToResObjectSet::const_iterator it,
@@ -932,7 +932,7 @@ bool resolve(const Zypper & zypper)
   God->resolver()->setForceResolve( force_resolution );
 
   cout_v << _("Resolving dependencies...") << endl;
-  DBG << "Calling the solver..." << endl; 
+  DBG << "Calling the solver..." << endl;
   return God->resolver()->resolvePool();
 }
 

diff --git a/src/zypper-utils.cc b/src/zypper-utils.cc
index 8951e08..c14efcc 100644 (file)
--- a/src/zypper-utils.cc
+++ b/src/zypper-utils.cc
@@ -72,29 +72,29 @@ bool is_changeable_media(const zypp::Url & url)
 
 // ----------------------------------------------------------------------------
 
-string kind_to_string_localized(const KindOf<Resolvable> & kind, unsigned long count)
+string kind_to_string_localized(const Resolvable::Kind & kind, unsigned long count)
 {
-  if (kind == ResTraits<Package>::kind.asString())
+  if (kind == ResTraits<Package>::kind)
     return _PL("package", "packages", count);
-  if (kind == ResTraits<Selection>::kind.asString())
+  if (kind == ResTraits<Selection>::kind)
     return _PL("selection", "selections", count);
-  if (kind == ResTraits<Pattern>::kind.asString())
+  if (kind == ResTraits<Pattern>::kind)
     return _PL("pattern", "patterns", count);
-  if (kind == ResTraits<Product>::kind.asString())
+  if (kind == ResTraits<Product>::kind)
     return _PL("product", "product", count);
-  if (kind == ResTraits<Patch>::kind.asString())
+  if (kind == ResTraits<Patch>::kind)
     return _PL("patch", "patches", count);
-  if (kind == ResTraits<Script>::kind.asString())
+  if (kind == ResTraits<Script>::kind)
     return _PL("script", "scripts", count);
-  if (kind == ResTraits<Message>::kind.asString())
+  if (kind == ResTraits<Message>::kind)
     return _PL("message", "messages", count);
-  if (kind == ResTraits<Language>::kind.asString())
+  if (kind == ResTraits<Language>::kind)
     return _PL("language", "languages", count);
-  if (kind == ResTraits<Atom>::kind.asString())
+  if (kind == ResTraits<Atom>::kind)
     return _PL("atom", "atoms", count);
-  if (kind == ResTraits<SystemResObject>::kind.asString())
+  if (kind == ResTraits<SystemResObject>::kind)
     return _PL("system", "systems", count);
-  if (kind == ResTraits<SrcPackage>::kind.asString())
+  if (kind == ResTraits<SrcPackage>::kind)
     return _PL("srcpackage", "srcpackages", count);
   // default
   return _PL("resolvable", "resolvables", count);

diff --git a/src/zypper-utils.h b/src/zypper-utils.h
index c3b16a2..4fdca6e 100644 (file)
--- a/src/zypper-utils.h
+++ b/src/zypper-utils.h
@@ -17,7 +17,7 @@ std::ostream & report_a_bug (std::ostream& stm);
 bool is_changeable_media(const zypp::Url & url);
 
 std::string kind_to_string_localized(
-    const zypp::KindOf<zypp::Resolvable> & kind, unsigned long count);
+    const zypp::Resolvable::Kind & kind, unsigned long count);
 
 /**
  * Constructor wrapper catching exceptions,