Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 9d56bdf

Browse files
bluemarvinbluemarvin
authored
Fix constant char arrays (#3216)
1 parent 82734b4 commit 9d56bdf

File tree

3 files changed

+68
-73
lines changed

3 files changed

+68
-73
lines changed

‎app/src/main/cpp/VRBrowser.cpp

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,56 +10,56 @@
1010

1111
namespace {
1212

13-
const char* kDispatchCreateWidgetName = "dispatchCreateWidget";
14-
const char* kDispatchCreateWidgetSignature = "(ILandroid/graphics/SurfaceTexture;II)V";
15-
const char* kDispatchCreateWidgetLayerName = "dispatchCreateWidgetLayer";
16-
const char* kDispatchCreateWidgetLayerSignature = "(ILandroid/view/Surface;IIJ)V";
17-
const char* kHandleMotionEventName = "handleMotionEvent";
18-
const char* kHandleMotionEventSignature = "(IIZZFF)V";
19-
const char* kHandleScrollEventName = "handleScrollEvent";
20-
const char* kHandleScrollEventSignature = "(IIFF)V";
21-
const char* kHandleAudioPoseName = "handleAudioPose";
22-
const char* kHandleAudioPoseSignature = "(FFFFFFF)V";
23-
const char* kHandleGestureName = "handleGesture";
24-
const char* kHandleGestureSignature = "(I)V";
25-
const char* kHandleResizeName = "handleResize";
26-
const char* kHandleResizeSignature = "(IFF)V";
27-
const char* kHandleMoveEndName = "handleMoveEnd";
28-
const char* kHandleMoveEndSignature = "(IFFFF)V";
29-
const char* kHandleBackEventName = "handleBack";
30-
const char* kHandleBackEventSignature = "()V";
31-
const char* kRegisterExternalContextName = "registerExternalContext";
32-
const char* kRegisterExternalContextSignature = "(J)V";
33-
const char* kOnEnterWebXRName = "onEnterWebXR";
34-
const char* kOnEnterWebXRSignature = "()V";
35-
const char* kOnExitWebXRName = "onExitWebXR";
36-
const char* kOnExitWebXRSignature = "()V";
37-
const char* kOnDismissWebXRInterstitialName = "onDismissWebXRInterstitial";
38-
const char* kOnDismissWebXRInterstitialSignature = "()V";
39-
const char* kRenderPointerLayerName = "renderPointerLayer";
40-
const char* kRenderPointerLayerSignature = "(Landroid/view/Surface;J)V";
41-
const char* kGetStorageAbsolutePathName = "getStorageAbsolutePath";
42-
const char* kGetStorageAbsolutePathSignature = "()Ljava/lang/String;";
43-
const char* kIsOverrideEnvPathEnabledName = "isOverrideEnvPathEnabled";
44-
const char* kIsOverrideEnvPathEnabledSignature = "()Z";
45-
const char* kGetActiveEnvironment = "getActiveEnvironment";
46-
const char* kGetActiveEnvironmentSignature = "()Ljava/lang/String;";
47-
const char* kGetPointerColor = "getPointerColor";
48-
const char* kGetPointerColorSignature = "()I";
49-
const char* kAreLayersEnabled = "areLayersEnabled";
50-
const char* kAreLayersEnabledSignature = "()Z";
51-
const char* kSetDeviceType = "setDeviceType";
52-
const char* kSetDeviceTypeSignature = "(I)V";
53-
const char* kHaltActivity = "haltActivity";
54-
const char* kHaltActivitySignature = "(I)V";
55-
const char* kHandlePoorPerformance = "handlePoorPerformance";
56-
const char* kHandlePoorPerformanceSignature = "()V";
57-
const char* kOnAppLink = "onAppLink";
58-
const char* kOnAppLinkSignature = "(Ljava/lang/String;)V";
59-
const char* kDisableLayers = "disableLayers";
60-
const char* kDisableLayersSignature = "()V";
61-
const char* kAppendAppNotesToCrashReport = "appendAppNotesToCrashReport";
62-
const char* kAppendAppNotesToCrashReportSignature = "(Ljava/lang/String;)V";
13+
const char* const kDispatchCreateWidgetName = "dispatchCreateWidget";
14+
const char* const kDispatchCreateWidgetSignature = "(ILandroid/graphics/SurfaceTexture;II)V";
15+
const char* const kDispatchCreateWidgetLayerName = "dispatchCreateWidgetLayer";
16+
const char* const kDispatchCreateWidgetLayerSignature = "(ILandroid/view/Surface;IIJ)V";
17+
const char* const kHandleMotionEventName = "handleMotionEvent";
18+
const char* const kHandleMotionEventSignature = "(IIZZFF)V";
19+
const char* const kHandleScrollEventName = "handleScrollEvent";
20+
const char* const kHandleScrollEventSignature = "(IIFF)V";
21+
const char* const kHandleAudioPoseName = "handleAudioPose";
22+
const char* const kHandleAudioPoseSignature = "(FFFFFFF)V";
23+
const char* const kHandleGestureName = "handleGesture";
24+
const char* const kHandleGestureSignature = "(I)V";
25+
const char* const kHandleResizeName = "handleResize";
26+
const char* const kHandleResizeSignature = "(IFF)V";
27+
const char* const kHandleMoveEndName = "handleMoveEnd";
28+
const char* const kHandleMoveEndSignature = "(IFFFF)V";
29+
const char* const kHandleBackEventName = "handleBack";
30+
const char* const kHandleBackEventSignature = "()V";
31+
const char* const kRegisterExternalContextName = "registerExternalContext";
32+
const char* const kRegisterExternalContextSignature = "(J)V";
33+
const char* const kOnEnterWebXRName = "onEnterWebXR";
34+
const char* const kOnEnterWebXRSignature = "()V";
35+
const char* const kOnExitWebXRName = "onExitWebXR";
36+
const char* const kOnExitWebXRSignature = "()V";
37+
const char* const kOnDismissWebXRInterstitialName = "onDismissWebXRInterstitial";
38+
const char* const kOnDismissWebXRInterstitialSignature = "()V";
39+
const char* const kRenderPointerLayerName = "renderPointerLayer";
40+
const char* const kRenderPointerLayerSignature = "(Landroid/view/Surface;J)V";
41+
const char* const kGetStorageAbsolutePathName = "getStorageAbsolutePath";
42+
const char* const kGetStorageAbsolutePathSignature = "()Ljava/lang/String;";
43+
const char* const kIsOverrideEnvPathEnabledName = "isOverrideEnvPathEnabled";
44+
const char* const kIsOverrideEnvPathEnabledSignature = "()Z";
45+
const char* const kGetActiveEnvironment = "getActiveEnvironment";
46+
const char* const kGetActiveEnvironmentSignature = "()Ljava/lang/String;";
47+
const char* const kGetPointerColor = "getPointerColor";
48+
const char* const kGetPointerColorSignature = "()I";
49+
const char* const kAreLayersEnabled = "areLayersEnabled";
50+
const char* const kAreLayersEnabledSignature = "()Z";
51+
const char* const kSetDeviceType = "setDeviceType";
52+
const char* const kSetDeviceTypeSignature = "(I)V";
53+
const char* const kHaltActivity = "haltActivity";
54+
const char* const kHaltActivitySignature = "(I)V";
55+
const char* const kHandlePoorPerformance = "handlePoorPerformance";
56+
const char* const kHandlePoorPerformanceSignature = "()V";
57+
const char* const kOnAppLink = "onAppLink";
58+
const char* const kOnAppLinkSignature = "(Ljava/lang/String;)V";
59+
const char* const kDisableLayers = "disableLayers";
60+
const char* const kDisableLayersSignature = "()V";
61+
const char* const kAppendAppNotesToCrashReport = "appendAppNotesToCrashReport";
62+
const char* const kAppendAppNotesToCrashReportSignature = "(Ljava/lang/String;)V";
6363

6464
JNIEnv* sEnv = nullptr;
6565
jclass sBrowserClass = nullptr;

‎app/src/picovr/cpp/VRBrowserPico.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@
1010

1111
namespace {
1212

13-
const char* sUpdateHapticsName = "updateHaptics";
14-
const char* sUpdateHapticsSignature = "(IFF)V";
15-
const char* sCancelAllHapticsName = "cancelAllHaptics";
16-
const char* sCancelAllHapticsSignature = "()V";
13+
const char* const sUpdateHapticsName = "updateHaptics";
14+
const char* const sUpdateHapticsSignature = "(IFF)V";
15+
const char* const sCancelAllHapticsName = "cancelAllHaptics";
16+
const char* const sCancelAllHapticsSignature = "()V";
17+
const char* const kGetGazeIndex = "getGazeIndex";
18+
const char* const kGetGazeIndexSignature = "()I";
1719

1820
JNIEnv* sEnv = nullptr;
1921
jclass sBrowserClass = nullptr;
2022
jobject sActivity = nullptr;
2123
jmethodID sUpdateHaptics = nullptr;
2224
jmethodID sCancelAllHaptics = nullptr;
25+
jmethodID sGetGazeIndex = nullptr;
2326
}
2427

2528
namespace crow {

‎app/src/picovr/cpp/VRBrowserPico.h

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,21 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
55

6-
#pragma once
7-
#include "vrb/MacroUtils.h"
6+
#ifndef VRBROWSER_PICO_H
7+
#define VRBROWSER_PICO_H
88

9-
#include <memory>
10-
#include <string>
119
#include <jni.h>
12-
#include <functional>
13-
14-
namespace {
15-
const char *kGetGazeIndex = "getGazeIndex";
16-
const char *kGetGazeIndexSignature = "()I";
17-
18-
jmethodID sGetGazeIndex = nullptr;
19-
}
2010

2111
namespace crow {
2212

23-
namespace VRBrowserPico {
24-
void InitializeJava(JNIEnv* aEnv, jobject aActivity);
25-
void ShutdownJava();
26-
void UpdateHaptics(jint aControllerIndex, jfloat aIntensity, jfloat aDuration);
27-
void CancelAllHaptics();
28-
int32_t GetGazeIndex();
29-
} // namespace VRBrowser;
13+
namespace VRBrowserPico {
14+
void InitializeJava(JNIEnv* aEnv, jobject aActivity);
15+
void ShutdownJava();
16+
void UpdateHaptics(jint aControllerIndex, jfloat aIntensity, jfloat aDuration);
17+
void CancelAllHaptics();
18+
int32_t GetGazeIndex();
19+
} // namespace VRBrowser;
3020

3121
} // namespace crow
22+
23+
#endif // VRBROWSER_PICO_H

0 commit comments

Comments
 (0)