ondra/server-sdk
1
0
Fork 1
mirror of https://gitlab.com/spaceti-app/integrations/common/server-sdk.git synced 2026-07-12 17:50:41 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/clang-checks' into 'master'

Browse Source 
clang: fixing warnings without impact on function

See merge request spaceti-app/integrations/common/server-sdk!14
This commit is contained in:
Filip Bucek 2019-12-02 09:02:32 +00:00
commit b1fa0566b4
9 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/serversdk/databasemanager.cpp
View File

@ -110,10 +110,9 @@ QSqlQuery DatabaseManager::executeQuery(QSqlQuery &query, const QString &sqlText
if ( ! sqlText.isEmpty()) { // prepared statement.
res = query.exec(sqlText);
return processResult(res, query);
} else {
res = query.exec();
return processResult(res, query);
}
res = query.exec();
return processResult(res, query);
}
return query;
}

2
src/serversdk/databasemanager.h
View File

@ -19,7 +19,7 @@ class DatabaseManager : public QObject
public:
DatabaseManager();
DatabaseManager(const QString& host, const QString& dbName, const QString& user, const QString& password, bool mDryMode = false);
~DatabaseManager();
~DatabaseManager() override;
// Attributes
bool dryMode() const;

2
src/serversdk/databasetable.h
View File

