Mailinglist Archive: zypp-commit (606 mails)

< Previous Next >
[zypp-commit] r9390 - in /trunk/libzypp: tests/zypp/PoolQuery_test.cc zypp/CMakeLists.txt zypp/PoolQuery.h zypp/PoolQueryUtil.tcc
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Fri, 04 Apr 2008 20:12:44 -0000
  • Message-id: <20080404201244.A727A342B8@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Fri Apr 4 22:12:44 2008
New Revision: 9390

URL: http://svn.opensuse.org/viewcvs/zypp?rev=9390&view=rev
Log:
fixed include guards and reamed internal includes

Added:
trunk/libzypp/zypp/PoolQueryUtil.tcc
- copied, changed from r9385, trunk/libzypp/zypp/PoolQueryUtil.h
Modified:
trunk/libzypp/tests/zypp/PoolQuery_test.cc
trunk/libzypp/zypp/CMakeLists.txt
trunk/libzypp/zypp/PoolQuery.h

Modified: trunk/libzypp/tests/zypp/PoolQuery_test.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/PoolQuery_test.cc?rev=9390&r1=9389&r2=9390&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/PoolQuery_test.cc (original)
+++ trunk/libzypp/tests/zypp/PoolQuery_test.cc Fri Apr 4 22:12:44 2008
@@ -6,7 +6,7 @@

#include "zypp/ZYppFactory.h"
#include "zypp/PoolQuery.h"
-#include "zypp/PoolQueryUtil.h"
+#include "zypp/PoolQueryUtil.tcc"
#include "zypp/TmpPath.h"

#define BOOST_TEST_MODULE PoolQuery

Modified: trunk/libzypp/zypp/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=9390&r1=9389&r2=9390&view=diff
==============================================================================
--- trunk/libzypp/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/zypp/CMakeLists.txt Fri Apr 4 22:12:44 2008
@@ -134,6 +134,7 @@
Pattern.h
PoolItem.h
PoolQuery.h
+ PoolQueryUtil.tcc
ProblemSolution.h
ProblemTypes.h
Product.h

Modified: trunk/libzypp/zypp/PoolQuery.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.h?rev=9390&r1=9389&r2=9390&view=diff
==============================================================================
--- trunk/libzypp/zypp/PoolQuery.h (original)
+++ trunk/libzypp/zypp/PoolQuery.h Fri Apr 4 22:12:44 2008
@@ -6,11 +6,11 @@
| /_____||_| |_| |_| |
| |
\---------------------------------------------------------------------*/
-/** \file zypp/ui/PoolQuery.h
+/** \file zypp/PoolQuery.h
*
*/
-#ifndef QUERY_H_
-#define QUERY_H_
+#ifndef ZYPP_POOLQUERY_H
+#define ZYPP_POOLQUERY_H

#include "zypp/ui/Selectable.h"
#include "zypp/sat/SolvAttr.h"
@@ -24,13 +24,13 @@

/**
* Meta-data query API for user interfaces.
- *
+ *
* TODO: details, examples.
*/
class PoolQuery
{
public:
-
+
//typedef SelectableSet::iterator ResultIterator;
//typedef constSelectableSet::iterator constResultIterator;

@@ -50,10 +50,10 @@

/**
* Filter by selectable kind.
- *
+ *
* By default, all kinds will be returned. If addKind() is used,
* only the specified kinds will be returned (multiple kinds will be ORed).
- *
+ *
* Pass ResTraits<T>::kind to this method, where T is one of the
* \ref Resolvable child classes (e.g. ResTraits<Pattern>::kind).
*/
@@ -62,7 +62,7 @@

/**
* Filter by repo.
- *
+ *
* By default, all repos will be returned. If addRepo() is used,
* only the specified repo will be returned (multiple repos will be ORed).
*/
@@ -70,7 +70,7 @@

/**
* Filter by selectable name.
- *
+ *
* \param name what to search for
* \param isRegex is the value a regex?
*/
@@ -90,10 +90,10 @@

/**
* Filter by the \a value of any available attribute of selectables.
- *
+ *
* \note Selectables of a kind not supporting the specified attribute will
* <b>not</b> be returned.
- *
+ *
* \param attrid attribute identfier (sat::SolvAttr or cache::Attribute
* or something implementation independent)
* \param value what to search for
@@ -105,13 +105,13 @@

/**
* Filter by Selectable status.
- *
+ *
* This should cover also plain 'is installed' and 'not installed'
statuses.
*
* \param status Selectable status (zypp::ui::Status enum)
*/
//void addStatus(const Status status);
-
+

/**
* Add dependency filter.
@@ -163,24 +163,24 @@

/** selectable iterator over the result */
//ResultIterator resultBegin() const;
- //ResultIterator resultEnd() const;
+ //ResultIterator resultEnd() const;

/** Returns the size of the query result. */
//size_t resultSize() const;

/** Low-cost empty query result checker */
//bool resultEmpty() const;
-
+
// a forEach method consuming a functor can be added here, too

/**
- * Reads from stream query. Attributes is sepated by delim. Query is
+ * Reads from stream query. Attributes is sepated by delim. Query is
* separated by two delim.
- *
+ *
* \param str input stream which contains query
* \param delim delimeter for attributes
* \return true if non-empty query is recovered
- *
+ *
* \see readPoolQueriesFromFile
*/
bool recover( std::istream &str, char delim = '\n' );
@@ -204,8 +204,8 @@



-/////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////

-#endif /*QUERY_H_*/
+#endif // ZYPP_POOLQUERY_H

Copied: trunk/libzypp/zypp/PoolQueryUtil.tcc (from r9385,
trunk/libzypp/zypp/PoolQueryUtil.h)
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryUtil.tcc?p2=trunk/libzypp/zypp/PoolQueryUtil.tcc&p1=trunk/libzypp/zypp/PoolQueryUtil.h&r1=9385&r2=9390&rev=9390&view=diff
==============================================================================
--- trunk/libzypp/zypp/PoolQueryUtil.h (original)
+++ trunk/libzypp/zypp/PoolQueryUtil.tcc Fri Apr 4 22:12:44 2008
@@ -1,12 +1,24 @@
-// including fstream is not hell here because this header only included
-// by implementation file, header doesn't need include it
-// also that's why this file is not protected by IFNDEF (you get it
-// only when you explicitly need it in implementation)
+/*---------------------------------------------------------------------\
+| ____ _ __ __ ___ |
+| |__ / \ / / . \ . \ |
+| / / \ V /| _/ _/ |
+| / /__ | | | | | | |
+| /_____||_| |_| |_| |
+| |
+\---------------------------------------------------------------------*/
+/** \file zypp/PoolQueryUtil.tcc
+ *
+ * including fstream is not hell here because this header only included
+ * by implementation file, header doesn't need include it.
+*/
+#ifndef ZYPP_POOLQUERYUTIL_TCC
+#define ZYPP_POOLQUERYUTIL_TCC
+
#include <fstream>

#include "zypp/Pathname.h"
#include "zypp/PoolQuery.h"
-
+
/**
* sends to output iterator all queries readed from file.
*
@@ -57,3 +69,5 @@

fout.close();
}
+
+#endif // ZYPP_POOLQUERYUTIL_H

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages