Imported Upstream version 14.45.0

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

diff --git a/zypp/RepoInfo.h b/zypp/RepoInfo.h
index 70a47e3..7ddcc7c 100644 (file)
--- a/zypp/RepoInfo.h
+++ b/zypp/RepoInfo.h
@@ -85,10 +85,6 @@ namespace zypp
        */
       static unsigned defaultPriority();
       /**
-       * The least priority (<tt>unsigned(-1)</tt>). 
-       */
-      static unsigned noPriority();
-      /**
        * Repository priority for solver.
        * Some number between \c 1 (highest priority) and \c 99 (\ref defaultPriority).
        */
@@ -204,10 +200,6 @@ namespace zypp
        * \param url The base url for the list
        */
       void setMirrorListUrl( const Url &url );
-      /**
-       * Like \ref setMirrorListUrl but expect metalink format.
-       */
-      void setMetalinkUrl( const Url &url );
 
       /**
        * Type of repository,
@@ -347,42 +339,38 @@ namespace zypp
        */
       void setTargetDistribution(const std::string & targetDistribution);
 
-
-      /** Content keywords defined. */
-      const std::set<std::string> & contentKeywords() const;
-
       /** Add content keywords */
       void addContent( const std::string & keyword_r );
       /** \overload add keywords from container */
-      template <class TIterator>
-      void addContentFrom( TIterator begin_r, TIterator end_r )
+      template <class _Iterator>
+      void addContentFrom( _Iterator begin_r, _Iterator end_r )
       { for_( it, begin_r, end_r ) addContent( *it ); }
       /** \overload  */
-      template <class TContainer>
-      void addContentFrom( const TContainer & container_r )
+      template <class _Container>
+      void addContentFrom( const _Container & container_r )
       { addContentFrom( container_r.begin(), container_r.end() ); }
 
       /** Check for content keywords.
-       * They may be missing due to missing metadata in disabled repos.
+       * Checking for an empty string returns whether content kewords are
+       * known at all. They may be missing due to missing metadata in disabled
+       * repos.
        */
-      bool hasContent() const;
-      /** \overload check for a keywords being present */
-      bool hasContent( const std::string & keyword_r ) const;
+      bool hasContent( const std::string & keyword_r = std::string() ) const;
       /** \overload check for \b all keywords being present */
-      template <class TIterator>
-      bool hasContentAll( TIterator begin_r, TIterator end_r ) const
+      template <class _Iterator>
+      bool hasContentAll( _Iterator begin_r, _Iterator end_r ) const
       { for_( it, begin_r, end_r ) if ( ! hasContent( *it ) ) return false; return true; }
       /** \overload  */
-      template <class TContainer>
-      bool hasContentAll( const TContainer & container_r ) const
+      template <class _Container>
+      bool hasContentAll( const _Container & container_r ) const
       { return hasContentAll( container_r.begin(), container_r.end() ); }
       /** \overload check for \b any keyword being present */
-      template <class TIterator>
-      bool hasContentAny( TIterator begin_r, TIterator end_r ) const
+      template <class _Iterator>
+      bool hasContentAny( _Iterator begin_r, _Iterator end_r ) const
       { for_( it, begin_r, end_r ) if ( hasContent( *it ) ) return true; return false; }
       /** \overload  */
-      template <class TContainer>
-      bool hasContentAny( const TContainer & container_r ) const
+      template <class _Container>
+      bool hasContentAny( const _Container & container_r ) const
       { return hasContentAny( container_r.begin(), container_r.end() ); }
 
     public: