Clang-tidy and Clanzy

This commit is contained in:
Ondřej Fischer 2019-11-06 16:56:16 +01:00
parent 8e21275b6a
commit 33e0c42eac
5 changed files with 14 additions and 15 deletions

View File

@ -16,7 +16,7 @@ DatabaseManager::DatabaseManager(const QString& host, const QString& dbName, con
} }
// add or update subject to db // add or update subject to db
int DatabaseManager::saveSubject(std::shared_ptr<Subject> subject, const QString& table) int DatabaseManager::saveSubject(const std::shared_ptr<Subject>& subject, const QString& table)
{ {
QSqlQuery query; QSqlQuery query;
QString id = subject->idToStringWithoutBraces(); QString id = subject->idToStringWithoutBraces();
@ -42,7 +42,7 @@ int DatabaseManager::saveSubject(std::shared_ptr<Subject> subject, const QString
} }
// add or update token to DB // add or update token to DB
int DatabaseManager::saveToken(std::shared_ptr<Token> token, const QString& table) int DatabaseManager::saveToken(const std::shared_ptr<Token>& token, const QString& table)
{ {
QSqlQuery query; QSqlQuery query;
QString id = token->idToStringWithoutBraces(); QString id = token->idToStringWithoutBraces();
@ -75,7 +75,7 @@ int DatabaseManager::saveToken(std::shared_ptr<Token> token, const QString& tabl
} }
// add of update subject attributes // add of update subject attributes
void DatabaseManager::saveSubjectAttributes(std::shared_ptr<Subject> subject, const QString& table) void DatabaseManager::saveSubjectAttributes(const std::shared_ptr<Subject>& subject, const QString& table)
{ {
QSqlQuery query; QSqlQuery query;
auto attributes = subject->getAtr(); auto attributes = subject->getAtr();

View File

@ -19,9 +19,9 @@ class DatabaseManager : public QObject
public: public:
DatabaseManager(const QString& host, const QString& dbName, const QString& user, const QString& password, const bool& dryMode = false); DatabaseManager(const QString& host, const QString& dbName, const QString& user, const QString& password, const bool& dryMode = false);
int saveSubject(std::shared_ptr<Subject> subject, const QString& table); int saveSubject(const std::shared_ptr<Subject>& subject, const QString& table);
int saveToken(std::shared_ptr<Token> token, const QString& table); int saveToken(const std::shared_ptr<Token>& token, const QString& table);
void saveSubjectAttributes(std::shared_ptr<Subject> subject, const QString& table); void saveSubjectAttributes(const std::shared_ptr<Subject>& subject, const QString& table);
void setDeleted(const QString& id, const QString& table, quint64 time); void setDeleted(const QString& id, const QString& table, quint64 time);
void dropTables(); void dropTables();

View File

@ -1,5 +1,7 @@
#include "logger.h" #include "logger.h"
#include <utility>
std::shared_ptr<DatabaseManager> Logger::dbMan = nullptr; std::shared_ptr<DatabaseManager> Logger::dbMan = nullptr;
Logger *Logger::logger = nullptr; Logger *Logger::logger = nullptr;
@ -28,7 +30,7 @@ void Logger::logToDb(const QString &msg)
void Logger::setDBMan(std::shared_ptr<DatabaseManager> dbMan) void Logger::setDBMan(std::shared_ptr<DatabaseManager> dbMan)
{ {
Logger::dbMan = dbMan; Logger::dbMan = std::move(dbMan);
} }
QString Logger::makeTokenMsg(const QString &tokenId, const QString &action, const QString &source) QString Logger::makeTokenMsg(const QString &tokenId, const QString &action, const QString &source)

View File

@ -23,8 +23,7 @@ Token::Token(const QString &name)
} }
Token::~Token() Token::~Token()
{ = default;
}
void Token::fromJSON(const QJsonObject &json) { void Token::fromJSON(const QJsonObject &json) {
@ -57,7 +56,7 @@ QJsonObject Token::toJSON() const {
return json; return json;
} }
void Token::fromSQLRecord(QSqlQuery query) void Token::fromSQLRecord(const QSqlQuery& query)
{ {
setId(query.value(0).toUuid()); setId(query.value(0).toUuid());
authErrors = query.value(1).toInt(); authErrors = query.value(1).toInt();

View File

@ -23,7 +23,7 @@ public:
return lToken.getLastModified() > rToken.getLastUpdate(); return lToken.getLastModified() > rToken.getLastUpdate();
} }
friend bool operator==(const Token &lToken, const Token &rToken){ friend bool operator==(const Token &lToken, const Token &rToken){
if ( lToken.getId() == rToken.getId() && return lToken.getId() == rToken.getId() &&
lToken.getName() == rToken.getName() && lToken.getName() == rToken.getName() &&
lToken.getDescription() == rToken.getDescription() && lToken.getDescription() == rToken.getDescription() &&
lToken.getLastUpdate() == rToken.getLastUpdate() && lToken.getLastUpdate() == rToken.getLastUpdate() &&
@ -33,9 +33,7 @@ public:
lToken.timeToLive == rToken.timeToLive && lToken.timeToLive == rToken.timeToLive &&
lToken.authErrors == rToken.authErrors && lToken.authErrors == rToken.authErrors &&
lToken.flags == rToken.flags && lToken.flags == rToken.flags &&
lToken.subjectId == rToken.subjectId) lToken.subjectId == rToken.subjectId;
return true;
return false;
} }
@ -57,7 +55,7 @@ public:
QString subjectIdToStringWithoutBraces(); QString subjectIdToStringWithoutBraces();
void fromSQLRecord(QSqlQuery query); void fromSQLRecord(const QSqlQuery& query);
void fromJSON(const QJsonObject &json) override; void fromJSON(const QJsonObject &json) override;
QJsonObject toJSON() const override; QJsonObject toJSON() const override;