[2.2.1] Merge different codes between 2.2 and 3.0

[platform/framework/native/appfw.git] / src / base / inc / FBase_ObjectManagerImpl.h

diff --git a/src/base/inc/FBase_ObjectManagerImpl.h b/src/base/inc/FBase_ObjectManagerImpl.h
index 8806cc8..362c451 100644 (file)
--- a/src/base/inc/FBase_ObjectManagerImpl.h
+++ b/src/base/inc/FBase_ObjectManagerImpl.h
@@ -71,15 +71,15 @@ public:
         *
         * @since 2.0
         */
-       _ObjectManagerImpl(_ObjectManagerImpl& pObjectManagerImpl)
+       _ObjectManagerImpl(_ObjectManagerImpl& objectManagerImpl)
        {
-               __slotCount = pObjectManagerImpl.__slotCount;
-               __slotCapacity = pObjectManagerImpl.__slotCapacity;
-               __pSlots = new _HandleElement[pObjectManagerImpl.__slotCapacity];
+               __slotCount = objectManagerImpl.__slotCount;
+               __slotCapacity = objectManagerImpl.__slotCapacity;
+               __pSlots = new _HandleElement[objectManagerImpl.__slotCapacity];
 
-               for (unsigned int i = 0; i < pObjectManagerImpl.__slotCapacity; i++)
+               for (unsigned int i = 0; i < objectManagerImpl.__slotCapacity; i++)
                {
-                       __pSlots[i] = pObjectManagerImpl.__pSlots[i];
+                       __pSlots[i] = objectManagerImpl.__pSlots[i];
                }
 
                __pLock = new (std::nothrow) Tizen::Base::Runtime::Mutex();