[zypp-commit] r6052 - in /trunk/libzypp-testsuite: source/ src/helix/
Author: dmacvicar Date: Tue Jul 17 16:48:42 2007 New Revision: 6052 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6052&view=rev Log: port to new classes Modified: trunk/libzypp-testsuite/source/source-read-test.cc trunk/libzypp-testsuite/source/suseparser.cc trunk/libzypp-testsuite/src/helix/HelixAtomImpl.cc trunk/libzypp-testsuite/src/helix/HelixExtract.h trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.cc trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.h trunk/libzypp-testsuite/src/helix/HelixMessageImpl.cc trunk/libzypp-testsuite/src/helix/HelixMessageImpl.h trunk/libzypp-testsuite/src/helix/HelixPackageImpl.cc trunk/libzypp-testsuite/src/helix/HelixPackageImpl.h trunk/libzypp-testsuite/src/helix/HelixParser.h trunk/libzypp-testsuite/src/helix/HelixPatchImpl.cc trunk/libzypp-testsuite/src/helix/HelixPatchImpl.h trunk/libzypp-testsuite/src/helix/HelixPatternImpl.cc trunk/libzypp-testsuite/src/helix/HelixPatternImpl.h trunk/libzypp-testsuite/src/helix/HelixProductImpl.cc trunk/libzypp-testsuite/src/helix/HelixProductImpl.h trunk/libzypp-testsuite/src/helix/HelixScriptImpl.cc trunk/libzypp-testsuite/src/helix/HelixSelectionImpl.cc trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h Modified: trunk/libzypp-testsuite/source/source-read-test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/source/source-read-test.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/source/source-read-test.cc (original) +++ trunk/libzypp-testsuite/source/source-read-test.cc Tue Jul 17 16:48:42 2007 @@ -18,11 +18,10 @@ #include "zypp/Dependencies.h" #include "zypp/base/Logger.h" #include "zypp/base/LogControl.h" -#include "zypp/SourceFactory.h" -#include "zypp/Source.h" +#include "zypp/Repository.h" #include "zypp/ZYpp.h" #include "zypp/ZYppFactory.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/media/MediaManager.h" #include "zypp/Dependencies.h" Modified: trunk/libzypp-testsuite/source/suseparser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/source/suseparser.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/source/suseparser.cc (original) +++ trunk/libzypp-testsuite/source/suseparser.cc Tue Jul 17 16:48:42 2007 @@ -18,11 +18,10 @@ #include "zypp/Dependencies.h" #include "zypp/base/Logger.h" #include "zypp/base/LogControl.h" -#include "zypp/SourceFactory.h" -#include "zypp/Source.h" +#include "zypp/Repository.h" #include "zypp/ZYpp.h" #include "zypp/ZYppFactory.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repository/RepositoryImpl.h" #include "zypp/media/MediaManager.h" #include "KeyRingCallbacks.h" Modified: trunk/libzypp-testsuite/src/helix/HelixAtomImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixAtomImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixAtomImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixAtomImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixAtomImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -29,12 +29,12 @@ /** Default ctor */ -HelixAtomImpl::HelixAtomImpl (Source_Ref source_r, const zypp::HelixParser & parsed) +HelixAtomImpl::HelixAtomImpl (Repository source_r, const zypp::HelixParser & parsed) : _source (source_r) { } -Source_Ref +Repository HelixAtomImpl::source() const { return _source; } Modified: trunk/libzypp-testsuite/src/helix/HelixExtract.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixExtract.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixExtract.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixExtract.h Tue Jul 17 16:48:42 2007 @@ -28,7 +28,7 @@ #define HELIXEXTRACT_H #include "zypp/Resolvable.h" -#include "zypp/Source.h" +#include "zypp/Repository.h" #include "zypp/ResStore.h" #include "HelixParser.h" Modified: trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixLanguageImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -29,7 +29,7 @@ /** Default ctor */ -HelixLanguageImpl::HelixLanguageImpl (Source_Ref source_r, const zypp::HelixParser & parsed) +HelixLanguageImpl::HelixLanguageImpl (Repository source_r, const zypp::HelixParser & parsed) : LanguageImplIf() { } Modified: trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixLanguageImpl.h Tue Jul 17 16:48:42 2007 @@ -32,7 +32,7 @@ class HelixParser; /** Default ctor */ - HelixLanguageImpl( Source_Ref source_r, const zypp::HelixParser & data ); + HelixLanguageImpl( Repository source_r, const zypp::HelixParser & data ); protected: Modified: trunk/libzypp-testsuite/src/helix/HelixMessageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixMessageImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixMessageImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixMessageImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixMessageImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -29,12 +29,12 @@ /** Default ctor */ -HelixMessageImpl::HelixMessageImpl (Source_Ref source_r, const zypp::HelixParser & parsed) +HelixMessageImpl::HelixMessageImpl (Repository source_r, const zypp::HelixParser & parsed) : _source (source_r) { } -Source_Ref +Repository HelixMessageImpl::source() const { return _source; } Modified: trunk/libzypp-testsuite/src/helix/HelixMessageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixMessageImpl.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixMessageImpl.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixMessageImpl.h Tue Jul 17 16:48:42 2007 @@ -32,16 +32,16 @@ class HelixParser; /** Default ctor */ - HelixMessageImpl( Source_Ref source_r, const zypp::HelixParser & data ); + HelixMessageImpl( Repository source_r, const zypp::HelixParser & data ); TranslatedText text () const; std::string type () const; virtual ByteCount size() const; /** */ - virtual Source_Ref source() const; + virtual Repository source() const; protected: - Source_Ref _source; + Repository _source; TranslatedText _text; std::string _type; ByteCount _size_installed; Modified: trunk/libzypp-testsuite/src/helix/HelixPackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixPackageImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixPackageImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixPackageImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixPackageImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -29,7 +29,7 @@ /** Default ctor */ -HelixPackageImpl::HelixPackageImpl (Source_Ref source_r, const zypp::HelixParser & parsed) +HelixPackageImpl::HelixPackageImpl (Repository source_r, const zypp::HelixParser & parsed) : _source (source_r) , _summary(parsed.summary) , _description(parsed.description) @@ -41,7 +41,7 @@ { } -Source_Ref +Repository HelixPackageImpl::source() const { return _source; } Modified: trunk/libzypp-testsuite/src/helix/HelixPackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixPackageImpl.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixPackageImpl.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixPackageImpl.h Tue Jul 17 16:48:42 2007 @@ -32,7 +32,7 @@ class HelixParser; /** Default ctor */ - HelixPackageImpl( Source_Ref source_r, const zypp::HelixParser & data ); + HelixPackageImpl( Repository source_r, const zypp::HelixParser & data ); /** Package summary */ virtual TranslatedText summary() const; @@ -48,7 +48,7 @@ /** */ virtual unsigned sourceMediaNr() const; /** */ - virtual Source_Ref source() const; + virtual Repository source() const; /** */ virtual Vendor vendor() const @@ -56,7 +56,7 @@ protected: - Source_Ref _source; + Repository _source; TranslatedText _summary; TranslatedText _description; PackageGroup _group; Modified: trunk/libzypp-testsuite/src/helix/HelixParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixParser.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixParser.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixParser.h Tue Jul 17 16:48:42 2007 @@ -29,7 +29,7 @@ #include "zypp/CapSet.h" #include "zypp/ResStore.h" #include "zypp/Dependencies.h" -#include "zypp/Source.h" +#include "zypp/Repository.h" #include "XmlNode.h" Modified: trunk/libzypp-testsuite/src/helix/HelixPatchImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixPatchImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixPatchImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixPatchImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixPatchImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" Modified: trunk/libzypp-testsuite/src/helix/HelixPatchImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixPatchImpl.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixPatchImpl.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixPatchImpl.h Tue Jul 17 16:48:42 2007 @@ -23,7 +23,7 @@ // // CLASS NAME : HelixPatchImpl // -/** Class representing a package +/** Class representing a Repository */ class HelixPatchImpl : public detail::PatchImplIf { @@ -43,7 +43,7 @@ virtual std::string category() const ; /** Does the system need to reboot to finish the update process? */ virtual bool reboot_needed() const ; - /** Does the patch affect the package manager itself? */ + /** Does the patch affect the Repository manager itself? */ virtual bool affects_pkg_manager() const ; /** */ virtual ByteCount size() const; Modified: trunk/libzypp-testsuite/src/helix/HelixPatternImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixPatternImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixPatternImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixPatternImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixPatternImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -29,7 +29,7 @@ /** Default ctor */ -HelixPatternImpl::HelixPatternImpl (Source_Ref source_r, const zypp::HelixParser & parsed) +HelixPatternImpl::HelixPatternImpl (Repository source_r, const zypp::HelixParser & parsed) : _source (source_r) , _summary(parsed.summary) , _description(parsed.description) @@ -40,7 +40,7 @@ { } -Source_Ref +Repository HelixPatternImpl::source() const { return _source; } Modified: trunk/libzypp-testsuite/src/helix/HelixPatternImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixPatternImpl.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixPatternImpl.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixPatternImpl.h Tue Jul 17 16:48:42 2007 @@ -25,7 +25,7 @@ // /** Class representing a package */ -class HelixPatternImpl : public detail::PatternImplIf +class HelixPatternImpl : public detail::Repository { public: Modified: trunk/libzypp-testsuite/src/helix/HelixProductImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixProductImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixProductImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixProductImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixProductImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -29,7 +29,7 @@ /** Default ctor */ -HelixProductImpl::HelixProductImpl (Source_Ref source_r, const zypp::HelixParser & parsed) +HelixProductImpl::HelixProductImpl (Repository source_r, const zypp::HelixParser & parsed) : _source (source_r) , _summary(parsed.summary) , _description(parsed.description) @@ -40,7 +40,7 @@ { } -Source_Ref +Repository HelixProductImpl::source() const { return _source; } Modified: trunk/libzypp-testsuite/src/helix/HelixProductImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixProductImpl.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixProductImpl.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixProductImpl.h Tue Jul 17 16:48:42 2007 @@ -32,7 +32,7 @@ class HelixParser; /** Default ctor */ - HelixProductImpl( Source_Ref source_r, const zypp::HelixParser & data ); + HelixProductImpl( Repository source_r, const zypp::HelixParser & data ); /** Product summary */ virtual TranslatedText summary() const; @@ -48,10 +48,10 @@ /** */ /** */ - virtual Source_Ref source() const; + virtual Repository source() const; protected: - Source_Ref _source; + Repository _source; TranslatedText _summary; TranslatedText _description; PackageGroup _group; Modified: trunk/libzypp-testsuite/src/helix/HelixScriptImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixScriptImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixScriptImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixScriptImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixScriptImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -29,13 +29,13 @@ /** Default ctor */ -HelixScriptImpl::HelixScriptImpl (Source_Ref source_r, const zypp::HelixParser & parsed) +HelixScriptImpl::HelixScriptImpl (Repository source_r, const zypp::HelixParser & parsed) : _source (source_r) , _size_installed(parsed.installedSize) { } -Source_Ref +Repository HelixScriptImpl::source() const { return _source; } Modified: trunk/libzypp-testsuite/src/helix/HelixSelectionImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixSelectionImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixSelectionImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixSelectionImpl.cc Tue Jul 17 16:48:42 2007 @@ -11,7 +11,7 @@ */ #include "HelixSelectionImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" @@ -29,14 +29,14 @@ /** Default ctor */ -HelixSelectionImpl::HelixSelectionImpl (Source_Ref source_r, const zypp::HelixParser & parsed) +HelixSelectionImpl::HelixSelectionImpl (Repository source_r, const zypp::HelixParser & parsed) : _source (source_r) , _summary(parsed.summary) , _description(parsed.description) { } -Source_Ref +Repository HelixSelectionImpl::source() const { return _source; } Modified: trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc (original) +++ trunk/libzypp-testsuite/src/helix/HelixSourceImpl.cc Tue Jul 17 16:48:42 2007 @@ -31,7 +31,7 @@ #include "HelixPatternImpl.h" #include "HelixProductImpl.h" -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "zypp/base/Logger.h" #include "zypp/base/Exception.h" @@ -80,7 +80,7 @@ void -HelixSourceImpl::createResolvables(Source_Ref source) +HelixSourceImpl::createResolvables(Repository source) { _source = source; Modified: trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h?rev=6052&r1=6051&r2=6052&view=diff ============================================================================== --- trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h (original) +++ trunk/libzypp-testsuite/src/helix/HelixSourceImpl.h Tue Jul 17 16:48:42 2007 @@ -25,7 +25,7 @@ #include <iosfwd> #include <string> -#include "zypp/source/SourceImpl.h" +#include "zypp/repo/RepositoryImpl.h" #include "HelixParser.h" @@ -45,7 +45,7 @@ // // CLASS NAME : HelixSourceImpl -class HelixSourceImpl : public zypp::source::SourceImpl { +class HelixSourceImpl : public zypp::repo::RepositoryImpl { public: @@ -84,9 +84,9 @@ void parserCallback (const HelixParser & data); private: - Source_Ref _source; + Repository _source; Pathname _pathname; - void createResolvables(Source_Ref source_r); + void createResolvables(Repository source_r); }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org
participants (1)
-
dmacvicar＠svn.opensuse.org