Removed the 'Res' from 'Res{Arch,Edition}' (files and classes)

diff --git a/test/Main.cc b/test/Main.cc
index 76a1b0db63269afa96ac178dcf5a40fdebf3d26d..daf46df3df1d5afcba5eef7b023a54f238fc7c5e 100644 (file)
--- a/test/Main.cc
+++ b/test/Main.cc
@@ -21,8 +21,8 @@ int main( int argc, char * argv[] )
   INT << "===[START]==========================================" << endl;
 
   ResName    _name( "foo" );
-  ResEdition _edition( "1.0", "42" );
-  ResArch    _arch( "i386" );
+  Edition    _edition( "1.0", "42" );
+  Arch       _arch( "i386" );
 
 
   detail::PackageImplPtr pi( new detail::PackageImpl(_name,_edition,_arch) );

diff --git a/zypp/Arch.cc b/zypp/Arch.cc
new file mode 100644 (file)
index 0000000..5c0141c
--- /dev/null
+++ b/zypp/Arch.cc
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file zypp/Arch.cc
+ *
+*/
+#include <iostream>
+
+#include "zypp/Arch.h"
+
+using namespace std;
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   METHOD NAME : Arch::Arch
+  //   METHOD TYPE : Ctor
+  //
+  Arch::Arch()
+  {}
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   METHOD NAME : Arch::Arch
+  //   METHOD TYPE : Ctor
+  //
+  Arch::Arch( const std::string & rhs )
+  : base::StringVal( rhs )
+  {}
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   METHOD NAME : Arch::Arch
+  //   METHOD TYPE : Ctor
+  //
+  Arch::Arch( const Arch & rhs )
+  : base::StringVal( rhs )
+  {}
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   METHOD NAME : Arch::~Arch
+  //   METHOD TYPE : Dtor
+  //
+  Arch::~Arch()
+  {}
+
+  /////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////

diff --git a/zypp/Arch.h b/zypp/Arch.h
new file mode 100644 (file)
index 0000000..e17aad5
--- /dev/null
+++ b/zypp/Arch.h
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file zypp/Arch.h
+ *
+*/
+#ifndef ZYPP_ARCH_H
+#define ZYPP_ARCH_H
+
+#include <iosfwd>
+
+#include "zypp/base/StringVal.h"
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   CLASS NAME : Arch
+  //
+  /** */
+  class Arch : public base::StringVal
+  {
+  public:
+    /** Default ctor */
+    Arch();
+    /** */
+    explicit
+    Arch( const std::string & rhs );
+    /** */
+    Arch( const Arch & rhs );
+    /** Dtor */
+    ~Arch();
+  };
+  ///////////////////////////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////
+#endif // ZYPP_ARCH_H

diff --git a/zypp/Edition.cc b/zypp/Edition.cc
new file mode 100644 (file)
index 0000000..8fa1914
--- /dev/null
+++ b/zypp/Edition.cc
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file zypp/Edition.cc
+ *
+*/
+#include <iostream>
+
+#include "zypp/base/Logger.h"
+#include "zypp/Edition.h"
+
+using namespace std;
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   CLASS NAME : Edition::Impl
+  //
+  /** Edition implementation */
+  struct Edition::Impl
+  {
+    /** Default ctor*/
+    Impl()
+    : _epoch( 0 )
+    {}
+
+    Impl( const std::string & version_r,
+          const std::string & release_r,
+          epoch_t epoch_r )
+    : _epoch( epoch_r )
+    , _version( version_r )
+    , _release( release_r )
+    {}
+
+    /** Dtor */
+    ~Impl()
+    {}
+
+    epoch_t      _epoch;
+    std::string _version;
+    std::string _release;
+  };
+  ///////////////////////////////////////////////////////////////////
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   CLASS NAME : Edition
+  //
+  ///////////////////////////////////////////////////////////////////
+
+  Edition::Edition()
+  : _pimpl( new Impl )
+  {}
+
+  Edition::Edition( const std::string & version_r,
+                    const std::string & release_r,
+                    epoch_t epoch_r )
+  : _pimpl( new Impl( version_r, release_r, epoch_r ) )
+  {}
+
+  Edition::~Edition()
+  {}
+
+  Edition::epoch_t Edition::epoch() const
+  { return _pimpl->_epoch; }
+
+  const std::string & Edition::version() const
+  { return _pimpl->_version; }
+
+  const std::string & Edition::release() const
+  { return _pimpl->_release; }
+
+  /******************************************************************
+  **
+  **   FUNCTION NAME : operator<<
+  **   FUNCTION TYPE : std::ostream &
+  */
+  std::ostream & operator<<( std::ostream & str, const Edition & obj )
+  {
+    return str << obj.version() << '-' << obj.release();
+  }
+
+  /////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////

