Skip to content

Commit 7843318

Browse files
authored
Standardize header guards (#518)
Standardize header guards, and turn on lint warnings for bad header guard names and line length, which were previously disabled. Includes a small fix to replace the double-quote symbol (") with the html entity (ampersand-quot;) in the lint output, for HTML compatibility. This also turns off the "build/include_subdir" and "whitespace/indent" lint warnings as they are extraneous.
1 parent 501e5fa commit 7843318

File tree

473 files changed

+1418
-1418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

473 files changed

+1418
-1418
lines changed

admob/src/android/ad_request_converter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
17+
#ifndef FIREBASE_ADMOB_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
18+
#define FIREBASE_ADMOB_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
1919

2020
#include <jni.h>
2121

@@ -82,4 +82,4 @@ class AdRequestConverter {
8282
} // namespace admob
8383
} // namespace firebase
8484

85-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
85+
#endif // FIREBASE_ADMOB_SRC_ANDROID_AD_REQUEST_CONVERTER_H_

admob/src/android/admob_android.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_ADMOB_ANDROID_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_ADMOB_ANDROID_H_
17+
#ifndef FIREBASE_ADMOB_SRC_ANDROID_ADMOB_ANDROID_H_
18+
#define FIREBASE_ADMOB_SRC_ANDROID_ADMOB_ANDROID_H_
1919

2020
#include <jni.h>
2121

@@ -47,4 +47,4 @@ void ReleaseClasses(JNIEnv* env);
4747
} // namespace admob
4848
} // namespace firebase
4949

50-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_ADMOB_ANDROID_H_
50+
#endif // FIREBASE_ADMOB_SRC_ANDROID_ADMOB_ANDROID_H_

admob/src/android/banner_view_internal_android.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
17+
#ifndef FIREBASE_ADMOB_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
18+
#define FIREBASE_ADMOB_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
1919

2020
#include "admob/src/common/banner_view_internal.h"
2121
#include "app/src/util_android.h"
@@ -87,4 +87,4 @@ class BannerViewInternalAndroid : public BannerViewInternal {
8787
} // namespace admob
8888
} // namespace firebase
8989

90-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
90+
#endif // FIREBASE_ADMOB_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_

admob/src/android/interstitial_ad_internal_android.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
17+
#ifndef FIREBASE_ADMOB_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
18+
#define FIREBASE_ADMOB_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
1919

2020
#include "admob/src/common/interstitial_ad_internal.h"
2121
#include "app/src/util_android.h"
@@ -60,4 +60,4 @@ class InterstitialAdInternalAndroid : public InterstitialAdInternal {
6060
} // namespace admob
6161
} // namespace firebase
6262

63-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
63+
#endif // FIREBASE_ADMOB_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_

admob/src/android/native_express_ad_view_internal_android.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
17+
#ifndef FIREBASE_ADMOB_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
18+
#define FIREBASE_ADMOB_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
1919

2020
#include "admob/src/common/native_express_ad_view_internal.h"
2121
#include "app/src/util_android.h"
@@ -85,4 +85,4 @@ class NativeExpressAdViewInternalAndroid : public NativeExpressAdViewInternal {
8585
} // namespace admob
8686
} // namespace firebase
8787

88-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
88+
#endif // FIREBASE_ADMOB_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_

admob/src/android/rewarded_video_internal_android.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
17+
#ifndef FIREBASE_ADMOB_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
18+
#define FIREBASE_ADMOB_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
1919

2020
#include "admob/src/common/rewarded_video_internal.h"
2121
#include "app/src/util_android.h"
@@ -74,4 +74,4 @@ class RewardedVideoInternalAndroid : public RewardedVideoInternal {
7474
} // namespace admob
7575
} // namespace firebase
7676

77-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
77+
#endif // FIREBASE_ADMOB_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_

admob/src/common/admob_common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_ADMOB_COMMON_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_ADMOB_COMMON_H_
17+
#ifndef FIREBASE_ADMOB_SRC_COMMON_ADMOB_COMMON_H_
18+
#define FIREBASE_ADMOB_SRC_COMMON_ADMOB_COMMON_H_
1919

2020
#include <stdarg.h>
2121

@@ -86,4 +86,4 @@ FutureCallbackData* CreateFutureCallbackData(FutureData* future_data,
8686
} // namespace admob
8787
} // namespace firebase
8888

89-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_ADMOB_COMMON_H_
89+
#endif // FIREBASE_ADMOB_SRC_COMMON_ADMOB_COMMON_H_

admob/src/common/banner_view_internal.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
17+
#ifndef FIREBASE_ADMOB_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
18+
#define FIREBASE_ADMOB_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
1919

2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/banner_view.h"
@@ -122,4 +122,4 @@ class BannerViewInternal {
122122
} // namespace admob
123123
} // namespace firebase
124124

125-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
125+
#endif // FIREBASE_ADMOB_SRC_COMMON_BANNER_VIEW_INTERNAL_H_

admob/src/common/interstitial_ad_internal.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
17+
#ifndef FIREBASE_ADMOB_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
18+
#define FIREBASE_ADMOB_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
1919

2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/interstitial_ad.h"
@@ -88,4 +88,4 @@ class InterstitialAdInternal {
8888
} // namespace admob
8989
} // namespace firebase
9090

91-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
91+
#endif // FIREBASE_ADMOB_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_

admob/src/common/native_express_ad_view_internal.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
18-
#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
17+
#ifndef FIREBASE_ADMOB_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
18+
#define FIREBASE_ADMOB_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
1919

2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
@@ -124,4 +124,4 @@ class NativeExpressAdViewInternal {
124124
} // namespace admob
125125
} // namespace firebase
126126

127-
#endif // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
127+
#endif // FIREBASE_ADMOB_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_

0 commit comments

Comments
 (0)