Remove 'using namespace' from header files

Summary: Fix linter warning when pulling in some code into AR Changelog: [Internal] Reviewed By: NickGerleman, mdvacca Differential Revision: D41269423 fbshipit-source-id: 4305d6c362a51e62b19b4d3590fb0823073dff9a
facebook · Nov 17, 2022 · e504141 · e504141
1 parent a9bed8e
commit e504141
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 35 deletions.
diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.mm b/React/Fabric/Mounting/RCTComponentViewRegistry.mm
@@ -17,6 +17,7 @@
 
 #import <butter/map.h>
 
+using namespace facebook;
 using namespace facebook::react;
 
 const NSInteger RCTComponentViewRegistryRecyclePoolMaxSize = 1024;

diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
@@ -39,6 +39,7 @@
 #import "PlatformRunLoopObserver.h"
 #import "RCTConversions.h"
 
+using namespace facebook;
 using namespace facebook::react;
 
 static dispatch_queue_t RCTGetBackgroundQueue()

diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJTypesVanilla.h b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJTypesVanilla.h
@@ -11,9 +11,6 @@
 #include <map>
 #include "common.h"
 
-using namespace facebook::yoga::vanillajni;
-using namespace std;
-
 class PtrJNodeMapVanilla {
   std::map<YGNodeRef, size_t> ptrsToIdxs_;
   jobjectArray javaNodes_;
@@ -22,6 +19,7 @@ class PtrJNodeMapVanilla {
   PtrJNodeMapVanilla() : ptrsToIdxs_{}, javaNodes_{} {}
   PtrJNodeMapVanilla(jlongArray javaNativePointers, jobjectArray javaNodes)
       : javaNodes_{javaNodes} {
+    using namespace facebook::yoga::vanillajni;
 
     JNIEnv* env = getCurrentEnv();
     size_t nativePointersSize = env->GetArrayLength(javaNativePointers);
@@ -34,7 +32,9 @@ class PtrJNodeMapVanilla {
     }
   }
 
-  ScopedLocalRef<jobject> ref(YGNodeRef node) {
+  facebook::yoga::vanillajni::ScopedLocalRef<jobject> ref(YGNodeRef node) {
+    using namespace facebook::yoga::vanillajni;
+
     JNIEnv* env = getCurrentEnv();
     auto idx = ptrsToIdxs_.find(node);
     if (idx == ptrsToIdxs_.end()) {

diff --git a/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h b/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h
@@ -8,14 +8,8 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
+#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-#include <react/renderer/scheduler/Scheduler.h>
-#include <react/utils/ContextContainer.h>
-#include <mutex>
-#include <unordered_set>
-
-using namespace facebook::jsi;
 
 namespace facebook {
 namespace react {

diff --git a/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h b/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h
@@ -13,9 +13,7 @@
 namespace facebook {
 namespace react {
 
-using namespace facebook::jni;
-
-class JBackgroundExecutor : public JavaClass<JBackgroundExecutor> {
+class JBackgroundExecutor : public jni::JavaClass<JBackgroundExecutor> {
  public:
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/bridge/BackgroundExecutor;";

diff --git a/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h b/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h
@@ -8,13 +8,12 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include "Binding.h"
 
-using namespace facebook::jni;
+#include "Binding.h"
 
 namespace facebook::react {
 
-class JFabricUIManager : public JavaClass<JFabricUIManager> {
+class JFabricUIManager : public jni::JavaClass<JFabricUIManager> {
  public:
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/fabric/FabricUIManager;";

diff --git a/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp b/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp
@@ -18,6 +18,8 @@
 namespace facebook {
 namespace react {
 
+using namespace jni;
+
 namespace {
 
 struct JavaJSException : jni::JavaClass<JavaJSException, JThrowable> {

diff --git a/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h b/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h
@@ -12,10 +12,7 @@
 #include <cxxreact/MessageQueueThread.h>
 #include <fbjni/fbjni.h>
 
-using namespace facebook::jni;
-
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class JavaMessageQueueThread : public jni::JavaClass<JavaMessageQueueThread> {
  public:
@@ -25,7 +22,7 @@ class JavaMessageQueueThread : public jni::JavaClass<JavaMessageQueueThread> {
 
 class JMessageQueueThread : public MessageQueueThread {
  public:
-  JMessageQueueThread(alias_ref<JavaMessageQueueThread::javaobject> jobj);
+  JMessageQueueThread(jni::alias_ref<JavaMessageQueueThread::javaobject> jobj);
 
   /**
    * Enqueues the given function to run on this MessageQueueThread.
@@ -50,8 +47,7 @@ class JMessageQueueThread : public MessageQueueThread {
   }
 
  private:
-  global_ref<JavaMessageQueueThread::javaobject> m_jobj;
+  jni::global_ref<JavaMessageQueueThread::javaobject> m_jobj;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/yoga/yoga/Utils.cpp b/ReactCommon/yoga/yoga/Utils.cpp
@@ -74,7 +74,7 @@ YGFloatOptional YGFloatOptionalMax(YGFloatOptional op1, YGFloatOptional op2) {
   return op1.isUndefined() ? op2 : op1;
 }
 
-void throwLogicalErrorWithMessage(const char* message) {
+void yoga::throwLogicalErrorWithMessage(const char* message) {
 #if defined(__cpp_exceptions)
   throw std::logic_error(message);
 #else // !defined(__cpp_exceptions)

diff --git a/ReactCommon/yoga/yoga/Utils.h b/ReactCommon/yoga/yoga/Utils.h
@@ -117,7 +117,7 @@ inline YGFloatOptional YGResolveValue(
 }
 
 inline YGFloatOptional YGResolveValue(
-    yoga::detail::CompactValue value,
+    facebook::yoga::detail::CompactValue value,
     float ownerSize) {
   return YGResolveValue((YGValue) value, ownerSize);
 }
@@ -142,11 +142,9 @@ inline YGFlexDirection YGResolveFlexDirection(
 }
 
 inline YGFloatOptional YGResolveValueMargin(
-    yoga::detail::CompactValue value,
+    facebook::yoga::detail::CompactValue value,
     const float ownerSize) {
   return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
 }
 
-void throwLogicalErrorWithMessage(const char* message);
-
 #endif
diff --git a/ReactCommon/yoga/yoga/YGLayout.h b/ReactCommon/yoga/yoga/YGLayout.h
@@ -13,8 +13,6 @@
 #include "YGFloatOptional.h"
 #include "Yoga-internal.h"
 
-using namespace facebook::yoga;
-
 struct YGLayout {
   std::array<float, 4> position = {};
   std::array<float, 2> dimensions = {{YGUndefined, YGUndefined}};

diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -40,11 +40,11 @@ inline bool isUndefined(double value) {
   return std::isnan(value);
 }
 
+void throwLogicalErrorWithMessage(const char* message);
+
 } // namespace yoga
 } // namespace facebook
 
-using namespace facebook;
-
 extern const std::array<YGEdge, 4> trailing;
 extern const std::array<YGEdge, 4> leading;
 extern const YGValue YGValueUndefined;
@@ -69,6 +69,8 @@ struct YGCachedMeasurement {
         computedHeight(-1) {}
 
   bool operator==(YGCachedMeasurement measurement) const {
+    using namespace facebook;
+
     bool isEqual = widthMeasureMode == measurement.widthMeasureMode &&
         heightMeasureMode == measurement.heightMeasureMode;
 
@@ -141,7 +143,6 @@ class Values {
 
   Values& operator=(const Values& other) = default;
 };
-
 } // namespace detail
 } // namespace yoga
 } // namespace facebook