diff --git a/zypp/Edition.h b/zypp/Edition.h
new file mode 100644 (file)
index 0000000..57fb66f
--- /dev/null
+++ b/zypp/Edition.h
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file zypp/Edition.h
+ *
+*/
+#ifndef ZYPP_EDITION_H
+#define ZYPP_EDITION_H
+
+#include <iosfwd>
+#include <string>
+
+#include "zypp/base/PtrTypes.h"
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   CLASS NAME : Edition
+  //
+  /** */
+  class Edition
+  {
+  public:
+    typedef unsigned epoch_t;
+  public:
+    /** Default ctor */
+    Edition();
+    /** */
+    Edition( const std::string & version_r,
+             const std::string & release_r,
+             epoch_t epoch = 0 );
+    /** Dtor */
+    ~Edition();
+  public:
+    /** */
+    epoch_t epoch() const;
+    /** */
+    const std::string & version() const;
+    /** */
+    const std::string & release() const;
+  private:
+    /** Hides implementation */
+    struct Impl;
+    /** Pointer to implementation */
+    base::shared_ptr<Impl> _pimpl;
+  };
+  ///////////////////////////////////////////////////////////////////
+
+  /** \relates ResEdition Stream output */
+  extern std::ostream & operator<<( std::ostream & str, const Edition & obj );
+
+  /////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////
+#endif // ZYPP_EDITION_H

diff --git a/zypp/Makefile.am b/zypp/Makefile.am
index a7f87c89af02260ada1bb0897de2d49e54f3e8cd..a1c666a805f54a6fff55518ca2dc7f564fd8f422 100644 (file)
--- a/zypp/Makefile.am
+++ b/zypp/Makefile.am
@@ -6,10 +6,10 @@ SUBDIRS = base detail
 ## ##################################################
 
 include_HEADERS = \
+       Arch.h          \
+       Edition.h       \
        ResKind.h       \
        ResName.h       \
-       ResArch.h       \
-       ResEdition.h    \
        Resolvable.h    \
        Package.h       \
        Selection.h
@@ -21,10 +21,10 @@ lib_LTLIBRARIES =   lib@PACKAGE@.la
 ## ##################################################
 
 lib@PACKAGE@_la_SOURCES = \
+       Arch.cc         \
+       Edition.cc      \
        ResKind.cc      \
        ResName.cc      \
-       ResArch.cc      \
-       ResEdition.cc   \
        Resolvable.cc   \
        Package.cc      \
        Selection.cc

diff --git a/zypp/ResArch.cc b/zypp/ResArch.cc
deleted file mode 100644 (file)
index eeea70c..0000000
--- a/zypp/ResArch.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file zypp/ResArch.cc
- *
-*/
-#include <iostream>
-
-#include "zypp/ResArch.h"
-
-using namespace std;
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : ResArch::ResArch
-  //   METHOD TYPE : Ctor
-  //
-  ResArch::ResArch()
-  {}
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : ResArch::ResArch
-  //   METHOD TYPE : Ctor
-  //
-  ResArch::ResArch( const std::string & rhs )
-  : base::StringVal( rhs )
-  {}
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : ResArch::ResArch
-  //   METHOD TYPE : Ctor
-  //
-  ResArch::ResArch( const ResArch & rhs )
-  : base::StringVal( rhs )
-  {}
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : ResArch::~ResArch
-  //   METHOD TYPE : Dtor
-  //
-  ResArch::~ResArch()
-  {}
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////

