Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit 80dbca7

Browse files
author
Alex Ames
committed
Minor formatting fixes in various files.
Change-Id: I4b536c9c36ce208f5f8e90b0b422b744651d6be0
1 parent 34afcb7 commit 80dbca7

File tree

11 files changed

+26
-47
lines changed

11 files changed

+26
-47
lines changed

‎admob/Classes/FirebaseAdMobScene.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ bool FirebaseAdMobScene::init() {
293293
auto visibleSize = Director::getInstance()->getVisibleSize();
294294
cocos2d::Vec2 origin = Director::getInstance()->getVisibleOrigin();
295295

296-
// Intitialize Firebase-AdMob.
296+
// Intitialize Firebase AdMob.
297297
CCLOG("Initializing the AdMob with Firebase API.");
298298
firebase::admob::Initialize(*firebase::App::GetInstance(), kAdMobAppID);
299299

@@ -304,7 +304,7 @@ bool FirebaseAdMobScene::init() {
304304

305305
// Create the Firebase label.
306306
auto firebaseLabel =
307-
Label::createWithTTF("Firebase-AdMob", "fonts/Marker Felt.ttf", 20);
307+
Label::createWithTTF("Firebase AdMob", "fonts/Marker Felt.ttf", 20);
308308
nextYPosition =
309309
origin.y + visibleSize.height - firebaseLabel->getContentSize().height;
310310
firebaseLabel->setPosition(

‎analytics/Classes/FirebaseAnalyticsScene.cpp

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
USING_NS_CC;
3737

38-
3938
/// Padding for the UI elements.
4039
static const float kUIElementPadding = 10.0;
4140

@@ -82,13 +81,13 @@ bool FirebaseAnalyticsScene::init() {
8281
auto visibleSize = Director::getInstance()->getVisibleSize();
8382
cocos2d::Vec2 origin = Director::getInstance()->getVisibleOrigin();
8483

85-
// Intitialize Firebase-Analytics.
84+
// Intitialize Firebase Analytics.
8685
CCLOG("Initializing the Analytics with Firebase API.");
8786
firebase::analytics::Initialize(*firebase::App::GetInstance());
8887

8988
// Create the Firebase label.
9089
auto firebaseLabel =
91-
Label::createWithTTF("Firebase-Analytics", "fonts/Marker Felt.ttf", 20);
90+
Label::createWithTTF("Firebase Analytics", "fonts/Marker Felt.ttf", 20);
9291
nextYPosition =
9392
origin.y + visibleSize.height - firebaseLabel->getContentSize().height;
9493
firebaseLabel->setPosition(
@@ -107,8 +106,7 @@ bool FirebaseAnalyticsScene::init() {
107106
// Set up the blue button.
108107
blue_button_ = createButton(true, kBlueButtonText, kBlueButtonColor);
109108
blue_button_->addTouchEventListener(
110-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
111-
cocos2d::ui::Button* button = static_cast(sender);
109+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
112110
switch (type) {
113111
case cocos2d::ui::Widget::TouchEventType::ENDED: {
114112
// When the blue button is clicked it logs an event with parameters
@@ -142,8 +140,7 @@ bool FirebaseAnalyticsScene::init() {
142140
// Set up the red button.
143141
red_button_ = createButton(true, kRedButtonText, kRedButtonColor);
144142
red_button_->addTouchEventListener(
145-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
146-
cocos2d::ui::Button* button = static_cast(sender);
143+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
147144
switch (type) {
148145
case cocos2d::ui::Widget::TouchEventType::ENDED: {
149146
// When the red button is clicked it logs an event with parameters
@@ -176,8 +173,7 @@ bool FirebaseAnalyticsScene::init() {
176173
// Set up the yellow button.
177174
yellow_button_ = createButton(true, kYellowButtonText, kYellowButtonColor);
178175
yellow_button_->addTouchEventListener(
179-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
180-
cocos2d::ui::Button* button = static_cast(sender);
176+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
181177
switch (type) {
182178
case cocos2d::ui::Widget::TouchEventType::ENDED: {
183179
// When the yellow button is clicked it logs an event with
@@ -210,8 +206,7 @@ bool FirebaseAnalyticsScene::init() {
210206
// Set up the green button.
211207
green_button_ = createButton(true, kGreenButtonText, kGreenButtonColor);
212208
green_button_->addTouchEventListener(
213-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
214-
cocos2d::ui::Button* button = static_cast(sender);
209+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
215210
switch (type) {
216211
case cocos2d::ui::Widget::TouchEventType::ENDED: {
217212
// When the green button is clicked it logs an event with

‎analytics/Classes/FirebaseAnalyticsScene.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "FirebaseCocos.h"
2828
#include "FirebaseScene.h"
2929

30-
3130
class FirebaseAnalyticsScene : public FirebaseScene {
3231
public:
3332
static cocos2d::Scene *createScene();

‎auth/Classes/FirebaseAuthScene.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
USING_NS_CC;
3535

36-
3736
/// Padding for the UI elements.
3837
static const float kUIElementPadding = 10.0;
3938

@@ -78,7 +77,7 @@ bool FirebaseAuthScene::init() {
7877

7978
// Create the Firebase label.
8079
auto firebaseLabel =
81-
Label::createWithTTF("Firebase-Auth", "fonts/Marker Felt.ttf", 20);
80+
Label::createWithTTF("Firebase Auth", "fonts/Marker Felt.ttf", 20);
8281
nextYPosition =
8382
origin.y + visibleSize.height - firebaseLabel->getContentSize().height;
8483
firebaseLabel->setPosition(
@@ -115,8 +114,7 @@ bool FirebaseAuthScene::init() {
115114

116115
register_user_button_ = createButton(true, "Register user");
117116
register_user_button_->addTouchEventListener(
118-
[this, auth](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
119-
cocos2d::ui::Button* button = static_cast(sender);
117+
[this, auth](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
120118
switch (type) {
121119
case cocos2d::ui::Widget::TouchEventType::ENDED: {
122120
this->logMessage("Registering user...");
@@ -136,8 +134,7 @@ bool FirebaseAuthScene::init() {
136134

137135
credentialed_sign_in_button_ = createButton(true, "Sign in");
138136
credentialed_sign_in_button_->addTouchEventListener(
139-
[this, auth](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
140-
cocos2d::ui::Button* button = static_cast(sender);
137+
[this, auth](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
141138
switch (type) {
142139
case cocos2d::ui::Widget::TouchEventType::ENDED: {
143140
this->logMessage("Signing in...");
@@ -161,8 +158,7 @@ bool FirebaseAuthScene::init() {
161158

162159
anonymous_sign_in_button_ = createButton(true, "Sign in anonymously");
163160
anonymous_sign_in_button_->addTouchEventListener(
164-
[this, auth](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
165-
cocos2d::ui::Button* button = static_cast(sender);
161+
[this, auth](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
166162
switch (type) {
167163
case cocos2d::ui::Widget::TouchEventType::ENDED: {
168164
this->logMessage("Signing in anonymously...");
@@ -183,8 +179,7 @@ bool FirebaseAuthScene::init() {
183179

184180
sign_out_button_ = createButton(false, "Sign out");
185181
sign_out_button_->addTouchEventListener(
186-
[this, auth](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
187-
cocos2d::ui::Button* button = static_cast(sender);
182+
[this, auth](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
188183
switch (type) {
189184
case cocos2d::ui::Widget::TouchEventType::ENDED: {
190185
this->logMessage("Signed out");

‎auth/Classes/FirebaseAuthScene.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "firebase/auth.h"
3030
#include "firebase/future.h"
3131

32-
3332
class FirebaseAuthScene : public FirebaseScene {
3433
public:
3534
static cocos2d::Scene *createScene();

‎common/Classes/FirebaseScene.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ void FirebaseScene::logMessage(std::string format, ...) {
130130

131131
va_list list;
132132
va_start(list, format);
133-
int stringLength = vsnprintf(buffer, kLineBufferSize, format.c_str(), list);
134-
stringLength =
135-
stringLength < kLineBufferSize ? stringLength : kLineBufferSize;
133+
vsnprintf(buffer, kLineBufferSize, format.c_str(), list);
136134
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
137135
__android_log_vprint(ANDROID_LOG_INFO, "FIREBASE-COCOS", format.c_str(),
138136
list);

‎database/Classes/FirebaseDatabaseScene.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ bool FirebaseDatabaseScene::init() {
135135

136136
// Create the Firebase label.
137137
auto firebaseLabel =
138-
Label::createWithTTF("Firebase-Database", "fonts/Marker Felt.ttf", 20);
138+
Label::createWithTTF("Firebase Database", "fonts/Marker Felt.ttf", 20);
139139
nextYPosition =
140140
origin.y + visibleSize.height - firebaseLabel->getContentSize().height;
141141
firebaseLabel->setPosition(
@@ -195,8 +195,7 @@ bool FirebaseDatabaseScene::init() {
195195

196196
add_listener_button_ = createButton(false, "Add Listener");
197197
add_listener_button_->addTouchEventListener(
198-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
199-
cocos2d::ui::Button* button = static_cast(sender);
198+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
200199
switch (type) {
201200
case cocos2d::ui::Widget::TouchEventType::ENDED: {
202201
const char* key = key_text_field_->getString().c_str();
@@ -218,8 +217,7 @@ bool FirebaseDatabaseScene::init() {
218217

219218
query_button_ = createButton(false, "Query");
220219
query_button_->addTouchEventListener(
221-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
222-
cocos2d::ui::Button* button = static_cast(sender);
220+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
223221
switch (type) {
224222
case cocos2d::ui::Widget::TouchEventType::ENDED: {
225223
const char* key = key_text_field_->getString().c_str();
@@ -247,8 +245,7 @@ bool FirebaseDatabaseScene::init() {
247245

248246
set_button_ = createButton(false, "Set");
249247
set_button_->addTouchEventListener(
250-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
251-
cocos2d::ui::Button* button = static_cast(sender);
248+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
252249
switch (type) {
253250
case cocos2d::ui::Widget::TouchEventType::ENDED: {
254251
const char* key = key_text_field_->getString().c_str();

‎invites/Classes/FirebaseInvitesScene.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ bool FirebaseInvitesScene::init() {
6868
auto visibleSize = Director::getInstance()->getVisibleSize();
6969
cocos2d::Vec2 origin = Director::getInstance()->getVisibleOrigin();
7070

71-
// Intitialize Firebase-Invites.
71+
// Intitialize Firebase Invites.
7272
CCLOG("Initializing the Invites with Firebase API.");
7373
firebase::invites::Initialize(*firebase::App::GetInstance());
7474

7575
// Create the Firebase label.
7676
auto firebaseLabel =
77-
Label::createWithTTF("Firebase-Invites", "fonts/Marker Felt.ttf", 20);
77+
Label::createWithTTF("Firebase Invites", "fonts/Marker Felt.ttf", 20);
7878
nextYPosition =
7979
origin.y + visibleSize.height - firebaseLabel->getContentSize().height;
8080
firebaseLabel->setPosition(
@@ -93,8 +93,7 @@ bool FirebaseInvitesScene::init() {
9393
// Set up the invite button.
9494
invite_button_ = createButton(true, kInviteButtonText);
9595
invite_button_->addTouchEventListener(
96-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
97-
cocos2d::ui::Button* button = static_cast(sender);
96+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
9897
switch (type) {
9998
case cocos2d::ui::Widget::TouchEventType::ENDED: {
10099
firebase::invites::Invite invite;

‎messaging/Classes/FirebaseMessagingScene.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
USING_NS_CC;
3535

36-
3736
/// Padding for the UI elements.
3837
static const float kUIElementPadding = 10.0;
3938

@@ -134,7 +133,7 @@ bool FirebaseMessagingScene::init() {
134133

135134
// Create the Firebase label.
136135
auto firebaseLabel =
137-
Label::createWithTTF("Firebase-Messaging", "fonts/Marker Felt.ttf", 20);
136+
Label::createWithTTF("Firebase Messaging", "fonts/Marker Felt.ttf", 20);
138137
nextYPosition =
139138
origin.y + visibleSize.height - firebaseLabel->getContentSize().height;
140139
firebaseLabel->setPosition(

‎remote_config/Classes/FirebaseRemoteConfigScene.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ bool FirebaseRemoteConfigScene::init() {
6969

7070
// Create the Firebase label.
7171
auto firebaseLabel = Label::createWithTTF(
72-
"Firebase-RemoteConfig", "fonts/Marker Felt.ttf", 20);
72+
"Firebase Remote Config", "fonts/Marker Felt.ttf", 20);
7373
nextYPosition =
7474
origin.y + visibleSize.height - firebaseLabel->getContentSize().height;
7575
firebaseLabel->setPosition(

‎storage/Classes/FirebaseStorageScene.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ bool FirebaseStorageScene::init() {
8787

8888
// Create the Firebase label.
8989
auto firebaseLabel =
90-
Label::createWithTTF("Firebase-Storage", "fonts/Marker Felt.ttf", 20);
90+
Label::createWithTTF("Firebase Storage", "fonts/Marker Felt.ttf", 20);
9191
nextYPosition =
9292
origin.y + visibleSize.height - firebaseLabel->getContentSize().height;
9393
firebaseLabel->setPosition(
@@ -145,8 +145,7 @@ bool FirebaseStorageScene::init() {
145145

146146
get_bytes_button_ = createButton(false, "Query");
147147
get_bytes_button_->addTouchEventListener(
148-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
149-
cocos2d::ui::Button* button = static_cast(sender);
148+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
150149
switch (type) {
151150
case cocos2d::ui::Widget::TouchEventType::ENDED: {
152151
const char* key = key_text_field_->getString().c_str();
@@ -175,8 +174,7 @@ bool FirebaseStorageScene::init() {
175174

176175
put_bytes_button_ = createButton(false, "Set");
177176
put_bytes_button_->addTouchEventListener(
178-
[this](Ref* sender, cocos2d::ui::Widget::TouchEventType type) {
179-
cocos2d::ui::Button* button = static_cast(sender);
177+
[this](Ref* /*sender*/, cocos2d::ui::Widget::TouchEventType type) {
180178
switch (type) {
181179
case cocos2d::ui::Widget::TouchEventType::ENDED: {
182180
const char* key = key_text_field_->getString().c_str();

0 commit comments

Comments
 (0)