Author: mlandres Date: Wed Jul 16 02:08:16 2008 New Revision: 10594 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10594&view=rev Log: Remove Atom, Script, Message and other obsolete classes Removed: trunk/libzypp/zypp/Dependencies.cc trunk/libzypp/zypp/Dependencies.h trunk/libzypp/zypp/NVR.cc trunk/libzypp/zypp/NVR.h trunk/libzypp/zypp/NVRA.cc trunk/libzypp/zypp/NVRA.h trunk/libzypp/zypp/NVRAD.cc trunk/libzypp/zypp/NVRAD.h Modified: trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/Resolvable.h trunk/libzypp/zypp/data/ResolvableData.cc trunk/libzypp/zypp/data/ResolvableData.h trunk/libzypp/zypp/solver/detail/SolutionAction.cc trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=10594&r1=10593&r2=10594&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Wed Jul 16 02:08:16 2008 @@ -16,7 +16,6 @@ CheckSum.cc Date.cc Dep.cc - Dependencies.cc Digest.cc DiskUsage.cc DiskUsageCounter.cc @@ -31,9 +30,6 @@ MediaProducts.cc MediaSetAccess.cc NameKindProxy.cc - NVRA.cc - NVRAD.cc - NVR.cc OnMediaLocation.cc Package.cc Patch.cc @@ -98,7 +94,6 @@ CheckSum.h CountryCode.h Date.h - Dependencies.h Dep.h Digest.h DiskUsageCounter.h @@ -119,9 +114,6 @@ MediaSetAccess.h NameKindProxy.h Vendor.h - NVRAD.h - NVRA.h - NVR.h OnMediaLocation.h Package.h PackageKeyword.h Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=10594&r1=10593&r2=10594&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Wed Jul 16 02:08:16 2008 @@ -38,9 +38,7 @@ #include "zypp/parser/ServiceFileReader.h" #include "zypp/parser/RepoindexFileReader.h" #include "zypp/repo/yum/Downloader.h" -#include "zypp/parser/yum/RepoParser.h" #include "zypp/repo/susetags/Downloader.h" -#include "zypp/parser/susetags/RepoParser.h" #include "zypp/parser/plaindir/RepoParser.h" #include "zypp/ZYppCallbacks.h" Modified: trunk/libzypp/zypp/Resolvable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolvable.h?rev=10594&r1=10593&r2=10594&view=diff ============================================================================== --- trunk/libzypp/zypp/Resolvable.h (original) +++ trunk/libzypp/zypp/Resolvable.h Wed Jul 16 02:08:16 2008 @@ -23,8 +23,6 @@ #include "zypp/sat/Solvable.h" -#include "zypp/Dependencies.h" - /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/data/ResolvableData.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableData.cc?rev=10594&r1=10593&r2=10594&view=diff ============================================================================== --- trunk/libzypp/zypp/data/ResolvableData.cc (original) +++ trunk/libzypp/zypp/data/ResolvableData.cc Wed Jul 16 02:08:16 2008 @@ -13,6 +13,7 @@ namespace zypp { +#warning figure out all the obsolete stuff here namespace data { Modified: trunk/libzypp/zypp/data/ResolvableData.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableData.h?rev=10594&r1=10593&r2=10594&view=diff ============================================================================== --- trunk/libzypp/zypp/data/ResolvableData.h (original) +++ trunk/libzypp/zypp/data/ResolvableData.h Wed Jul 16 02:08:16 2008 @@ -22,7 +22,6 @@ #include "zypp/data/RecordId.h" #include "zypp/Pathname.h" #include "zypp/Resolvable.h" -#include "zypp/NVR.h" #include "zypp/Edition.h" #include "zypp/ByteCount.h" #include "zypp/Arch.h" @@ -334,9 +333,6 @@ struct Package : public Packagebase { virtual PackageType packageType() const { return BIN; } - - /** NVR of the corresponding SrcPackage. */ - NVR srcPackageIdent; }; DEFINE_PTR_TYPE(SrcPackage); Modified: trunk/libzypp/zypp/solver/detail/SolutionAction.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolutionAction.cc?rev=10594&r1=10593&r2=10594&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/SolutionAction.cc (original) +++ trunk/libzypp/zypp/solver/detail/SolutionAction.cc Wed Jul 16 02:08:16 2008 @@ -25,8 +25,6 @@ #include "zypp/solver/detail/SolutionAction.h" #include "zypp/Capabilities.h" #include "zypp/base/Logger.h" -#include "zypp/Dependencies.h" - ///////////////////////////////////////////////////////////////////////// namespace zypp @@ -70,7 +68,7 @@ case REMOVE_EXTRA_REQUIRE: os << "Remove require " << _capability; break; case REMOVE_EXTRA_CONFLICT: os << "Remove conflict " << _capability; break; case ADD_SOLVE_QUEUE_ITEM: os << "Add SolveQueueItem " << _solverQueueItem; break; - case REMOVE_SOLVE_QUEUE_ITEM: os << "Remove SolveQueueItem " << _solverQueueItem; break; + case REMOVE_SOLVE_QUEUE_ITEM: os << "Remove SolveQueueItem " << _solverQueueItem; break; } os << endl; @@ -156,7 +154,7 @@ break; case REMOVE_EXTRA_REQUIRE: resolver.removeExtraRequire (_capability); - break; + break; case REMOVE_EXTRA_CONFLICT: resolver.removeExtraConflict (_capability); break; Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc?rev=10594&r1=10593&r2=10594&view=diff ============================================================================== --- trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc (original) +++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Wed Jul 16 02:08:16 2008 @@ -19,7 +19,6 @@ #include "zypp/solver/detail/Helper.h" #include "zypp/target/TargetImpl.h" #include "zypp/ZYpp.h" -#include "zypp/NVRAD.h" #include "zypp/DiskUsageCounter.h" #include "zypp/NameKindProxy.h" #include "zypp/ZConfig.h" -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org