diff --git a/zypp/ResArch.h b/zypp/ResArch.h
deleted file mode 100644 (file)
index 9716ce2..0000000
--- a/zypp/ResArch.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file zypp/ResArch.h
- *
-*/
-#ifndef ZYPP_RESARCH_H
-#define ZYPP_RESARCH_H
-
-#include <iosfwd>
-
-#include "zypp/base/StringVal.h"
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   CLASS NAME : ResArch
-  //
-  /** */
-  class ResArch : public base::StringVal
-  {
-  public:
-    /** Default ctor */
-    ResArch();
-    /** */
-    explicit
-    ResArch( const std::string & rhs );
-    /** */
-    ResArch( const ResArch & rhs );
-    /** Dtor */
-    ~ResArch();
-  };
-  ///////////////////////////////////////////////////////////////////
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////
-#endif // ZYPP_RESARCH_H

diff --git a/zypp/ResEdition.cc b/zypp/ResEdition.cc
deleted file mode 100644 (file)
index 2e907db..0000000
--- a/zypp/ResEdition.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file zypp/ResEdition.cc
- *
-*/
-#include <iostream>
-
-#include "zypp/base/Logger.h"
-#include "zypp/ResEdition.h"
-
-using namespace std;
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   CLASS NAME : ResEdition::Impl
-  //
-  /** ResEdition implementation */
-  struct ResEdition::Impl
-  {
-    /** Default ctor*/
-    Impl()
-    : _epoch( 0 )
-    {}
-
-    Impl( const std::string & version_r,
-          const std::string & release_r,
-          epoch_t epoch_r )
-    : _epoch( epoch_r )
-    , _version( version_r )
-    , _release( release_r )
-    {}
-
-    /** Dtor */
-    ~Impl()
-    {}
-
-    epoch_t      _epoch;
-    std::string _version;
-    std::string _release;
-  };
-  ///////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   CLASS NAME : ResEdition
-  //
-  ///////////////////////////////////////////////////////////////////
-
-  ResEdition::ResEdition()
-  : _pimpl( new Impl )
-  {}
-
-  ResEdition::ResEdition( const std::string & version_r,
-                          const std::string & release_r,
-                          epoch_t epoch_r )
-  : _pimpl( new Impl( version_r, release_r, epoch_r ) )
-  {}
-
-  ResEdition::~ResEdition()
-  {}
-
-  ResEdition::epoch_t ResEdition::epoch() const
-  { return _pimpl->_epoch; }
-
-  const std::string & ResEdition::version() const
-  { return _pimpl->_version; }
-
-  const std::string & ResEdition::release() const
-  { return _pimpl->_release; }
-
-  /******************************************************************
-  **
-  **   FUNCTION NAME : operator<<
-  **   FUNCTION TYPE : std::ostream &
-  */
-  std::ostream & operator<<( std::ostream & str, const ResEdition & obj )
-  {
-    return str << obj.version() << '-' << obj.release();
-  }
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////

