commit 67aa0d3fcf523cc64b04585e2151dc3e8a107b89 Author: Christian Ehringfeld Date: Thu Aug 6 23:40:54 2015 +0200 clean up diff --git a/src/database.h b/src/database.h index 78de5da..397df98 100644 --- a/src/database.h +++ b/src/database.h @@ -65,11 +65,9 @@ class Database { void startTransaction(); bool commitTransaction(); bool rollbackTransaction(); - static DatabaseType getDatabaseType(QString s); static QSharedPointer getSchema(DatabaseType db, QSharedPointer database); - }; } #endif // DATABASE_H diff --git a/src/databasemigration.cpp b/src/databasemigration.cpp index b365e1e..f856620 100644 --- a/src/databasemigration.cpp +++ b/src/databasemigration.cpp @@ -17,7 +17,6 @@ using namespace CuteEntityManager; DatabaseMigration::DatabaseMigration() : Entity() { - } DatabaseMigration::DatabaseMigration(QString version, diff --git a/src/entityhelper.cpp b/src/entityhelper.cpp index 19a0d24..a70b290 100644 --- a/src/entityhelper.cpp +++ b/src/entityhelper.cpp @@ -21,10 +21,8 @@ using namespace CuteEntityManager; EntityHelper::EntityHelper() { - } - const QHash EntityHelper::getNonInheritedRelations( const Entity *entity) { auto relations = entity->getRelations(); @@ -44,7 +42,6 @@ const QHash EntityHelper::getNonInheritedRelations( return relations; } - const QList EntityHelper::superClasses( const Entity *entity, bool stopAtSingleTableInheritance) { @@ -169,7 +166,7 @@ void EntityHelper::removeEntityFromListProperty(const QSharedPointer auto list = EntityInstanceFactory::castQVariantList(var); for (int i = 0; i < list.size(); ++i) { auto e = list.at(i); - if(e->getId() == remove->getId()) { + if (e->getId() == remove->getId()) { list.removeAt(i); EntityHelper::setListProperty(entity, list, property); break; diff --git a/src/entityhelper.h b/src/entityhelper.h index f099744..2ff9421 100644 --- a/src/entityhelper.h +++ b/src/entityhelper.h @@ -47,7 +47,7 @@ class EntityHelper { static void addEntityToListProperty(const QSharedPointer &entity, QSharedPointer add, const QMetaProperty &property); static void removeEntityFromListProperty(const QSharedPointer &entity, - QSharedPointer remove, const QMetaProperty &property); + QSharedPointer remove, const QMetaProperty &property); static void setListProperty(const QSharedPointer &entity, QList> &list, const QMetaProperty &property); @@ -59,7 +59,8 @@ class EntityHelper { const QString property); static QMetaProperty mappedProperty(const Relation &r, const QSharedPointer &foreignEntity); - static QHash getEntityAttributes(const QHash + static QHash getEntityAttributes(const + QHash &props, const QSharedPointer &entity); }; diff --git a/src/entityinstancefactory.cpp b/src/entityinstancefactory.cpp index b52d0da..7c4a8d0 100644 --- a/src/entityinstancefactory.cpp +++ b/src/entityinstancefactory.cpp @@ -24,7 +24,6 @@ EntityInstanceFactory::instance = QHash(); EntityInstanceFactory::EntityInstanceFactory() { - } Entity *EntityInstanceFactory::createInstance(const char *className) { diff --git a/src/entityinstancefactory.h b/src/entityinstancefactory.h index 9a5c2fb..bf83f97 100644 --- a/src/entityinstancefactory.h +++ b/src/entityinstancefactory.h @@ -47,7 +47,8 @@ class EntityInstanceFactory { //http://www.mimec.org/node/350 template static void registerClass() { - EntityInstanceFactory::instance.insert( T::staticMetaObject.className(), &constructorHelper ); + EntityInstanceFactory::instance.insert( T::staticMetaObject.className(), + &constructorHelper ); QString lName = "QList>"); diff --git a/src/entitymanager.h b/src/entitymanager.h index 2c01878..134b443 100644 --- a/src/entitymanager.h +++ b/src/entitymanager.h @@ -71,8 +71,6 @@ class EntityManager : public QObject { QList > selectBySql(const QString &sql); qint8 count(Query &query); - - public: public: EntityManager(QSqlDatabase database); EntityManager(const QString &databaseType, QString databasename = "" , diff --git a/src/expression.h b/src/expression.h index c35753b..c338fc1 100644 --- a/src/expression.h +++ b/src/expression.h @@ -23,8 +23,9 @@ namespace CuteEntityManager { class Expression { public: Expression(); - explicit Expression(QString expression,QHash params = QHash(), - bool onlyColumn = false); + explicit Expression(QString expression, + QHash params = QHash(), + bool onlyColumn = false); explicit Expression(QString expression, bool onlyColumn); QString getExpression() const; void setExpression(const QString &value); @@ -38,7 +39,7 @@ class Expression { QHash getParams() const; void setParams(const QHash &value); -private: + private: QString expression; QHash params; bool onlyColumn; diff --git a/src/join.cpp b/src/join.cpp index d4da472..f946043 100644 --- a/src/join.cpp +++ b/src/join.cpp @@ -17,7 +17,6 @@ #include "join.h" using namespace CuteEntityManager; Join::Join() { - } Join::Join(QString foreignTable, QString expression, QString type) { diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp index d108ada..a06a855 100644 --- a/src/querybuilder.cpp +++ b/src/querybuilder.cpp @@ -1224,7 +1224,7 @@ Expression QueryBuilder::plainNand() { Expression QueryBuilder::like(QString column, QVariant value, JokerPosition jp, QChar wildcard) { return this->arbitraryOperator(this->likeKeyword(), column, - this->addWildcard(value, jp, wildcard)); + this->addWildcard(value, jp, wildcard)); } Expression QueryBuilder::like(QHash conditions, diff --git a/src/querybuilder.h b/src/querybuilder.h index c001cb4..1992a97 100644 --- a/src/querybuilder.h +++ b/src/querybuilder.h @@ -112,19 +112,19 @@ class QueryBuilder { * @param conjunction its AND or OR */ Expression where(QHash conditions, - QString conjunction = "AND"); + QString conjunction = "AND"); Expression where(QString condition, - QHash values = QHash()); + QHash values = QHash()); //void where(Query &query,QHash> conditions, QString concat="AND"); Expression between(QString column, QVariant firstValue, - QVariant secondValue); + QVariant secondValue); Expression notBetween(QString column, QVariant firstValue, - QVariant secondValue); + QVariant secondValue); Expression in(QString column, QList values); Expression notIn(QString column, QList values); Expression notOperator(QString column, QVariant value); Expression orOperator(QHash conditions, - bool like = false); + bool like = false); Expression andOperator(QHash conditions); /** * @brief arbitraryOperator @@ -134,7 +134,7 @@ class QueryBuilder { * @param value */ Expression arbitraryOperator(QString op, QString column, - QVariant value); + QVariant value); Expression isNull(QString column); Expression isNotNull(QString column); @@ -149,15 +149,15 @@ class QueryBuilder { * @param value */ Expression like(QString column, QVariant value, - JokerPosition jp = JokerPosition::BOTH, QChar wildcard = '%'); + JokerPosition jp = JokerPosition::BOTH, QChar wildcard = '%'); /** * @brief like * @param condition * @param concat */ Expression like(QHash conditions, - QString conjunction = "AND", - JokerPosition jp = JokerPosition::BOTH, QChar wildcard = '%'); + QString conjunction = "AND", + JokerPosition jp = JokerPosition::BOTH, QChar wildcard = '%'); QStringList quoteTableNames(const QStringList &tables); QString getSeparator() const; @@ -220,7 +220,8 @@ class QueryBuilder { const QString &primaryKey = "id") const; QList createOrMerge(const QSharedPointer &entity, bool insert) const; - virtual QString limit(const quint64 &limit, const quint64 &offset, bool withSpace=true) const; + virtual QString limit(const quint64 &limit, const quint64 &offset, + bool withSpace = true) const; QString generateIndexName(const QString &name, const QString &table, const QString &refColumn, const QString &refTable, const bool fk) const; QString generateColumnNameID(QString name) const; @@ -287,7 +288,7 @@ class QueryBuilder { virtual QString whereKeyword() const; virtual QString countKeyword() const; virtual Expression inFunction(QString column, QList values, - bool notOp = false); + bool notOp = false); virtual QString between(QString colName, QString valName1, QString valName2, bool notOp = false); virtual QString likeKeyword() const; @@ -295,7 +296,7 @@ class QueryBuilder { virtual QString offsetKeyword() const; QString appendNot(bool notOp); virtual Expression appendCondition(QString ph1, QString ph2, QVariant val1, - QVariant val2, QString condition); + QVariant val2, QString condition); QString entityClassname() const; QString separator; QSharedPointer schema; diff --git a/src/tableschema.cpp b/src/tableschema.cpp index 3ab7279..3fd1563 100644 --- a/src/tableschema.cpp +++ b/src/tableschema.cpp @@ -17,11 +17,9 @@ using namespace CuteEntityManager; TableSchema::TableSchema() { - } TableSchema::~TableSchema() { - } const QSharedPointer TableSchema::getColumn(QString name) const {