X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zypp%2FGlob.h;h=a96d72c143cb9ca4977fab7df92c6687e6392b33;hb=42b5d038414cf4a4a050e816b471f890b24e8032;hp=c86f7348b7626b9cf66fa48670117bcee72eeb6d;hpb=b61a0ff7e76a542a874714e4ee7753db48f9f8aa;p=platform%2Fupstream%2Flibzypp.git

diff --git a/zypp/Glob.h b/zypp/Glob.h
index c86f734..a96d72c 100644
--- a/zypp/Glob.h
+++ b/zypp/Glob.h
@@ -41,7 +41,7 @@ namespace zypp
     //
     /** Find pathnames matching a pattern.
      * \code
-     * Glob glob( Glob::_BRACE );
+     * Glob glob( Glob::kBrace );
      * glob.add( "/somewhere/solverTestcase/ *{.xml,.xml.gz}" );
      * glob.add( "/somewhere/else/a*" );
      * for_( it, glob.begin(), glob.end() )
@@ -49,7 +49,7 @@ namespace zypp
      * \endcode
      * \code
      * std::list<Pathname> plist;
-     * Glob::collect( "/somewherre/solverTestcase/ *{.xml,.xml.gz}", Glob::_BRACE,
+     * Glob::collect( "/somewherre/solverTestcase/ *{.xml,.xml.gz}", Glob::kBrace,
      *                std::back_inserter( plist ) );
      * \endcode
      * \see Manual page glob(3)
@@ -93,21 +93,21 @@ namespace zypp
       public:
         /** Individual bits to combine in \ref Flags. */
         enum Bits {
-          _ERR		= GLOB_ERR,		//!< Return on read errors.
-          _MARK		= GLOB_MARK,		//!< Append a slash to each name.
-          _NOSORT	= GLOB_NOSORT,		//!< Don't sort the names.
-          // unsupported _DOOFFS = GLOB_DOOFFS,	//!< Insert PGLOB->gl_offs NULLs.
-          _NOCHECK	= GLOB_NOCHECK,		//!< If nothing matches, return the pattern.
-          // autoapplied _APPEND = GLOB_APPEND,	//!< Append to results of a previous call.
-          _NOESCAPE	= GLOB_NOESCAPE,	//!< Backslashes don't quote metacharacters.
-          _PERIOD	= GLOB_PERIOD,		//!< Leading `.' can be matched by metachars.
-          // unsupported _MAGCHAR = GLOB_MAGCHAR,//!< Set in gl_flags if any metachars seen.
-          _ALTDIRFUNC	= GLOB_ALTDIRFUNC,	//!< Use gl_opendir et al functions.
-          _BRACE	= GLOB_BRACE,		//!< Expand "{a,b}" to "a" "b".
-          _NOMAGIC	= GLOB_NOMAGIC,		//!< If no magic chars, return the pattern.
-          _TILDE	= GLOB_TILDE,		//!< Expand ~user and ~ to home directories.
-          _ONLYDIR	= GLOB_ONLYDIR,		//!< Match only directories.
-          _TILDE_CHECK	= GLOB_TILDE_CHECK,	//!< Like GLOB_TILDE but return an error if the user name is not available.
+          kErr		= GLOB_ERR,		//!< Return on read errors.
+          kMark		= GLOB_MARK,		//!< Append a slash to each name.
+          kNoSort	= GLOB_NOSORT,		//!< Don't sort the names.
+          // unsupported kDoOffs = GLOB_DOOFFS,	//!< Insert PGLOB->gl_offs NULLs.
+          kNoCheck	= GLOB_NOCHECK,		//!< If nothing matches, return the pattern.
+          // autoapplied kAppend = GLOB_APPEND,	//!< Append to results of a previous call.
+          kNoEscape	= GLOB_NOESCAPE,	//!< Backslashes don't quote metacharacters.
+          kPeriod	= GLOB_PERIOD,		//!< Leading `.' can be matched by metachars.
+          // unsupported kMagChar = GLOB_MAGCHAR,//!< Set in gl_flags if any metachars seen.
+          kAltDirFunc	= GLOB_ALTDIRFUNC,	//!< Use gl_opendir et al functions.
+          kBrace	= GLOB_BRACE,		//!< Expand "{a,b}" to "a" "b".
+          kNoMagic	= GLOB_NOMAGIC,		//!< If no magic chars, return the pattern.
+          kTilde	= GLOB_TILDE,		//!< Expand ~user and ~ to home directories.
+          kOnlyDir	= GLOB_ONLYDIR,		//!< Match only directories.
+          kTildeCheck	= GLOB_TILDE_CHECK,	//!< Like GLOB_TILDE but return an error if the user name is not available.
         };
 
         /** type Flags: Type-safe OR-combination of \ref Bits. */
@@ -203,43 +203,43 @@ namespace zypp
 
       public:
 
-        /** \name Collecting Glob results to some _OutputIterator
+        /** \name Collecting Glob results to some TOutputIterator
          * \code
          * std::list<Pathname> p;
          * Glob::collect( "/bin/a*.dat}", std::back_inserter(p) );
-         * Glob::collect( "/bin/a*{.xml,.xml.gz}", Glob::_BRACE, std::back_inserter(p) );
+         * Glob::collect( "/bin/a*{.xml,.xml.gz}", Glob::kBrace, std::back_inserter(p) );
          * \endcode
          */
         //@{
         /** Write glob result to some \c OutputIterator. */
-        template<class _OutputIterator>
-        static int collect( const Pathname & pattern_r, _OutputIterator result_r )
+        template<class TOutputIterator>
+        static int collect( const Pathname & pattern_r, TOutputIterator result_r )
         { return collect( pattern_r.c_str(), Flags(), result_r ); }
         /** \overload */
-        template<class _OutputIterator>
-        static int collect( const std::string & pattern_r, _OutputIterator result_r )
+        template<class TOutputIterator>
+        static int collect( const std::string & pattern_r, TOutputIterator result_r )
         { return collect( pattern_r.c_str(), Flags(), result_r ); }
         /** \overload */
-        template<class _OutputIterator>
-        static int collect( const char * pattern_r, _OutputIterator result_r )
+        template<class TOutputIterator>
+        static int collect( const char * pattern_r, TOutputIterator result_r )
         { return collect( pattern_r, Flags(), result_r ); }
 
         /** \overload With \ref Flags */
-        template<class _OutputIterator>
-        static int collect( const Pathname & pattern_r, Flags flags_r, _OutputIterator result_r )
+        template<class TOutputIterator>
+        static int collect( const Pathname & pattern_r, Flags flags_r, TOutputIterator result_r )
         { return collect( pattern_r.c_str(), flags_r, result_r ); }
         /** \overload */
-        template<class _OutputIterator>
-        static int collect( const std::string & pattern_r, Flags flags_r, _OutputIterator result_r )
+        template<class TOutputIterator>
+        static int collect( const std::string & pattern_r, Flags flags_r, TOutputIterator result_r )
         { return collect( pattern_r.c_str(), flags_r, result_r ); }
         /** \overload */
-        template<class _OutputIterator>
-        static int collect( const char * pattern_r, Flags flags_r, _OutputIterator result_r )
+        template<class TOutputIterator>
+        static int collect( const char * pattern_r, Flags flags_r, TOutputIterator result_r )
         {
           Glob glob( pattern_r, flags_r );
           if ( glob.lastGlobReturn() == 0 )
             for_( it, glob.begin(), glob.end() )
-              (*result_r)++ = typename _OutputIterator::container_type::value_type(*it);
+              (*result_r)++ = typename TOutputIterator::container_type::value_type(*it);
           return glob.lastGlobReturn();
         }
         //@}