[zypp-commit] r10661 - in /trunk/libzypp/zypp: RepoInfo.h Service.cc Service.h

Author: jkupec Date: Thu Jul 24 15:18:43 2008 New Revision: 10661 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10661&view=rev Log: - cosmetics Modified: trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/Service.cc trunk/libzypp/zypp/Service.h Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=10661&r1=10660&r2=10661&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Thu Jul 24 15:18:43 2008 @@ -239,8 +239,8 @@ bool keepPackages() const; /** - * Gets service name which add it or empty string if this repository - * is added manually. + * Gets name of the service to which this repository belongs or empty string + * if it has been added manually. */ std::string service() const; Modified: trunk/libzypp/zypp/Service.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Service.cc?rev=10661&r1=10660&r2=10661&view=diff ============================================================================== --- trunk/libzypp/zypp/Service.cc (original) +++ trunk/libzypp/zypp/Service.cc Thu Jul 24 15:18:43 2008 @@ -1,3 +1,14 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/Service.cc + * + */ #include "zypp/Service.h" #include <ostream> @@ -9,12 +20,15 @@ #include "zypp/parser/RepoindexFileReader.h" using namespace std; + /////////////////////////////////////////////////////////////////////////////// namespace zypp {////////////////////////////////////////////////////////////////////////////// - struct RepoInfoCollector { - std::vector<RepoInfo> repos; + + struct RepoInfoCollector + { + vector<RepoInfo> repos; bool collect(const RepoInfo& info) { repos.push_back(info); @@ -22,31 +36,36 @@ } }; - class Service::Impl{ - public: - string name; - Url url; - DefaultIntegral enabled; - Pathname loc; - - Impl() : name("") {}; - Impl(const string& name_) : name(name_) {}; - Impl(const string& name_, const Url& url_) : name(name_), url(url_) {}; - private: - friend Impl * rwcowClone<Impl>( const Impl * rhs ); - /** clone for RWCOW_pointer */ - Impl * clone() const - { return new Impl( *this ); } + + class Service::Impl + { + public: + string name; + Url url; + DefaultIntegral enabled; + Pathname loc; + + Impl() : name("") {}; + Impl(const string& name_) : name(name_) {}; + Impl(const string& name_, const Url& url_) : name(name_), url(url_) {}; + + private: + friend Impl * rwcowClone<Impl>( const Impl * rhs ); + + /** clone for RWCOW_pointer */ + Impl * clone() const + { return new Impl( *this ); } }; + + const Service Service::noService; + Service::Service() : _pimpl( new Impl() ) {}; Service::Service(const string& name) : _pimpl( new Impl(name) ) {}; Service::Service(const string& name, const Url& url) : _pimpl( new Impl(name,url) ) {}; - const Service Service::noService; - string Service::name() const { return _pimpl->name; } void Service::setName( const std::string& name ) { _pimpl->name = name; } Modified: trunk/libzypp/zypp/Service.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Service.h?rev=10661&r1=10660&r2=10661&view=diff ============================================================================== --- trunk/libzypp/zypp/Service.h (original) +++ trunk/libzypp/zypp/Service.h Thu Jul 24 15:18:43 2008 @@ -13,8 +13,9 @@ #define ZYPP_SERVICE_H #include <string> + #include "zypp/Url.h" -#include "zypp/RepoManager.h" +#include "zypp/Pathname.h" /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org