Release v1.4 #11

Merged
0xFEEDC0DE64 merged 16 commits from devel into master 2017-12-17 17:14:39 +01:00
163 changed files with 1431 additions and 1049 deletions
Showing only changes of commit a05e70ef8c - Show all commits

View File

@@ -1,6 +1,14 @@
#include "lunchmealplugin.h" #include "lunchmealplugin.h"
LunchMealPlugin::LunchMealPlugin(QObject *parent) : QObject(parent) #include <QDebug>
LunchMealPlugin::LunchMealPlugin(QObject *parent) :
ZeiterfassungPlugin(parent)
{ {
} }
void LunchMealPlugin::initialize()
{
qDebug() << "called";
}

View File

@@ -3,15 +3,19 @@
#include <QObject> #include <QObject>
class Q_DECL_EXPORT LunchMealPlugin : public QObject #include "zeiterfassungplugin.h"
class Q_DECL_EXPORT LunchMealPlugin : public ZeiterfassungPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "dbsoftware.zeiterfassung.plugin/1.0" FILE "lunchmealplugin.json")
Q_INTERFACES(ZeiterfassungPlugin)
public: public:
explicit LunchMealPlugin(QObject *parent = 0); explicit LunchMealPlugin(QObject *parent = 0);
signals: // ZeiterfassungPlugin interface
void initialize() Q_DECL_OVERRIDE;
public slots:
}; };
#endif // LUNCHMEALPLUGIN_H #endif // LUNCHMEALPLUGIN_H

View File

@@ -9,13 +9,13 @@ DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassunglib LIBS += -L$$OUT_PWD/../../lib -lzeiterfassunglib
INCLUDEPATH += $$PWD/../zeiterfassunglib INCLUDEPATH += $$PWD/../../zeiterfassunglib
DEPENDPATH += $$PWD/../zeiterfassunglib DEPENDPATH += $$PWD/../../zeiterfassunglib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += \ HEADERS += lunchmealplugin.h
lunchmealplugin.h
SOURCES += \ SOURCES += lunchmealplugin.cpp
lunchmealplugin.cpp
OTHER_FILES += lunchmealplugin.json

View File

@@ -1,6 +1,14 @@
#include "presenceplugin.h" #include "presenceplugin.h"
PresencePlugin::PresencePlugin(QObject *parent) : QObject(parent) #include <QDebug>
PresencePlugin::PresencePlugin(QObject *parent) :
ZeiterfassungPlugin(parent)
{ {
} }
void PresencePlugin::initialize()
{
qDebug() << "called";
}

View File

@@ -3,15 +3,19 @@
#include <QObject> #include <QObject>
class Q_DECL_EXPORT PresencePlugin : public QObject #include "zeiterfassungplugin.h"
class Q_DECL_EXPORT PresencePlugin : public ZeiterfassungPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "dbsoftware.zeiterfassung.plugin/1.0" FILE "presenceplugin.json")
Q_INTERFACES(ZeiterfassungPlugin)
public: public:
explicit PresencePlugin(QObject *parent = 0); explicit PresencePlugin(QObject *parent = 0);
signals: // ZeiterfassungPlugin interface
void initialize() Q_DECL_OVERRIDE;
public slots:
}; };
#endif // PRESENCEPLUGIN_H #endif // PRESENCEPLUGIN_H

View File

@@ -9,13 +9,13 @@ DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassunglib LIBS += -L$$OUT_PWD/../../lib -lzeiterfassunglib
INCLUDEPATH += $$PWD/../zeiterfassunglib INCLUDEPATH += $$PWD/../../zeiterfassunglib
DEPENDPATH += $$PWD/../zeiterfassunglib DEPENDPATH += $$PWD/../../zeiterfassunglib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += \ HEADERS += presenceplugin.h
presenceplugin.h
SOURCES += \ SOURCES += presenceplugin.cpp
presenceplugin.cpp
OTHER_FILES += presenceplugin.json

View File

@@ -1,6 +1,14 @@
#include "weatherplugin.h" #include "weatherplugin.h"
WeatherPlugin::WeatherPlugin(QObject *parent) : QObject(parent) #include <QDebug>
WeatherPlugin::WeatherPlugin(QObject *parent) :
ZeiterfassungPlugin(parent)
{ {
} }
void WeatherPlugin::initialize()
{
qDebug() << "called";
}

View File

@@ -3,15 +3,19 @@
#include <QObject> #include <QObject>
class Q_DECL_EXPORT WeatherPlugin : public QObject #include "zeiterfassungplugin.h"
class Q_DECL_EXPORT WeatherPlugin : public ZeiterfassungPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "dbsoftware.zeiterfassung.plugin/1.0" FILE "weatherplugin.json")
Q_INTERFACES(ZeiterfassungPlugin)
public: public:
explicit WeatherPlugin(QObject *parent = 0); explicit WeatherPlugin(QObject *parent = 0);
signals: // ZeiterfassungPlugin interface
void initialize() Q_DECL_OVERRIDE;
public slots:
}; };
#endif // WEATHERPLUGIN_H #endif // WEATHERPLUGIN_H

View File

View File

@@ -9,13 +9,13 @@ DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassunglib LIBS += -L$$OUT_PWD/../../lib -lzeiterfassunglib
INCLUDEPATH += $$PWD/../zeiterfassunglib INCLUDEPATH += $$PWD/../../zeiterfassunglib
DEPENDPATH += $$PWD/../zeiterfassunglib DEPENDPATH += $$PWD/../../zeiterfassunglib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += \ HEADERS += weatherplugin.h
weatherplugin.h
SOURCES += \ SOURCES += weatherplugin.cpp
weatherplugin.cpp
OTHER_FILES += weatherplugin.json

View File

@@ -11,6 +11,7 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSA
DEFINES += ZEITERFASSUNGLIB_LIBRARY DEFINES += ZEITERFASSUNGLIB_LIBRARY
SOURCES += zeiterfassungapi.cpp \ SOURCES += zeiterfassungapi.cpp \
zeiterfassungplugin.cpp \
replies/createtimeassignmentreply.cpp \ replies/createtimeassignmentreply.cpp \
replies/updatebookingreply.cpp \ replies/updatebookingreply.cpp \
replies/getbookingsreply.cpp \ replies/getbookingsreply.cpp \
@@ -30,6 +31,7 @@ SOURCES += zeiterfassungapi.cpp \
HEADERS += cpp14polyfills.h \ HEADERS += cpp14polyfills.h \
zeiterfassunglib_global.h \ zeiterfassunglib_global.h \
zeiterfassungapi.h \ zeiterfassungapi.h \
zeiterfassungplugin.h \
replies/createtimeassignmentreply.h \ replies/createtimeassignmentreply.h \
replies/updatebookingreply.h \ replies/updatebookingreply.h \
replies/getbookingsreply.h \ replies/getbookingsreply.h \

View File

@@ -0,0 +1,7 @@
#include "zeiterfassungplugin.h"
ZeiterfassungPlugin::ZeiterfassungPlugin(QObject *parent) :
QObject(parent)
{
}

View File

@@ -0,0 +1,18 @@
#ifndef ZEITERFASSUNGPLUGIN_H
#define ZEITERFASSUNGPLUGIN_H
#include <QObject>
class ZeiterfassungPlugin : public QObject
{
Q_OBJECT
public:
explicit ZeiterfassungPlugin(QObject *parent = 0);
virtual void initialize() = 0;
};
Q_DECLARE_INTERFACE(ZeiterfassungPlugin, "dbsoftware.zeiterfassung.plugin/1.0")
#endif // ZEITERFASSUNGPLUGIN_H