Author: mlandres
Date: Tue Jan 8 13:52:16 2008
New Revision: 8221
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8221&view=rev
Log:
Fixed inappropriate use of "zypp::KindOfzypp::Resolvable" instead of
"zypp::Resolvable::Kind".
Modified:
trunk/zypper/src/zypper-misc.cc
trunk/zypper/src/zypper-utils.cc
trunk/zypper/src/zypper-utils.h
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=8221&r1=8220&r2=8221&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Tue Jan 8 13:52:16 2008
@@ -578,7 +578,7 @@
return retry;
}
-typedef mapResObject::constPtr > KindToResObjectSet;
+typedef mapResObject::constPtr > KindToResObjectSet;
void show_summary_resolvable_list(const string & label,
KindToResObjectSet::const_iterator it,
@@ -932,7 +932,7 @@
God->resolver()->setForceResolve( force_resolution );
cout_v << _("Resolving dependencies...") << endl;
- DBG << "Calling the solver..." << endl;
+ DBG << "Calling the solver..." << endl;
return God->resolver()->resolvePool();
}
Modified: trunk/zypper/src/zypper-utils.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.cc?rev=8221&r1=8220&r2=8221&view=diff
==============================================================================
--- trunk/zypper/src/zypper-utils.cc (original)
+++ trunk/zypper/src/zypper-utils.cc Tue Jan 8 13:52:16 2008
@@ -72,29 +72,29 @@
// ----------------------------------------------------------------------------
-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);
Modified: trunk/zypper/src/zypper-utils.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.h?rev=8221&r1=8220&r2=8221&view=diff
==============================================================================
--- trunk/zypper/src/zypper-utils.h (original)
+++ trunk/zypper/src/zypper-utils.h Tue Jan 8 13:52:16 2008
@@ -17,7 +17,7 @@
bool is_changeable_media(const zypp::Url & url);
std::string kind_to_string_localized(
- const zypp::KindOfzypp::Resolvable & kind, unsigned long count);
+ const zypp::Resolvable::Kind & kind, unsigned long count);
/**
* Constructor wrapper catching exceptions,
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
