[yast-commit] r44716 - /trunk/gtk/src/yzyppwrapper.cc

Author: coolo Date: Thu Feb 21 06:54:54 2008 New Revision: 44716 URL: http://svn.opensuse.org/viewcvs/yast?rev=44716&view=rev Log: compile against latest libzypp (selection support removed, language support commented out) Modified: trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=44716&r1=44715&r2=44716&view=diff ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Thu Feb 21 06:54:54 2008 @@ -15,10 +15,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -37,15 +35,12 @@ typedef zypp::Package::constPtr ZyppPackage; typedef zypp::Patch::constPtr ZyppPatch; typedef zypp::Pattern::constPtr ZyppPattern; -typedef zypp::Language::constPtr ZyppLanguage; inline ZyppPackage tryCastToZyppPkg (ZyppObject obj) { return zypp::dynamic_pointer_cast <const zypp::Package> (obj); } inline ZyppPatch tryCastToZyppPatch (ZyppObject obj) { return zypp::dynamic_pointer_cast <const zypp::Patch> (obj); } inline ZyppPattern tryCastToZyppPattern (ZyppObject obj) { return zypp::dynamic_pointer_cast <const zypp::Pattern> (obj); } -inline ZyppLanguage tryCastToZyppLanguage (ZyppObject obj) -{ return zypp::dynamic_pointer_cast <const zypp::Language> (obj); } //** Utilities @@ -403,8 +398,8 @@ { std::string text; ZyppObject object = impl->zyppSel->theObj(); - const zypp::CapSet &capSet = object->dep (zypp::Dep::PROVIDES); - for (zypp::CapSet::const_iterator it = capSet.begin(); + const zypp::Capabilities &capSet = object->dep (zypp::Dep::PROVIDES); + for (zypp::Capabilities::const_iterator it = capSet.begin(); it != capSet.end(); it++) { if (!text.empty()) text += "\n"; @@ -417,8 +412,8 @@ { std::string text; ZyppObject object = impl->zyppSel->theObj(); - const zypp::CapSet &capSet = object->dep (zypp::Dep::REQUIRES); - for (zypp::CapSet::const_iterator it = capSet.begin(); + const zypp::Capabilities &capSet = object->dep (zypp::Dep::REQUIRES); + for (zypp::Capabilities::const_iterator it = capSet.begin(); it != capSet.end(); it++) { if (!text.empty()) text += "\n"; @@ -449,6 +444,7 @@ } break; } +#if 0 case Ypp::Package::LANGUAGE_TYPE: { ZyppSelectable selectable = collection->impl->zyppSel; @@ -456,13 +452,14 @@ ZyppLanguage language = tryCastToZyppLanguage (object); ZyppObject pkgobj = this->impl->zyppSel->theObj(); - const zypp::CapSet &capSet = pkgobj->dep (zypp::Dep::FRESHENS); - for (zypp::CapSet::const_iterator it = capSet.begin(); + const zypp::Capabilities &capSet = pkgobj->dep (zypp::Dep::FRESHENS); + for (zypp::Capabilities::const_iterator it = capSet.begin(); it != capSet.end(); it++) { if (it->index() == language->name()) return true; } } +#endif default: break; } @@ -1320,10 +1317,12 @@ it = zyppPool().byKindBegin zypp::Pattern(); end = zyppPool().byKindEnd zypp::Pattern(); break; +#if 0 case Package::LANGUAGE_TYPE: it = zyppPool().byKindBegin zypp::Language(); end = zyppPool().byKindEnd zypp::Language(); break; +#endif case Package::PATCH_TYPE: it = zyppPool().byKindBegin zypp::Patch(); end = zyppPool().byKindEnd zypp::Patch(); @@ -1388,8 +1387,7 @@ zyppPool().saveState(); zyppPool().saveState(); - zyppPool().saveStatezypp::Selection(); - zyppPool().saveState(); + // zyppPool().saveState(); zyppPool().saveState(); } @@ -1411,8 +1409,7 @@ { return zyppPool().diffState() || zyppPool().diffState() || - zyppPool().diffStatezypp::Selection() || - zyppPool().diffState() || + // zyppPool().diffState() || zyppPool().diffState(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org