diff --git a/zypp/ResEdition.h b/zypp/ResEdition.h
deleted file mode 100644 (file)
index 4cb006e..0000000
--- a/zypp/ResEdition.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file zypp/ResEdition.h
- *
-*/
-#ifndef ZYPP_RESEDITION_H
-#define ZYPP_RESEDITION_H
-
-#include <iosfwd>
-#include <string>
-
-#include "zypp/base/PtrTypes.h"
-
-///////////////////////////////////////////////////////////////////
-namespace zypp
-{ /////////////////////////////////////////////////////////////////
-
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   CLASS NAME : ResEdition
-  //
-  /** */
-  class ResEdition
-  {
-  public:
-    typedef unsigned epoch_t;
-  public:
-    /** Default ctor */
-    ResEdition();
-    /** */
-    ResEdition( const std::string & version_r,
-                const std::string & release_r,
-                epoch_t epoch = 0 );
-    /** Dtor */
-    ~ResEdition();
-  public:
-    /** */
-    epoch_t epoch() const;
-    /** */
-    const std::string & version() const;
-    /** */
-    const std::string & release() const;
-  private:
-    /** Hides implementation */
-    struct Impl;
-    /** Pointer to implementation */
-    base::shared_ptr<Impl> _pimpl;
-  };
-  ///////////////////////////////////////////////////////////////////
-
-  /** \relates ResEdition Stream output */
-  extern std::ostream & operator<<( std::ostream & str, const ResEdition & obj );
-
-  /////////////////////////////////////////////////////////////////
-} // namespace zypp
-///////////////////////////////////////////////////////////////////
-#endif // ZYPP_RESEDITION_H

diff --git a/zypp/Resolvable.cc b/zypp/Resolvable.cc
index 0832a8320e79d4047414e382be23a8e3970840a4..4d9ce3bd4c122a75e65f221eeb6127960df25eba 100644 (file)
--- a/zypp/Resolvable.cc
+++ b/zypp/Resolvable.cc
@@ -43,10 +43,10 @@ namespace zypp
   const ResName & Resolvable::name() const
   { return _pimpl->name(); }
 
-  const ResEdition & Resolvable::edition() const
+  const Edition & Resolvable::edition() const
   { return _pimpl->edition(); }
 
-  const ResArch & Resolvable::arch() const
+  const Arch & Resolvable::arch() const
   { return _pimpl->arch(); }
 
   ///////////////////////////////////////////////////////////////////

diff --git a/zypp/Resolvable.h b/zypp/Resolvable.h
index 4e0b5e98e1ab74ce7ad38a4f1a7abd72d5f9a546..db794833f09bb1c0215ef7f06ae08cc34108892e 100644 (file)
--- a/zypp/Resolvable.h
+++ b/zypp/Resolvable.h
@@ -31,8 +31,8 @@ namespace zypp
 
   class ResKind;
   class ResName;
-  class ResEdition;
-  class ResArch;
+  class Edition;
+  class Arch;
 
   ///////////////////////////////////////////////////////////////////
   //
@@ -53,9 +53,9 @@ namespace zypp
     /**  */
     const ResName & name() const;
     /**  */
-    const ResEdition & edition() const;
+    const Edition & edition() const;
     /**  */
-    const ResArch & arch() const;
+    const Arch & arch() const;
 
   private:
     /** Pointer to implementation */

diff --git a/zypp/detail/PackageImpl.cc b/zypp/detail/PackageImpl.cc
index d73e2a7743ef50bbbf86f1a5e39f0d93158d73b4..e5c79fcfea67a8205768f0e989fec77cdbcff7db 100644 (file)
--- a/zypp/detail/PackageImpl.cc
+++ b/zypp/detail/PackageImpl.cc
@@ -28,8 +28,8 @@ namespace zypp
     // METHOD TYPE : Ctor
     //
     PackageImpl::PackageImpl( const ResName & name_r,
-                              const ResEdition & edition_r,
-                              const ResArch & arch_r )
+                              const Edition & edition_r,
+                              const Arch & arch_r )
     : ResolvableImpl( ResKind("package"), name_r, edition_r, arch_r )
     {}
 

diff --git a/zypp/detail/PackageImpl.h b/zypp/detail/PackageImpl.h
index e644fe7d30988498495c782535f3525d04f79bd1..1c25280525e4bec5a4a5335aed3994575c6b631d 100644 (file)
--- a/zypp/detail/PackageImpl.h
+++ b/zypp/detail/PackageImpl.h
@@ -34,8 +34,8 @@ namespace zypp
     public:
       /** */
       PackageImpl( const ResName & name_r,
-                   const ResEdition & edition_r,
-                   const ResArch & arch_r );
+                   const Edition & edition_r,
+                   const Arch & arch_r );
       /** Dtor */
       virtual ~PackageImpl();
 

