commit a82e4cea14bc393757b4c8c303608da99655d980
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Sun Jul 19 20:27:07 2015 +0200

    formatting

diff --git a/samples/example/main.cpp b/samples/example/main.cpp
index f342b03..f5ac428 100644
--- a/samples/example/main.cpp
+++ b/samples/example/main.cpp
@@ -20,6 +20,8 @@ int main(int argc, char *argv[]) {
     CuteEntityManager::EntityManager *e = new
     CuteEntityManager::EntityManager("QSQLITE",
                                      QDir::currentPath() + "/db.sqlite");
+//            CuteEntityManager::EntityManager("QSQLITE",
+//                                                 ":memory:");
     EntityInstanceFactory::registerClass<Group>();
     EntityInstanceFactory::registerClass<Person>();
     EntityInstanceFactory::registerClass<Pupil>();
diff --git a/src/database.cpp b/src/database.cpp
index 00860f0..cf39462 100644
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -24,25 +24,27 @@ Database::Database(QSqlDatabase database) {
 
 }
 
-Database::Database(QString databaseType, QString connectionName,
-                   QString databasename) {
-    this->database = QSqlDatabase::addDatabase(databaseType, connectionName);
-    this->connectionName = connectionName;
-    this->database.setDatabaseName(databasename);
-    this->init();
-}
-
 Database::Database(QString databaseType, QString connectionName,
                    QString hostname,
                    QString databasename,
                    QString username, QString password, qint64 port) {
     this->database = QSqlDatabase::addDatabase(databaseType, connectionName);
     this->connectionName = connectionName;
-    this->database.setHostName(hostname);
-    this->database.setDatabaseName(databasename);
-    this->database.setUserName(username);
-    this->database.setPassword(password);
-    this->database.setPort(port);
+    if (hostname != QString("")) {
+        this->database.setHostName(hostname);
+    }
+    if (databasename != QString("")) {
+        this->database.setDatabaseName(databasename);
+    }
+    if (username != QString("")) {
+        this->database.setUserName(username);
+    }
+    if (password != QString("")) {
+        this->database.setPassword(password);
+    }
+    if (port != 0) {
+        this->database.setPort(port);
+    }
     this->init();
 }
 
diff --git a/src/database.h b/src/database.h
index cd6b05e..c3d45d7 100644
--- a/src/database.h
+++ b/src/database.h
@@ -32,19 +32,17 @@ class Database {
   private:
     QSqlDatabase database;
     QString connectionName;
-    bool seqTable;
     bool supportTransactions;
     void init();
 
   public:
     Database(QSqlDatabase database);
     ~Database();
-    Database(QString databaseType, QString databasename);
-    Database(QString databaseType, QString connectionName, QString databasename);
-    Database(QString databaseType, QString connectionName = "",
-             QString hostname = "",
-             QString databasename = "" ,
-             QString username = "", QString password = "", qint64 port = 0);
+    Database(QString databaseType, QString connectionName = QString(""),
+             QString hostname = QString(""),
+             QString databasename = QString("") ,
+             QString username = QString(""), QString password = QString(""),
+             qint64 port = 0);
     QSqlDatabase getDatabase();
     QString getConnectionName();
     QSqlQuery getQuery();
diff --git a/src/entitymanager.h b/src/entitymanager.h
index a981938..d99d4d8 100644
--- a/src/entitymanager.h
+++ b/src/entitymanager.h
@@ -38,77 +38,6 @@ class EntityManager : public QObject {
     Q_OBJECT
   signals:
     void actionFinished(qint64 id);
-
-  private:
-    static QStringList connectionNames;
-    QSharedPointer<Schema> schema;
-    static void setConnectionNames(QStringList list);
-    QSharedPointer<Database> db;
-    Cache cache;
-    QString createConnection();
-    QList<QHash<QString, QVariant> > convertQueryResult(QSqlQuery &q);
-    bool checkTable(const QSharedPointer<Entity> &entity);
-
-  protected:
-    void init();
-    QList<QHash<QString, QVariant> > findAll(const QSharedPointer<Entity> &e);
-    void resolveRelations(const QSharedPointer<Entity> &entity,
-                          const QHash<QString, QVariant> &map, const bool refresh = false);
-    QHash<QString, QVariant> findByPk(qint64 id, const QSharedPointer<Entity> &e);
-    QSharedPointer<Entity> convert(const QHash<QString, QVariant> &map,
-                                   const char *classname, const bool refresh = false);
-    QList<QSharedPointer<Entity>> convert(QList<QHash<QString, QVariant> > maps,
-                                          const char *classname, const bool refresh = false);
-    void manyToOne(const QSharedPointer<Entity> &entity, const QVariant &id,
-                   const QMetaProperty &property, const bool refresh = false);
-    void oneToMany(const QSharedPointer<Entity> &entity, const Relation &r,
-                   const QMetaProperty &property, const bool refresh = false);
-    void manyToMany(const QSharedPointer<Entity> &entity,
-                    const QMetaProperty &property, const bool refresh = false);
-    void oneToOne(const QSharedPointer<Entity> &entity, const Relation &r,
-                  const QMetaProperty &property, const bool refresh = false,
-                  const QVariant &id = "");
-    bool canPersistRelation(const Relation &relation, const RelationType &r,
-                            const QVariant &var) const;
-    void persistManyToMany(const QSharedPointer<Entity> &entity, const Relation &r,
-                           QVariant &property);
-    QList<QHash<QString, QVariant> > findAllByAttributes(const
-            QSharedPointer<Entity> &entity,
-            bool ignoreID = false);
-    QList<QHash<QString, QVariant> > findAllByAttributes(const
-            QHash<QString, QVariant> &m,
-            const QString &tblname,
-            bool ignoreID = false);
-    QSharedPointer<Entity> findById(const qint64 &id, QSharedPointer<Entity> &e,
-                                    const bool refresh = false);
-    void addEntityToListProperty(const QSharedPointer<Entity> &entity,
-                                 QSharedPointer<Entity> add, const QMetaProperty &property);
-    void setListProperty(const QSharedPointer<Entity> &entity,
-                         QList<QSharedPointer<Entity>> &list,
-                         const QMetaProperty &property) const;
-    void setProperty(const QSharedPointer<Entity> &entity,
-                     QSharedPointer<Entity> value,
-                     const QMetaProperty &property) const;
-    void savePrePersistedRelations(const QSharedPointer<Entity> &entity);
-    void savePostPersistedRelations(const QSharedPointer<Entity> &entity);
-
-    QList<QSharedPointer<Entity>> saveRelationEntities(const
-                               QList<QSharedPointer<Entity>> &list, const Relation &r);
-    void persistMappedByRelation(const QList<QSharedPointer<Entity>> &list,
-                                 QSqlQuery &q, const QSharedPointer<Entity> &entity,
-                                 const QSharedPointer<Entity> &ptr, const Relation &r,
-                                 const QString &tblName);
-    bool shouldBeSaved(QSharedPointer<Entity> &entity , const Relation &r);
-    void removeRelations(const QSharedPointer<Entity> &entity);
-    void removeEntityList(QVariant &var);
-    void removeManyToManyEntityList(const QSharedPointer<Entity> &e,
-                                    const Relation &r, QVariant &var);
-    void removeEntity(QVariant &var);
-    void setNullOneToManyRelation(QVariant &var, const Relation &r);
-    void setNullEntityPropertyRelation(QVariant &var, const Relation &r);
-    QMetaProperty mappedProperty(const Relation &r,
-                                 const QSharedPointer<Entity> &foreignEntity) const;
-
   public:
     EntityManager(QSqlDatabase database);
     EntityManager(const QString &databaseType, QString databasename = "" ,
@@ -232,6 +161,76 @@ class EntityManager : public QObject {
         return false;
     }
 
+  protected:
+    void init();
+    QList<QHash<QString, QVariant> > findAll(const QSharedPointer<Entity> &e);
+    void resolveRelations(const QSharedPointer<Entity> &entity,
+                          const QHash<QString, QVariant> &map, const bool refresh = false);
+    QHash<QString, QVariant> findByPk(qint64 id, const QSharedPointer<Entity> &e);
+    QSharedPointer<Entity> convert(const QHash<QString, QVariant> &map,
+                                   const char *classname, const bool refresh = false);
+    QList<QSharedPointer<Entity>> convert(QList<QHash<QString, QVariant> > maps,
+                                          const char *classname, const bool refresh = false);
+    void manyToOne(const QSharedPointer<Entity> &entity, const QVariant &id,
+                   const QMetaProperty &property, const bool refresh = false);
+    void oneToMany(const QSharedPointer<Entity> &entity, const Relation &r,
+                   const QMetaProperty &property, const bool refresh = false);
+    void manyToMany(const QSharedPointer<Entity> &entity,
+                    const QMetaProperty &property, const bool refresh = false);
+    void oneToOne(const QSharedPointer<Entity> &entity, const Relation &r,
+                  const QMetaProperty &property, const bool refresh = false,
+                  const QVariant &id = "");
+    bool canPersistRelation(const Relation &relation, const RelationType &r,
+                            const QVariant &var) const;
+    void persistManyToMany(const QSharedPointer<Entity> &entity, const Relation &r,
+                           QVariant &property);
+    QList<QHash<QString, QVariant> > findAllByAttributes(const
+            QSharedPointer<Entity> &entity,
+            bool ignoreID = false);
+    QList<QHash<QString, QVariant> > findAllByAttributes(const
+            QHash<QString, QVariant> &m,
+            const QString &tblname,
+            bool ignoreID = false);
+    QSharedPointer<Entity> findById(const qint64 &id, QSharedPointer<Entity> &e,
+                                    const bool refresh = false);
+    void addEntityToListProperty(const QSharedPointer<Entity> &entity,
+                                 QSharedPointer<Entity> add, const QMetaProperty &property);
+    void setListProperty(const QSharedPointer<Entity> &entity,
+                         QList<QSharedPointer<Entity>> &list,
+                         const QMetaProperty &property) const;
+    void setProperty(const QSharedPointer<Entity> &entity,
+                     QSharedPointer<Entity> value,
+                     const QMetaProperty &property) const;
+    void savePrePersistedRelations(const QSharedPointer<Entity> &entity);
+    void savePostPersistedRelations(const QSharedPointer<Entity> &entity);
+
+    QList<QSharedPointer<Entity>> saveRelationEntities(const
+                               QList<QSharedPointer<Entity>> &list, const Relation &r);
+    void persistMappedByRelation(const QList<QSharedPointer<Entity>> &list,
+                                 QSqlQuery &q, const QSharedPointer<Entity> &entity,
+                                 const QSharedPointer<Entity> &ptr, const Relation &r,
+                                 const QString &tblName);
+    bool shouldBeSaved(QSharedPointer<Entity> &entity , const Relation &r);
+    void removeRelations(const QSharedPointer<Entity> &entity);
+    void removeEntityList(QVariant &var);
+    void removeManyToManyEntityList(const QSharedPointer<Entity> &e,
+                                    const Relation &r, QVariant &var);
+    void removeEntity(QVariant &var);
+    void setNullOneToManyRelation(QVariant &var, const Relation &r);
+    void setNullEntityPropertyRelation(QVariant &var, const Relation &r);
+    QMetaProperty mappedProperty(const Relation &r,
+                                 const QSharedPointer<Entity> &foreignEntity) const;
+
+  private:
+    static QStringList connectionNames;
+    QSharedPointer<Schema> schema;
+    static void setConnectionNames(QStringList list);
+    QSharedPointer<Database> db;
+    Cache cache;
+    QString createConnection();
+    QList<QHash<QString, QVariant> > convertQueryResult(QSqlQuery &q);
+    bool checkTable(const QSharedPointer<Entity> &entity);
+
 };
 }
 Q_DECLARE_METATYPE(QSharedPointer<CuteEntityManager::Entity>)