*: cleanup

src/entt/entity/helper.hpp

@@ -158,7 +158,7 @@ Entity to_entity(const basic_registry<Entity> &reg, const Component &instance) {
         }
     }
 
-    return entt::null;
+    return null;
 }
 
 

src/entt/entity/organizer.hpp

@@ -123,8 +123,8 @@ resource<type_list<>, type_list<Req...>> to_resource();
  */
 template<typename Entity>
 class basic_organizer final {
-    using callback_type = void(const void *, entt::basic_registry<Entity> &);
-    using prepare_type = void(entt::basic_registry<Entity> &);
+    using callback_type = void(const void *, basic_registry<Entity> &);
+    using prepare_type = void(basic_registry<Entity> &);
     using dependency_type = std::size_t(const bool, type_info *, const std::size_t);
 
     struct vertex_data final {
@@ -498,7 +498,7 @@ public:
     }
 
 private:
-    std::unordered_map<entt::id_type, std::vector<std::pair<std::size_t, bool>>> dependencies;
+    std::unordered_map<id_type, std::vector<std::pair<std::size_t, bool>>> dependencies;
     std::vector<vertex_data> vertices;
 };
 

src/entt/entity/view.hpp

@@ -1001,7 +1001,7 @@ struct basic_view<Entity, exclude_t<Exclude...>, Component...>
  */
 template<typename... Storage>
 basic_view(Storage &... storage)
--> basic_view<std::common_type_t<typename Storage::entity_type...>, entt::exclude_t<>, constness_as_t<typename Storage::value_type, Storage>...>;
+-> basic_view<std::common_type_t<typename Storage::entity_type...>, exclude_t<>, constness_as_t<typename Storage::value_type, Storage>...>;
 
 
 /**

src/entt/meta/factory.hpp

@@ -82,7 +82,7 @@ private:
             property[1u]
         };
 
-        entt::meta_any instance{std::forward<Key>(key)};
+        meta_any instance{std::forward<Key>(key)};
         property[0u] = std::move(instance);
         property[1u] = std::move(value);