Fix unneeded static keyword inside empty namespace warnings (#1273)

Author: MortimerGoro

app/src/googlevr/cpp/DeviceDelegateGoogleVR.cpp

@@ -27,8 +27,8 @@
 
 namespace {
 
-static const vrb::Vector kAverageHeight(0.0f, 1.7f, 0.0f);
-static const int32_t kMaxControllerCount = 2;
+const vrb::Vector kAverageHeight(0.0f, 1.7f, 0.0f);
+const int32_t kMaxControllerCount = 2;
 
 struct Controller {
   vrb::Matrix transform;

app/src/main/cpp/BrowserWorld.cpp

@@ -70,12 +70,12 @@ using namespace vrb;
 
 namespace {
 
-static const int GestureSwipeLeft = 0;
-static const int GestureSwipeRight = 1;
+const int GestureSwipeLeft = 0;
+const int GestureSwipeRight = 1;
 
-static const float kScrollFactor = 20.0f; // Just picked what fell right.
-static const float kWorldDPIRatio = 2.0f/720.0f;
-static const double kHoverRate = 1.0 / 10.0;
+const float kScrollFactor = 20.0f; // Just picked what fell right.
+const float kWorldDPIRatio = 2.0f/720.0f;
+const double kHoverRate = 1.0 / 10.0;
 
 #if SPACE_THEME == 1
   static const std::string CubemapDay = "cubemap/space";

app/src/main/cpp/ExternalBlitter.cpp

@@ -15,7 +15,7 @@
 #include <map>
 
 namespace {
-static const char* sVertexShader = R"SHADER(
+const char* sVertexShader = R"SHADER(
 attribute vec4 a_position;
 attribute vec2 a_uv;
 varying vec2 v_uv;
@@ -25,7 +25,7 @@ void main(void) {
 }
 )SHADER";
 
-static const char* sFragmentShader = R"SHADER(
+const char* sFragmentShader = R"SHADER(
 #extension GL_OES_EGL_image_external : require
 precision mediump float;
 
@@ -38,7 +38,7 @@ void main() {
 }
 )SHADER";
 
-static const GLfloat sVerticies[] = {
+const GLfloat sVerticies[] = {
     -1.0f, 1.0f, 0.0f,
     -1.0f, -1.0f, 0.0f,
     1.0f, 1.0f, 0.0f,

app/src/main/cpp/VRBrowser.cpp

@@ -10,64 +10,64 @@
 
 namespace {
 
-static const char* kDispatchCreateWidgetName = "dispatchCreateWidget";
-static const char* kDispatchCreateWidgetSignature = "(ILandroid/graphics/SurfaceTexture;II)V";
-static const char* kDispatchCreateWidgetLayerName = "dispatchCreateWidgetLayer";
-static const char* kDispatchCreateWidgetLayerSignature = "(ILandroid/view/Surface;IIJ)V";
-static const char* kHandleMotionEventName = "handleMotionEvent";
-static const char* kHandleMotionEventSignature = "(IIZFF)V";
-static const char* kHandleScrollEventName = "handleScrollEvent";
-static const char* kHandleScrollEventSignature = "(IIFF)V";
-static const char* kHandleAudioPoseName = "handleAudioPose";
-static const char* kHandleAudioPoseSignature = "(FFFFFFF)V";
-static const char* kHandleGestureName = "handleGesture";
-static const char* kHandleGestureSignature = "(I)V";
-static const char* kHandleResizeName = "handleResize";
-static const char* kHandleResizeSignature = "(IFF)V";
-static const char* kHandleBackEventName = "handleBack";
-static const char* kHandleBackEventSignature = "()V";
-static const char* kRegisterExternalContextName = "registerExternalContext";
-static const char* kRegisterExternalContextSignature = "(J)V";
-static const char* kPauseCompositorName = "pauseGeckoViewCompositor";
-static const char* kPauseCompositorSignature = "()V";
-static const char* kResumeCompositorName = "resumeGeckoViewCompositor";
-static const char* kResumeCompositorSignature = "()V";
-static const char* kRenderPointerLayerName = "renderPointerLayer";
-static const char* kRenderPointerLayerSignature = "(Landroid/view/Surface;J)V";
-static const char* kGetStorageAbsolutePathName = "getStorageAbsolutePath";
-static const char* kGetStorageAbsolutePathSignature = "()Ljava/lang/String;";
-static const char* kIsOverrideEnvPathEnabledName = "isOverrideEnvPathEnabled";
-static const char* kIsOverrideEnvPathEnabledSignature = "()Z";
-static const char* kGetActiveEnvironment = "getActiveEnvironment";
-static const char* kGetActiveEnvironmentSignature = "()Ljava/lang/String;";
-static const char* kGetPointerColor = "getPointerColor";
-static const char* kGetPointerColorSignature = "()I";
-static const char* kAreLayersEnabled = "areLayersEnabled";
-static const char* kAreLayersEnabledSignature = "()Z";
-static const char* kSetDeviceType = "setDeviceType";
-static const char* kSetDeviceTypeSignature = "(I)V";
-
-static JNIEnv* sEnv;
-static jclass sBrowserClass;
-static jobject sActivity;
-static jmethodID sDispatchCreateWidget;
-static jmethodID sDispatchCreateWidgetLayer;
-static jmethodID sHandleMotionEvent;
-static jmethodID sHandleScrollEvent;
-static jmethodID sHandleAudioPose;
-static jmethodID sHandleGesture;
-static jmethodID sHandleResize;
-static jmethodID sHandleBack;
-static jmethodID sRegisterExternalContext;
-static jmethodID sPauseCompositor;
-static jmethodID sResumeCompositor;
-static jmethodID sRenderPointerLayer;
-static jmethodID sGetStorageAbsolutePath;
-static jmethodID sIsOverrideEnvPathEnabled;
-static jmethodID sGetActiveEnvironment;
-static jmethodID sGetPointerColor;
-static jmethodID sAreLayersEnabled;
-static jmethodID sSetDeviceType;
+const char* kDispatchCreateWidgetName = "dispatchCreateWidget";
+const char* kDispatchCreateWidgetSignature = "(ILandroid/graphics/SurfaceTexture;II)V";
+const char* kDispatchCreateWidgetLayerName = "dispatchCreateWidgetLayer";
+const char* kDispatchCreateWidgetLayerSignature = "(ILandroid/view/Surface;IIJ)V";
+const char* kHandleMotionEventName = "handleMotionEvent";
+const char* kHandleMotionEventSignature = "(IIZFF)V";
+const char* kHandleScrollEventName = "handleScrollEvent";
+const char* kHandleScrollEventSignature = "(IIFF)V";
+const char* kHandleAudioPoseName = "handleAudioPose";
+const char* kHandleAudioPoseSignature = "(FFFFFFF)V";
+const char* kHandleGestureName = "handleGesture";
+const char* kHandleGestureSignature = "(I)V";
+const char* kHandleResizeName = "handleResize";
+const char* kHandleResizeSignature = "(IFF)V";
+const char* kHandleBackEventName = "handleBack";
+const char* kHandleBackEventSignature = "()V";
+const char* kRegisterExternalContextName = "registerExternalContext";
+const char* kRegisterExternalContextSignature = "(J)V";
+const char* kPauseCompositorName = "pauseGeckoViewCompositor";
+const char* kPauseCompositorSignature = "()V";
+const char* kResumeCompositorName = "resumeGeckoViewCompositor";
+const char* kResumeCompositorSignature = "()V";
+const char* kRenderPointerLayerName = "renderPointerLayer";
+const char* kRenderPointerLayerSignature = "(Landroid/view/Surface;J)V";
+const char* kGetStorageAbsolutePathName = "getStorageAbsolutePath";
+const char* kGetStorageAbsolutePathSignature = "()Ljava/lang/String;";
+const char* kIsOverrideEnvPathEnabledName = "isOverrideEnvPathEnabled";
+const char* kIsOverrideEnvPathEnabledSignature = "()Z";
+const char* kGetActiveEnvironment = "getActiveEnvironment";
+const char* kGetActiveEnvironmentSignature = "()Ljava/lang/String;";
+const char* kGetPointerColor = "getPointerColor";
+const char* kGetPointerColorSignature = "()I";
+const char* kAreLayersEnabled = "areLayersEnabled";
+const char* kAreLayersEnabledSignature = "()Z";
+const char* kSetDeviceType = "setDeviceType";
+const char* kSetDeviceTypeSignature = "(I)V";
+
+JNIEnv* sEnv;
+jclass sBrowserClass;
+jobject sActivity;
+jmethodID sDispatchCreateWidget;
+jmethodID sDispatchCreateWidgetLayer;
+jmethodID sHandleMotionEvent;
+jmethodID sHandleScrollEvent;
+jmethodID sHandleAudioPose;
+jmethodID sHandleGesture;
+jmethodID sHandleResize;
+jmethodID sHandleBack;
+jmethodID sRegisterExternalContext;
+jmethodID sPauseCompositor;
+jmethodID sResumeCompositor;
+jmethodID sRenderPointerLayer;
+jmethodID sGetStorageAbsolutePath;
+jmethodID sIsOverrideEnvPathEnabled;
+jmethodID sGetActiveEnvironment;
+jmethodID sGetPointerColor;
+jmethodID sAreLayersEnabled;
+jmethodID sSetDeviceType;
 }
 
 namespace crow {