commit c5d0ed540b9a1c5ad529eac3a16a9788e727a357 Author: Christian Ehringfeld Date: Mon Oct 12 00:25:46 2015 +0200 samples and includes diff --git a/samples/samples.pri b/samples/samples.pri index 19a587d..8807870 100644 --- a/samples/samples.pri +++ b/samples/samples.pri @@ -9,8 +9,8 @@ DEPENDPATH += $$PWD/../src unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug/src/ $$EM_LIB else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Release/src/ $$EM_LIB -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Release/release/src/ $$EM_LIB -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug/debug/src/ $$EM_LIB +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Release/src/ $$EM_LIB +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug/src/ $$EM_LIB CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/samples/simple/article.cpp b/samples/simple/article.cpp new file mode 100644 index 0000000..7c3c91f --- /dev/null +++ b/samples/simple/article.cpp @@ -0,0 +1,52 @@ +/* + Small test class + Copyright (C) 2013 Christian Ehringfeld + + This file is part of OpenTeacherTool. + + OpenTeacherTool is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenTeacherTool 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 General Public License + along with OpenTeacherTool. If not, see . +*/ +#include "article.h" + +QString Article::getName() const { + return name; +} + +void Article::setName(const QString &value) { + name = value; +} + +Article::~Article() { + +} + +Article::Article() : Entity() { + this->price = 0.0; + this->name = ""; +} + +Article::Article(double preis, QString name) : Entity() { + this->price = preis; + this->name = name; +} + +double Article::getPrice() const +{ + return price; +} + +void Article::setPrice(double value) +{ + price = value; +} diff --git a/samples/simple/article.h b/samples/simple/article.h new file mode 100644 index 0000000..3df8968 --- /dev/null +++ b/samples/simple/article.h @@ -0,0 +1,42 @@ +/* + Small test class + Copyright (C) 2013 Christian Ehringfeld + + This file is part of OpenTeacherTool. + + OpenTeacherTool is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenTeacherTool 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 General Public License + along with OpenTeacherTool. If not, see . +*/ + +#ifndef ARTICLE_H +#define ARTICLE_H +#include "entity.h" + +class Article : public CuteEntityManager::Entity { + Q_OBJECT + Q_PROPERTY(double price READ getPrice WRITE setPrice) + Q_PROPERTY(QString name READ getName WRITE setName) + private: + double price; + QString name; + + public: + virtual ~Article(); + Q_INVOKABLE Article(); + Article(double price, QString name); + QString getName() const; + void setName(const QString &value); + double getPrice() const; + void setPrice(double value); +}; +#endif // ARTIKEL_H diff --git a/samples/simple/artikel.cpp b/samples/simple/artikel.cpp deleted file mode 100644 index 493e669..0000000 --- a/samples/simple/artikel.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - Small test class - Copyright (C) 2013 Christian Ehringfeld - - This file is part of OpenTeacherTool. - - OpenTeacherTool is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenTeacherTool 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 General Public License - along with OpenTeacherTool. If not, see . -*/ -#include "artikel.h" - -double Artikel::getPreis() const { - return preis; -} - -void Artikel::setPreis(double value) { - preis = value; -} - -QString Artikel::getName() const { - return name; -} - -void Artikel::setName(const QString &value) { - name = value; -} - -Artikel::~Artikel() { - -} - -Artikel::Artikel() : Entity() { - this->preis = 0.0; - this->name = ""; -} - -Artikel::Artikel(double preis, QString name) : Entity() { - this->preis = preis; - this->name = name; -} diff --git a/samples/simple/artikel.h b/samples/simple/artikel.h deleted file mode 100644 index 1467031..0000000 --- a/samples/simple/artikel.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - Small test class - Copyright (C) 2013 Christian Ehringfeld - - This file is part of OpenTeacherTool. - - OpenTeacherTool is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenTeacherTool 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 General Public License - along with OpenTeacherTool. If not, see . -*/ - -#ifndef ARTIKEL_H -#define ARTIKEL_H -#include "../../src/entity.h" -#include -#include - -class Artikel : public CuteEntityManager::Entity { - Q_OBJECT - Q_PROPERTY(double preis READ getPreis WRITE setPreis) - Q_PROPERTY(QString name READ getName WRITE setName) - private: - double preis; - QString name; - - public: - virtual ~Artikel(); - Q_INVOKABLE Artikel(); - Artikel(double preis, QString name); - double getPreis() const; - void setPreis(double value); - QString getName() const; - void setName(const QString &value); -}; -#endif // ARTIKEL_H diff --git a/samples/simple/main.cpp b/samples/simple/main.cpp index beebbf2..8793e19 100644 --- a/samples/simple/main.cpp +++ b/samples/simple/main.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "artikel.h" +#include "article.h" #include "entitymanager.h" #include "entityinstancefactory.h" @@ -9,14 +9,20 @@ using namespace CuteEntityManager; int main(int argc, char *argv[]) { Q_UNUSED(argc) Q_UNUSED(argv) - EntityInstanceFactory::registerClass(); - QSharedPointer e = QSharedPointer(new - CuteEntityManager::EntityManager("QSQLITE", QDir::currentPath() + "/db.sqlite")); - QStringList inits = QStringList() << "Artikel"; + EntityInstanceFactory::registerClass
(); + QSharedPointer e = + QSharedPointer(new + CuteEntityManager::EntityManager("QSQLITE", + QDir::currentPath() + "/db.sqlite")); + QStringList inits = QStringList() << "Article"; e->startup("0.1", inits); - QSharedPointer a = QSharedPointer(new Artikel(20.0, - "Müsli")); + QSharedPointer
a = QSharedPointer
(new Article(5.0, + "muesli")); auto ep = a.objectCast(); - qDebug() << e->create(ep, true, true); + qDebug() << e->create(ep, true, true); //INSERT on database + a->setPrice(6.0); //inflation + a->setName("muesli improved"); //1337 muesli upgrade + qDebug() << e->save(ep); //UPDATE on database + qDebug() << e->remove(ep); //REMOVE on database return 0; } diff --git a/samples/simple/simple.pro b/samples/simple/simple.pro index 6137776..4ea8f88 100644 --- a/samples/simple/simple.pro +++ b/samples/simple/simple.pro @@ -15,8 +15,8 @@ CONFIG -= app_bundle TEMPLATE = app HEADERS += \ - artikel.h + article.h SOURCES += \ main.cpp \ - artikel.cpp + article.cpp diff --git a/tests/models.h b/tests/models.h index 8ee67d7..2e54836 100644 --- a/tests/models.h +++ b/tests/models.h @@ -26,9 +26,9 @@ class Person: public Entity { public: enum class Gender {MALE, FEMALE, UNKNOWNGENDER}; - Q_ENUM(Gender) + Q_ENUM(Gender); enum class NameOrder {FIRST_FAMILY_NAME_ORDER, FAMILY_FIRST_NAME_ORDER}; - Q_ENUM(NameOrder) + Q_ENUM(NameOrder); Q_INVOKABLE explicit Person(QObject *parent = 0); Person(QString firstName, QString familyName, Gender gender = Gender::UNKNOWNGENDER, diff --git a/tests/tests.pri b/tests/tests.pri index 469c1be..edc31cf 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -12,6 +12,6 @@ DEPENDPATH += $$PWD/../src unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug/src/ $$EM_LIB else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Release/src/ $$EM_LIB -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Release/release/src/ $$EM_LIB -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug/debug/src/ $$EM_LIB +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Release/src/ $$EM_LIB +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug/src/ $$EM_LIB