Author: mlandres Date: Thu Jun 4 15:32:31 2009 New Revision: 57446 URL: http://svn.opensuse.org/viewcvs/yast?rev=57446&view=rev Log: Cleanup use of deprecated methods. Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/Locks.cc trunk/pkg-bindings/yast2-pkg-bindings.spec.in Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=57446&r1=57445&r2=57446&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Jun 4 15:32:31 2009 @@ -1 +1 @@ -2.18.5 +2.18.6 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=57446&r1=57445&r2=57446&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Jun 4 15:32:31 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 4 15:21:20 CEST 2009 - ma@suse.de + +- Remove more use of deprecated methods. +- 2.18.6 + +------------------------------------------------------------------- Wed May 27 14:49:23 CEST 2009 - ma@suse.de - Remove use of deprecated Package::filenames. Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?rev=57446&r1=57445&r2=57446&view=diff ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Thu Jun 4 15:32:31 2009 @@ -1035,7 +1035,7 @@ if (!ycp_val.isNull() && ycp_val->isString()) { // set the entered username - auth_data.setUserName(ycp_val->asString()->value()); + auth_data.setUsername(ycp_val->asString()->value()); } else { Modified: trunk/pkg-bindings/src/Locks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Locks.cc?rev=57446&r1=57445&r2=57446&view=diff ============================================================================== --- trunk/pkg-bindings/src/Locks.cc (original) +++ trunk/pkg-bindings/src/Locks.cc Thu Jun 4 15:32:31 2009 @@ -43,12 +43,6 @@ // UINT_MAX #include <climits> -// SEARCH_* constants (SEARCH_STRING, SEARCH_SUBSTRING,...) -extern "C" -{ -#include "satsolver/repo.h" -} - /** * @builtin AddLock @@ -57,7 +51,7 @@ * Add a new lock to the package manager. Input parameter is a map $[ "kind" : list<string>, * "install_status":string, "repo_id":list<integer>, "case_sensitive" : boolean, "global_string":list<string> * "string_type" : string, "solvable:.*" : list<string> ] - * + * * see http://en.opensuse.org/Libzypp/Locksfile for more information * @param map lock Definition of the lock * @return boolean true on success @@ -106,7 +100,7 @@ if (!list_item.isNull() && list_item->isString()) { - query.addKind(zypp::ResKind(list_item->asString()->value())); + query.addKind(zypp::ResKind(list_item->asString()->value())); } else { @@ -353,7 +347,7 @@ } } - + // add "kind" attribute if (!pool_query.kinds().empty()) { @@ -369,7 +363,7 @@ // add "install_status" attribute std::string status; - + switch(pool_query.statusFilterFlags()) { case zypp::PoolQuery::ALL : status = "all"; break; @@ -415,12 +409,13 @@ // add "string_type" attribute std::string str_type; - switch(pool_query.matchType()) + switch(pool_query.matchMode().mode()) { - case SEARCH_STRING : str_type = "exact"; break; - case SEARCH_SUBSTRING : str_type = "substring"; break; - case SEARCH_GLOB : str_type = "glob"; break; - case SEARCH_REGEX : str_type = "regex"; break; + case zypp::Match::STRING : str_type = "exact"; break; + case zypp::Match::SUBSTRING : str_type = "substring"; break; + case zypp::Match::GLOB : str_type = "glob"; break; + case zypp::Match::REGEX : str_type = "regex"; break; + default: break; } if (!str_type.empty()) @@ -436,7 +431,7 @@ * @short Get list of current locks * @description * Returns list of of current locks, see AddLock() for details about returned lock map. - * + * * see http://en.opensuse.org/Libzypp/Locksfile for more information * @return list list of locks (YCP maps) */ @@ -496,7 +491,7 @@ zypp::Locks::const_iterator it = locks.begin(); zypp::Locks::const_iterator it_end = locks.end(); - + unsigned int i = 0; while(i < idx) { Modified: trunk/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/yast2-pkg-bindings.spec.in?rev=57446&r1=57445&r2=57446&view=diff ============================================================================== --- trunk/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ trunk/pkg-bindings/yast2-pkg-bindings.spec.in Thu Jun 4 15:32:31 2009 @@ -2,10 +2,10 @@ @HEADER@ BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools -BuildRequires: libzypp-devel >= 5.24.7 +BuildRequires: libzypp-devel >= 6.6.0 # new GPG callbacks -Requires: libzypp >= 5.24.7 +Requires: libzypp >= 6.6.0 Summary: - -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org