diff --git a/zypp/detail/ResolvableImpl.cc b/zypp/detail/ResolvableImpl.cc
index 1452369071250e29d7868b407afb751de8ed1418..47b1921c4dd60c9d8295bdc39750f389491170af 100644 (file)
--- a/zypp/detail/ResolvableImpl.cc
+++ b/zypp/detail/ResolvableImpl.cc
@@ -29,8 +29,8 @@ namespace zypp
     //
     ResolvableImpl::ResolvableImpl( const ResKind & kind_r,
                                     const ResName & name_r,
-                                    const ResEdition & edition_r,
-                                    const ResArch & arch_r )
+                                    const Edition & edition_r,
+                                    const Arch & arch_r )
     : _kind( kind_r )
     , _name( name_r )
     , _edition( edition_r )

diff --git a/zypp/detail/ResolvableImpl.h b/zypp/detail/ResolvableImpl.h
index de1f76a7a675138bd160bdbf617b38c9b06cb1fd..63c5d3961011d63a6b4306264f20ab5c92e85df4 100644 (file)
--- a/zypp/detail/ResolvableImpl.h
+++ b/zypp/detail/ResolvableImpl.h
@@ -17,8 +17,8 @@
 
 #include "zypp/ResKind.h"
 #include "zypp/ResName.h"
-#include "zypp/ResEdition.h"
-#include "zypp/ResArch.h"
+#include "zypp/Edition.h"
+#include "zypp/Arch.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
@@ -39,8 +39,8 @@ namespace zypp
       /** ctor */
       ResolvableImpl( const ResKind & kind_r,
                       const ResName & name_r,
-                      const ResEdition & edition_r,
-                      const ResArch & arch_r );
+                      const Edition & edition_r,
+                      const Arch & arch_r );
       /** Dtor */
       virtual ~ResolvableImpl();
 
@@ -52,10 +52,10 @@ namespace zypp
       const ResName & name() const
       { return _name; }
       /**  */
-      const ResEdition & edition() const
+      const Edition & edition() const
       { return _edition; }
       /**  */
-      const ResArch & arch() const
+      const Arch & arch() const
       { return _arch; }
 
     private:
@@ -64,9 +64,9 @@ namespace zypp
       /**  */
       ResName    _name;
       /**  */
-      ResEdition _edition;
+      Edition _edition;
       /**  */
-      ResArch    _arch;
+      Arch    _arch;
     };
     ///////////////////////////////////////////////////////////////////
 

diff --git a/zypp/detail/SelectionImpl.cc b/zypp/detail/SelectionImpl.cc
index 73dc0e91d24a859c42ca4ebf5e179ef6cd06d023..5744ebf4a662f557db64c463332319908290847b 100644 (file)
--- a/zypp/detail/SelectionImpl.cc
+++ b/zypp/detail/SelectionImpl.cc
@@ -28,8 +28,8 @@ namespace zypp
     // METHOD TYPE : Ctor
     //
     SelectionImpl::SelectionImpl( const ResName & name_r,
-                                  const ResEdition & edition_r,
-                                  const ResArch & arch_r )
+                                  const Edition & edition_r,
+                                  const Arch & arch_r )
     : ResolvableImpl( ResKind("selection"), name_r, edition_r, arch_r )
     {}
 

diff --git a/zypp/detail/SelectionImpl.h b/zypp/detail/SelectionImpl.h
index d2b48388093cf6c753b3ab0db1c59632ea9053bb..cdc20b1467965365a9d4b8bf3caecd1be75909e7 100644 (file)
--- a/zypp/detail/SelectionImpl.h
+++ b/zypp/detail/SelectionImpl.h
@@ -34,8 +34,8 @@ namespace zypp
     public:
       /** */
       SelectionImpl( const ResName & name_r,
-                     const ResEdition & edition_r,
-                     const ResArch & arch_r );
+                     const Edition & edition_r,
+                     const Arch & arch_r );
       /** Dtor */
       virtual ~SelectionImpl();