Author: matz
Date: Thu Oct 18 11:59:07 2007
New Revision: 7556
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7556&view=rev
Log:
Okay, the fun starts. Breaking compilation all over by transitioning
everything we can from strings to pool IDs. Start with Edition, then
we'll fix all breakage.
So this is the interface to Edition as it's supposed to be.
Modified:
branches/use-solv/libzypp/zypp/Edition.h
Modified: branches/use-solv/libzypp/zypp/Edition.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/Edition.h?rev=7556&r1=7555&r2=7556&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/Edition.h (original)
+++ branches/use-solv/libzypp/zypp/Edition.h Thu Oct 18 11:59:07 2007
@@ -21,6 +21,8 @@
#include "zypp/RelCompare.h"
#include "zypp/Range.h"
+#include "source_solv.h"
+
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
@@ -68,11 +70,6 @@
class Edition
{
public:
- /** Type of an epoch. */
- typedef unsigned epoch_t;
-
- /** Value representing \c noepoch. */
- static const epoch_t noepoch = 0;
/** Value representing \c noedition.
* This is in fact a valid Edition. It's what the default ctor
@@ -84,39 +81,12 @@
/** Default ctor: \ref noedition. */
Edition();
- /** Ctor taking edition as string.
- * \throw INTERNAL if \a edition_r does not make a valid Edition.
- */
- Edition( const std::string & edition_r );
-
- /** Ctor taking \a version_r, \a release_r and optional \a epoch_r
- * \throw INTERNAL if \a version_r or \a release_r are not valid.
- */
- Edition( const std::string & version_r,
- const std::string & release_r,
- epoch_t epoch_r = noepoch );
-
- /** Ctor taking \a version_r, \a release_r and optional \a epoch_r as string.
- * \throw INTERNAL if \a version_r or \a release_r \a epoch_r are
- * not valid.
- */
- Edition( const std::string & version_r,
- const std::string & release_r,
- const std::string & epoch_r );
+ Edition(Id);
/** Dtor */
~Edition();
public:
- /** Epoch */
- epoch_t epoch() const;
-
- /** Version */
- const std::string & version() const;
-
- /** Release */
- const std::string & release() const;
-
/** String representation of Edition. */
std::string asString() const;
@@ -170,10 +140,7 @@
typedef Range