Author: mlandres Date: Fri Apr 4 22:11:12 2008 New Revision: 9389 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9389&view=rev Log: Fixed IdStringType ctor calls Modified: trunk/libzypp/zypp/Edition.h trunk/libzypp/zypp/PackageKeyword.h trunk/libzypp/zypp/sat/SolvAttr.cc trunk/libzypp/zypp/sat/SolvAttr.h Modified: trunk/libzypp/zypp/Edition.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Edition.h?rev=9389&r1=9388&r2=9389&view=diff ============================================================================== --- trunk/libzypp/zypp/Edition.h (original) +++ trunk/libzypp/zypp/Edition.h Fri Apr 4 22:11:12 2008 @@ -77,8 +77,8 @@ Edition() {} /** Ctor taking edition as string. */ - explicit Edition( IdString::IdType id_r ) : _str( IdString(id_r).c_str() ) {} - explicit Edition( const IdString & idstr_r ) : _str( idstr_r.c_str() ) {} + explicit Edition( IdString::IdType id_r ) : _str( id_r ) {} + explicit Edition( const IdString & idstr_r ) : _str( idstr_r ) {} explicit Edition( const std::string & str_r ) : _str( str_r ) {} explicit Edition( const char * cstr_r ) : _str( cstr_r ) {} Modified: trunk/libzypp/zypp/PackageKeyword.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PackageKeyword.h?rev=9389&r1=9388&r2=9389&view=diff ============================================================================== --- trunk/libzypp/zypp/PackageKeyword.h (original) +++ trunk/libzypp/zypp/PackageKeyword.h Fri Apr 4 22:11:12 2008 @@ -32,8 +32,8 @@ PackageKeyword() {} /** Ctor taking keyword as string. */ - explicit PackageKeyword( sat::detail::IdType id_r ) : _str( IdString(id_r).c_str() ) {} - explicit PackageKeyword( const IdString & idstr_r ) : _str( idstr_r.c_str() ) {} + explicit PackageKeyword( sat::detail::IdType id_r ) : _str( id_r ) {} + explicit PackageKeyword( const IdString & idstr_r ) : _str( idstr_r ) {} explicit PackageKeyword( const std::string & str_r ) : _str( str_r ) {} explicit PackageKeyword( const char * cstr_r ) : _str( cstr_r ) {} Modified: trunk/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev=9389&r1=9388&r2=9389&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.cc (original) +++ trunk/libzypp/zypp/sat/SolvAttr.cc Fri Apr 4 22:11:12 2008 @@ -27,6 +27,7 @@ namespace sat { ///////////////////////////////////////////////////////////////// + const SolvAttr SolvAttr::allAttr( detail::noId ); const SolvAttr SolvAttr::noAttr; #warning STILL ATTRIBUTES HERE WHICH ARE NOT PROVIDED BY SOLV FILES Modified: trunk/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.h?rev=9389&r1=9388&r2=9389&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.h (original) +++ trunk/libzypp/zypp/sat/SolvAttr.h Fri Apr 4 22:11:12 2008 @@ -36,6 +36,8 @@ public: /** \name Some builtin SolvAttr constants. */ //@{ + /** Value to request searching all Attributes (0). */ + static const SolvAttr allAttr; /** Value representing \c noAttr (<tt>""</tt>)*/ static const SolvAttr noAttr; @@ -91,8 +93,8 @@ SolvAttr() {} /** Ctor taking kind as string. */ - explicit SolvAttr( sat::detail::IdType id_r ) : _str( IdString(id_r).c_str() ) {} - explicit SolvAttr( const IdString & idstr_r ) : _str( idstr_r.c_str() ) {} + explicit SolvAttr( sat::detail::IdType id_r ) : _str( id_r ) {} + explicit SolvAttr( const IdString & idstr_r ) : _str( idstr_r ) {} explicit SolvAttr( const std::string & str_r ) : _str( str_r ) {} explicit SolvAttr( const char * cstr_r ) : _str( cstr_r ) {} -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org