commit 6bd57432bdfa8628fbd8ca02e5dcc60cbc2548e4
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Tue Oct 27 17:08:34 2015 +0100

    style and deleted redudant conditions

diff --git a/src/entityinspector.h b/src/entityinspector.h
index 7547639..9af48af 100644
--- a/src/entityinspector.h
+++ b/src/entityinspector.h
@@ -30,7 +30,7 @@ namespace CuteEntityManager {
  */
 class EntityInspector {
   public:
-    EntityInspector(const MsgType msgType = MsgType::DEBUG);
+    explicit EntityInspector(const MsgType msgType = MsgType::DEBUG);
     ~EntityInspector();
     bool checkRegisteredEntities();
     bool checkEntity(QString name);
diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp
index fd17caf..e90cd45 100644
--- a/src/entitymanager.cpp
+++ b/src/entitymanager.cpp
@@ -450,7 +450,7 @@ void EntityManager::manyToOne(const QSharedPointer<Entity> &entity,
                                 property.typeName());
         QSharedPointer<Entity> ptr = QSharedPointer<Entity>();
         if (refresh || !(this->cache.contains(convertedId, className)
-                         && (ptr = this->cache.get(convertedId, className)) && ptr)) {
+                         && (ptr = this->cache.get(convertedId, className)))) {
             ptr = this->findById(convertedId, className);
         }
         EntityHelper::setProperty(entity, ptr, property);
@@ -828,7 +828,7 @@ void EntityManager::manyToMany(const QSharedPointer<Entity> &entity,
             QSharedPointer<Entity> e;
             for (int var = 0; var < listMap.size(); ++var) {
                 auto id = listMap.at(var).value(builder->generateManyToManyColumnName(secEntityPtr));
-                if ((!refresh && this->cache.contains(id.toLongLong(), secClassName) && (e = this->cache.get(id.toLongLong(), secClassName))) || !e) {
+                if (refresh || !(this->cache.contains(id.toLongLong(), secClassName) && (e = this->cache.get(id.toLongLong(), secClassName)))) {
                     e = this->findById(id.toLongLong(), secClassName);
                 }
                 if (e) {
diff --git a/src/orderby.h b/src/orderby.h
index 0855607..b4c3b54 100644
--- a/src/orderby.h
+++ b/src/orderby.h
@@ -29,7 +29,7 @@ enum class Direction {
 class OrderBy {
   public:
     OrderBy();
-    OrderBy(QString column, Direction direction = Direction::DEFAULT);
+    explicit OrderBy(QString column, Direction direction = Direction::DEFAULT);
     OrderBy(Expression direction);
     QString getColumn() const;
     void setColumn(const QString &value);
diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp
index b864d33..c338b2e 100644
--- a/src/querybuilder.cpp
+++ b/src/querybuilder.cpp
@@ -44,8 +44,7 @@ bool QueryBuilder::createTable(const QSharedPointer<Entity> &entity,
         if (!rc) {
             QSqlQuery q = this->database->getQuery(this->createTable(tableName,
                                                    tableDefinition));
-            if (this->database->exec(q) && (!createRelationTables || (createRelationTables
-                                            && this->createRelationTables(entity)))) {
+            if (this->database->exec(q) && (!createRelationTables || this->createRelationTables(entity))) {
                 rc = true;
             } else {
                 this->database->getLogger()->logMsg("Table " + entity->getTablename() +
@@ -1075,7 +1074,7 @@ void QueryBuilder::bindValues(const QHash<QString, QVariant> &h, QSqlQuery &q,
                               bool ignoreID, const QString &primaryKey) const {
     QHash<QString, QVariant>::const_iterator i = h.constBegin();
     while (i != h.constEnd()) {
-        if ((!ignoreID || (ignoreID && !(i.key() == primaryKey)))
+        if ((!ignoreID || !(i.key() == primaryKey))
                 && !i.value().isNull()) {
             this->bindValue(i.key(), i.value(), q);
         }
@@ -1115,7 +1114,7 @@ QString QueryBuilder::attributes(const QHash<QString, QVariant> &m, bool select,
                                  bool ignoreID, const QString &primaryKey) const {
     QString rc = "";
     for (auto i = m.constBegin(); i != m.constEnd(); ++i) {
-        if (!ignoreID || (ignoreID && i.key() != primaryKey)) {
+        if (!ignoreID || i.key() != primaryKey) {
             if (!rc.isEmpty()) {
                 rc += " " + conjunction + " ";
             }
@@ -1284,10 +1283,9 @@ QString QueryBuilder::joinSuperClasses(const QSharedPointer<Entity> &entity)
 const {
     auto classes = EntityHelper::superClasses(entity.data(), true);
     QString joined = "";
-    Entity *e = nullptr;
     for (int var = 0; var < classes.size(); ++var) {
         auto metaObject = classes.at(var);
-        e = EntityInstanceFactory::createInstance(metaObject->className());
+        Entity *e = EntityInstanceFactory::createInstance(metaObject->className());
         if (e) {
             joined.append(" ");
             joined.append(this->leftJoin(e->getTablename(), entity->getTablename(),