[2.2.1] Merge different codes between 2.2 and 3.0

[platform/framework/native/appfw.git] / inc / FBaseColStlConverter.h

diff --git a/inc/FBaseColStlConverter.h b/inc/FBaseColStlConverter.h
index 24a5ba3..819b18b 100644 (file)
--- a/inc/FBaseColStlConverter.h
+++ b/inc/FBaseColStlConverter.h
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2013 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -44,7 +43,7 @@ class IMultiMap;
 
 /**
  *     @class  StlConverter
- *     @brief  This class provides static methods to convert %Tizen Collection to STL Container and vice versa.
+ *     @brief  This class provides static methods to convert %Tizen %Collection to STL Container and vice versa.
  *
  *     @since  2.1
  *
@@ -98,7 +97,7 @@ public:
         * @return              An IteratorT instance
         * @param[in]   pList                   A pointer to the IList instance to convert
         */
-       template < typename T >
+       template< typename T >
        static IteratorT< T > GetBeginIterator(const IList* pList)
        {
                return IteratorT< T >(*pList);
@@ -112,7 +111,7 @@ public:
         * @return              An IteratorT instance
         * @param[in]   pList                   A pointer to the IList instance to convert
         */
-       template < typename T >
+       template< typename T >
        static IteratorT< T > GetEndIterator(const IList* pList)
        {
                return IteratorT< T >(*pList, true);
@@ -126,7 +125,7 @@ public:
         * @return              A RandomIteratorT instance
         * @param[in]   pList                   A pointer to the IList instance to convert
         */
-       template < typename T >
+       template< typename T >
        static RandomIteratorT< T > GetBeginRandomIterator(const IList* pList)
        {
                return RandomIteratorT< T >(*pList, 0);
@@ -140,7 +139,7 @@ public:
         * @return              A RandomIteratorT instance
         * @param[in]   pList                   A pointer to the IList instance to convert
         */
-       template < typename T >
+       template< typename T >
        static RandomIteratorT< T > GetEndRandomIterator(const IList* pList)
        {
                return RandomIteratorT< T >(*pList, pList->GetCount());
@@ -155,7 +154,7 @@ public:
         * @return              A PairIteratorT instance
         * @param[in]   pMap            A pointer to the IMap instance to convert
         */
-       template < typename K, typename V >
+       template< typename K, typename V >
        static PairIteratorT< K, V > GetBeginPairIterator(const IMap* pMap)
        {
                return PairIteratorT< K, V >(*pMap);
@@ -170,7 +169,7 @@ public:
         * @return              A PairIteratorT instance
         * @param[in]   pMap            A pointer to the IMap instance to convert
         */
-       template < typename K, typename V >
+       template< typename K, typename V >
        static PairIteratorT< K, V > GetEndPairIterator(const IMap* pMap)
        {
                return PairIteratorT< K, V >(*pMap, true);
@@ -185,7 +184,7 @@ public:
         * @return              A PairIteratorT instance
         * @param[in]   pMultiMap       A pointer to the IMultiMap instance to convert
         */
-       template < typename K, typename V >
+       template< typename K, typename V >
        static PairIteratorT< K, V > GetBeginPairIterator(const IMultiMap* pMultiMap)
        {
                return PairIteratorT< K, V >(*pMultiMap);
@@ -200,7 +199,7 @@ public:
         * @return              A PairIteratorT instance
         * @param[in]   pMultiMap       A pointer to the IMultiMap instance to convert
         */
-       template < typename K, typename V >
+       template< typename K, typename V >
        static PairIteratorT< K, V > GetEndPairIterator(const IMultiMap* pMultiMap)
        {
                return PairIteratorT< K, V >(*pMultiMap, true);
@@ -228,7 +227,7 @@ public:
         * @see                 SingleObjectDeleter()
         * @see                 ArrayDeleter()
         */
-       template < typename FwdIter >
+       template< typename FwdIter >
        static std::unique_ptr< ArrayList > GetArrayListN(FwdIter begin, FwdIter end, DeleterFunctionType deleter = NoOpDeleter)
        {
                std::unique_ptr< ArrayList > pArrayList(new (std::nothrow) ArrayList(deleter));
@@ -272,7 +271,7 @@ public:
         * @see                 SingleObjectDeleter()
         * @see                 ArrayDeleter()
         */
-       template < typename FwdIter >
+       template< typename FwdIter >
        static std::unique_ptr< LinkedList > GetLinkedListN(FwdIter begin, FwdIter end, DeleterFunctionType deleter = NoOpDeleter)
        {
                std::unique_ptr< LinkedList > pLinkedList(new (std::nothrow) LinkedList(deleter));
@@ -313,7 +312,7 @@ public:
         * @see                 SingleObjectDeleter()
         * @see                 ArrayDeleter()
         */
-       template < typename PairedFwdIter >
+       template< typename PairedFwdIter >
        static std::unique_ptr< HashMap > GetHashMapN(PairedFwdIter begin, PairedFwdIter end, DeleterFunctionType deleter = NoOpDeleter)
        {
                std::unique_ptr< HashMap > pMap(new (std::nothrow) HashMap(deleter));
@@ -357,7 +356,7 @@ public:
         * @see                 SingleObjectDeleter()
         * @see                 ArrayDeleter()
         */
-       template < typename PairedFwdIter >
+       template< typename PairedFwdIter >
        static std::unique_ptr< MultiHashMap > GetMultiHashMapN(PairedFwdIter begin, PairedFwdIter end, DeleterFunctionType deleter = NoOpDeleter)
        {
                std::unique_ptr< MultiHashMap > pMultiMap(new (std::nothrow) MultiHashMap(deleter));
@@ -411,7 +410,7 @@ private:
        // @return              A reference to the %StlConverter instance
        // @param[in]   rhs             A reference to the %StlConverter instance
        //
-       StlConverter& operator=(const StlConverter& rhs);
+       StlConverter& operator =(const StlConverter& rhs);
 };
 
 }}} // Tizen::Base::Collection