- Changed susetags Selection/Pattern to use Locale instead of

  LanguageCode.

diff --git a/zypp/LanguageCode.cc b/zypp/LanguageCode.cc
index d8debe37194b1bf1413779792a830c62fb6812bf..fbdc275ac2544a734f9279e466b0a9798e985a0d 100644 (file)
--- a/zypp/LanguageCode.cc
+++ b/zypp/LanguageCode.cc
@@ -93,8 +93,6 @@ namespace zypp
       if ( it != others.end() )
         return it;
 
-#warning Support sub-locales like el_GR
-
       // not found: Remember a new code
       CodeMap::value_type nval( code_r, std::string() );
 

diff --git a/zypp/detail/SelectionImplIf.h b/zypp/detail/SelectionImplIf.h
index a3dcef1a847086cca38432b5a4d87d4b2025facc..ae36e02ad43b680e7a1bef3a713b9b9a8c4feea7 100644 (file)
--- a/zypp/detail/SelectionImplIf.h
+++ b/zypp/detail/SelectionImplIf.h
@@ -36,30 +36,24 @@ namespace zypp
     public:
       typedef Selection ResType;
 
-    public:
-      /** Ctor */
-      SelectionImplIf() : ResObjectImplIf ()
-      {}
-      /** Dtor. Makes this an abstract class. */
-      virtual ~SelectionImplIf() = 0;
-
     public:
 
         /** */
-        virtual TranslatedText summary() const = 0;
+        virtual TranslatedText summary() const PURE_VIRTUAL;
 
         /** */
-        virtual TranslatedText description() const = 0;
+        virtual TranslatedText description() const PURE_VIRTUAL;
 
         /** */
-       virtual Label category() const = 0;
+       virtual Label category() const PURE_VIRTUAL;
 
         /** */
-       virtual bool visible() const = 0;
-    
+       virtual bool visible() const PURE_VIRTUAL;
+
         /** */
-       virtual Label order() const = 0;
+       virtual Label order() const PURE_VIRTUAL;
 #if 0
+        // NOTE LangCode id zypp:Locale
       virtual std::list<std::string> suggests() const;
       virtual std::list<std::string> recommends() const;
       virtual std::list<std::string> insnotify( const LangCode & lang = LangCode("") ) const;
@@ -83,11 +77,6 @@ namespace zypp
     };
     ///////////////////////////////////////////////////////////////////
 
-    /* Implementation of pure virtual dtor is required! */
-    inline SelectionImplIf::~SelectionImplIf()
-    {}
-
-
     /////////////////////////////////////////////////////////////////
   } // namespace detail
   ///////////////////////////////////////////////////////////////////

diff --git a/zypp/source/susetags/PatternTagFileParser.cc b/zypp/source/susetags/PatternTagFileParser.cc
index 4483749de4c93d0ce06811a7a21fceda6aa48276..2462f4795cc4274918baa08bf5e70e9235d1d1a1 100644 (file)
--- a/zypp/source/susetags/PatternTagFileParser.cc
+++ b/zypp/source/susetags/PatternTagFileParser.cc
@@ -57,7 +57,7 @@ namespace zypp
       {
         if ( tag.name == "Sum" )
         {
-          selImpl->_summary.setText(tag.value, LanguageCode(tag.modifier));
+          selImpl->_summary.setText(tag.value, Locale(tag.modifier));
         }
         else if ( tag.name == "Ver" )
         {
@@ -87,7 +87,7 @@ namespace zypp
           selImpl->_order = tag.value;
         }
       }
-      
+
       void PatternTagFileParser::consume( const MultiTag &tag )
       {
         if ( tag.name == "Req" )

diff --git a/zypp/source/susetags/SelectionTagFileParser.cc b/zypp/source/susetags/SelectionTagFileParser.cc
index 2505300c4a25294af737fe31dc3d98987d3d01d2..78b141df4330878b79102c0fcebe5458aa85d9b7 100644 (file)
--- a/zypp/source/susetags/SelectionTagFileParser.cc
+++ b/zypp/source/susetags/SelectionTagFileParser.cc
@@ -57,7 +57,7 @@ namespace zypp
       {
        if ( tag.name == "Sum" )
        {
-         selImpl->_summary.setText(tag.value, LanguageCode(tag.modifier));
+         selImpl->_summary.setText(tag.value, Locale(tag.modifier));
        }
        else if ( tag.name == "Ver" )
        {
@@ -87,7 +87,7 @@ namespace zypp
          selImpl->_order = tag.value;
        }
       }
-      
+
       void SelectionTagFileParser::consume( const MultiTag &tag )
       {
        if ( tag.name == "Req" )
@@ -112,7 +112,7 @@ namespace zypp
        }
        else if ( tag.name == "Ins" )
        {
-         selImpl->_inspacks[LanguageCode(tag.modifier)] = tag.values;
+         selImpl->_inspacks[Locale(tag.modifier)] = tag.values;
        }
       }
 
