- Core library header files added to core.h file.

- Fixed windows build.
- Added AccommodationService class.

accommodation/accommodation.cpp

@@ -5,6 +5,7 @@
 #include "accommodationform.h"
 
 #include "data/person.h"
+#include "accommodationservice.h"
 
 Accommodation::Accommodation()
 {
@@ -15,11 +16,12 @@ QString Accommodation::pluginName()
     return "Ubytovani";
 }
 
-void Accommodation::init()
+void Accommodation::init(const QJsonObject &metaData)
 {
-    qDebug() << "init accomodation";
+    qDebug() << "init accomodation" << metaData;
     m_ui = new AccommodationForm();
-    m_service = new Service<Person>();
+    AccommodationService *service = new AccommodationService();
+    m_service = service;
 }
 
 QString Accommodation::pluginId()

accommodation/accommodation.h

@@ -2,14 +2,14 @@
 #define ACCOMMODATION_H
 
 #include "accommodation_global.h"
-#include <context.h>
-#include <iplugin.h>
+#include <core.h>
 #include <QObject>
 #include <QtPlugin>
 
 class ACCOMMODATIONSHARED_EXPORT Accommodation : public QObject, IPlugin
 {
     Q_OBJECT
+
     Q_PLUGIN_METADATA(IID PluginInterface_iid FILE "accommodation.json")
     Q_INTERFACES(IPlugin)
 
@@ -17,7 +17,7 @@ public:
     Accommodation();
 
     QString pluginName() Q_DECL_OVERRIDE;
-    void init() Q_DECL_OVERRIDE;
+    void init(const QJsonObject &metaData) Q_DECL_OVERRIDE;
     QString pluginId() Q_DECL_OVERRIDE;
 
 };

accommodation/accommodation.json

@@ -0,0 +1,12 @@
+{
+    "id" : "ACCOMMODATION",
+    "name" : {
+        "default" : "Accommodation",
+        "CZ" : "Ubytování"
+    },
+    "descriptoin" : {
+        "default" : "",
+        "CZ" : ""
+    },
+    "dependencies" : []
+}

accommodation/accommodation.pro

@@ -14,13 +14,15 @@ DEFINES += ACCOMMODATION_LIBRARY
 SOURCES += accommodation.cpp \
     accommodationform.cpp \
     data/person.cpp \
-    dialog.cpp
+    dialog.cpp \
+    accommodationservice.cpp
 
 HEADERS += accommodation.h\
         accommodation_global.h \
     accommodationform.h \
     data/person.h \
-    dialog.h
+    dialog.h \
+    accommodationservice.h
 
 unix {
     target.path = /usr/lib
@@ -46,3 +48,4 @@ FORMS += \
 ODB_FILES = accommodation/data/person.h
 H_DIR = $$PWD/data/*.h
 include(../odb.pri)
+

accommodation/accommodationform.cpp

@@ -17,6 +17,6 @@ AccommodationForm::~AccommodationForm()
 
 void AccommodationForm::on_pushButton_clicked()
 {
-    Dialog d;
-    d.open();
+    Dialog *d = new Dialog();
+    d->open();
 }

accommodation/accommodationservice.cpp

@@ -0,0 +1,17 @@
+#include "accommodationservice.h"
+
+AccommodationService::AccommodationService()
+{
+
+}
+
+AccommodationService::~AccommodationService()
+{
+
+}
+
+void AccommodationService::pokus()
+{
+
+}
+

accommodation/accommodationservice.h

@@ -0,0 +1,18 @@
+#ifndef ACCOMMODATIONSERVICE_H
+#define ACCOMMODATIONSERVICE_H
+
+#include "data/person.h"
+#include <core.h>
+
+#include "accommodation_global.h"
+
+class AccommodationService : public Service<Person>
+{
+public:
+    AccommodationService();
+    ~AccommodationService();
+
+    void pokus();
+};
+
+#endif // ACCOMMODATIONSERVICE_H

accommodation/dialog.cpp

@@ -1,9 +1,10 @@
 #include "dialog.h"
 #include "ui_dialog.h"
 
-#include <context.h>
-#include <iplugin.h>
+#include <core.h>
+
 #include "data/person.h"
+#include "accommodationservice.h"
 
 #include "accommodation-odb.hxx"
 
@@ -27,5 +28,6 @@ void Dialog::on_buttonBox_accepted()
     p->setFirstName(ui->lineEdit->text());
     p->setLastName(ui->lineEdit_2->text());
 
-    plugin->service<Person>()->save(p);
+    AccommodationService *service = (AccommodationService*)plugin->service<Person>();
+    service->save(p);
 }