From c341fd758ecb805f1483db1964b4591933c159d4 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Mon, 8 Jan 2018 15:26:58 +0330 Subject: [PATCH] trying to resolve travis build errors --- src/databasemodel.cpp | 10 +++++----- src/databasemodel.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/databasemodel.cpp b/src/databasemodel.cpp index 36f682e..3b203a4 100644 --- a/src/databasemodel.cpp +++ b/src/databasemodel.cpp @@ -63,8 +63,8 @@ TableModel *DatabaseModel::tableByName(QString tableName) const return s; } - qWarning("Table with name '%s' not found in model", - qUtf8Printable(tableName)); +// qWarning("Table with name '%s' not found in model", +// qUtf8Printable(tableName)); return 0; } @@ -77,8 +77,8 @@ TableModel *DatabaseModel::tableByClassName(QString className) const return s; } - qWarning("Table with class name '%s' not found in model", - qUtf8Printable(className)); +// qWarning("Table with class name '%s' not found in model", +// qUtf8Printable(className)); // Q_UNREACHABLE(); return 0; } @@ -120,7 +120,7 @@ QJsonObject DatabaseModel::toJson() const { QJsonObject obj; - obj.insert(QT_STRINGIFY(version), QJsonValue(_version)); + obj.insert(NODE_VERSION, QJsonValue(_version)); QJsonObject tables; for(int i = 0; i < size(); i++){ TableModel *s = at(i); diff --git a/src/databasemodel.h b/src/databasemodel.h index 40d5373..6fc251d 100644 --- a/src/databasemodel.h +++ b/src/databasemodel.h @@ -22,6 +22,9 @@ #define DATABASEMODEL_H #include +#include +#include + #include "defines.h" class QJsonObject;