[zypp-commit] r6093 - in /trunk/libzypp-bindings/swig: Kind.i Package.i Repository.i ResObject.i Resolvable.i Target.i

Author: aschnell Date: Thu Jul 19 15:14:54 2007 New Revision: 6093 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6093&view=rev Log: - some minor adaptions for newer zypp Modified: trunk/libzypp-bindings/swig/Kind.i trunk/libzypp-bindings/swig/Package.i trunk/libzypp-bindings/swig/Repository.i trunk/libzypp-bindings/swig/ResObject.i trunk/libzypp-bindings/swig/Resolvable.i trunk/libzypp-bindings/swig/Target.i Modified: trunk/libzypp-bindings/swig/Kind.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Kind.i?rev=6093&r1=6092&r2=6093&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/Kind.i (original) +++ trunk/libzypp-bindings/swig/Kind.i Thu Jul 19 15:14:54 2007 @@ -45,7 +45,7 @@ } } -// this is just a workaround since the whole code above does not work +// FIXME: this is just a workaround since the whole code above does not work %extend Resolvable { const char* kindToS() { Modified: trunk/libzypp-bindings/swig/Package.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Package.i?rev=6093&r1=6092&r2=6093&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/Package.i (original) +++ trunk/libzypp-bindings/swig/Package.i Thu Jul 19 15:14:54 2007 @@ -1,6 +1,6 @@ - class Package : public ResObject - { +class Package : public ResObject +{ public: typedef detail::PackageImplIf Impl; @@ -10,10 +10,7 @@ typedef TraitsType::constPtrType constPtr; public: - /** - * Checksum the source says this package should have - */ - CheckSum checksum() const; + /** Get the package change log */ Changelog changelog() const; /** */ @@ -50,10 +47,11 @@ //DiskUsage diskusage() const; /** location in source */ - Pathname location() const; + OnMediaLocation location() const; protected: Package( const NVRAD & nvrad_r ); /** Dtor */ virtual ~Package(); - }; \ No newline at end of file +}; + Modified: trunk/libzypp-bindings/swig/Repository.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Repository.i?rev=6093&r1=6092&r2=6093&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/Repository.i (original) +++ trunk/libzypp-bindings/swig/Repository.i Thu Jul 19 15:14:54 2007 @@ -1,7 +1,7 @@ - - class Repository : private base::SafeBool<Repository> - { - public: + +class Repository : private base::SafeBool<Repository> +{ + public: Repository(); static const Repository noRepository; public: @@ -11,5 +11,5 @@ const RepoInfo info() const; const std::listpackagedelta::PatchRpm & patchRpms() const; const std::listpackagedelta::DeltaRpm & deltaRpms() const; - }; +}; Modified: trunk/libzypp-bindings/swig/ResObject.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResObject.i?rev=6093&r1=6092&r2=6093&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/ResObject.i (original) +++ trunk/libzypp-bindings/swig/ResObject.i Thu Jul 19 15:14:54 2007 @@ -1,8 +1,8 @@ -%template(ResObject_Ptr) intrusive_ptr<ResObject>; +// %template(ResObject_Ptr) intrusive_ptr<ResObject>; class ResObject : public Resolvable - { +{ public: typedef detail::ResObjectImplIf Impl; typedef ResObject Self; @@ -18,7 +18,7 @@ Text licenseToConfirm() const; Vendor vendor() const; ByteCount size() const; - ByteCount archivesize() const; + ByteCount downloadSize() const; Repository repository() const; unsigned mediaNr() const; bool installOnly() const; @@ -29,4 +29,4 @@ const NVRAD & nvrad_r ); virtual ~ResObject(); virtual std::ostream & dumpOn( std::ostream & str ) const; - }; +}; Modified: trunk/libzypp-bindings/swig/Resolvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Resolvable.i?rev=6093&r1=6092&r2=6093&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/Resolvable.i (original) +++ trunk/libzypp-bindings/swig/Resolvable.i Thu Jul 19 15:14:54 2007 @@ -1,13 +1,13 @@ - class Resolvable - { +class Resolvable +{ public: typedef Resolvable Self; typedef ResTraits<Self> TraitsType; typedef TraitsType::KindType Kind; typedef TraitsType::PtrType Ptr; typedef TraitsType::constPtrType constPtr; - + const Kind & kind() const; const std::string & name() const; const Edition & edition() const; @@ -17,11 +17,11 @@ //const Dependencies & deps() const; //void injectProvides( const Capability & cap_r ); //void injectRequires( const Capability & cap_r ); - + protected: Resolvable( const Kind & kind_r, const NVRAD & nvrad_r ); virtual ~Resolvable(); virtual std::ostream & dumpOn( std::ostream & str ) const; - }; +}; Modified: trunk/libzypp-bindings/swig/Target.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Target.i?rev=6093&r1=6092&r2=6093&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/Target.i (original) +++ trunk/libzypp-bindings/swig/Target.i Thu Jul 19 15:14:54 2007 @@ -2,25 +2,25 @@ typedef intrusive_ptr<Target> Target_Ptr; class Target - { +{ public: - + typedef std::list PoolItemList; public: /** All resolvables provided by the target. */ const ResStore & resolvables(); - - /** + + /** * reload the target in future calls if * needed. * note the loading can actually be delayed, but - * the next call to resolvables must reflect the + * the next call to resolvables must reflect the * status of the system. */ void reset(); - + /** * load resolvables of certain kind in the internal store * and return a iterator @@ -41,15 +41,6 @@ ResObject::constPtr whoOwnsFile (const std::string & path_str) const; - /** JUST FOR TESTSUITE */ - /** Sort according to prereqs and media numbers - * \todo provide it as standalone algorithm - */ - void getResolvablesToInsDel ( const ResPool pool_r, - PoolItemList & dellist_r, - PoolItemList & instlist_r, - PoolItemList & srclist_r ) const; - #ifndef STORAGE_DISABLED /** enables the storage target */ bool isStorageEnabled() const; @@ -64,6 +55,6 @@ /** return the last modification date of the target */ Date timestamp() const; - }; - -%template(Target_Ptr) intrusive_ptr<Target>; \ No newline at end of file +}; + +%template(Target_Ptr) intrusive_ptr<Target>; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org