commit 40d229e35f27368c23dc1f4e62bca1349dac8cf9
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Sun Apr 26 17:25:44 2015 +0200

    grml

diff --git a/src/entitymanager.h b/src/entitymanager.h
index d8ceb5b..779acc9 100644
--- a/src/entitymanager.h
+++ b/src/entitymanager.h
@@ -68,7 +68,7 @@ class EntityManager {
     bool create(QSharedPointer<Entity> &entity);
     bool save(QSharedPointer<Entity> &entity);
     qint64 findId(QSharedPointer<Entity> &entity);
-    bool merge(QSharedPointer<Entity> &entity, bool withManyToOne = true);
+    bool merge(QSharedPointer<Entity> &entity, bool withRelations = true);
     bool remove(QSharedPointer<Entity> &entity);
     bool removeAll(QString tblname);
     bool createTable(const QSharedPointer<Entity> &entity);
diff --git a/src/entitymanager.h.autosave b/src/entitymanager.h.autosave
deleted file mode 100644
index 779acc9..0000000
--- a/src/entitymanager.h.autosave
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2015 Christian Ehringfeld <c.ehringfeld@t-online.de>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef ENTITYMANAGER_H
-#define ENTITYMANAGER_H
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlRecord>
-#include <QtSql/QSqlField>
-#include <QString>
-#include <QStringList>
-#include <QSharedPointer>
-#include <QDebug>
-#include "schema.h"
-#include <QtSql/QSqlError>
-#include "entity.h"
-#include "database.h"
-
-namespace CuteEntityManager {
-
-class EntityManager {
-  signals:
-    void actionFinished(qint64 id);
-
-  private:
-    static QStringList connectionNames;
-    QSharedPointer<Schema> schema;
-    static void setConnectionNames(QStringList list);
-    QSharedPointer<Database> db;
-    QString createConnection();
-    QString createTableQuery(const QSharedPointer<Entity> &entity);
-    QList<QHash<QString, QVariant> > convertQueryResult(QSqlQuery &q);
-    bool checkTable(const QSharedPointer<Entity> &entity);
-
-  protected:
-    void init();
-    QList<QHash<QString, QVariant> > findAll(QString tblname);
-    QHash<QString, QVariant> find(QSharedPointer<Entity> entity);
-    QHash<QString, QVariant> find(qint64 id, QString tblname);
-    QList<QHash<QString, QVariant> > findByAttributes(const QSharedPointer<Entity> &entity, bool ignoreID = false);
-    QList<QHash<QString, QVariant> > findByAttributes(const QHash<QString, QVariant> &m, const QString &tblname,
-            bool ignoreID = false);
-
-  public:
-    EntityManager(QSqlDatabase database);
-    EntityManager(const QString &databaseType, QString databasename = "" , QString hostname = "", QString username = "",
-                  QString password = "", QString port = "");
-    ~EntityManager();
-    static QStringList getConnectionNames();
-    static void removeConnectionName(const QString &name);
-    QList<QSharedPointer<Entity>> findAllEntities(QSharedPointer<Entity> entity);
-    QSharedPointer<Entity> findEntity(QSharedPointer<Entity> entity);
-    QList<QSharedPointer<Entity>> findEntityByAttributes(const QSharedPointer<Entity> &entity, bool ignoreID = false);
-
-
-    bool create(QSharedPointer<Entity> &entity);
-    bool save(QSharedPointer<Entity> &entity);
-    qint64 findId(QSharedPointer<Entity> &entity);
-    bool merge(QSharedPointer<Entity> &entity, bool withRelations = true);
-    bool remove(QSharedPointer<Entity> &entity);
-    bool removeAll(QString tblname);
-    bool createTable(const QSharedPointer<Entity> &entity);
-    qint8 count(const QSharedPointer<Entity> &entity, bool ignoreID = true);
-    qint8 count(const QString &tableName);
-    QSharedPointer<Database> getDb() const;
-    void setDb(const QSharedPointer<Database> &value);
-    QSharedPointer<Schema> getSchema() const;
-    void setSchema(const QSharedPointer<Schema> &value);
-
-};
-}
-#endif // ENTITYMANAGER_H