git repos / oastat

commit 80199927

sago007 · 2018-11-10 16:41
801999272734700e41df0fa54602b0cf77b17660 patch · browse files
parent 554307deec92f16e1ba026fdc1b191b80a299959 

Add C++11 override

Changed files

M src/db/Db2CppDb.hpp before
M src/db/Db2DbiXX.hpp before
M src/db/Db2Xml.hpp before
M src/oss2db/Accuracy2Db.hpp before
M src/oss2db/Challenge2Db.hpp before
M src/oss2db/Ctf2Db.hpp before
M src/oss2db/Disconnect2Db.h before
M src/oss2db/Elimination2Db.hpp before
M src/oss2db/Harvester2Db.hpp before
M src/oss2db/Warmup2Db.hpp before
M src/oss2db/kill2db.h before
diff --git a/src/db/Db2CppDb.hpp b/src/db/Db2CppDb.hpp index fe7528f..ac8edb7 100644 --- a/src/db/Db2CppDb.hpp +++ b/src/db/Db2CppDb.hpp
@@ -35,25 +35,25 @@ public:
Db2CppDb(const std::string &dbargs);
Db2CppDb(const Db2CppDb& orig);
virtual ~Db2CppDb();
- void createTables();
- void startGame(int gametype, const std::string &mapname, const std::string &basegame, const std::string &servername, const OaStatStruct &oss);
- void addGameCvar(const std::string &cvar, const std::string &value);
- void endGame(int second);
- int getGameNumber();
- void setPlayerInfo(const std::string &guid, const std::string &nickname, bool isBot, int second, int team, const std::string &model, const std::string &headmodel, int skill);
- void addKill(int second, const std::string &attackerID, const std::string &targetID, int type);
+ void createTables() override;
+ void startGame(int gametype, const std::string &mapname, const std::string &basegame, const std::string &servername, const OaStatStruct &oss) override;
+ void addGameCvar(const std::string &cvar, const std::string &value) override;
+ void endGame(int second) override;
+ int getGameNumber() override;
+ void setPlayerInfo(const std::string &guid, const std::string &nickname, bool isBot, int second, int team, const std::string &model, const std::string &headmodel, int skill) override;
+ void addKill(int second, const std::string &attackerID, const std::string &targetID, int type) override;
//void addCapture(int second, string player, int team);
- void addAward(int second, const std::string &player, int award);
- void addScoreInfo(int second, const std::string &player, int score);
- void addCtf(int second, const std::string &player, int team, int event);
- void addCtf1f(int second, const std::string &player, int team, int event);
- void addElimination(int second, int roundnumber, int team, int event);
- void addCtfElimination(int second, int roundnumber, const std::string &player, int team, int event);
- void addHarvester(int second, const std::string &player1, const std::string &player2, int team, int event, int score);
- void addChallenge(int second, const std::string &player, int challenge, int amount);
- void addAccuracy(int second, const std::string &player, int type, int shotsFired, int shotsHit);
- void addGenericTeamEvent(int second, int team, int amount, const std::string &gametype, const std::string &player1, const std::string &player2, int event, int generic1);
- void doNotCommit();
+ void addAward(int second, const std::string &player, int award) override;
+ void addScoreInfo(int second, const std::string &player, int score) override;
+ void addCtf(int second, const std::string &player, int team, int event) override;
+ void addCtf1f(int second, const std::string &player, int team, int event) override;
+ void addElimination(int second, int roundnumber, int team, int event) override;
+ void addCtfElimination(int second, int roundnumber, const std::string &player, int team, int event) override;
+ void addHarvester(int second, const std::string &player1, const std::string &player2, int team, int event, int score) override;
+ void addChallenge(int second, const std::string &player, int challenge, int amount) override;
+ void addAccuracy(int second, const std::string &player, int type, int shotsFired, int shotsHit) override;
+ void addGenericTeamEvent(int second, int team, int amount, const std::string &gametype, const std::string &player1, const std::string &player2, int event, int generic1) override;
+ void doNotCommit() override;
private:
std::shared_ptr<cppdb::session> sql;
std::shared_ptr<cppdb::transaction> commitlock;
diff --git a/src/db/Db2DbiXX.hpp b/src/db/Db2DbiXX.hpp index 3db42ce..81d8dfd 100644 --- a/src/db/Db2DbiXX.hpp +++ b/src/db/Db2DbiXX.hpp
@@ -38,25 +38,25 @@ public:
Db2DbiXX(const string &dbargs);
Db2DbiXX(const Db2DbiXX& orig);
virtual ~Db2DbiXX();
- void createTables();
- void startGame(int gametype, const string &mapname, const string &basegame, const string &servername, const OaStatStruct &oss);
- void addGameCvar(const std::string &cvar, const std::string &value);
- void endGame(int second);
- int getGameNumber();
- void setPlayerInfo(const std::string &guid, const std::string &nickname, bool isBot, int second, int team, const std::string &model, const std::string &headmodel, int skill);
- void addKill(int second, const std::string &attackerID, const std::string &targetID, int type);
+ void createTables() override;
+ void startGame(int gametype, const std::string &mapname, const std::string &basegame, const std::string &servername, const OaStatStruct &oss) override;
+ void addGameCvar(const std::string &cvar, const std::string &value) override;
+ void endGame(int second) override;
+ int getGameNumber() override;
+ void setPlayerInfo(const std::string &guid, const std::string &nickname, bool isBot, int second, int team, const std::string &model, const std::string &headmodel, int skill) override;
+ void addKill(int second, const std::string &attackerID, const std::string &targetID, int type) override;
//void addCapture(int second, string player, int team);
- void addAward(int second, const std::string &player, int award);
- void addScoreInfo(int second, const std::string &player, int score);
- void addCtf(int second, const std::string &player, int team, int event);
- void addCtf1f(int second, const std::string &player, int team, int event);
- void addElimination(int second, int roundnumber, int team, int event);
- void addCtfElimination(int second, int roundnumber, const std::string &player, int team, int event);
- void addHarvester(int second, const std::string &player1, const std::string &player2, int team, int event, int score);
- void addChallenge(int second, const std::string &player, int challenge, int amount);
- void addAccuracy(int second, const std::string &player, int type, int shotsFired, int shotsHit);
- void addGenericTeamEvent(int second, int team, int amount, const std::string &gametype, const std::string &player1, const std::string &player2, int event, int generic1);
- void doNotCommit();
+ void addAward(int second, const std::string &player, int award) override;
+ void addScoreInfo(int second, const std::string &player, int score) override;
+ void addCtf(int second, const std::string &player, int team, int event) override;
+ void addCtf1f(int second, const std::string &player, int team, int event) override;
+ void addElimination(int second, int roundnumber, int team, int event) override;
+ void addCtfElimination(int second, int roundnumber, const std::string &player, int team, int event) override;
+ void addHarvester(int second, const std::string &player1, const std::string &player2, int team, int event, int score) override;
+ void addChallenge(int second, const std::string &player, int challenge, int amount) override;
+ void addAccuracy(int second, const std::string &player, int type, int shotsFired, int shotsHit) override;
+ void addGenericTeamEvent(int second, int team, int amount, const std::string &gametype, const std::string &player1, const std::string &player2, int event, int generic1) override;
+ void doNotCommit() override;
private:
dbixx::session *sql;
dbixx::transaction *commitlock;
diff --git a/src/db/Db2Xml.hpp b/src/db/Db2Xml.hpp index 60e8f66..93fe933 100644 --- a/src/db/Db2Xml.hpp +++ b/src/db/Db2Xml.hpp
@@ -43,26 +43,26 @@ public:
Db2Xml(std::string dbargs);
Db2Xml(const Db2Xml& orig);
virtual ~Db2Xml();
- void createTables();
- void startGame(int gametype, const std::string &mapname, const std::string &basegame, const std::string &servername, const OaStatStruct &oss);
- void addGameCvar(const std::string &cvar, const std::string &value);
- void endGame(int second);
- int getGameNumber();
+ void createTables() override;
+ void startGame(int gametype, const std::string &mapname, const std::string &basegame, const std::string &servername, const OaStatStruct &oss) override;
+ void addGameCvar(const std::string &cvar, const std::string &value) override;
+ void endGame(int second) override;
+ int getGameNumber() override;
void setPlayerInfo(const std::string &guid, const std::string &nickname, bool isBot,
- int second, int team, const std::string &model, const std::string &headmodel, int skill);
- void addKill(int second, const std::string &attackerID, const std::string &targetID, int type);
+ int second, int team, const std::string &model, const std::string &headmodel, int skill) override;
+ void addKill(int second, const std::string &attackerID, const std::string &targetID, int type) override;
//void addCapture(int second, string player, int team);
- void addAward(int second, const std::string &player, int award);
- void addScoreInfo(int second, const std::string &player, int score);
- void addCtf(int second, const std::string &player, int team, int event);
- void addCtf1f(int second, const std::string &player, int team, int event);
- void addElimination(int second, int roundnumber, int team, int event);
- void addCtfElimination(int second, int roundnumber, const std::string &player, int team, int event);
- void addHarvester(int second, const std::string &player1, const std::string &player2, int team, int event, int score);
- void addChallenge(int second, const std::string &player, int challenge, int amount);
- void addAccuracy(int second, const std::string &player, int type, int shotsFired, int shotsHit);
- void addGenericTeamEvent(int second, int team, int amount, const std::string &gametype, const std::string &player1, const std::string &player2, int event, int generic1);
- void doNotCommit();
+ void addAward(int second, const std::string &player, int award) override;
+ void addScoreInfo(int second, const std::string &player, int score) override;
+ void addCtf(int second, const std::string &player, int team, int event) override;
+ void addCtf1f(int second, const std::string &player, int team, int event) override;
+ void addElimination(int second, int roundnumber, int team, int event) override;
+ void addCtfElimination(int second, int roundnumber, const std::string &player, int team, int event) override;
+ void addHarvester(int second, const std::string &player1, const std::string &player2, int team, int event, int score) override;
+ void addChallenge(int second, const std::string &player, int challenge, int amount) override;
+ void addAccuracy(int second, const std::string &player, int type, int shotsFired, int shotsHit) override;
+ void addGenericTeamEvent(int second, int team, int amount, const std::string &gametype, const std::string &player1, const std::string &player2, int event, int generic1) override;
+ void doNotCommit() override;
private:
std::string p_output_dir;
std::string p_servername; //Used for filename
diff --git a/src/oss2db/Accuracy2Db.hpp b/src/oss2db/Accuracy2Db.hpp index 7cfa14e..f7ad133 100644 --- a/src/oss2db/Accuracy2Db.hpp +++ b/src/oss2db/Accuracy2Db.hpp
@@ -29,10 +29,10 @@ https://github.com/sago007/oastat/
class Accuracy2Db : public Struct2Db {
public:
- std::string getCommand() const;
- bool canProcess(const OaStatStruct &oss) const;
+ std::string getCommand() const override;
+ bool canProcess(const OaStatStruct &oss) const override;
- void process(const OaStatStruct &oss);
+ void process(const OaStatStruct &oss) override;
private:
};
diff --git a/src/oss2db/Challenge2Db.hpp b/src/oss2db/Challenge2Db.hpp index 9131ac0..2993417 100644 --- a/src/oss2db/Challenge2Db.hpp +++ b/src/oss2db/Challenge2Db.hpp
@@ -30,10 +30,10 @@ https://github.com/sago007/oastat/
class Challenge2Db : public Struct2Db
{
public:
- std::string getCommand() const;
- bool canProcess(const OaStatStruct &oss) const;
+ std::string getCommand() const override;
+ bool canProcess(const OaStatStruct &oss) const override;
- void process(const OaStatStruct &oss);
+ void process(const OaStatStruct &oss) override;
private:
};
diff --git a/src/oss2db/Ctf2Db.hpp b/src/oss2db/Ctf2Db.hpp index 6284df0..27bf95b 100644 --- a/src/oss2db/Ctf2Db.hpp +++ b/src/oss2db/Ctf2Db.hpp
@@ -31,10 +31,10 @@ class Ctf2Db : public Struct2Db
{
public:
- std::string getCommand() const;
- bool canProcess(const OaStatStruct &oss) const;
+ std::string getCommand() const override;
+ bool canProcess(const OaStatStruct &oss) const override;
- void process(const OaStatStruct &oss);
+ void process(const OaStatStruct &oss) override;
private:
};
diff --git a/src/oss2db/Disconnect2Db.h b/src/oss2db/Disconnect2Db.h index 5465416..8740722 100644 --- a/src/oss2db/Disconnect2Db.h +++ b/src/oss2db/Disconnect2Db.h
@@ -31,10 +31,10 @@ class Disconnect2Db : public Struct2Db
{
public:
- std::string getCommand() const;
- bool canProcess(const OaStatStruct &oss) const;
+ std::string getCommand() const override;
+ bool canProcess(const OaStatStruct &oss) const override;
- void process(const OaStatStruct &oss);
+ void process(const OaStatStruct &oss) override;
private:
};
diff --git a/src/oss2db/Elimination2Db.hpp b/src/oss2db/Elimination2Db.hpp index 3f7c6d3..3e72622 100644 --- a/src/oss2db/Elimination2Db.hpp +++ b/src/oss2db/Elimination2Db.hpp
@@ -30,10 +30,10 @@ https://github.com/sago007/oastat/
class Elimination2Db : public Struct2Db
{
public:
- std::string getCommand() const;
- bool canProcess(const OaStatStruct &oss) const;
+ std::string getCommand() const override;
+ bool canProcess(const OaStatStruct &oss) const override;
- void process(const OaStatStruct &oss);
+ void process(const OaStatStruct &oss) override;
private:
};
diff --git a/src/oss2db/Harvester2Db.hpp b/src/oss2db/Harvester2Db.hpp index 5a5dff2..89625fe 100644 --- a/src/oss2db/Harvester2Db.hpp +++ b/src/oss2db/Harvester2Db.hpp
@@ -30,10 +30,10 @@ https://github.com/sago007/oastat/
class Harvester2Db : public Struct2Db
{
public:
- std::string getCommand() const;
- bool canProcess(const OaStatStruct &oss) const;
+ std::string getCommand() const override;
+ bool canProcess(const OaStatStruct &oss) const override;
- void process(const OaStatStruct &oss);
+ void process(const OaStatStruct &oss) override;
private:
};
diff --git a/src/oss2db/Warmup2Db.hpp b/src/oss2db/Warmup2Db.hpp index 2ac9d67..d6a9787 100644 --- a/src/oss2db/Warmup2Db.hpp +++ b/src/oss2db/Warmup2Db.hpp
@@ -30,10 +30,10 @@ https://github.com/sago007/oastat/
class Warmup2Db : public Struct2Db
{
public:
- std::string getCommand() const;
- bool canProcess(const OaStatStruct &oss) const;
+ std::string getCommand() const override;
+ bool canProcess(const OaStatStruct &oss) const override;
- void process(const OaStatStruct &oss);
+ void process(const OaStatStruct &oss) override;
private:
};
diff --git a/src/oss2db/kill2db.h b/src/oss2db/kill2db.h index f3403ae..e17ba44 100644 --- a/src/oss2db/kill2db.h +++ b/src/oss2db/kill2db.h
@@ -30,10 +30,10 @@ https://github.com/sago007/oastat/
class Kill2Db : public Struct2Db
{
- std::string getCommand() const;
- bool canProcess(const OaStatStruct &oss) const;
+ std::string getCommand() const override;
+ bool canProcess(const OaStatStruct &oss) const override;
- void process(const OaStatStruct &oss);
+ void process(const OaStatStruct &oss) override;
};