commit 7d60c5a2ed960406c39470bb0c401bae025c12c7
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Fri Jul 24 01:30:21 2015 +0200

    ...

diff --git a/src/entityinstancefactory.cpp b/src/entityinstancefactory.cpp
index ab76212..d4f09a9 100644
--- a/src/entityinstancefactory.cpp
+++ b/src/entityinstancefactory.cpp
@@ -57,7 +57,7 @@ Entity *EntityInstanceFactory::createInstance(int metaTypeId) {
 
 Entity *EntityInstanceFactory::createInstance(const char *className,
         const QHash<QString, QVariant> &attributes) {
-        Entity *e = EntityInstanceFactory::createInstance(className);
+    Entity *e = EntityInstanceFactory::createInstance(className);
     e = EntityInstanceFactory::setAttributes(e, attributes);
     return e;
 }
@@ -88,9 +88,9 @@ Entity *EntityInstanceFactory::setAttributes(Entity *&e,
 
 Entity *EntityInstanceFactory::setAttributes(Entity *&e,
         const QHash<QString, QVariant> &attributes) {
-    if(!attributes.isEmpty()) {
-    auto metaprops = e->getMetaProperties();
-    return EntityInstanceFactory::setAttributes(e, attributes, metaprops);
+    if (!attributes.isEmpty()) {
+        auto metaprops = e->getMetaProperties();
+        return EntityInstanceFactory::setAttributes(e, attributes, metaprops);
     } else {
         return e;
     }
diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp
index 8506c44..3089b96 100644
--- a/src/entitymanager.cpp
+++ b/src/entitymanager.cpp
@@ -164,9 +164,8 @@ QSharedPointer<Entity> EntityManager::findById(const qint64 &id,
 QSharedPointer<Entity> EntityManager::convert(const QHash<QString, QVariant>
         &map,
         const char *classname, const bool refresh) {
-    auto e = EntityInstanceFactory::createInstance(
-                 classname, map);
-    auto ptr = QSharedPointer<Entity>(e);
+    auto ptr = QSharedPointer<Entity>(EntityInstanceFactory::createInstance(
+                                          classname, map));
     this->cache.insert(ptr);
     this->resolveRelations(ptr, map, refresh);
     return ptr;
diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp
index 3d14925..50d26d4 100644
--- a/src/querybuilder.cpp
+++ b/src/querybuilder.cpp
@@ -448,7 +448,7 @@ const {
 
 
 QString QueryBuilder::transformTypeToAbstractDbType(QString typeName) const {
-    QHash<QString, QString> *m = this->schema->getAbstractTypeMap().data();
+    auto m = this->schema->getAbstractTypeMap();
     if (m->contains(typeName)) {
         return m->value(typeName);
     }
@@ -469,7 +469,7 @@ QString QueryBuilder::getColumnType(const QString &type) const {
     /**
       * @WARNING
       */
-    QHash<QString, QString> *tMap = this->schema->getTypeMap().data();
+    auto tMap = this->schema->getTypeMap();
     if (tMap->contains(type)) {
         return this->transformAbstractTypeToRealDbType(type);
     }