Author: mlandres Date: Wed Jul 16 18:59:52 2008 New Revision: 10598 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10598&view=rev Log: cleanup unused code Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/data/ResolvableData.cc trunk/libzypp/zypp/data/ResolvableData.h trunk/libzypp/zypp/data/ResolvableDataConsumer.h Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=10598&r1=10597&r2=10598&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Wed Jul 16 18:59:52 2008 @@ -848,38 +848,10 @@ ZYPP_THROW(RepoUnknownTypeException("Unhandled repository type")); break; } -#if 0 - switch ( repokind.toEnum() ) - { - case RepoType::RPMMD_e : - if (0) - { - CombinedProgressData subprogrcv( progress, 100); - parser::yum::RepoParser parser(id, store, parser::yum::RepoParserOpts(), subprogrcv); - parser.parse(rawpath); - // no error - } - break; - case RepoType::YAST2_e : - if (0) - { - CombinedProgressData subprogrcv( progress, 100); - parser::susetags::RepoParser parser(id, store, subprogrcv); - parser.parse(rawpath); - // no error - } - break; - - default: - ZYPP_THROW(RepoUnknownTypeException()); - } -#endif // update timestamp and checksum - //store.updateRepositoryStatus(id, raw_metadata_status); setCacheStatus(info, raw_metadata_status); MIL << "Commit cache.." << endl; - //store.commit(); - //progress.toMax(); + progress.toMax(); } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/data/ResolvableData.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableData.cc?rev=10598&r1=10597&r2=10598&view=diff ============================================================================== --- trunk/libzypp/zypp/data/ResolvableData.cc (original) +++ trunk/libzypp/zypp/data/ResolvableData.cc Wed Jul 16 18:59:52 2008 @@ -19,9 +19,6 @@ IMPL_PTR_TYPE(Resolvable); IMPL_PTR_TYPE(ResObject); -IMPL_PTR_TYPE(Script); -IMPL_PTR_TYPE(Message); -IMPL_PTR_TYPE(Atom); IMPL_PTR_TYPE(Patch); IMPL_PTR_TYPE(Pattern); IMPL_PTR_TYPE(Product); @@ -30,8 +27,6 @@ IMPL_PTR_TYPE(SrcPackage); IMPL_PTR_TYPE(DeltaRpm); -IMPL_PTR_TYPE(PatchRpm); -IMPL_PTR_TYPE(PackageAtom); IMPL_PTR_TYPE(BaseVersion); Modified: trunk/libzypp/zypp/data/ResolvableData.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableData.h?rev=10598&r1=10597&r2=10598&view=diff ============================================================================== --- trunk/libzypp/zypp/data/ResolvableData.h (original) +++ trunk/libzypp/zypp/data/ResolvableData.h Wed Jul 16 18:59:52 2008 @@ -118,55 +118,6 @@ /////////////////////////////////////////////////////////////////// - DEFINE_PTR_TYPE(Atom); - - /* Data Object for Atom resolvable. */ - class Atom : public ResObject - { - public: - Atom() - {}; - }; - - /////////////////////////////////////////////////////////////////// - - DEFINE_PTR_TYPE(Script); - - /* Data Object for Script resolvable. */ - class Script : public ResObject - { - public: - Script() - {}; - - /** Inlined doScript. */ - std::string doScript; - /** Location of doScript on the repositories media. */ - OnMediaLocation doScriptLocation; - - /** Inlined undoScript. */ - std::string undoScript; - /** Location of undoScript on the repositories media. */ - OnMediaLocation undoScriptLocation; - }; - - /////////////////////////////////////////////////////////////////// - - DEFINE_PTR_TYPE(Message); - - /* Data Object for Message resolvable. */ - class Message : public ResObject - { - public: - Message() - {}; - - /** Inlined Text. */ - TranslatedText text; - }; - - /////////////////////////////////////////////////////////////////// - DEFINE_PTR_TYPE(Patch); /* Data Object for Patch resolvable. */ @@ -374,13 +325,6 @@ virtual std::ostream & dumpOn( std::ostream & str ) const; }; - DEFINE_PTR_TYPE(PatchRpm); - /** Patch RPM data object */ - struct PatchRpm : RpmBase - { - std::set baseVersions; - }; - DEFINE_PTR_TYPE(DeltaRpm); /** Delta RPM data object */ struct DeltaRpm : RpmBase @@ -395,19 +339,6 @@ DeltaBaseVersion baseVersion; }; - DEFINE_PTR_TYPE(PackageAtom); - /** - * Data Object for YUM package atom. - * - * \see zypp/parser/yum/schema/patch.rng - */ - struct PackageAtom : public Package - { - std::set patchRpms; - std::set deltaRpms; - // TODO support mulitple licenses (licenseToConfirm) - }; - // --- ----------END--YUM-package-atom-metadata----------------------------- /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/data/ResolvableDataConsumer.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableDataConsumer.h?rev=10598&r1=10597&r2=10598&view=diff ============================================================================== --- trunk/libzypp/zypp/data/ResolvableDataConsumer.h (original) +++ trunk/libzypp/zypp/data/ResolvableDataConsumer.h Wed Jul 16 18:59:52 2008 @@ -33,17 +33,14 @@ virtual data::RecordId consumeSourcePackage( const data::SrcPackage_Ptr & ) = 0; virtual data::RecordId consumeProduct ( const data::Product_Ptr & ) = 0; virtual data::RecordId consumePatch ( const data::Patch_Ptr & ) = 0; - virtual data::RecordId consumePackageAtom ( const data::PackageAtom_Ptr & ) = 0; - virtual data::RecordId consumeMessage ( const data::Message_Ptr & ) = 0; - virtual data::RecordId consumeScript ( const data::Script_Ptr & ) = 0; virtual data::RecordId consumePattern ( const data::Pattern_Ptr & ) = 0; virtual data::RecordId consumeChangelog ( const data::RecordId & resolvable_id, const Changelog & ) = 0; virtual data::RecordId consumeFilelist ( const data::RecordId & resolvable_id, const data::Filenames & ) = 0; virtual void consumeDiskUsage ( const data::RecordId &resolvable_id, const DiskUsage &disk ) = 0; - + virtual void updatePackageLang( const data::RecordId & resolvable_id, const data::Packagebase_Ptr & data_r ) = 0; - + }; } // namespace parser -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org