Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / CountryCode.h

diff --git a/zypp/CountryCode.h b/zypp/CountryCode.h
index 1418e7b..e7e915a 100644 (file)
--- a/zypp/CountryCode.h
+++ b/zypp/CountryCode.h
@@ -15,32 +15,40 @@
 #include <iosfwd>
 #include <string>
 
-#include "zypp/IdStringType.h"
+#include "zypp/base/PtrTypes.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
-{
-  ///////////////////////////////////////////////////////////////////
-  /// \class CountryCode
-  /// \brief Country codes (iso3166-1-alpha-2).
-  ///
-  /// In fact the class will not prevent to use a non iso country code.
-  /// Just a warning will appear in the log.
+{ /////////////////////////////////////////////////////////////////
+
+  class CountryCode;
+  inline bool operator==( const CountryCode & lhs, const CountryCode & rhs );
+  inline bool operator!=( const CountryCode & lhs, const CountryCode & rhs );
+
   ///////////////////////////////////////////////////////////////////
-  class CountryCode : public IdStringType<CountryCode>
+  //
+  //   CLASS NAME : CountryCode
+  //
+  /** Country codes (iso3166-1-alpha-2).
+   *
+   * In fact the class will not prevent to use a non iso country code.
+   * Just a warning will appear in the log.
+  */
+  class CountryCode
   {
-  public:
-    /** Default Ctor: \ref noCode */
-    CountryCode();
+    friend std::ostream & operator<<( std::ostream & str, const CountryCode & obj );
 
-    /** Ctor from string. */
-    explicit CountryCode( IdString str_r );
+  public:
+    /** Implementation  */
+    class Impl;
 
-    /** Ctor from string. */
-    explicit CountryCode( const std::string & str_r );
+  public:
+    /** Default ctor */
+    CountryCode();
 
-    /** Ctor from string. */
-    explicit CountryCode( const char * str_r );
+    /** Ctor taking a string. */
+    explicit
+    CountryCode( const std::string & code_r );
 
     /** Dtor */
     ~CountryCode();
@@ -49,27 +57,72 @@ namespace zypp
 
     /** \name CountryCode constants. */
     //@{
-    /** Empty code. */
+    /** No or empty code. */
     static const CountryCode noCode;
     //@}
 
   public:
-    /** Return the country code asString. */
-    std::string code() const
-    { return std::string(_str); }
+    /** Return the country code. */
+    std::string code() const;
 
-    /** Return the translated country name; if unknown the country code. */
+    /** Return the country name; if not available the country code. */
     std::string name() const;
 
+    /** <tt>*this != noCode</tt>. */
+    bool hasCode() const
+    { return *this != noCode; }
+
   private:
-    friend class IdStringType<CountryCode>;
-    IdString _str;
+    /** Pointer to implementation */
+    RW_pointer<Impl> _pimpl;
   };
+  ///////////////////////////////////////////////////////////////////
+
+  /** \relates CountryCode Stream output */
+  inline std::ostream & operator<<( std::ostream & str, const CountryCode & obj )
+  { return str << obj.code(); }
+
+  /** Comparison based on string value. */
+  //@{
+  /** \relates CountryCode */
+  inline bool operator==( const CountryCode & lhs, const CountryCode & rhs ) {
+    return( lhs.code() == rhs.code() );
+  }
+  /** \relates CountryCode */
+  inline bool operator==( const std::string & lhs, const CountryCode & rhs ) {
+    return( lhs == rhs.code() );
+  }
+  /** \relates CountryCode */
+  inline bool operator==( const CountryCode & lhs, const std::string & rhs ) {
+    return( lhs.code() == rhs );
+  }
+
+  /** \relates CountryCode */
+  inline bool operator!=( const CountryCode & lhs, const CountryCode & rhs ) {
+    return( ! operator==( lhs, rhs ) );
+  }
+  /** \relates CountryCode */
+  inline bool operator!=( const std::string & lhs, const CountryCode & rhs ) {
+    return( ! operator==( lhs, rhs ) );
+  }
+  /** \relates CountryCode */
+  inline bool operator!=( const CountryCode & lhs, const std::string & rhs ) {
+    return( ! operator==( lhs, rhs ) );
+  }
+  //@}
+
+  /////////////////////////////////////////////////////////////////
 } // namespace zypp
 ///////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////
-
-ZYPP_DEFINE_ID_HASHABLE( ::zypp::CountryCode );
-
+namespace std
+{ /////////////////////////////////////////////////////////////////
+  /** \relates zypp::CountryCode Default order for std::container based on code string value.*/
+  template<>
+    inline bool less<zypp::CountryCode>::operator()( const zypp::CountryCode & lhs, const zypp::CountryCode & rhs ) const
+    { return lhs.code() < rhs.code(); }
+  /////////////////////////////////////////////////////////////////
+} // namespace std
+///////////////////////////////////////////////////////////////////
 #endif // ZYPP_COUNTRYCODE_H