Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Clang-format corrections
  • Loading branch information
Grant-Postma committed May 31, 2020
commit eedf812896ec2dd35695c41128c7d17ca8ae7936
1 change: 0 additions & 1 deletion database/testapp/src/common_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "firebase/future.h"
#include "firebase/util.h"


// Thin OS abstraction layer.
#include "main.h" // NOLINT

Expand Down
15 changes: 7 additions & 8 deletions demos/TicTacToe/Classes/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

#include "cocos2d.h"

class AppDelegate : private cocos2d::Application
{
public:
AppDelegate();
virtual ~AppDelegate();
class AppDelegate : private cocos2d::Application {
public:
AppDelegate();
virtual ~AppDelegate();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of virtual, use override.

https://en.cppreference.com/w/cpp/language/override


virtual bool applicationDidFinishLaunching();
virtual void applicationDidEnterBackground();
virtual void applicationWillEnterForeground();
virtual bool applicationDidFinishLaunching();
virtual void applicationDidEnterBackground();
virtual void applicationWillEnterForeground();
};
18 changes: 7 additions & 11 deletions demos/TicTacToe/Classes/TicTacToeScene.h
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
#pragma once
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


#include "cocos2d.h"
#include <array>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need any of these in the header. None of them are needed for what is exposed in this header.

#include <iostream>
#include <cstdlib>
#include <iostream>

#include "cocos2d.h"


class TicTacToe : public cocos2d::Layer
{
public:
static cocos2d::Scene* createScene();
virtual bool init();
CREATE_FUNC(TicTacToe);


class TicTacToe : public cocos2d::Layer {
public:
static cocos2d::Scene* createScene();
virtual bool init();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

override

CREATE_FUNC(TicTacToe);
};