Author: jkupec
Date: Tue Apr 8 13:00:20 2008
New Revision: 9450
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9450&view=rev
Log:
- move ResultIterator out and down
Modified:
trunk/libzypp/zypp/PoolQuery.h
Modified: trunk/libzypp/zypp/PoolQuery.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.h?rev=9450&r1=9449&r2=9450&view=diff
==============================================================================
--- trunk/libzypp/zypp/PoolQuery.h (original)
+++ trunk/libzypp/zypp/PoolQuery.h Tue Apr 8 13:00:20 2008
@@ -25,8 +25,11 @@
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////
+ //
+ // CLASS NAME : PoolQuery
+ //
/**
* Meta-data query API. Returns solvables of specified kinds from specified
* repositories with attributes matching the specified search strings.
@@ -42,59 +45,6 @@
typedef std::map CompiledAttrMap;
typedef unsigned int size_type;
- class Impl;
-
- class ResultIterator : public boost::iterator_adaptor<
- ResultIterator // Derived
- , ::_Dataiterator * // Base
- , sat::Solvable // Value
- , boost::forward_traversal_tag // CategoryOrTraversal
- , sat::Solvable // Reference
- >
- {
- public:
- ResultIterator()
- : ResultIterator::iterator_adaptor_(0), _has_next(true),
- _attrs(CompiledAttrMap()), _do_matching(false), _pool((sat::Pool::instance()))
- { _rdit = 0; _sid = 0; }
-
- private:
- friend class boost::iterator_core_access;
- friend class PoolQuery;
-
- ResultIterator(Impl * pqimpl);
-
- sat::Solvable dereference() const
- {
- return _sid ? sat::Solvable(_sid) : sat::Solvable::noSolvable;
- }
-
- void increment();
-
- bool matchSolvable();
-
- template
- bool equal( const boost::iterator_adaptor & rhs ) const
- {
- if (!rhs.base() && !base())
- return true;
- if (!rhs.base() || !base())
- return false;
- /*if (rhs.base()->solvid == base()->solvid)
- return true;*/
- return true;
- }
-
- private:
- ::_Dataiterator * _rdit;
- Impl * _pqimpl;
- /*SolvableId*/ int _sid;
- bool _has_next;
- const CompiledAttrMap & _attrs;
- bool _do_matching;
- sat::Pool _pool;
- };
-
public:
typedef function ProcessResolvable;
@@ -104,6 +54,8 @@
/** Query result accessers. */
//@{
+ class ResultIterator;
+
/** */
ResultIterator begin();
/** */
@@ -308,15 +260,76 @@
*/
void setFlags(int flags);
+ class Impl;
private:
/** Pointer to implementation */
RW_pointer<Impl> _pimpl;
};
-
+ ///////////////////////////////////////////////////////////////////
/** \relates PoolQuery Stream output. */
std::ostream & operator<<( std::ostream & str, const PoolQuery & obj );
+ ///////////////////////////////////////////////////////////////////
+ //
+ // CLASS NAME : PoolQuery::ResultIterator
+ //
+ /**
+ *
+ */
+ class PoolQuery::ResultIterator : public boost::iterator_adaptor<
+ ResultIterator // Derived
+ , ::_Dataiterator * // Base
+ , sat::Solvable // Value
+ , boost::forward_traversal_tag // CategoryOrTraversal
+ , sat::Solvable // Reference
+ >
+ {
+ public:
+ ResultIterator()
+ : ResultIterator::iterator_adaptor_(0), _has_next(true),
+ _attrs(CompiledAttrMap()), _do_matching(false), _pool((sat::Pool::instance()))
+ { _rdit = 0; _sid = 0; }
+
+ private:
+ friend class boost::iterator_core_access;
+ friend class PoolQuery;
+
+ ResultIterator(Impl * pqimpl);
+
+ sat::Solvable dereference() const
+ {
+ return _sid ? sat::Solvable(_sid) : sat::Solvable::noSolvable;
+ }
+
+ void increment();
+
+ bool matchSolvable();
+
+ template
+ bool equal( const boost::iterator_adaptor & rhs ) const
+ {
+ if (!rhs.base() && !base())
+ return true;
+ if (!rhs.base() || !base())
+ return false;
+ /*if (rhs.base()->solvid == base()->solvid)
+ return true;*/
+ return true;
+ }
+
+ private:
+ //! \todo clean up this mess
+ ::_Dataiterator * _rdit;
+ PoolQuery::Impl * _pqimpl;
+ /*SolvableId*/ int _sid;
+ bool _has_next;
+ const CompiledAttrMap & _attrs;
+ bool _do_matching;
+ sat::Pool _pool;
+ };
+ ///////////////////////////////////////////////////////////////////
+
/////////////////////////////////////////////////////////////////
} // namespace zypp
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