@ -17,7 +17,7 @@
emit NAME ## Changed(value); \
} \
Q_SIGNAL void NAME ## Changed(TYPE value);\
protected: \
private: \
TYPE a_ ## NAME = INITVAL;
namespace serversdk {

23
src/serversdk/databaseutils.cpp
View File

@ -4,6 +4,7 @@
#include "logger.h"
#include <QMetaProperty>
#include <utility>
namespace serversdk {
@ -29,14 +30,14 @@ namespace serversdk {
*
*
*/
DatabaseUtils::DatabaseUtils(DatabaseManager *manager, const QString type)
: mDatabaseManager(manager), mSqlType(type)
DatabaseUtils::DatabaseUtils(DatabaseManager *manager, QString type)
: mDatabaseManager(manager), mSqlType(std::move(type))
{
Q_ASSERT(mDatabaseManager);
}
QString DatabaseUtils::createTableText(const DatabaseTable *table, const QString table_name) const
QString DatabaseUtils::createTableText(const DatabaseTable *table, const QString &table_name) const
{
QString userData;
@ -101,10 +102,10 @@ QString DatabaseUtils::createTableText(const DatabaseTable *table, const QString
return sql;
}
QSqlQuery DatabaseUtils::createTable(const DatabaseTable *table, const QString tableName) const
QSqlQuery DatabaseUtils::createTable(const DatabaseTable *table, const QString &table_name) const
{
// CREATE TABLE ...
QString sql = createTableText(table, tableName);
QString sql = createTableText(table, table_name);
qCDebug(sdkdb) << "SQL:" << sql;
return mDatabaseManager->execPlainSql(sql);
}
@ -117,7 +118,7 @@ QSqlQuery DatabaseUtils::createTable(const DatabaseTable *table, const QString t
*
* @todo Loop VariantMap change to Loop over propertiess
*/
QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QString table_name) const
QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QString &table_name) const
{
QString columns;
QString values;
@ -128,7 +129,7 @@ QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QStri
// out: columns: id
// out: values: :id
auto keys = valueMap.keys();
for (auto _key : keys) {
for (const auto& _key : keys) {
QString key = fromCamelCase(_key);
if (!columns.isEmpty()) {
columns += ", ";
@ -142,7 +143,7 @@ QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QStri
QString queryText = QString("INSERT INTO %1 ( %2 ) VALUES ( %3 );").arg(table_name).arg(columns).arg(values);
query.prepare(queryText);
for (auto _key : keys ) {
for (const auto& _key : keys ) {
QString key = fromCamelCase(_key);
auto value = valueMap.value(_key);
query.bindValue(":"+key, value);
@ -153,7 +154,7 @@ QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QStri
}
QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString table_name) const
QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString &table_name) const
{
QString columnsAndValues;
QString primaryKeyCondition;
@ -168,7 +169,7 @@ QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString t
const QString primaryKey = table->primaryKey();
primaryKeyCondition = primaryKey + " = :" + primaryKey;
for (auto _key : keys) {
for (const auto& _key : keys) {
QString key = fromCamelCase(_key);
if (!columnsAndValues.isEmpty()) {
columnsAndValues += ", ";
@ -180,7 +181,7 @@ QSqlQuery DatabaseUtils::updateTable(const DatabaseTable *table, const QString t
QString queryText = QString("UPDATE %1 SET %2 WHERE %3;").arg(table_name).arg(columnsAndValues).arg(primaryKeyCondition);
query.prepare(queryText);
for (auto _key : keys ) {
for (const auto& _key : keys ) {
QString key = fromCamelCase(_key);
auto value = valueMap.value(_key);
query.bindValue(":"+key, value);

10
src/serversdk/databaseutils.h
View File

@ -19,13 +19,13 @@ class DatabaseUtils : public QObject
Q_OBJECT
friend class ::DatabaseUtilsTest;
public:
explicit DatabaseUtils(DatabaseManager *manager = nullptr, const QString type = "SQLITE");
explicit DatabaseUtils(DatabaseManager *manager = nullptr, QString type = "SQLITE");
QSqlQuery createTable(const DatabaseTable *table, const QString table_name) const;
QSqlQuery createTable(const DatabaseTable *table, const QString &table_name) const;
QSqlQuery insertIntoTable(const DatabaseTable *table, const QString table_name) const;
QSqlQuery insertIntoTable(const DatabaseTable *table, const QString &table_name) const;
QSqlQuery updateTable(const DatabaseTable *table, const QString table_name) const;
QSqlQuery updateTable(const DatabaseTable *table, const QString &table_name) const;
template <class T>
QList<std::shared_ptr<T>> tableFromQuery(QSqlQuery query) const {
@ -55,7 +55,7 @@ public:
static QString toCamelCase(const QString& s);
private:
QString createTableText(const DatabaseTable *table, const QString table_name) const;
QString createTableText(const DatabaseTable *table, const QString &table_name) const;
private:
DatabaseManager *mDatabaseManager = nullptr;

2
src/serversdk/request.cpp
View File

@ -7,7 +7,7 @@
namespace serversdk {
Request::Request(QString type, QString url, QByteArray requestData)
: mType(type), mUrl(url), mRequestData(requestData)
: mType(std::move(type)), mUrl(std::move(url)), mRequestData(std::move(requestData))
{
}

6
src/serversdk/soaprequest.cpp
View File

@ -1,9 +1,11 @@
#include "soaprequest.h"
#include <utility>
namespace serversdk {
SoapRequest::SoapRequest(QString action, QString endpoint, QByteArray data)
: mSoapAction(action)
SoapRequest::SoapRequest(QString action, const QString& endpoint, const QByteArray& data)
: mSoapAction(std::move(action))
{
setType("POST");
setUrl(endpoint);

2
src/serversdk/soaprequest.h
View File

@ -8,7 +8,7 @@ class SoapRequest : public Request
{
Q_OBJECT
public:
SoapRequest(QString action, QString endpoint, QByteArray data);
SoapRequest(QString action, const QString& endpoint, const QByteArray& data);
QNetworkRequest networkRequest() const override;
QString soapAction() const;

2
src/serversdk/utils.cpp
View File

@ -19,7 +19,7 @@ namespace serversdk {
QByteArray Utils::decompress(const QByteArray &compressed)
{
if (compressed.size() <= 4) {
qWarning("gUncompress: Input data is truncated");
qCCritical(sdkutils) << "gUncompress: Input data is truncated";
return QByteArray();
}