Remove Atom, Script, Message and other obsolete classes

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 83f3fdb..c457503 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -16,7 +16,6 @@ SET( zypp_SRCS
   CheckSum.cc
   Date.cc
   Dep.cc
-  Dependencies.cc
   Digest.cc
   DiskUsage.cc
   DiskUsageCounter.cc
@@ -31,9 +30,6 @@ SET( zypp_SRCS
   MediaProducts.cc
   MediaSetAccess.cc
   NameKindProxy.cc
-  NVRA.cc
-  NVRAD.cc
-  NVR.cc
   OnMediaLocation.cc
   Package.cc
   Patch.cc
@@ -98,7 +94,6 @@ SET( zypp_HEADERS
   CheckSum.h
   CountryCode.h
   Date.h
-  Dependencies.h
   Dep.h
   Digest.h
   DiskUsageCounter.h
@@ -119,9 +114,6 @@ SET( zypp_HEADERS
   MediaSetAccess.h
   NameKindProxy.h
   Vendor.h
-  NVRAD.h
-  NVRA.h
-  NVR.h
   OnMediaLocation.h
   Package.h
   PackageKeyword.h

diff --git a/zypp/Dependencies.cc b/zypp/Dependencies.cc
deleted file mode 100644 (file)
index 8267fa5..0000000
--- a/zypp/Dependencies.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/Dependencies.cc
- *
-*/
-#include <iostream>
-
-#include "zypp/base/LogTools.h"
-
-#include "zypp/Dependencies.h"
-
-using std::endl;
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  /******************************************************************
-  **
-  **   FUNCTION NAME : operator<<
-  **   FUNCTION TYPE : std::ostream &
-  */
-  std::ostream & operator<<( std::ostream & str, const Dependencies & obj )
-  {
-    str << "Dependencies: [" << endl;
-    if ( ! obj[Dep::PROVIDES].empty() )
-      str << "PROVIDES:" << endl << obj[Dep::PROVIDES];
-    if ( ! obj[Dep::PREREQUIRES].empty() )
-      str << "PREREQUIRES:" << endl << obj[Dep::PREREQUIRES];
-    if ( ! obj[Dep::REQUIRES].empty() )
-      str << "REQUIRES:" << endl << obj[Dep::REQUIRES];
-    if ( ! obj[Dep::CONFLICTS].empty() )
-      str << "CONFLICTS:" << endl << obj[Dep::CONFLICTS];
-    if ( ! obj[Dep::OBSOLETES].empty() )
-      str << "OBSOLETES:" << endl << obj[Dep::OBSOLETES];
-    if ( ! obj[Dep::RECOMMENDS].empty() )
-      str << "RECOMMENDS:" << endl << obj[Dep::RECOMMENDS];
-    if ( ! obj[Dep::SUGGESTS].empty() )
-      str << "SUGGESTS:" << endl << obj[Dep::SUGGESTS];
-    if ( ! obj[Dep::SUPPLEMENTS].empty() )
-      str << "SUPPLEMENTS:" << endl << obj[Dep::SUPPLEMENTS];
-    if ( ! obj[Dep::ENHANCES].empty() )
-      str << "ENHANCES:" << endl << obj[Dep::ENHANCES];
-    if ( ! obj[Dep::FRESHENS].empty() )
-      str << "FRESHENS:" << endl << obj[Dep::FRESHENS];
-    return str << "]";
-  }
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////

diff --git a/zypp/Dependencies.h b/zypp/Dependencies.h
deleted file mode 100644 (file)
index 37c2404..0000000
--- a/zypp/Dependencies.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/Dependencies.h
- *
-*/
-#ifndef ZYPP_DEPENDENCIES_H
-#define ZYPP_DEPENDENCIES_H
-
-#include <iosfwd>
-#include <map>
-
-#include "zypp/Dep.h"
-#include "zypp/Capability.h"
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   CLASS NAME : Dependencies
-  //
-  /** Helper keeping CapabilitySet for all kinds of dependencies.
-  */
-  struct ZYPP_DEPRECATED Dependencies
-  {
-    CapabilitySet & operator[]( Dep idx_r )
-    { return _capsets[idx_r]; }
-
-    const CapabilitySet & operator[]( Dep idx_r ) const
-    { return const_cast<std::map<Dep,CapabilitySet>&>(_capsets)[idx_r]; }
-
-  private:
-    std::map<Dep,CapabilitySet> _capsets;
-  };
-  ///////////////////////////////////////////////////////////////////
-
-  /** \relates Dependencies Stream output */
-  std::ostream & operator<<( std::ostream & str, const Dependencies & obj ) ZYPP_DEPRECATED;
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////
-#endif // ZYPP_DEPENDENCIES_H

diff --git a/zypp/NVR.cc b/zypp/NVR.cc
deleted file mode 100644 (file)
index b4f4292..0000000
--- a/zypp/NVR.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/NVR.cc
- *
-*/
-#include <iostream>
-
-#include "zypp/NVR.h"
-#include "zypp/Resolvable.h"
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  NVR::NVR( ResTraits<Resolvable>::constPtrType res_r )
-  {
-    if ( res_r )
-      {
-        *this = NVR( res_r->name(), res_r->edition() );
-      }
-  }
-
-  /******************************************************************
-  **
-  **   FUNCTION NAME : operator<<
-  **   FUNCTION TYPE : std::ostream &
-  */
-  std::ostream & operator<<( std::ostream & str, const NVR & obj )
-  {
-    return str << obj.name << '-' << obj.edition;
-  }
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////

diff --git a/zypp/NVR.h b/zypp/NVR.h
deleted file mode 100644 (file)
index c0c2a03..0000000
--- a/zypp/NVR.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/NVR.h
- *
-*/
-#ifndef ZYPP_NVR_H
-#define ZYPP_NVR_H
-
-#include <iosfwd>
-#include <string>
-
-#include "zypp/Edition.h"
-#include "zypp/ResTraits.h"
-#include "zypp/RelCompare.h"
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   CLASS NAME : NVR
-  //
-  /** Helper storing Name and Edition. */
-  struct NVR
-  {
-    /** Default ctor */
-    NVR()
-    {}
-
-    /** Ctor */
-    explicit
-    NVR( const std::string & name_r,
-         const Edition & edition_r = Edition() )
-    : name( name_r )
-    , edition( edition_r )
-    {}
-
-    /** Ctor from Resolvable::constPtr */
-    explicit
-    NVR( ResTraits<Resolvable>::constPtrType res_r );
-
-    /**  */
-    std::string name;
-    /**  */
-    Edition edition;
-
-  public:
-    /** Comparison mostly for std::container */
-    static int compare( const NVR & lhs, const NVR & rhs )
-    {
-      int res = lhs.name.compare( rhs.name );
-      if ( res )
-        return res;
-      return lhs.edition.compare( rhs.edition );
-    }
-  };
-  ///////////////////////////////////////////////////////////////////
-
-  /** \relates NVR Stream output */
-  std::ostream & operator<<( std::ostream & str, const NVR & obj );
-
-  /** \relates NVR */
-  inline bool operator==( const NVR & lhs, const NVR & rhs )
-  { return compareByRel( Rel::EQ, lhs, rhs ); }
-
-  /** \relates NVR */
-  inline bool operator!=( const NVR & lhs, const NVR & rhs )
-  { return compareByRel( Rel::NE, lhs, rhs ); }
-
-  /** \relates NVR Order in std::container */
-  inline bool operator<( const NVR & lhs, const NVR & rhs )
-  { return compareByRel( Rel::LT, lhs, rhs ); }
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////
-#endif // ZYPP_NVR_H

diff --git a/zypp/NVRA.cc b/zypp/NVRA.cc
deleted file mode 100644 (file)
index 446eb42..0000000
--- a/zypp/NVRA.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/NVRA.cc
- *
-*/
-#include <iostream>
-
-#include "zypp/NVRA.h"
-#include "zypp/Resolvable.h"
-
-using std::endl;
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  NVRA::NVRA( ResTraits< Resolvable >::constPtrType res_r )
-  {
-    if ( res_r )
-      {
-        *this = NVRA( res_r->name(), res_r->edition(), res_r->arch() );
-      }
-  }
-
-  /******************************************************************
-  **
-  **   FUNCTION NAME : operator<<
-  **   FUNCTION TYPE : std::ostream &
-  */
-  std::ostream & operator<<( std::ostream & str, const NVRA & obj )
-  {
-    return str << obj.name << '-' << obj.edition << '.' << obj.arch;
-  }
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////

diff --git a/zypp/NVRA.h b/zypp/NVRA.h
deleted file mode 100644 (file)
index c7b4748..0000000
--- a/zypp/NVRA.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/NVRA.h
- *
-*/
-#ifndef ZYPP_NVRA_H
-#define ZYPP_NVRA_H
-
-#include <iosfwd>
-
-#include "zypp/NVR.h"
-#include "zypp/Arch.h"
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   CLASS NAME : NVRA
-  //
-  /**  Helper storing Name, Edition and Arch. */
-  struct NVRA : public NVR
-  {
-    /** Default ctor */
-    NVRA()
-    {}
-
-    /** Ctor */
-    explicit
-    NVRA( const std::string & name_r,
-          const Edition & edition_r = Edition(),
-          const Arch & arch_r = Arch() )
-    : NVR( name_r, edition_r )
-    , arch( arch_r )
-    {}
-
-    /** Ctor */
-    explicit
-    NVRA( const NVR & nvr_r,
-          const Arch & arch_r = Arch() )
-    : NVR( nvr_r )
-    , arch( arch_r )
-    {}
-
-    /** Ctor from Resolvable::constPtr */
-    explicit
-    NVRA( ResTraits<Resolvable>::constPtrType res_r );
-
-    /**  */
-    Arch arch;
-
-  public:
-    /** Comparison mostly for std::container */
-    static int compare( const NVRA & lhs, const NVRA & rhs )
-    {
-      int res = NVR::compare( lhs, rhs );
-      if ( res )
-        return res;
-      return lhs.arch.compare( rhs.arch );
-    }
-  };
-  ///////////////////////////////////////////////////////////////////
-
-  /** \relates NVRA Stream output */
-  std::ostream & operator<<( std::ostream & str, const NVRA & obj );
-
-  /** \relates NVRA */
-  inline bool operator==( const NVRA & lhs, const NVRA & rhs )
-  { return compareByRel( Rel::EQ, lhs, rhs ); }
-
-  /** \relates NVRA */
-  inline bool operator!=( const NVRA & lhs, const NVRA & rhs )
-  { return compareByRel( Rel::NE, lhs, rhs ); }
-
-  /** \relates NVRA Order in std::container */
-  inline bool operator<( const NVRA & lhs, const NVRA & rhs )
-  { return compareByRel( Rel::LT, lhs, rhs ); }
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////
-#endif // ZYPP_NVRA_H

diff --git a/zypp/NVRAD.cc b/zypp/NVRAD.cc
deleted file mode 100644 (file)
index d98c1ee..0000000
--- a/zypp/NVRAD.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/NVRAD.cc
- *
-*/
-
-#include "zypp/NVRAD.h"
-#include "zypp/Resolvable.h"
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  namespace
-  {
-    void copycaps( CapabilitySet & lhs, const Capabilities & rhs )
-    {
-      if ( rhs.empty() )
-        return;
-      CapabilitySet( rhs.begin(), rhs.end() ).swap( lhs );
-    }
-  }
-
-  NVRAD::NVRAD( Resolvable::constPtr res_r )
-  {
-    if ( res_r )
-    {
-      *this = NVRAD( res_r->name(), res_r->edition(), res_r->arch() );
-#define OUTS(X) copycaps( operator[](X), res_r->dep(X) )
-      OUTS( Dep::PROVIDES );
-      OUTS( Dep::PREREQUIRES );
-      OUTS( Dep::CONFLICTS );
-      OUTS( Dep::OBSOLETES );
-      OUTS( Dep::FRESHENS );
-      OUTS( Dep::REQUIRES );
-      OUTS( Dep::RECOMMENDS );
-      OUTS( Dep::ENHANCES );
-      OUTS( Dep::SUPPLEMENTS );
-      OUTS( Dep::SUGGESTS );
-#undef OUTS
-    }
-  }
-
-  std::ostream & operator<<( std::ostream & str, const NVRAD & obj )
-  {
-    return str << obj.name << '-' << obj.edition << '.' << obj.arch;
-  }
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////

diff --git a/zypp/NVRAD.h b/zypp/NVRAD.h
deleted file mode 100644 (file)
index 5cd704c..0000000
--- a/zypp/NVRAD.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      zypp/NVRAD.h
- *
-*/
-#ifndef ZYPP_NVRAD_H
-#define ZYPP_NVRAD_H
-
-#include "zypp/NVRA.h"
-#include "zypp/Dependencies.h"
-#include "zypp/Resolvable.h"
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   CLASS NAME : NVRAD
-  //
-  /**  Helper storing Name, Edition, Arch and Dependencies.
-   *
-   * \note Stream output and comaprison operators based on
-   * \ref NVRA.
-  */
-  struct ZYPP_DEPRECATED NVRAD : public NVRA, public Dependencies
-  {
-    /** Default ctor */
-    NVRAD()
-    {}
-
-    /** Ctor */
-    explicit
-    NVRAD( const std::string & name_r,
-           const Edition & edition_r = Edition(),
-           const Arch & arch_r = Arch(),
-           const Dependencies & deps_r = Dependencies() )
-    : NVRA( name_r, edition_r, arch_r )
-    , Dependencies( deps_r )
-    {}
-
-    /** Ctor */
-    explicit
-    NVRAD( const NVRA & nvra_r,
-           const Dependencies & deps_r = Dependencies() )
-    : NVRA( nvra_r )
-    , Dependencies( deps_r )
-    {}
-
-    /** Ctor from Resolvable::constPtr */
-    explicit
-    NVRAD( const NVR & nvr_r,
-           const Arch & arch_r = Arch(),
-           const Dependencies & deps_r = Dependencies() )
-    : NVRA( nvr_r, arch_r )
-    , Dependencies( deps_r )
-    {}
-
-    /** Ctor */
-    explicit
-    NVRAD( Resolvable::constPtr res_r );
-  };
-  ///////////////////////////////////////////////////////////////////
-
-  /** \relates NVRAD Stream output */
-  std::ostream & operator<<( std::ostream & str, const NVRAD & obj ) ZYPP_DEPRECATED;
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////
-#endif // ZYPP_NVRAD_H

diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index c162cc8..780117e 100644 (file)
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -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"

diff --git a/zypp/Resolvable.h b/zypp/Resolvable.h
index 347c009..33b7eda 100644 (file)
--- a/zypp/Resolvable.h
+++ b/zypp/Resolvable.h
@@ -23,8 +23,6 @@
 
 #include "zypp/sat/Solvable.h"
 
-#include "zypp/Dependencies.h"
-
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 { /////////////////////////////////////////////////////////////////

diff --git a/zypp/data/ResolvableData.cc b/zypp/data/ResolvableData.cc
index 4c75556..b560006 100644 (file)
--- a/zypp/data/ResolvableData.cc
+++ b/zypp/data/ResolvableData.cc
@@ -13,6 +13,7 @@ using namespace std;
 
 namespace zypp
 {
+#warning figure out all the obsolete stuff here
 namespace data
 {
 

diff --git a/zypp/data/ResolvableData.h b/zypp/data/ResolvableData.h
index 2413d92..d7f52af 100644 (file)
--- a/zypp/data/ResolvableData.h
+++ b/zypp/data/ResolvableData.h
@@ -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 @@ namespace data
   struct Package : public Packagebase
   {
     virtual PackageType packageType() const { return BIN; }
-
-    /** NVR of the corresponding SrcPackage. */
-    NVR srcPackageIdent;
   };
 
   DEFINE_PTR_TYPE(SrcPackage);

diff --git a/zypp/solver/detail/SolutionAction.cc b/zypp/solver/detail/SolutionAction.cc
index 93a75e5..503ba3f 100644 (file)
--- a/zypp/solver/detail/SolutionAction.cc
+++ b/zypp/solver/detail/SolutionAction.cc
@@ -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 @@ TransactionSolutionAction::dumpOn( ostream& os) const
        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 @@ TransactionSolutionAction::execute(Resolver & resolver) const
            break;
        case REMOVE_EXTRA_REQUIRE:
            resolver.removeExtraRequire (_capability);
-           break;          
+           break;
        case REMOVE_EXTRA_CONFLICT:
            resolver.removeExtraConflict (_capability);
            break;

diff --git a/zypp/zypp_detail/ZYppImpl.cc b/zypp/zypp_detail/ZYppImpl.cc
index dace8ee..d6315ed 100644 (file)
--- a/zypp/zypp_detail/ZYppImpl.cc
+++ b/zypp/zypp_detail/ZYppImpl.cc
@@ -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"