more fixes to ObjectFactory

* implement removeAll()
* exit early
* remove typedef that's only used in one place and in private scope

Author: JohnCoconut

cocos/base/ObjectFactory.cpp

@@ -65,7 +65,7 @@ Ref* ObjectFactory::createObject(const std::string &name)
     if (t._fun != nullptr) {
         return t._fun();
     }
-    else if (t._func != nullptr) {
+    if (t._func != nullptr) {
         return t._func();
     }
     return nullptr;
@@ -76,4 +76,9 @@ void ObjectFactory::registerType(const TInfo &t)
     _typeMap.emplace(t._class, t);
 }
 
+void ObjectFactory::removeAll()
+{
+    _typeMap.clear();
+}
+
 NS_CC_END

cocos/base/ObjectFactory.h

@@ -48,12 +48,11 @@ class CC_DLL ObjectFactory
         Instance _fun = nullptr;
         InstanceFunc _func;
     };
-    typedef std::unordered_map<std::string, TInfo> FactoryMap;
 
     static ObjectFactory* getInstance();
     static void destroyInstance();
-    cocos2d::Ref* createObject(const std::string &name);
 
+    cocos2d::Ref* createObject(const std::string &name);
     void registerType(const TInfo &t);
     void removeAll();
 
@@ -62,7 +61,7 @@ class CC_DLL ObjectFactory
     virtual ~ObjectFactory() = default;
 private:
     static ObjectFactory *_sharedFactory;
-    FactoryMap _typeMap;
+    std::unordered_map<std::string, TInfo> _typeMap;
 };
 
 NS_CC_END