@@ -122,12 +122,12 @@ namespace zypp
        CapFactory _f;
        Dependencies _deps;
 
-       for (std::list<std::string>::const_iterator it = selImpl->_inspacks[LanguageCode()].begin(); it != selImpl->_inspacks[LanguageCode()].end(); it++)
+       for (std::list<std::string>::const_iterator it = selImpl->_inspacks[Locale()].begin(); it != selImpl->_inspacks[Locale()].end(); it++)
        {
          Capability _cap = _f.parse( ResTraits<Package>::kind, *it);
          _deps[Dep::RECOMMENDS].insert(_cap);
        }
-       
+
        for (std::list<std::string>::const_iterator it = selImpl->_recommends.begin(); it != selImpl->_recommends.end(); it++)
        {
          Capability _cap = _f.parse( ResTraits<Selection>::kind, *it );

diff --git a/zypp/source/susetags/SuseTagsPatternImpl.h b/zypp/source/susetags/SuseTagsPatternImpl.h
index 5214e177e79836a25137b02008dec9437d5671f0..a7fb732e0c868b9bd4d3a19dfd4c53714d1f44aa 100644 (file)
--- a/zypp/source/susetags/SuseTagsPatternImpl.h
+++ b/zypp/source/susetags/SuseTagsPatternImpl.h
@@ -83,9 +83,9 @@ namespace zypp
       std::list<std::string> _pkgrecommends;
       std::list<std::string> _pkgrequires;
       std::list<std::string> _supported_locales;
-      std::map< LanguageCode, std::list<std::string> > _insnotify;
-      std::map< LanguageCode, std::list<std::string> > _delnotify;
-      
+      std::map< Locale, std::list<std::string> > _insnotify;
+      std::map< Locale, std::list<std::string> > _delnotify;
+
     };
     ///////////////////////////////////////////////////////////////////
 

diff --git a/zypp/source/susetags/SuseTagsSelectionImpl.h b/zypp/source/susetags/SuseTagsSelectionImpl.h
index 47874fb5af8eef1fb5db9f322ede1636d36ae27b..4f65b2274b1d3bb2093b6bd47f7508045e5432ce 100644 (file)
--- a/zypp/source/susetags/SuseTagsSelectionImpl.h
+++ b/zypp/source/susetags/SuseTagsSelectionImpl.h
@@ -80,11 +80,11 @@ namespace zypp
       std::list<std::string> _provides;
       std::list<std::string> _obsoletes;
       std::list<std::string> _supported_locales;
-      std::map< LanguageCode, std::list<std::string> > _insnotify;
-      std::map< LanguageCode, std::list<std::string> > _delnotify;
-      std::map< LanguageCode, std::list<std::string> > _inspacks;
-      std::map< LanguageCode, std::list<std::string> > _delpacks;
-      
+      std::map< Locale, std::list<std::string> > _insnotify;
+      std::map< Locale, std::list<std::string> > _delnotify;
+      std::map< Locale, std::list<std::string> > _inspacks;
+      std::map< Locale, std::list<std::string> > _delpacks;
+
     };
     ///////////////////////////////////////////////////////////////////
 

diff --git a/zypp/ui/ResPoolProxy.h b/zypp/ui/ResPoolProxy.h
index 14b5dccdfa87ec5efaa9ab005e8a7849289ea73d..3d37991ccf486779dd40fc2fae98bbd584872856 100644 (file)
--- a/zypp/ui/ResPoolProxy.h
+++ b/zypp/ui/ResPoolProxy.h
@@ -17,6 +17,7 @@
 #include "zypp/base/PtrTypes.h"
 
 #include "zypp/ResPool.h"
+#include "zypp/ui/Selectable.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp