refactor(Core): apply clang-tidy modernize-use-override (#3817)

This commit is contained in:
Francesco Borzì
2020-12-06 18:04:55 +01:00
committed by GitHub
parent 9facd81e54
commit d4a58700d4
561 changed files with 9574 additions and 9574 deletions

View File

@@ -85,34 +85,34 @@ namespace VMAP
static std::string getMapFileName(unsigned int mapId);
VMapManager2();
~VMapManager2(void);
~VMapManager2(void) override;
int loadMap(const char* pBasePath, unsigned int mapId, int x, int y);
int loadMap(const char* pBasePath, unsigned int mapId, int x, int y) override;
void unloadMap(unsigned int mapId, int x, int y);
void unloadMap(unsigned int mapId);
void unloadMap(unsigned int mapId, int x, int y) override;
void unloadMap(unsigned int mapId) override;
bool isInLineOfSight(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2) ;
bool isInLineOfSight(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2) override ;
/**
fill the hit pos and return true, if an object was hit
*/
bool getObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist);
float getHeight(unsigned int mapId, float x, float y, float z, float maxSearchDist);
bool getObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) override;
float getHeight(unsigned int mapId, float x, float y, float z, float maxSearchDist) override;
bool processCommand(char* /*command*/) { return false; } // for debug and extensions
bool processCommand(char* /*command*/) override { return false; } // for debug and extensions
bool getAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const;
bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type) const;
bool getAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const override;
bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type) const override;
WorldModel* acquireModelInstance(const std::string& basepath, const std::string& filename);
void releaseModelInstance(const std::string& filename);
// what's the use of this? o.O
virtual std::string getDirFileName(unsigned int mapId, int /*x*/, int /*y*/) const
std::string getDirFileName(unsigned int mapId, int /*x*/, int /*y*/) const override
{
return getMapFileName(mapId);
}
virtual bool existsMap(const char* basePath, unsigned int mapId, int x, int y);
bool existsMap(const char* basePath, unsigned int mapId, int x, int y) override;
public:
void getInstanceMapTree(InstanceTreeMap& instanceMapTree);

View File

@@ -17,9 +17,9 @@ class BasicStatementTask : public SQLOperation
public:
BasicStatementTask(const char* sql);
BasicStatementTask(const char* sql, QueryResultFuture result);
~BasicStatementTask();
~BasicStatementTask() override;
bool Execute();
bool Execute() override;
private:
const char* m_sql; //- Raw query to be executed

View File

@@ -18,8 +18,8 @@ public:
DatabaseWorker(ACE_Activation_Queue* new_queue, MySQLConnection* con);
///- Inherited from ACE_Task_Base
int svc();
int wait() { return ACE_Task_Base::wait(); }
int svc() override;
int wait() override { return ACE_Task_Base::wait(); }
private:
DatabaseWorker() : ACE_Task_Base() { }

View File

@@ -24,7 +24,7 @@
class PingOperation : public SQLOperation
{
//! Operation for idle delaythreads
bool Execute()
bool Execute() override
{
m_conn->Ping();
return true;

View File

@@ -18,7 +18,7 @@ public:
CharacterDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {}
//- Loads database type specific prepared statements
void DoPrepareStatements();
void DoPrepareStatements() override;
};
typedef DatabaseWorkerPool<CharacterDatabaseConnection> CharacterDatabaseWorkerPool;

View File

@@ -18,7 +18,7 @@ public:
LoginDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) { }
//- Loads database type specific prepared statements
void DoPrepareStatements();
void DoPrepareStatements() override;
};
typedef DatabaseWorkerPool<LoginDatabaseConnection> LoginDatabaseWorkerPool;

View File

@@ -18,7 +18,7 @@ public:
WorldDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) { }
//- Loads database type specific prepared statements
void DoPrepareStatements();
void DoPrepareStatements() override;
};
typedef DatabaseWorkerPool<WorldDatabaseConnection> WorldDatabaseWorkerPool;

View File

@@ -144,9 +144,9 @@ class PreparedStatementTask : public SQLOperation
public:
PreparedStatementTask(PreparedStatement* stmt);
PreparedStatementTask(PreparedStatement* stmt, PreparedQueryResultFuture result);
~PreparedStatementTask();
~PreparedStatementTask() override;
bool Execute();
bool Execute() override;
protected:
PreparedStatement* m_stmt;

View File

@@ -39,7 +39,7 @@ private:
public:
SQLQueryHolderTask(SQLQueryHolder* holder, QueryResultHolderFuture res)
: m_holder(holder), m_result(res) { };
bool Execute();
bool Execute() override;
};

View File

@@ -49,7 +49,7 @@ class SQLOperation : public ACE_Method_Request
{
public:
SQLOperation(): m_conn(NULL) { }
virtual int call()
int call() override
{
Execute();
return 0;

View File

@@ -49,10 +49,10 @@ class TransactionTask : public SQLOperation
public:
TransactionTask(SQLTransaction trans) : m_trans(trans) { } ;
~TransactionTask() { };
~TransactionTask() override { };
protected:
bool Execute();
bool Execute() override;
SQLTransaction m_trans;
};

View File

@@ -22,9 +22,9 @@
class ByteBufferException : public std::exception
{
public:
~ByteBufferException() throw() { }
~ByteBufferException() throw() override { }
char const* what() const throw() { return msg_.c_str(); }
char const* what() const throw() override { return msg_.c_str(); }
protected:
std::string& message() throw() { return msg_; }
@@ -38,7 +38,7 @@ class ByteBufferPositionException : public ByteBufferException
public:
ByteBufferPositionException(bool add, size_t pos, size_t size, size_t valueSize);
~ByteBufferPositionException() throw() { }
~ByteBufferPositionException() throw() override { }
};
class ByteBufferSourceException : public ByteBufferException
@@ -46,7 +46,7 @@ class ByteBufferSourceException : public ByteBufferException
public:
ByteBufferSourceException(size_t pos, size_t size, size_t valueSize);
~ByteBufferSourceException() throw() { }
~ByteBufferSourceException() throw() override { }
};
class ByteBuffer

View File

@@ -16,7 +16,7 @@ namespace acore
class SignalHandler : public ACE_Event_Handler
{
public:
int handle_signal(int SigNum, siginfo_t* = NULL, ucontext_t* = NULL)
int handle_signal(int SigNum, siginfo_t* = NULL, ucontext_t* = NULL) override
{
HandleSignal(SigNum);
return 0;