Author: mlandres Date: Fri Jun 22 13:47:48 2007 New Revision: 5828 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5828&view=rev Log: remove unneeded friends and fix constness Modified: branches/REFACTORING-10_3/libzypp/zypp/Repository.cc branches/REFACTORING-10_3/libzypp/zypp/Repository.h branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.h Modified: branches/REFACTORING-10_3/libzypp/zypp/Repository.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/Repository.cc?rev=5828&r1=5827&r2=5828&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/Repository.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/Repository.cc Fri Jun 22 13:47:48 2007 @@ -41,38 +41,38 @@ Repository::NumericId Repository::numericId() const { return _pimpl->numericId(); } - const ResStore & Repository::resolvables() + const ResStore & Repository::resolvables() const { return _pimpl->resolvables(); } - - const RepoInfo Repository::info() const + + const RepoInfo & Repository::info() const { return _pimpl->info(); } - + const std::listpackagedelta::PatchRpm & Repository::patchRpms() const { return _pimpl->patchRpms(); } - + const std::listpackagedelta::DeltaRpm & Repository::deltaRpms() const { return _pimpl->deltaRpms(); } - + std::ostream & operator<<( std::ostream & str, const Repository & obj ) { return str << "[" << obj.info().alias() << "]" << endl; } - + bool operator==( const Repository & lhs, const Repository & rhs ) { return (lhs.info().alias() == rhs.info().alias()); } - + bool operator<( const Repository & lhs, const Repository & rhs ) { return (lhs.info().alias() < rhs.info().alias()); Modified: branches/REFACTORING-10_3/libzypp/zypp/Repository.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/Repository.h?rev=5828&r1=5827&r2=5828&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/Repository.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/Repository.h Fri Jun 22 13:47:48 2007 @@ -14,7 +14,7 @@ namespace zypp { class ResStore; - + namespace repo { DEFINE_PTR_TYPE(RepositoryImpl); @@ -23,24 +23,19 @@ class Repository : private base::SafeBool<Repository> { - public: - friend std::ostream & operator<<( std::ostream & str, const Repository & obj ); - friend bool operator==( const Repository & lhs, const Repository & rhs ); - friend bool operator<( const Repository & lhs, const Repository & rhs ); - public: typedef repo::RepositoryImpl Impl; typedef repo::RepositoryImpl_Ptr Impl_Ptr; public: - /** + /** * \short Default ctor: noRepository. * \see RepoManager::createFromCache. */ Repository(); - /** + /** * A dummy Repository (Id \c 0) providing nothing, doing nothing. */ static const Repository noRepository; @@ -59,23 +54,23 @@ /** * \short Get the resolvables for repo */ - const zypp::ResStore & resolvables(); + const zypp::ResStore & resolvables() const; /** * \short Repository info used to create this repository */ - const RepoInfo info() const; + const RepoInfo & info() const; /** * \short Patch RPMs the repository provides */ const std::listpackagedelta::PatchRpm & patchRpms() const; - + /** * \short Delta RPMs the repository provides */ const std::listpackagedelta::DeltaRpm & deltaRpms() const; - + private: friend base::SafeBool<Repository>::operator bool_type() const; /** \ref SafeBool test. */ @@ -97,10 +92,13 @@ RW_pointer _pimpl; }; + /** \relates Repository */ std::ostream & operator<<( std::ostream & str, const Repository & obj ); + /** \relates Repository */ bool operator==( const Repository & lhs, const Repository & rhs ); + /** \relates Repository */ bool operator<( const Repository & lhs, const Repository & rhs ); - + } #endif Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.cc?rev=5828&r1=5827&r2=5828&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.cc Fri Jun 22 13:47:48 2007 @@ -11,7 +11,7 @@ } -const RepoInfo RepositoryImpl::info() const +const RepoInfo & RepositoryImpl::info() const { return _info; } @@ -36,7 +36,7 @@ { return _patchRpms; } - + const std::listpackagedelta::DeltaRpm & RepositoryImpl::deltaRpms() const { Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.h?rev=5828&r1=5827&r2=5828&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/RepositoryImpl.h Fri Jun 22 13:47:48 2007 @@ -29,34 +29,34 @@ { friend std::ostream & operator<<( std::ostream & str, const RepositoryImpl & obj ); public: - + /** * \short Ctor. * \param info What is known about this source at construction time. * */ RepositoryImpl( const RepoInfo &info = RepoInfo() ); - + + /** + * \short Dtor + */ + ~RepositoryImpl(); + /** * \short Information about this repository * You can't change this information after creation. * Use \ref RepoManager for that. */ - const RepoInfo info() const; - - /** - * \short Dtor - */ - ~RepositoryImpl(); + const RepoInfo & info() const; const ResStore & resolvables() const; - struct null {}; - const std::listpackagedelta::PatchRpm & patchRpms() const; const std::listpackagedelta::DeltaRpm & deltaRpms() const; - + public: + struct null {}; + /** Offer default Impl. */ static RepositoryImpl_Ptr nullimpl() { @@ -68,13 +68,13 @@ Repository selfRepository() { return Repository( this ); } + protected: - RepoInfo _info; - ResStore _store; - std::listpackagedelta::PatchRpm _patchRpms; std::listpackagedelta::DeltaRpm _deltaRpms; + private: + RepoInfo _info; }; } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org