Author: dmacvicar Date: Thu May 31 14:44:12 2007 New Revision: 5651 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5651&view=rev Log: - rename too long name classes: - dont be reundant, with namespaces and class names ej: zypp::repository::cached::CachedRepositoryPackageImpl can be zypp::repo::cached::PackageImpl - Add RepoStatus, which contains non-hint data like timestamps and checksum of indexes. Added: trunk/libzypp/zypp2/RepoInfo.cc - copied, changed from r5649, trunk/libzypp/zypp2/RepositoryInfo.cc trunk/libzypp/zypp2/RepoInfo.h - copied, changed from r5649, trunk/libzypp/zypp2/RepositoryInfo.h trunk/libzypp/zypp2/RepoManager.cc - copied, changed from r5650, trunk/libzypp/zypp2/RepositoryManager.cc trunk/libzypp/zypp2/RepoManager.h - copied, changed from r5650, trunk/libzypp/zypp2/RepositoryManager.h trunk/libzypp/zypp2/RepoStatus.cc trunk/libzypp/zypp2/RepoStatus.h trunk/libzypp/zypp2/repo/ - copied from r5650, trunk/libzypp/zypp2/repository/ Removed: trunk/libzypp/zypp2/CommiterIface.h trunk/libzypp/zypp2/RepositoryInfo.cc trunk/libzypp/zypp2/RepositoryInfo.h trunk/libzypp/zypp2/RepositoryManager.cc trunk/libzypp/zypp2/RepositoryManager.h trunk/libzypp/zypp2/repository/ Modified: trunk/libzypp/zypp2/CMakeLists.txt trunk/libzypp/zypp2/Repository.cc trunk/libzypp/zypp2/Repository.h trunk/libzypp/zypp2/RepositoryFactory.cc trunk/libzypp/zypp2/RepositoryFactory.h trunk/libzypp/zypp2/repo/RepositoryImpl.cc trunk/libzypp/zypp2/repo/RepositoryImpl.h trunk/libzypp/zypp2/repo/cached/PackageImpl.cc trunk/libzypp/zypp2/repo/cached/PackageImpl.h trunk/libzypp/zypp2/repo/cached/RepoImpl.cc trunk/libzypp/zypp2/repo/cached/RepoImpl.h trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.cc trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.h trunk/libzypp/zypp2/repo/memory/DPackageImpl.cc trunk/libzypp/zypp2/repo/memory/DPackageImpl.h trunk/libzypp/zypp2/repo/memory/DPatternImpl.cc trunk/libzypp/zypp2/repo/memory/DPatternImpl.h trunk/libzypp/zypp2/repo/memory/DProductImpl.cc trunk/libzypp/zypp2/repo/memory/DProductImpl.h trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.cc trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.h Modified: trunk/libzypp/zypp2/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/CMakeLists.txt?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/CMakeLists.txt (original) +++ trunk/libzypp/zypp2/CMakeLists.txt Thu May 31 14:44:12 2007 @@ -12,18 +12,19 @@ SET( zypp2_SRCS Repository.cc - RepositoryInfo.cc - RepositoryManager.cc + RepoInfo.cc + RepoStatus.cc + RepoManager.cc RepositoryFactory.cc dummy.cc ) SET( zypp2_HEADERS Repository.h - RepositoryInfo.h - RepositoryManager.h + RepoInfo.h + RepoStatus.h + RepoManager.h RepositoryFactory.h - CommiterIface.h ) #INSTALL( FILES ${zypp2_HEADERS} @@ -73,37 +74,37 @@ #) SET( zypp2_repository_SRCS - repository/dummy.cc - repository/RepositoryImpl.cc + repo/dummy.cc + repo/RepositoryImpl.cc ) SET( zypp2_repository_HEADERS - repository/dummy.h - repository/RepositoryImpl.h + repo/dummy.h + repo/RepositoryImpl.h ) SET( zypp2_repository_cached_SRCS - repository/cached/RepoImpl.cc - repository/cached/PackageImpl.cc + repo/cached/RepoImpl.cc + repo/cached/PackageImpl.cc ) SET( zypp2_repository_cached_HEADERS - repository/cached/RepoImpl.h - repository/cached/PackageImpl.h + repo/cached/RepoImpl.h + repo/cached/PackageImpl.h ) SET( zypp2_repository_data_SRCS - repository/memory/DPackageImpl.cc - repository/memory/DPatternImpl.cc - repository/memory/DProductImpl.cc - repository/memory/DSrcPackageImpl.cc + repo/memory/DPackageImpl.cc + repo/memory/DPatternImpl.cc + repo/memory/DProductImpl.cc + repo/memory/DSrcPackageImpl.cc ) SET( zypp2_repository_data_HEADERS - repository/memory/DPackageImpl.h - repository/memory/DPatternImpl.h - repository/memory/DProductImpl.h - repository/memory/DSrcPackageImpl.h + repo/memory/DPackageImpl.h + repo/memory/DPatternImpl.h + repo/memory/DProductImpl.h + repo/memory/DSrcPackageImpl.h ) SET( zypp2_parser_susetags_SRCS Copied: trunk/libzypp/zypp2/RepoInfo.cc (from r5649, trunk/libzypp/zypp2/RepositoryInfo.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/RepoInfo.cc?p2=trunk/libzypp/zypp2/RepoInfo.cc&p1=trunk/libzypp/zypp2/RepositoryInfo.cc&r1=5649&r2=5651&rev=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/RepositoryInfo.cc (original) +++ trunk/libzypp/zypp2/RepoInfo.cc Thu May 31 14:44:12 2007 @@ -6,132 +6,184 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp/repository/RepositoryInfo.cc +/** \file zypp/RepoInfo.cc * */ - -#include <string> #include <iostream> -#include "zypp2/RepositoryInfo.h" +#include "zypp/base/Logger.h" + +#include "zypp2/RepoInfo.h" +using namespace std; using namespace boost; /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// - RepositoryInfo::RepositoryInfo() - : _enabled (indeterminate) - , _autorefresh(indeterminate) + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoInfo::Impl + // + /** RepoInfo implementation. */ + struct RepoInfo::Impl { + + Impl() + : enabled (indeterminate), + autorefresh(indeterminate) + {} + public: + boost::tribool enabled; + boost::tribool autorefresh; + std::string type; + Url baseurl; + std::set<Url> urls; + Pathname path; + std::string alias; + std::string name; + CheckSum checksum; + Date timestamp; + + public: + /** Offer default Impl. */ + static shared_ptr<Impl> nullimpl() + { + static shared_ptr<Impl> _nullimpl( new Impl ); + return _nullimpl; + } + + private: + friend Impl * rwcowClone<Impl>( const Impl * rhs ); + /** clone for RWCOW_pointer */ + Impl * clone() const + { return new Impl( *this ); } + }; + /////////////////////////////////////////////////////////////////// + + /** \relates RepoInfo::Impl Stream output */ + inline std::ostream & operator<<( std::ostream & str, const RepoInfo::Impl & obj ) + { + return str << "RepoInfo::Impl"; + } + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoInfo + // + /////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : RepoInfo::RepoInfo + // METHOD TYPE : Ctor + // + RepoInfo::RepoInfo() + : _pimpl( Impl::nullimpl() ) + {} + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : RepoInfo::~RepoInfo + // METHOD TYPE : Dtor + // + RepoInfo::~RepoInfo() + {} - } - - RepositoryInfo::RepositoryInfo( const Url & url, - const Pathname & path, - const std::string & alias, - tribool autorefresh) - : _enabled (true), - _autorefresh(autorefresh), - _baseurl(url), - _path(path), - _alias(alias) - { - - } - - RepositoryInfo & RepositoryInfo::setEnabled( boost::tribool enabled ) + + + RepoInfo & RepoInfo::setEnabled( boost::tribool enabled ) { - _enabled = enabled; + _pimpl->enabled = enabled; return *this; } - RepositoryInfo & RepositoryInfo::setAutorefresh( boost::tribool autorefresh ) + RepoInfo & RepoInfo::setAutorefresh( boost::tribool autorefresh ) { - _autorefresh = autorefresh; + _pimpl->autorefresh = autorefresh; return *this; } - RepositoryInfo & RepositoryInfo::setBaseUrl( const Url &url ) + RepoInfo & RepoInfo::setBaseUrl( const Url &url ) { - _baseurl = url; + _pimpl->baseurl = url; return *this; } - RepositoryInfo & RepositoryInfo::setPath( const Pathname &p ) + RepoInfo & RepoInfo::setPath( const Pathname &p ) { - _path = p; + _pimpl->path = p; return *this; } - RepositoryInfo & RepositoryInfo::setAlias( const std::string &alias ) + RepoInfo & RepoInfo::setAlias( const std::string &alias ) { - _alias = alias; + _pimpl->alias = alias; return *this; } - RepositoryInfo & RepositoryInfo::setType( const std::string &t ) + RepoInfo & RepoInfo::setType( const std::string &t ) { - _type = t; + _pimpl->type = t; return *this; } - RepositoryInfo & RepositoryInfo::setDescription( const std::string &description ) + RepoInfo & RepoInfo::setName( const std::string &name ) { - _description = description; + _pimpl->name = name; return *this; } - RepositoryInfo & RepositoryInfo::setChecksum( const CheckSum &checksum ) + RepoInfo & RepoInfo::setChecksum( const CheckSum &checksum ) { - _checksum = checksum; + _pimpl->checksum = checksum; return *this; } - RepositoryInfo & RepositoryInfo::setTimestamp( const Date ×tamp ) + RepoInfo & RepoInfo::setTimestamp( const Date ×tamp ) { - _timestamp = timestamp; + _pimpl->timestamp = timestamp; return *this; } - tribool RepositoryInfo::enabled() const - { return _enabled; } + tribool RepoInfo::enabled() const + { return _pimpl->enabled; } - tribool RepositoryInfo::autorefresh() const - { return _autorefresh; } + tribool RepoInfo::autorefresh() const + { return _pimpl->autorefresh; } - Pathname RepositoryInfo::path() const - { return _path; } + Pathname RepoInfo::path() const + { return _pimpl->path; } - std::string RepositoryInfo::alias() const - { return _alias; } + std::string RepoInfo::alias() const + { return _pimpl->alias; } - std::string RepositoryInfo::description() const - { return _description; } + std::string RepoInfo::name() const + { return _pimpl->name; } - CheckSum RepositoryInfo::checksum() const - { return _checksum; } + CheckSum RepoInfo::checksum() const + { return _pimpl->checksum; } - Date RepositoryInfo::timestamp() const - { return _timestamp; } + Date RepoInfo::timestamp() const + { return _pimpl->timestamp; } - std::string RepositoryInfo::type() const - { return _type; } + std::string RepoInfo::type() const + { return _pimpl->type; } - Url RepositoryInfo::baseUrl() const - { return _baseurl; } + Url RepoInfo::baseUrl() const + { return _pimpl->baseurl; } - std::set<Url> RepositoryInfo::urls() const - { return _urls; } + std::set<Url> RepoInfo::urls() const + { return _pimpl->urls; } - RepositoryInfo::urls_const_iterator RepositoryInfo::urlsBegin() const - { return _urls.begin(); } + RepoInfo::urls_const_iterator RepoInfo::urlsBegin() const + { return _pimpl->urls.begin(); } - RepositoryInfo::urls_const_iterator RepositoryInfo::urlsEnd() const - { return _urls.end(); } + RepoInfo::urls_const_iterator RepoInfo::urlsEnd() const + { return _pimpl->urls.end(); } - std::ostream & RepositoryInfo::dumpOn( std::ostream & str ) const + std::ostream & RepoInfo::dumpOn( std::ostream & str ) const { str << "--------------------------------------" << std::endl; str << "- alias : " << alias() << std::endl; @@ -142,8 +194,7 @@ str << "- path : " << path() << std::endl; return str; } - + ///////////////////////////////////////////////////////////////// -} // namespace zypp +} // namespace zypp2 /////////////////////////////////////////////////////////////////// - Copied: trunk/libzypp/zypp2/RepoInfo.h (from r5649, trunk/libzypp/zypp2/RepositoryInfo.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/RepoInfo.h?p2=trunk/libzypp/zypp2/RepoInfo.h&p1=trunk/libzypp/zypp2/RepositoryInfo.h&r1=5649&r2=5651&rev=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/RepositoryInfo.h (original) +++ trunk/libzypp/zypp2/RepoInfo.h Thu May 31 14:44:12 2007 @@ -6,12 +6,17 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ +/** \file zypp2/RepoInfo.h + * +*/ +#ifndef ZYPP2_REPOSITORYINFO_H +#define ZYPP2_REPOSITORYINFO_H -#ifndef ZYPP_RepositoryInfo_H -#define ZYPP_RepositoryInfo_H - +#include <iosfwd> #include <list> #include <set> +#include "zypp/base/PtrTypes.h" + #include #include "zypp/Pathname.h" #include "zypp/Url.h" @@ -22,21 +27,53 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoInfo + // /** - * The class RepositoryInfo represents everything that + * \short What is known about a repository + * + * The class RepoInfo represents everything that * is known about a software repository. + * + * It can be used to store information about known + * sources. + * + * This class tries to be compatible with the + * concept of a .repo file used by YUM and + * also available in the openSUSE build service. + * + * Example file + * + * \code + * [ruby] + * name=Ruby repository (openSUSE_10.2) + * type=rpm-md + * baseurl=http://software.opensuse.org/download/ruby/openSUSE_10.2/ + * gpgcheck=1 + * gpgkey=http://software.opensuse.org/openSUSE-Build-Service.asc + * enabled=1 + * \endcode + * + * \note A Repository info is a hint about how + * to create a repository. */ - class RepositoryInfo + class RepoInfo { + friend std::ostream & operator<<( std::ostream & str, const RepoInfo & obj ); + public: - - RepositoryInfo(); - - RepositoryInfo( const Url & url, const Pathname & path, const std::string & alias = "", boost::tribool autorefresh = boost::indeterminate ); + RepoInfo(); + ~RepoInfo(); + //RepoInfo( const Url & url, const Pathname & path, const std::string & alias = "", boost::tribool autorefresh = boost::indeterminate ); /** * unique identifier for this source. If not specified * It should be generated from the base url. + * + * Normally, in a .repo file the section name is used + * ( [somerepo] ) */ std::string alias() const; @@ -97,10 +134,13 @@ std::string type() const; /** - * Description of the repository, to be used on + * \short Repository short label + * + * Short label or description of the repository, to be used on * the user interface. + * ie: "SUSE Linux 10.2 updates" */ - std::string description() const; + std::string name() const; /** * Checksum of the repository. @@ -121,81 +161,71 @@ * Set the base url. \see baseUrl * \param url The base url for the repository. */ - RepositoryInfo & setBaseUrl( const Url &url ); + RepoInfo & setBaseUrl( const Url &url ); /** * enable or disable the repository \see enabled * \param enabled */ - RepositoryInfo & setEnabled( boost::tribool enabled ); + RepoInfo & setEnabled( boost::tribool enabled ); /** * enable or disable autorefresh \see autorefresh * \param enabled */ - RepositoryInfo & setAutorefresh( boost::tribool autorefresh ); + RepoInfo & setAutorefresh( boost::tribool autorefresh ); /** * set the repository path \see path * \param p */ - RepositoryInfo & setPath( const Pathname &p ); + RepoInfo & setPath( const Pathname &p ); /** * set the repository alias \see alias * \param alias */ - RepositoryInfo & setAlias( const std::string &alias ); + RepoInfo & setAlias( const std::string &alias ); /** * set the repository type \see type * \param t */ - RepositoryInfo & setType( const std::string &t ); + RepoInfo & setType( const std::string &t ); /** - * set the repository description \see description - * \param description + * set the repository name \see name + * \param name */ - RepositoryInfo & setDescription( const std::string &description ); + RepoInfo & setName( const std::string &name ); /** * set the repository checksum \see checksum * \param checksum */ - RepositoryInfo & setChecksum( const CheckSum &checksum ); + RepoInfo & setChecksum( const CheckSum &checksum ); /** * set the repository timestamp \see timestamp * \param timestamp */ - RepositoryInfo & setTimestamp( const Date ×tamp ); + RepoInfo & setTimestamp( const Date ×tamp ); - /** Overload to realize stream output. */ std::ostream & dumpOn( std::ostream & str ) const; - private: - - boost::tribool _enabled; - boost::tribool _autorefresh; - std::string _type; - Url _baseurl; - std::set<Url> _urls; - Pathname _path; - std::string _alias; - std::string _description; - CheckSum _checksum; - Date _timestamp; + class Impl; + private: + /** Pointer to implementation */ + RWCOW_pointer<Impl> _pimpl; }; + /////////////////////////////////////////////////////////////////// - /** \relates RepositoryInfo Stream output */ - inline std::ostream & operator<<( std::ostream & str, const RepositoryInfo & obj ) - { return obj.dumpOn( str ); } - - typedef std::list<RepositoryInfo> RepositoryInfoList; + /** \relates RepoInfo Stream output */ + std::ostream & operator<<( std::ostream & str, const RepoInfo & obj ); -} // namespace zypp + typedef std::list<RepoInfo> RepoInfoList; + + ///////////////////////////////////////////////////////////////// +} // namespace zypp2 /////////////////////////////////////////////////////////////////// -#endif // ZYPP_RepositoryInfo_H - - +#endif // ZYPP2_REPOSITORYINFO_H Copied: trunk/libzypp/zypp2/RepoManager.cc (from r5650, trunk/libzypp/zypp2/RepositoryManager.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/RepoManager.cc?p2=trunk/libzypp/zypp2/RepoManager.cc&p1=trunk/libzypp/zypp2/RepositoryManager.cc&r1=5650&r2=5651&rev=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/RepositoryManager.cc (original) +++ trunk/libzypp/zypp2/RepoManager.cc Thu May 31 14:44:12 2007 @@ -4,26 +4,49 @@ #include <list> #include <algorithm> #include "zypp/base/Exception.h" +#include "zypp/base/InputStream.h" #include "zypp/base/Logger.h" #include "zypp/PathInfo.h" #include "zypp/parser/IniDict.h" -#include "zypp2/RepositoryManager.h" +#include "zypp2/RepoManager.h" using namespace std; using namespace zypp; using namespace zypp::filesystem; +using parser::IniDict; namespace zypp { -RepositoryManager::RepositoryManager() +RepoManager::RepoManager() { } -static std::list<RepositoryInfo> repositories_in_file( const Pathname &file ) +static std::list<RepoInfo> repositories_in_file( const Pathname &file ) { + InputStream is(file); + IniDict dict(is); + std::list<RepoInfo> repos; + + for ( IniDict::section_const_iterator its = dict.sectionsBegin(); + its != dict.sectionsEnd(); + ++its ) + { + MIL << (*its) << endl; + + RepoInfo info; + + for ( IniDict::entry_const_iterator it = dict.entriesBegin(*its); + it != dict.entriesEnd(*its); + ++it ) + { + + MIL << (*it).first << endl; + } + } + // dictionary *d = iniparser_new(file.c_str()); // // if ( d == NULL ) @@ -37,12 +60,12 @@ // MIL << iniparser_getsecname(d, i) << endl; // // } - return std::list<RepositoryInfo>(); + return std::list<RepoInfo>(); } -static std::list<RepositoryInfo> repositories_in_path( const Pathname &dir ) +static std::list<RepoInfo> repositories_in_path( const Pathname &dir ) { - std::list<RepositoryInfo> repos; + std::list<RepoInfo> repos; list<Pathname> entries; if ( filesystem::readdir( entries, Pathname(dir), false ) != 0 ) ZYPP_THROW(Exception("failed to read directory")); @@ -50,17 +73,17 @@ for ( list<Pathname>::const_iterator it = entries.begin(); it != entries.end(); ++it ) { Pathname file = *it; - std::list<RepositoryInfo> repos_here = repositories_in_file(file); + std::list<RepoInfo> repos_here = repositories_in_file(file); std::copy( repos_here.begin(), repos_here.end(), std::back_inserter(repos)); } return repos; } -std::list<RepositoryInfo> RepositoryManager::knownRepositories() +std::list<RepoInfo> RepoManager::knownRepositories() { - return std::list<RepositoryInfo>(); + return std::list<RepoInfo>(); } } // ns zypp Copied: trunk/libzypp/zypp2/RepoManager.h (from r5650, trunk/libzypp/zypp2/RepositoryManager.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/RepoManager.h?p2=trunk/libzypp/zypp2/RepoManager.h&p1=trunk/libzypp/zypp2/RepositoryManager.h&r1=5650&r2=5651&rev=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/RepositoryManager.h (original) +++ trunk/libzypp/zypp2/RepoManager.h Thu May 31 14:44:12 2007 @@ -7,17 +7,17 @@ #include "zypp/base/NonCopyable.h" #include "zypp/Pathname.h" -#include "zypp2/RepositoryInfo.h" +#include "zypp2/RepoInfo.h" namespace zypp { - class RepositoryManager : public base::ReferenceCounted, private base::NonCopyable + class RepoManager : public base::ReferenceCounted, private base::NonCopyable { - friend std::ostream & operator<<( std::ostream & str, const RepositoryManager & obj ); + friend std::ostream & operator<<( std::ostream & str, const RepoManager & obj ); public: - RepositoryManager(); - std::list<RepositoryInfo> knownRepositories(); + RepoManager(); + std::list<RepoInfo> knownRepositories(); }; Added: trunk/libzypp/zypp2/RepoStatus.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/RepoStatus.cc?rev=5651&view=auto ============================================================================== --- trunk/libzypp/zypp2/RepoStatus.cc (added) +++ trunk/libzypp/zypp2/RepoStatus.cc Thu May 31 14:44:12 2007 @@ -0,0 +1,87 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp2/RepoStatus.cc + * +*/ +#include <iostream> +//#include "zypp/base/Logger.h" +#include "zypp2/RepoStatus.h" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoStatus::Impl + // + /** RepoStatus implementation. */ + struct RepoStatus::Impl + { + + public: + /** Offer default Impl. */ + static shared_ptr<Impl> nullimpl() + { + static shared_ptr<Impl> _nullimpl( new Impl ); + return _nullimpl; + } + + private: + friend Impl * rwcowClone<Impl>( const Impl * rhs ); + /** clone for RWCOW_pointer */ + Impl * clone() const + { return new Impl( *this ); } + }; + /////////////////////////////////////////////////////////////////// + + /** \relates RepoStatus::Impl Stream output */ + inline std::ostream & operator<<( std::ostream & str, const RepoStatus::Impl & obj ) + { + return str << "RepoStatus::Impl"; + } + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoStatus + // + /////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : RepoStatus::RepoStatus + // METHOD TYPE : Ctor + // + RepoStatus::RepoStatus() + : _pimpl( Impl::nullimpl() ) + {} + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : RepoStatus::~RepoStatus + // METHOD TYPE : Dtor + // + RepoStatus::~RepoStatus() + {} + + /****************************************************************** + ** + ** FUNCTION NAME : operator<< + ** FUNCTION TYPE : std::ostream & + */ + std::ostream & operator<<( std::ostream & str, const RepoStatus & obj ) + { + return str << *obj._pimpl; + } + + ///////////////////////////////////////////////////////////////// +} // namespace zypp2 +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp2/RepoStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/RepoStatus.h?rev=5651&view=auto ============================================================================== --- trunk/libzypp/zypp2/RepoStatus.h (added) +++ trunk/libzypp/zypp2/RepoStatus.h Thu May 31 14:44:12 2007 @@ -0,0 +1,55 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/RepoStatus.h + * +*/ +#ifndef ZYPP2_REPOSTATUS_H +#define ZYPP2_REPOSTATUS_H + +#include <iosfwd> +#include "zypp/base/PtrTypes.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : RepoStatus + // + /** */ + class RepoStatus + { + friend std::ostream & operator<<( std::ostream & str, const RepoStatus & obj ); + + public: + /** Implementation */ + class Impl; + + public: + /** Default ctor */ + RepoStatus(); + /** Dtor */ + ~RepoStatus(); + + public: + + private: + /** Pointer to implementation */ + RWCOW_pointer<Impl> _pimpl; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates RepoStatus Stream output */ + std::ostream & operator<<( std::ostream & str, const RepoStatus & obj ); + + ///////////////////////////////////////////////////////////////// +} // namespace zypp2 +/////////////////////////////////////////////////////////////////// +#endif // ZYPP2_REPOSTATUS_H Modified: trunk/libzypp/zypp2/Repository.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/Repository.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/Repository.cc (original) +++ trunk/libzypp/zypp2/Repository.cc Thu May 31 14:44:12 2007 @@ -2,7 +2,7 @@ #include <iostream> #include "zypp2/Repository.h" -#include "zypp2/repository/RepositoryImpl.h" +#include "zypp2/repo/RepositoryImpl.h" using namespace std; Modified: trunk/libzypp/zypp2/Repository.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/Repository.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/Repository.h (original) +++ trunk/libzypp/zypp2/Repository.h Thu May 31 14:44:12 2007 @@ -10,7 +10,7 @@ namespace zypp { - namespace repository + namespace repo { DEFINE_PTR_TYPE(RepositoryImpl); class RepositoryImpl; @@ -24,8 +24,8 @@ friend bool operator<( const Repository & lhs, const Repository & rhs ); public: - typedef repository::RepositoryImpl Impl; - typedef repository::RepositoryImpl_Ptr Impl_Ptr; + typedef repo::RepositoryImpl Impl; + typedef repo::RepositoryImpl_Ptr Impl_Ptr; public: @@ -58,7 +58,7 @@ private: /** Factory */ friend class RepositoryFactory; - friend class repository::RepositoryImpl; + friend class repo::RepositoryImpl; private: /** Factory ctor */ Modified: trunk/libzypp/zypp2/RepositoryFactory.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/RepositoryFactory.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/RepositoryFactory.cc (original) +++ trunk/libzypp/zypp2/RepositoryFactory.cc Thu May 31 14:44:12 2007 @@ -13,7 +13,7 @@ } -Repository RepositoryFactory::createFrom( const RepositoryInfo & context ) +Repository RepositoryFactory::createFrom( const RepoInfo & context ) { } Modified: trunk/libzypp/zypp2/RepositoryFactory.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/RepositoryFactory.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/RepositoryFactory.h (original) +++ trunk/libzypp/zypp2/RepositoryFactory.h Thu May 31 14:44:12 2007 @@ -3,7 +3,7 @@ #define ZYPP_REPOSITORY_FACTORY_H #include "zypp2/Repository.h" -#include "zypp2/RepositoryInfo.h" +#include "zypp2/RepoInfo.h" namespace zypp { @@ -21,7 +21,7 @@ /** Construct source. * \throw EXCEPTION on fail */ - Repository createFrom( const RepositoryInfo & context ); + Repository createFrom( const RepoInfo & context ); }; } Modified: trunk/libzypp/zypp2/repo/RepositoryImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/RepositoryImpl.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/RepositoryImpl.cc (original) +++ trunk/libzypp/zypp2/repo/RepositoryImpl.cc Thu May 31 14:44:12 2007 @@ -1,7 +1,7 @@ -#include "zypp2/repository/RepositoryImpl.h" +#include "zypp2/repo/RepositoryImpl.h" -namespace zypp { namespace repository { +namespace zypp { namespace repo { IMPL_PTR_TYPE(RepositoryImpl) Modified: trunk/libzypp/zypp2/repo/RepositoryImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/RepositoryImpl.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/RepositoryImpl.h (original) +++ trunk/libzypp/zypp2/repo/RepositoryImpl.h Thu May 31 14:44:12 2007 @@ -1,7 +1,5 @@ - - #ifndef ZYPP_REPOSITORY_IMPL_h #define ZYPP_REPOSITORY_IMPL_h @@ -17,7 +15,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - namespace repository + namespace repo { ///////////////////////////////////////////////////////////////// DEFINE_PTR_TYPE(RepositoryImpl); Modified: trunk/libzypp/zypp2/repo/cached/PackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/cached/PackageImpl.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/cached/PackageImpl.cc (original) +++ trunk/libzypp/zypp2/repo/cached/PackageImpl.cc Thu May 31 14:44:12 2007 @@ -13,16 +13,16 @@ #include "zypp/TranslatedText.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" -#include "zypp2/repository/RepositoryImpl.h" +#include "zypp2/repo/RepositoryImpl.h" #include "PackageImpl.h" using namespace std; using namespace zypp::detail; -using namespace::zypp::repository; +using namespace::zypp::repo; /////////////////////////////////////////////////////////////////// -namespace zypp { namespace repository { namespace cached { +namespace zypp { namespace repo { namespace cached { /////////////////////////////////////////////////////////////////// // @@ -96,6 +96,6 @@ } ///////////////////////////////////////////////////////////////// -} } } // namespace zypp::repository::cached +} } } // namespace zypp::repo::cached /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp2/repo/cached/PackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/cached/PackageImpl.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/cached/PackageImpl.h (original) +++ trunk/libzypp/zypp2/repo/cached/PackageImpl.h Thu May 31 14:44:12 2007 @@ -11,12 +11,12 @@ #define zypp_repo_cached_PackageImpl_H #include "zypp/detail/PackageImpl.h" -#include "zypp2/repository/cached/RepoImpl.h" +#include "zypp2/repo/cached/RepoImpl.h" /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// -namespace repository +namespace repo { ///////////////////////////////////////////////////////////////// namespace cached { ///////////////////////////////////////////////////////////////// @@ -29,7 +29,7 @@ { public: - PackageImpl( const data::RecordId &id, repository::cached::RepoImpl::Ptr repository_r ); + PackageImpl( const data::RecordId &id, repo::cached::RepoImpl::Ptr repository_r ); virtual TranslatedText summary() const; virtual TranslatedText description() const; @@ -43,7 +43,7 @@ virtual Vendor vendor() const; protected: - repository::cached::RepoImpl::Ptr _repository; + repo::cached::RepoImpl::Ptr _repository; TranslatedText _summary; TranslatedText _description; PackageGroup _group; Modified: trunk/libzypp/zypp2/repo/cached/RepoImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/cached/RepoImpl.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/cached/RepoImpl.cc (original) +++ trunk/libzypp/zypp2/repo/cached/RepoImpl.cc Thu May 31 14:44:12 2007 @@ -18,8 +18,8 @@ #include "zypp/detail/ResImplTraits.h" #include "zypp/CapFactory.h" -#include "zypp2/repository/cached/RepoImpl.h" -#include "zypp2/repository/cached/PackageImpl.h" +#include "zypp2/repo/cached/RepoImpl.h" +#include "zypp2/repo/cached/PackageImpl.h" using namespace zypp::detail; @@ -31,7 +31,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -namespace repository +namespace repo { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// namespace cached Modified: trunk/libzypp/zypp2/repo/cached/RepoImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/cached/RepoImpl.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/cached/RepoImpl.h (original) +++ trunk/libzypp/zypp2/repo/cached/RepoImpl.h Thu May 31 14:44:12 2007 @@ -16,7 +16,7 @@ #include "zypp/Rel.h" #include "zypp/Pathname.h" #include "zypp/data/RecordId.h" -#include "zypp2/repository/RepositoryImpl.h" +#include "zypp2/repo/RepositoryImpl.h" #include "zypp/ResStore.h" #include "zypp2/cache/sqlite3x/sqlite3x.hpp" #include "zypp2/cache/CacheTypes.h" @@ -26,7 +26,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - namespace repository + namespace repo { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// namespace cached @@ -37,7 +37,7 @@ // CLASS NAME : RepoImpl // /** */ - class RepoImpl : public repository::RepositoryImpl + class RepoImpl : public repo::RepositoryImpl { public: typedef intrusive_ptr<RepoImpl> Ptr; Modified: trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.cc (original) +++ trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.cc Thu May 31 14:44:12 2007 @@ -20,8 +20,7 @@ using namespace zypp::detail; /////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// +namespace zypp { namespace repo { namespace cached { /////////////////////////////////////////////////////////////////// // @@ -94,5 +93,5 @@ } ///////////////////////////////////////////////////////////////// -} // namespace zypp +} } } // namespace zypp.repo.cached /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.h (original) +++ trunk/libzypp/zypp2/repo/cached/SrcPackageImpl.h Thu May 31 14:44:12 2007 @@ -17,7 +17,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// -namespace repository +namespace repo { namespace cached { @@ -57,6 +57,9 @@ bool _data_loaded; }; ///////////////////////////////////////////////////////////////// +} // ns cached +} // ns repo } // namespace zypp + /////////////////////////////////////////////////////////////////// #endif // ZMD_BACKEND_DBSOURCE_DBPACKAGEIMPL_H Modified: trunk/libzypp/zypp2/repo/memory/DPackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/memory/DPackageImpl.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/memory/DPackageImpl.cc (original) +++ trunk/libzypp/zypp2/repo/memory/DPackageImpl.cc Thu May 31 14:44:12 2007 @@ -6,11 +6,11 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp2/repository/memory/DPackageImpl.cc +/** \file zypp/repo/memory/PackageImpl.cc * */ -#include "zypp2/repository/memory/DPackageImpl.h" +#include "zypp2/repo/memory/DPackageImpl.h" using namespace std; @@ -18,7 +18,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -namespace repository +namespace repo { ///////////////////////////////////////////////////////////////// namespace memory { ///////////////////////////////////////////////////////////////// @@ -28,7 +28,7 @@ // METHOD NAME : PackageImpl::PackageImpl // METHOD TYPE : Ctor // -DPackageImpl::DPackageImpl(data::Package_Ptr ptr) +PackageImpl::PackageImpl(data::Package_Ptr ptr) : _summary(ptr->summary), _description(ptr->description), @@ -55,176 +55,176 @@ // METHOD NAME : PackageImpl::~PackageImpl // METHOD TYPE : Dtor // -DPackageImpl::~DPackageImpl() +PackageImpl::~PackageImpl() {} -TranslatedText DPackageImpl::summary() const +TranslatedText PackageImpl::summary() const { return _summary; } -TranslatedText DPackageImpl::description() const +TranslatedText PackageImpl::description() const { return _description; } -TranslatedText DPackageImpl::insnotify() const +TranslatedText PackageImpl::insnotify() const { return _insnotify; } -TranslatedText DPackageImpl::delnotify() const +TranslatedText PackageImpl::delnotify() const { return _delnotify; } -TranslatedText DPackageImpl::licenseToConfirm() const +TranslatedText PackageImpl::licenseToConfirm() const { return _license_to_confirm; } -Source_Ref DPackageImpl::source() const +Source_Ref PackageImpl::source() const { return Source_Ref::noSource; } -unsigned DPackageImpl::sourceMediaNr() const +unsigned PackageImpl::sourceMediaNr() const { return _media_number; } -CheckSum DPackageImpl::checksum() const +CheckSum PackageImpl::checksum() const { return _checksum; } -Date DPackageImpl::buildtime() const +Date PackageImpl::buildtime() const { return _buildtime; } -string DPackageImpl::buildhost() const +string PackageImpl::buildhost() const { return string(); } -Date DPackageImpl::installtime() const +Date PackageImpl::installtime() const { return Date(); } // it was never installed -string DPackageImpl::distribution() const +string PackageImpl::distribution() const { return string(); } -Vendor DPackageImpl::vendor() const +Vendor PackageImpl::vendor() const { return string(); } -Label DPackageImpl::license() const +Label PackageImpl::license() const { return _license; } -string DPackageImpl::packager() const +string PackageImpl::packager() const { return string(); } -PackageGroup DPackageImpl::group() const +PackageGroup PackageImpl::group() const { return _group; } -DPackageImpl::Keywords DPackageImpl::keywords() const +PackageImpl::Keywords PackageImpl::keywords() const { return _keywords; } -Changelog DPackageImpl::changelog() const +Changelog PackageImpl::changelog() const { return Changelog(); } -Pathname DPackageImpl::location() const +Pathname PackageImpl::location() const { return _location; } -string DPackageImpl::url() const +string PackageImpl::url() const { return string(); } -string DPackageImpl::os() const +string PackageImpl::os() const { return string(); } -Text DPackageImpl::prein() const +Text PackageImpl::prein() const { return Text(); } -Text DPackageImpl::postin() const +Text PackageImpl::postin() const { return Text(); } -Text DPackageImpl::preun() const +Text PackageImpl::preun() const { return Text(); } -Text DPackageImpl::postun() const +Text PackageImpl::postun() const { return Text(); } -ByteCount DPackageImpl::size() const +ByteCount PackageImpl::size() const { return _size; } -ByteCount DPackageImpl::sourcesize() const +ByteCount PackageImpl::sourcesize() const // FIXME { return 0; } -ByteCount DPackageImpl::archivesize() const +ByteCount PackageImpl::archivesize() const { return _archivesize; } -DiskUsage DPackageImpl::diskusage() const +DiskUsage PackageImpl::diskusage() const { return _diskusage; } -list<string> DPackageImpl::authors() const +list<string> PackageImpl::authors() const { return list<string>(); } -list<string> DPackageImpl::filenames() const +list<string> PackageImpl::filenames() const { return list<string>(); } -listdetail::PackageImplIf::DeltaRpm DPackageImpl::deltaRpms() const +listdetail::PackageImplIf::DeltaRpm PackageImpl::deltaRpms() const { return detail::PackageImplIf::deltaRpms(); } -listdetail::PackageImplIf::PatchRpm DPackageImpl::patchRpms() const +listdetail::PackageImplIf::PatchRpm PackageImpl::patchRpms() const { return detail::PackageImplIf::patchRpms(); } -bool DPackageImpl::installOnly() const +bool PackageImpl::installOnly() const { return false; } Modified: trunk/libzypp/zypp2/repo/memory/DPackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/memory/DPackageImpl.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/memory/DPackageImpl.h (original) +++ trunk/libzypp/zypp2/repo/memory/DPackageImpl.h Thu May 31 14:44:12 2007 @@ -6,7 +6,7 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp/source/memory/DPackageImpl.h +/** \file zypp/repo/memory/PackageImpl.h * */ #ifndef ZYPP_SOURCE_MEMORYPACKAGEIMPL_H @@ -22,7 +22,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - namespace repository + namespace repo { ///////////////////////////////////////////////////////////////// namespace memory { ///////////////////////////////////////////////////////////////// @@ -35,10 +35,10 @@ // /** */ - struct DPackageImpl : public zypp::detail::PackageImplIf + struct PackageImpl : public zypp::detail::PackageImplIf { - DPackageImpl( data::Package_Ptr ptr ); - virtual ~DPackageImpl(); + PackageImpl( data::Package_Ptr ptr ); + virtual ~PackageImpl(); /** \name ResObject attributes. */ //@{ Modified: trunk/libzypp/zypp2/repo/memory/DPatternImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/memory/DPatternImpl.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/memory/DPatternImpl.cc (original) +++ trunk/libzypp/zypp2/repo/memory/DPatternImpl.cc Thu May 31 14:44:12 2007 @@ -6,10 +6,10 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp2/repository/memory/DPatternImpl.cc +/** \file zypp2/repository/memory/PatternImpl.cc * */ -#include "zypp2/repository/memory/DPatternImpl.h" +#include "zypp2/repo/memory/DPatternImpl.h" using namespace std; @@ -17,7 +17,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -namespace repository +namespace repo { ///////////////////////////////////////////////////////////////// namespace memory { @@ -26,7 +26,7 @@ // METHOD NAME : PatternImpl::PatternImpl // METHOD TYPE : Ctor // -DPatternImpl::DPatternImpl(data::Pattern_Ptr ptr) +PatternImpl::PatternImpl(data::Pattern_Ptr ptr) {} /////////////////////////////////////////////////////////////////// @@ -34,40 +34,40 @@ // METHOD NAME : PatternImpl::~PatternImpl // METHOD TYPE : Dtor // -DPatternImpl::~DPatternImpl() +PatternImpl::~PatternImpl() {} -Source_Ref DPatternImpl::source() const +Source_Ref PatternImpl::source() const { return Source_Ref::noSource; } -TranslatedText DPatternImpl::summary() const +TranslatedText PatternImpl::summary() const { return _summary; } -TranslatedText DPatternImpl::description() const +TranslatedText PatternImpl::description() const { return _description; } -TranslatedText DPatternImpl::category() const +TranslatedText PatternImpl::category() const { return _category; } -bool DPatternImpl::userVisible() const +bool PatternImpl::userVisible() const { return _visible; } -Label DPatternImpl::order() const +Label PatternImpl::order() const { return _order; } -Pathname DPatternImpl::icon() const +Pathname PatternImpl::icon() const { return _icon; } Modified: trunk/libzypp/zypp2/repo/memory/DPatternImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/memory/DPatternImpl.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/memory/DPatternImpl.h (original) +++ trunk/libzypp/zypp2/repo/memory/DPatternImpl.h Thu May 31 14:44:12 2007 @@ -6,7 +6,7 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp2/repository/memory/DPatternImpl.h +/** \file zypp2/repository/memory/PatternImpl.h * */ #ifndef ZYPP_DETAIL_MEMORY_PATTERNIMPL_H @@ -20,7 +20,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - namespace repository + namespace repo { ///////////////////////////////////////////////////////////////// namespace memory { @@ -31,11 +31,11 @@ // /** */ - struct DPatternImpl : public zypp::detail::PatternImplIf + struct PatternImpl : public zypp::detail::PatternImplIf { public: - DPatternImpl(data::Pattern_Ptr ptr); - virtual ~DPatternImpl(); + PatternImpl(data::Pattern_Ptr ptr); + virtual ~PatternImpl(); virtual TranslatedText summary() const; virtual TranslatedText description() const; Modified: trunk/libzypp/zypp2/repo/memory/DProductImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/memory/DProductImpl.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/memory/DProductImpl.cc (original) +++ trunk/libzypp/zypp2/repo/memory/DProductImpl.cc Thu May 31 14:44:12 2007 @@ -6,10 +6,10 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp2/repository/memory/DProductImpl.cc +/** \file zypp2/repo/memory/ProductImpl.cc * */ -#include "zypp2/repository/memory/DProductImpl.h" +#include "zypp2/repo/memory/DProductImpl.h" using namespace std; @@ -17,7 +17,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - namespace repository + namespace repo { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// namespace memory @@ -25,77 +25,77 @@ /////////////////////////////////////////////////////////////////// // - // METHOD NAME : DProductImpl::DProductImpl + // METHOD NAME : ProductImpl::ProductImpl // METHOD TYPE : Ctor // - DProductImpl::DProductImpl(data::Product_Ptr ptr) + ProductImpl::ProductImpl(data::Product_Ptr ptr) {} /////////////////////////////////////////////////////////////////// // - // METHOD NAME : DProductImpl::~DProductImpl + // METHOD NAME : ProductImpl::~ProductImpl // METHOD TYPE : Dtor // - DProductImpl::~DProductImpl() + ProductImpl::~ProductImpl() {} - std::string DProductImpl::category() const + std::string ProductImpl::category() const { return _category; } - Label DProductImpl::vendor() const + Label ProductImpl::vendor() const { return _vendor; } - TranslatedText DProductImpl::summary() const + TranslatedText ProductImpl::summary() const { return _summary; } - Source_Ref DProductImpl::source() const + Source_Ref ProductImpl::source() const { return Source_Ref::noSource; } - Url DProductImpl::releaseNotesUrl() const + Url ProductImpl::releaseNotesUrl() const { return _release_notes_url; } - std::list<Url> DProductImpl::updateUrls() const + std::list<Url> ProductImpl::updateUrls() const { return _update_urls; } - std::list<Url> DProductImpl::extraUrls() const + std::list<Url> ProductImpl::extraUrls() const { return _extra_urls; } - std::list<Url> DProductImpl::optionalUrls() const + std::list<Url> ProductImpl::optionalUrls() const { return _optional_urls; } - std::liststd::string DProductImpl::flags() const + std::liststd::string ProductImpl::flags() const { return _flags; } - TranslatedText DProductImpl::shortName() const + TranslatedText ProductImpl::shortName() const { return TranslatedText(_shortlabel); } - std::string DProductImpl::distributionName() const + std::string ProductImpl::distributionName() const { return _dist_name; } - Edition DProductImpl::distributionEdition() const + Edition ProductImpl::distributionEdition() const { return _dist_version; } Modified: trunk/libzypp/zypp2/repo/memory/DProductImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/memory/DProductImpl.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/memory/DProductImpl.h (original) +++ trunk/libzypp/zypp2/repo/memory/DProductImpl.h Thu May 31 14:44:12 2007 @@ -6,7 +6,7 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp2/repository/memory/DProductImpl.h +/** \file zypp2/repo/memory/ProductImpl.h * */ #ifndef ZYPP_DETAIL_MEMORY_PRODUCTIMPL_H @@ -25,7 +25,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - namespace repository + namespace repo { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// namespace memory @@ -37,11 +37,11 @@ // /** */ - struct DProductImpl : public zypp::detail::ProductImplIf + struct ProductImpl : public zypp::detail::ProductImplIf { public: - DProductImpl(data::Product_Ptr ptr); - virtual ~DProductImpl(); + ProductImpl(data::Product_Ptr ptr); + virtual ~ProductImpl(); virtual std::string category() const; virtual Label vendor() const; Modified: trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.cc?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.cc (original) +++ trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.cc Thu May 31 14:44:12 2007 @@ -6,10 +6,10 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp2/repository/memory/DSrcPackageImpl.cc +/** \file zypp2/repo/memory/SrcPackageImpl.cc * */ -#include "zypp2/repository/memory/DSrcPackageImpl.h" +#include "zypp2/repo/memory/DSrcPackageImpl.h" using namespace std; @@ -17,7 +17,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -namespace repository +namespace repo { ///////////////////////////////////////////////////////////////// namespace memory { ///////////////////////////////////////////////////////////////// @@ -27,7 +27,7 @@ // METHOD NAME : SrcPackageImpl::SrcPackageImpl // METHOD TYPE : Ctor // -DSrcPackageImpl::DSrcPackageImpl(data::SrcPackage_Ptr ptr) +SrcPackageImpl::SrcPackageImpl(data::SrcPackage_Ptr ptr) : _media_number( 1 ) {} @@ -36,31 +36,31 @@ // METHOD NAME : SrcPackageImpl::~SrcPackageImpl // METHOD TYPE : Dtor // -DSrcPackageImpl::~DSrcPackageImpl() +SrcPackageImpl::~SrcPackageImpl() {} -Pathname DSrcPackageImpl::location() const +Pathname SrcPackageImpl::location() const { return _location; } -ByteCount DSrcPackageImpl::archivesize() const +ByteCount SrcPackageImpl::archivesize() const { return _archivesize; } -DiskUsage DSrcPackageImpl::diskusage() const +DiskUsage SrcPackageImpl::diskusage() const { return _diskusage; } -Source_Ref DSrcPackageImpl::source() const +Source_Ref SrcPackageImpl::source() const { return Source_Ref::noSource; } -unsigned DSrcPackageImpl::sourceMediaNr() const +unsigned SrcPackageImpl::sourceMediaNr() const { return _media_number; } Modified: trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.h?rev=5651&r1=5650&r2=5651&view=diff ============================================================================== --- trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.h (original) +++ trunk/libzypp/zypp2/repo/memory/DSrcPackageImpl.h Thu May 31 14:44:12 2007 @@ -6,7 +6,7 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp2/repository/memory/DSrcPackageImpl.h +/** \file zypp2/repository/memory/SrcPackageImpl.h * */ #ifndef ZYPP_SOURCE_MEMORYSRCPackageIMPL_H @@ -21,7 +21,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - namespace repository + namespace repo { ///////////////////////////////////////////////////////////////// namespace memory { ///////////////////////////////////////////////////////////////// @@ -32,10 +32,10 @@ // /** */ - struct DSrcPackageImpl : public zypp::detail::SrcPackageImplIf + struct SrcPackageImpl : public zypp::detail::SrcPackageImplIf { - DSrcPackageImpl(data::SrcPackage_Ptr ptr); - virtual ~DSrcPackageImpl(); + SrcPackageImpl(data::SrcPackage_Ptr ptr); + virtual ~SrcPackageImpl(); /** */ virtual Pathname location() const; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org