Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / ui / Selectable.h

diff --git a/zypp/ui/Selectable.h b/zypp/ui/Selectable.h
index 654d117..3743e96 100644 (file)
--- a/zypp/ui/Selectable.h
+++ b/zypp/ui/Selectable.h
@@ -114,7 +114,7 @@ namespace zypp
       IdString ident() const;
 
       /** The ResObjects kind. */
-      ResKind kind() const;
+      ResObject::Kind kind() const;
 
       /** The ResObjects name.  */
       const std::string & name() const;
@@ -192,9 +192,9 @@ namespace zypp
        *   Package::constPtr p( mySelectable.installedAsKind<Package>() );
        * \endcode
       */
-      template<class TRes>
-      typename ResTraits<TRes>::constPtrType installedAsKind() const
-      { return asKind<TRes>( candidateObj() ); }
+      template<class _Res>
+      typename ResTraits<_Res>::constPtrType installedAsKind() const
+      { return asKind<_Res>( candidateObj() ); }
 
       /** Return the \ref candidateObj resolvable casted to a specific kind.
        * \code
@@ -202,9 +202,9 @@ namespace zypp
        *   Package::constPtr p( mySelectable.candidateAsKind<Package>() );
        * \endcode
       */
-      template<class TRes>
-      typename ResTraits<TRes>::constPtrType candidateAsKind() const
-      { return asKind<TRes>( candidateObj() ); }
+      template<class _Res>
+      typename ResTraits<_Res>::constPtrType candidateAsKind() const
+      { return asKind<_Res>( candidateObj() ); }
 
       /** Set a candidate (out of available objects).
        * \return The new candidate, or NULL if choice was invalid
@@ -243,8 +243,6 @@ namespace zypp
       available_size_type availableSize() const;
       available_iterator availableBegin() const;
       available_iterator availableEnd() const;
-      inline Iterable<available_iterator>  available() const
-      { return makeIterable( availableBegin(), availableEnd() ); }
       //@}
 
       ////////////////////////////////////////////////////////////////////////
@@ -257,9 +255,7 @@ namespace zypp
       installed_size_type installedSize() const;
       installed_iterator installedBegin() const;
       installed_iterator installedEnd() const;
-      inline Iterable<installed_iterator> installed() const
-      { return makeIterable( installedBegin(), installedEnd() ); }
-      //@}
+      //}
 
       ////////////////////////////////////////////////////////////////////////
 
@@ -272,9 +268,7 @@ namespace zypp
       picklist_size_type picklistSize() const;
       picklist_iterator picklistBegin() const;
       picklist_iterator picklistEnd() const;
-      inline Iterable<picklist_iterator> picklist() const
-      { return makeIterable( picklistBegin(), picklistEnd() ); }
-      //@}
+      //}
 
       ////////////////////////////////////////////////////////////////////////
 
@@ -320,9 +314,8 @@ namespace zypp
        * install will deselect any other.
        */
       //@{
-      /** Whether at least one of the available packages has multiversionInstall set.
-       * \see \ref Solvable::multiversionInstall
-       * \see also \ref ZConfig::multiversion.
+      /** Whether different versions of this package can be installed at the same time.
+       * Per default \c false. \see also \ref ZConfig::multiversion.
        */
       bool multiversionInstall() const;