diff --git a/plugins/advancedviewplugin/advancedviewplugin.pro b/plugins/advancedviewplugin/advancedviewplugin.pro index ad05070..58a31f5 100644 --- a/plugins/advancedviewplugin/advancedviewplugin.pro +++ b/plugins/advancedviewplugin/advancedviewplugin.pro @@ -7,10 +7,10 @@ CONFIG += shared c++14 DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung -LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib +LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib -INCLUDEPATH += $$PWD/../../zeiterfassungguilib -DEPENDPATH += $$PWD/../../zeiterfassungguilib +INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib +DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT diff --git a/plugins/lunchmealplugin/lunchmealplugin.pro b/plugins/lunchmealplugin/lunchmealplugin.pro index a034877..9ce77c2 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.pro +++ b/plugins/lunchmealplugin/lunchmealplugin.pro @@ -7,10 +7,10 @@ CONFIG += shared c++14 DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung -LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib +LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib -INCLUDEPATH += $$PWD/../../zeiterfassungguilib -DEPENDPATH += $$PWD/../../zeiterfassungguilib +INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib +DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT diff --git a/plugins/presenceplugin/presenceplugin.pro b/plugins/presenceplugin/presenceplugin.pro index cb39656..2411bac 100644 --- a/plugins/presenceplugin/presenceplugin.pro +++ b/plugins/presenceplugin/presenceplugin.pro @@ -7,10 +7,10 @@ CONFIG += shared c++14 DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung -LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib +LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib -INCLUDEPATH += $$PWD/../../zeiterfassungguilib -DEPENDPATH += $$PWD/../../zeiterfassungguilib +INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib +DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT diff --git a/plugins/reportsplugin/reportsplugin.pro b/plugins/reportsplugin/reportsplugin.pro index 139de8a..8a9a6d8 100644 --- a/plugins/reportsplugin/reportsplugin.pro +++ b/plugins/reportsplugin/reportsplugin.pro @@ -7,10 +7,10 @@ CONFIG += shared c++14 DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung -LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib +LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib -INCLUDEPATH += $$PWD/../../zeiterfassungguilib -DEPENDPATH += $$PWD/../../zeiterfassungguilib +INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib +DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT diff --git a/plugins/updaterplugin/updaterplugin.pro b/plugins/updaterplugin/updaterplugin.pro index ccc22f0..95c635b 100644 --- a/plugins/updaterplugin/updaterplugin.pro +++ b/plugins/updaterplugin/updaterplugin.pro @@ -7,10 +7,10 @@ CONFIG += shared c++14 DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung -LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib +LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib -INCLUDEPATH += $$PWD/../../zeiterfassungguilib -DEPENDPATH += $$PWD/../../zeiterfassungguilib +INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib +DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT diff --git a/plugins/weatherplugin/weatherplugin.pro b/plugins/weatherplugin/weatherplugin.pro index 558bac6..275eeaa 100644 --- a/plugins/weatherplugin/weatherplugin.pro +++ b/plugins/weatherplugin/weatherplugin.pro @@ -7,10 +7,10 @@ CONFIG += shared c++14 DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung -LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib +LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib -INCLUDEPATH += $$PWD/../../zeiterfassungguilib -DEPENDPATH += $$PWD/../../zeiterfassungguilib +INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib +DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT diff --git a/zeiterfassung.pro b/zeiterfassung.pro index dba4b08..fed8288 100644 --- a/zeiterfassung.pro +++ b/zeiterfassung.pro @@ -2,7 +2,9 @@ TEMPLATE = subdirs SUBDIRS += plugins \ zeiterfassung \ + zeiterfassungcorelib \ zeiterfassungguilib plugins.depends += zeiterfassungguilib -zeiterfassung.depends += zeiterfassungguilib +zeiterfassung.depends += zeiterfassungcorelib zeiterfassungguilib +zeiterfassungguilib.depends += zeiterfassungcorelib diff --git a/zeiterfassung/installs.pri b/zeiterfassung/installs.pri index 6f8b73d..6d9adc7 100644 --- a/zeiterfassung/installs.pri +++ b/zeiterfassung/installs.pri @@ -12,6 +12,8 @@ COMPILED_TRANSLATIONS += $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \ $${OUT_PWD}/translations/zeiterfassung_en.qm \ $${OUT_PWD}/translations/zeiterfassung_de.qm \ + $${OUT_PWD}/../zeiterfassungcorelib/translations/zeiterfassungcorelib_en.qm \ + $${OUT_PWD}/../zeiterfassungcorelib/translations/zeiterfassungcorelib_de.qm \ $${OUT_PWD}/../zeiterfassungguilib/translations/zeiterfassungguilib_en.qm \ $${OUT_PWD}/../zeiterfassungguilib/translations/zeiterfassungguilib_de.qm diff --git a/zeiterfassung/installs_win32.pri b/zeiterfassung/installs_win32.pri index 3344a13..4609981 100644 --- a/zeiterfassung/installs_win32.pri +++ b/zeiterfassung/installs_win32.pri @@ -1,6 +1,7 @@ CONFIG(debug, release|debug): DEBUG_SIGN = d LIBRARIES += win32/Qt.conf \ + $$OUT_PWD/../lib/zeiterfassungcorelib.dll \ $$OUT_PWD/../lib/zeiterfassungguilib.dll \ $$[QT_INSTALL_BINS]/Qt5Core$${DEBUG_SIGN}.dll \ $$[QT_INSTALL_BINS]/Qt5Gui$${DEBUG_SIGN}.dll \ diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassung/zeiterfassung.pro index 7502644..82626d1 100755 --- a/zeiterfassung/zeiterfassung.pro +++ b/zeiterfassung/zeiterfassung.pro @@ -8,10 +8,10 @@ CONFIG -= app_bundle DESTDIR = $${OUT_PWD}/../bin -LIBS += -L$$OUT_PWD/../lib -lzeiterfassungguilib +LIBS += -L$$OUT_PWD/../lib -lzeiterfassungcorelib -lzeiterfassungguilib -INCLUDEPATH += $$PWD/../zeiterfassungguilib -DEPENDPATH += $$PWD/../zeiterfassungguilib +INCLUDEPATH += $$PWD/../zeiterfassungcorelib $$PWD/../zeiterfassungguilib +DEPENDPATH += $$PWD/../zeiterfassungcorelib $$PWD/../zeiterfassungguilib DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT diff --git a/zeiterfassungguilib/cpp14polyfills.h b/zeiterfassungcorelib/cpp14polyfills.h similarity index 100% rename from zeiterfassungguilib/cpp14polyfills.h rename to zeiterfassungcorelib/cpp14polyfills.h diff --git a/zeiterfassungguilib/replies/createbookingreply.cpp b/zeiterfassungcorelib/replies/createbookingreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/createbookingreply.cpp rename to zeiterfassungcorelib/replies/createbookingreply.cpp diff --git a/zeiterfassungguilib/replies/createbookingreply.h b/zeiterfassungcorelib/replies/createbookingreply.h similarity index 71% rename from zeiterfassungguilib/replies/createbookingreply.h rename to zeiterfassungcorelib/replies/createbookingreply.h index f179041..d3527ad 100644 --- a/zeiterfassungguilib/replies/createbookingreply.h +++ b/zeiterfassungcorelib/replies/createbookingreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT CreateBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT CreateBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/createtimeassignmentreply.cpp b/zeiterfassungcorelib/replies/createtimeassignmentreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/createtimeassignmentreply.cpp rename to zeiterfassungcorelib/replies/createtimeassignmentreply.cpp diff --git a/zeiterfassungguilib/replies/createtimeassignmentreply.h b/zeiterfassungcorelib/replies/createtimeassignmentreply.h similarity index 74% rename from zeiterfassungguilib/replies/createtimeassignmentreply.h rename to zeiterfassungcorelib/replies/createtimeassignmentreply.h index efbf1e7..1b50982 100644 --- a/zeiterfassungguilib/replies/createtimeassignmentreply.h +++ b/zeiterfassungcorelib/replies/createtimeassignmentreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT CreateTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT CreateTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/deletebookingreply.cpp b/zeiterfassungcorelib/replies/deletebookingreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/deletebookingreply.cpp rename to zeiterfassungcorelib/replies/deletebookingreply.cpp diff --git a/zeiterfassungguilib/replies/deletebookingreply.h b/zeiterfassungcorelib/replies/deletebookingreply.h similarity index 71% rename from zeiterfassungguilib/replies/deletebookingreply.h rename to zeiterfassungcorelib/replies/deletebookingreply.h index 755bd5b..e7bd1a8 100644 --- a/zeiterfassungguilib/replies/deletebookingreply.h +++ b/zeiterfassungcorelib/replies/deletebookingreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT DeleteBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT DeleteBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/deletetimeassignmentreply.cpp b/zeiterfassungcorelib/replies/deletetimeassignmentreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/deletetimeassignmentreply.cpp rename to zeiterfassungcorelib/replies/deletetimeassignmentreply.cpp diff --git a/zeiterfassungguilib/replies/deletetimeassignmentreply.h b/zeiterfassungcorelib/replies/deletetimeassignmentreply.h similarity index 70% rename from zeiterfassungguilib/replies/deletetimeassignmentreply.h rename to zeiterfassungcorelib/replies/deletetimeassignmentreply.h index 1d33bd2..ff65b86 100644 --- a/zeiterfassungguilib/replies/deletetimeassignmentreply.h +++ b/zeiterfassungcorelib/replies/deletetimeassignmentreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT DeleteTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT DeleteTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/getbookingsreply.cpp b/zeiterfassungcorelib/replies/getbookingsreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/getbookingsreply.cpp rename to zeiterfassungcorelib/replies/getbookingsreply.cpp diff --git a/zeiterfassungguilib/replies/getbookingsreply.h b/zeiterfassungcorelib/replies/getbookingsreply.h similarity index 82% rename from zeiterfassungguilib/replies/getbookingsreply.h rename to zeiterfassungcorelib/replies/getbookingsreply.h index 90974a1..2272829 100644 --- a/zeiterfassungguilib/replies/getbookingsreply.h +++ b/zeiterfassungcorelib/replies/getbookingsreply.h @@ -5,12 +5,12 @@ #include #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGGUILIBSHARED_EXPORT GetBookingsReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT GetBookingsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/getpresencestatusreply.cpp b/zeiterfassungcorelib/replies/getpresencestatusreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/getpresencestatusreply.cpp rename to zeiterfassungcorelib/replies/getpresencestatusreply.cpp diff --git a/zeiterfassungguilib/replies/getpresencestatusreply.h b/zeiterfassungcorelib/replies/getpresencestatusreply.h similarity index 82% rename from zeiterfassungguilib/replies/getpresencestatusreply.h rename to zeiterfassungcorelib/replies/getpresencestatusreply.h index 3c12ae6..91e86b0 100644 --- a/zeiterfassungguilib/replies/getpresencestatusreply.h +++ b/zeiterfassungcorelib/replies/getpresencestatusreply.h @@ -4,12 +4,12 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGGUILIBSHARED_EXPORT GetPresenceStatusReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT GetPresenceStatusReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/getprojectsreply.cpp b/zeiterfassungcorelib/replies/getprojectsreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/getprojectsreply.cpp rename to zeiterfassungcorelib/replies/getprojectsreply.cpp diff --git a/zeiterfassungguilib/replies/getprojectsreply.h b/zeiterfassungcorelib/replies/getprojectsreply.h similarity index 80% rename from zeiterfassungguilib/replies/getprojectsreply.h rename to zeiterfassungcorelib/replies/getprojectsreply.h index 2461baf..6124d63 100644 --- a/zeiterfassungguilib/replies/getprojectsreply.h +++ b/zeiterfassungcorelib/replies/getprojectsreply.h @@ -5,12 +5,12 @@ #include #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGGUILIBSHARED_EXPORT GetProjectsReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT GetProjectsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/getreportreply.cpp b/zeiterfassungcorelib/replies/getreportreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/getreportreply.cpp rename to zeiterfassungcorelib/replies/getreportreply.cpp diff --git a/zeiterfassungguilib/replies/getreportreply.h b/zeiterfassungcorelib/replies/getreportreply.h similarity index 77% rename from zeiterfassungguilib/replies/getreportreply.h rename to zeiterfassungcorelib/replies/getreportreply.h index b2de3bf..aea13e3 100644 --- a/zeiterfassungguilib/replies/getreportreply.h +++ b/zeiterfassungcorelib/replies/getreportreply.h @@ -5,10 +5,10 @@ #include #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT GetReportReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT GetReportReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/gettimeassignmentsreply.cpp b/zeiterfassungcorelib/replies/gettimeassignmentsreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/gettimeassignmentsreply.cpp rename to zeiterfassungcorelib/replies/gettimeassignmentsreply.cpp diff --git a/zeiterfassungguilib/replies/gettimeassignmentsreply.h b/zeiterfassungcorelib/replies/gettimeassignmentsreply.h similarity index 83% rename from zeiterfassungguilib/replies/gettimeassignmentsreply.h rename to zeiterfassungcorelib/replies/gettimeassignmentsreply.h index 4b32d85..cd97149 100644 --- a/zeiterfassungguilib/replies/gettimeassignmentsreply.h +++ b/zeiterfassungcorelib/replies/gettimeassignmentsreply.h @@ -5,12 +5,12 @@ #include #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGGUILIBSHARED_EXPORT GetTimeAssignmentsReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT GetTimeAssignmentsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/getuserinforeply.cpp b/zeiterfassungcorelib/replies/getuserinforeply.cpp similarity index 100% rename from zeiterfassungguilib/replies/getuserinforeply.cpp rename to zeiterfassungcorelib/replies/getuserinforeply.cpp diff --git a/zeiterfassungguilib/replies/getuserinforeply.h b/zeiterfassungcorelib/replies/getuserinforeply.h similarity index 88% rename from zeiterfassungguilib/replies/getuserinforeply.h rename to zeiterfassungcorelib/replies/getuserinforeply.h index e816611..4be4278 100644 --- a/zeiterfassungguilib/replies/getuserinforeply.h +++ b/zeiterfassungcorelib/replies/getuserinforeply.h @@ -4,12 +4,12 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGGUILIBSHARED_EXPORT GetUserInfoReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT GetUserInfoReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/loginpagereply.cpp b/zeiterfassungcorelib/replies/loginpagereply.cpp similarity index 100% rename from zeiterfassungguilib/replies/loginpagereply.cpp rename to zeiterfassungcorelib/replies/loginpagereply.cpp diff --git a/zeiterfassungguilib/replies/loginpagereply.h b/zeiterfassungcorelib/replies/loginpagereply.h similarity index 71% rename from zeiterfassungguilib/replies/loginpagereply.h rename to zeiterfassungcorelib/replies/loginpagereply.h index 6ade4ce..0777741 100644 --- a/zeiterfassungguilib/replies/loginpagereply.h +++ b/zeiterfassungcorelib/replies/loginpagereply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT LoginPageReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT LoginPageReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/loginreply.cpp b/zeiterfassungcorelib/replies/loginreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/loginreply.cpp rename to zeiterfassungcorelib/replies/loginreply.cpp diff --git a/zeiterfassungguilib/replies/loginreply.h b/zeiterfassungcorelib/replies/loginreply.h similarity index 71% rename from zeiterfassungguilib/replies/loginreply.h rename to zeiterfassungcorelib/replies/loginreply.h index 10e7d6e..f6f76c4 100644 --- a/zeiterfassungguilib/replies/loginreply.h +++ b/zeiterfassungcorelib/replies/loginreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT LoginReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT LoginReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/updatebookingreply.cpp b/zeiterfassungcorelib/replies/updatebookingreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/updatebookingreply.cpp rename to zeiterfassungcorelib/replies/updatebookingreply.cpp diff --git a/zeiterfassungguilib/replies/updatebookingreply.h b/zeiterfassungcorelib/replies/updatebookingreply.h similarity index 72% rename from zeiterfassungguilib/replies/updatebookingreply.h rename to zeiterfassungcorelib/replies/updatebookingreply.h index 295f927..137bd2e 100644 --- a/zeiterfassungguilib/replies/updatebookingreply.h +++ b/zeiterfassungcorelib/replies/updatebookingreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT UpdateBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT UpdateBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/updatetimeassignmentreply.cpp b/zeiterfassungcorelib/replies/updatetimeassignmentreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/updatetimeassignmentreply.cpp rename to zeiterfassungcorelib/replies/updatetimeassignmentreply.cpp diff --git a/zeiterfassungguilib/replies/updatetimeassignmentreply.h b/zeiterfassungcorelib/replies/updatetimeassignmentreply.h similarity index 74% rename from zeiterfassungguilib/replies/updatetimeassignmentreply.h rename to zeiterfassungcorelib/replies/updatetimeassignmentreply.h index a6d9872..3bdb59e 100644 --- a/zeiterfassungguilib/replies/updatetimeassignmentreply.h +++ b/zeiterfassungcorelib/replies/updatetimeassignmentreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT UpdateTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGCORELIBSHARED_EXPORT UpdateTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungguilib/replies/zeiterfassungreply.cpp b/zeiterfassungcorelib/replies/zeiterfassungreply.cpp similarity index 100% rename from zeiterfassungguilib/replies/zeiterfassungreply.cpp rename to zeiterfassungcorelib/replies/zeiterfassungreply.cpp diff --git a/zeiterfassungguilib/replies/zeiterfassungreply.h b/zeiterfassungcorelib/replies/zeiterfassungreply.h similarity index 81% rename from zeiterfassungguilib/replies/zeiterfassungreply.h rename to zeiterfassungcorelib/replies/zeiterfassungreply.h index a278db4..11b535d 100644 --- a/zeiterfassungguilib/replies/zeiterfassungreply.h +++ b/zeiterfassungcorelib/replies/zeiterfassungreply.h @@ -2,11 +2,11 @@ #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" class ZeiterfassungApi; -class ZEITERFASSUNGGUILIBSHARED_EXPORT ZeiterfassungReply : public QObject +class ZEITERFASSUNGCORELIBSHARED_EXPORT ZeiterfassungReply : public QObject { Q_OBJECT diff --git a/zeiterfassungguilib/timeutils.cpp b/zeiterfassungcorelib/timeutils.cpp similarity index 100% rename from zeiterfassungguilib/timeutils.cpp rename to zeiterfassungcorelib/timeutils.cpp diff --git a/zeiterfassungcorelib/timeutils.h b/zeiterfassungcorelib/timeutils.h new file mode 100644 index 0000000..3544299 --- /dev/null +++ b/zeiterfassungcorelib/timeutils.h @@ -0,0 +1,10 @@ +#pragma once + +#include + +#include "zeiterfassungcorelib_global.h" + +int ZEITERFASSUNGCORELIBSHARED_EXPORT timeToSeconds(const QTime &time); +QTime ZEITERFASSUNGCORELIBSHARED_EXPORT timeBetween(const QTime &l, const QTime &r); +QTime ZEITERFASSUNGCORELIBSHARED_EXPORT timeAdd(const QTime &l, const QTime &r); +QTime ZEITERFASSUNGCORELIBSHARED_EXPORT timeNormalise(const QTime &time); diff --git a/zeiterfassungcorelib/translations/zeiterfassungcorelib_de.ts b/zeiterfassungcorelib/translations/zeiterfassungcorelib_de.ts new file mode 100644 index 0000000..b624ce5 --- /dev/null +++ b/zeiterfassungcorelib/translations/zeiterfassungcorelib_de.ts @@ -0,0 +1,277 @@ + + + + + CreateBookingReply + + + Request error occured: %0 + + + + + CreateTimeAssignmentReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + DeleteBookingReply + + + Request error occured: %0 + + + + + DeleteTimeAssignmentReply + + + Request error occured: %0 + + + + + GetBookingsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetPresenceStatusReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetProjectsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain elements! + + + + + elements is not an array! + + + + + GetReportReply + + + + Request error occured: %0 + + + + + GetTimeAssignmentsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetUserInfoReply + + + Request 0 error occured: %0 + + + + + Parsing JSON 0 failed: %0 + + + + + JSON document 0 is not an object! + + + + + JSON 0 does not contain evoAppsUser! + + + + + evoAppsUser is not an object! + + + + + Request 1 error occured: %0 + + + + + Parsing JSON 1 failed: %0 + + + + + JSON document 1 is not an array! + + + + + JSON array 1 is empty! + + + + + JSON array value is not an object! + + + + + LoginPageReply + + + Request error occured: %0 + + + + + Could not find necessary keywords in login page! + + + + + LoginReply + + + Request error occured: %0 + + + + + Response did not contain a Location header. + + + + + Authentication failure. Please check username and password. + + + + + An unknown authentication failure occured. Redirected to: %0 + + + + + UpdateBookingReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + UpdateTimeAssignmentReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + diff --git a/zeiterfassungcorelib/translations/zeiterfassungcorelib_en.ts b/zeiterfassungcorelib/translations/zeiterfassungcorelib_en.ts new file mode 100644 index 0000000..747f7a7 --- /dev/null +++ b/zeiterfassungcorelib/translations/zeiterfassungcorelib_en.ts @@ -0,0 +1,277 @@ + + + + + CreateBookingReply + + + Request error occured: %0 + + + + + CreateTimeAssignmentReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + DeleteBookingReply + + + Request error occured: %0 + + + + + DeleteTimeAssignmentReply + + + Request error occured: %0 + + + + + GetBookingsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetPresenceStatusReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetProjectsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain elements! + + + + + elements is not an array! + + + + + GetReportReply + + + + Request error occured: %0 + + + + + GetTimeAssignmentsReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an array! + + + + + GetUserInfoReply + + + Request 0 error occured: %0 + + + + + Parsing JSON 0 failed: %0 + + + + + JSON document 0 is not an object! + + + + + JSON 0 does not contain evoAppsUser! + + + + + evoAppsUser is not an object! + + + + + Request 1 error occured: %0 + + + + + Parsing JSON 1 failed: %0 + + + + + JSON document 1 is not an array! + + + + + JSON array 1 is empty! + + + + + JSON array value is not an object! + + + + + LoginPageReply + + + Request error occured: %0 + + + + + Could not find necessary keywords in login page! + + + + + LoginReply + + + Request error occured: %0 + + + + + Response did not contain a Location header. + + + + + Authentication failure. Please check username and password. + + + + + An unknown authentication failure occured. Redirected to: %0 + + + + + UpdateBookingReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + + UpdateTimeAssignmentReply + + + Request error occured: %0 + + + + + Parsing JSON failed: %0 + + + + + JSON document is not an object! + + + + + JSON does not contain bookingNr! + + + + diff --git a/zeiterfassungguilib/zeiterfassungapi.cpp b/zeiterfassungcorelib/zeiterfassungapi.cpp similarity index 100% rename from zeiterfassungguilib/zeiterfassungapi.cpp rename to zeiterfassungcorelib/zeiterfassungapi.cpp diff --git a/zeiterfassungguilib/zeiterfassungapi.h b/zeiterfassungcorelib/zeiterfassungapi.h similarity index 96% rename from zeiterfassungguilib/zeiterfassungapi.h rename to zeiterfassungcorelib/zeiterfassungapi.h index c4bce45..b1320ee 100644 --- a/zeiterfassungguilib/zeiterfassungapi.h +++ b/zeiterfassungcorelib/zeiterfassungapi.h @@ -7,7 +7,7 @@ #include #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" class QNetworkAccessManager; @@ -26,7 +26,7 @@ class GetProjectsReply; class GetReportReply; class GetPresenceStatusReply; -class ZEITERFASSUNGGUILIBSHARED_EXPORT ZeiterfassungApi : public QObject +class ZEITERFASSUNGCORELIBSHARED_EXPORT ZeiterfassungApi : public QObject { Q_OBJECT diff --git a/zeiterfassungcorelib/zeiterfassungcorelib.pro b/zeiterfassungcorelib/zeiterfassungcorelib.pro new file mode 100644 index 0000000..d653219 --- /dev/null +++ b/zeiterfassungcorelib/zeiterfassungcorelib.pro @@ -0,0 +1,65 @@ +QT += core network + +TARGET = zeiterfassungcorelib +TEMPLATE = lib + +CONFIG += c++14 + +DESTDIR = $${OUT_PWD}/../lib + +DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DEFINES += ZEITERFASSUNGCORELIB_LIBRARY + +SOURCES += timeutils.cpp \ + zeiterfassungapi.cpp \ + zeiterfassungsettings.cpp \ + replies/createbookingreply.cpp \ + replies/createtimeassignmentreply.cpp \ + replies/deletebookingreply.cpp \ + replies/deletetimeassignmentreply.cpp \ + replies/getbookingsreply.cpp \ + replies/getpresencestatusreply.cpp \ + replies/getprojectsreply.cpp \ + replies/getreportreply.cpp \ + replies/gettimeassignmentsreply.cpp \ + replies/getuserinforeply.cpp \ + replies/loginpagereply.cpp \ + replies/loginreply.cpp \ + replies/updatebookingreply.cpp \ + replies/updatetimeassignmentreply.cpp \ + replies/zeiterfassungreply.cpp + +HEADERS += cpp14polyfills.h \ + timeutils.h \ + zeiterfassungapi.h \ + zeiterfassungcorelib_global.h \ + zeiterfassungsettings.h \ + replies/createbookingreply.h \ + replies/createtimeassignmentreply.h \ + replies/deletebookingreply.h \ + replies/deletetimeassignmentreply.h \ + replies/getbookingsreply.h \ + replies/getpresencestatusreply.h \ + replies/getprojectsreply.h \ + replies/getreportreply.h \ + replies/gettimeassignmentsreply.h \ + replies/getuserinforeply.h \ + replies/loginpagereply.h \ + replies/loginreply.h \ + replies/updatebookingreply.h \ + replies/updatetimeassignmentreply.h \ + replies/zeiterfassungreply.h + +FORMS += + +RESOURCES += + +TRANSLATIONS += translations/zeiterfassungcorelib_en.ts \ + translations/zeiterfassungcorelib_de.ts + +include(../lrelease.pri) + +# unix { +# target.path = /usr/lib +# INSTALLS += target +# } diff --git a/zeiterfassungcorelib/zeiterfassungcorelib_global.h b/zeiterfassungcorelib/zeiterfassungcorelib_global.h new file mode 100644 index 0000000..334fcf9 --- /dev/null +++ b/zeiterfassungcorelib/zeiterfassungcorelib_global.h @@ -0,0 +1,9 @@ +#pragma once + +#include + +#if defined(ZEITERFASSUNGCORELIB_LIBRARY) +# define ZEITERFASSUNGCORELIBSHARED_EXPORT Q_DECL_EXPORT +#else +# define ZEITERFASSUNGCORELIBSHARED_EXPORT Q_DECL_IMPORT +#endif diff --git a/zeiterfassungguilib/zeiterfassungsettings.cpp b/zeiterfassungcorelib/zeiterfassungsettings.cpp similarity index 100% rename from zeiterfassungguilib/zeiterfassungsettings.cpp rename to zeiterfassungcorelib/zeiterfassungsettings.cpp diff --git a/zeiterfassungguilib/zeiterfassungsettings.h b/zeiterfassungcorelib/zeiterfassungsettings.h similarity index 93% rename from zeiterfassungguilib/zeiterfassungsettings.h rename to zeiterfassungcorelib/zeiterfassungsettings.h index a919bd0..843ea9c 100644 --- a/zeiterfassungguilib/zeiterfassungsettings.h +++ b/zeiterfassungcorelib/zeiterfassungsettings.h @@ -6,9 +6,9 @@ #include #include -#include "zeiterfassungguilib_global.h" +#include "zeiterfassungcorelib_global.h" -class ZEITERFASSUNGGUILIBSHARED_EXPORT ZeiterfassungSettings : public QSettings +class ZEITERFASSUNGCORELIBSHARED_EXPORT ZeiterfassungSettings : public QSettings { Q_OBJECT diff --git a/zeiterfassungguilib/timeutils.h b/zeiterfassungguilib/timeutils.h deleted file mode 100644 index 00a48e0..0000000 --- a/zeiterfassungguilib/timeutils.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include - -#include "zeiterfassungguilib_global.h" - -int ZEITERFASSUNGGUILIBSHARED_EXPORT timeToSeconds(const QTime &time); -QTime ZEITERFASSUNGGUILIBSHARED_EXPORT timeBetween(const QTime &l, const QTime &r); -QTime ZEITERFASSUNGGUILIBSHARED_EXPORT timeAdd(const QTime &l, const QTime &r); -QTime ZEITERFASSUNGGUILIBSHARED_EXPORT timeNormalise(const QTime &time); diff --git a/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts b/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts index 873a88d..baf47aa 100644 --- a/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts +++ b/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts @@ -54,187 +54,6 @@ Passwort: - - CreateBookingReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - CreateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - DeleteBookingReply - - - Request error occured: %0 - - - - - DeleteTimeAssignmentReply - - - Request error occured: %0 - - - - - GetBookingsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetPresenceStatusReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetProjectsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain elements! - - - - - elements is not an array! - - - - - GetReportReply - - - - Request error occured: %0 - - - - - GetTimeAssignmentsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetUserInfoReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain evoAppsUser! - - - - - evoAppsUser is not an object! - - - LanguageSelectionDialog @@ -264,42 +83,6 @@ Deutsch - - LoginPageReply - - - Request error occured: %0 - - - - - Could not find necessary keywords in login page! - - - - - LoginReply - - - Request error occured: %0 - - - - - Response did not contain a Location header. - - - - - Authentication failure. Please check username and password. - - - - - An unknown authentication failure occured. Redirected to: %0 - - - MainWindow @@ -544,7 +327,7 @@ Booking ID: %1 - + %0: %1 %0: %1 @@ -555,17 +338,17 @@ Booking ID: %1 - - + + %0h %0h - - - - + + + + HH:mm HH:mm @@ -575,62 +358,48 @@ Booking ID: %1 Kontierung fehlend! - - - - Expected %0 but received %1 in time assignment. -Time assignment ID: %2 - - - - - - - - - - - - + + + HH:mm:ss HH:mm:ss - - + + There is another booking after an unfinished time assignment. Booking ID: %0 Time assignment ID: %1 - - - + + + There is another time assignment after an unfinished time assignment. Time assignment ID: %0 Time assignment ID: %1 - + The last time assignment is finished without end booking Time assignment ID: %0 - + Expected end booking, instead got type %0 Booking ID: %1 - + Missing time assignment! Missing: %0 Kontierung fehlend! %0 nicht kontiert - + Assigned time Kontierte Zeit @@ -645,14 +414,14 @@ Booking ID: %1 %0 (%1) - + Time assignment time longer than booking time! Time assignment: %0 Booking: %1 - + Strip rendering aborted due error. Your bookings and time assignments for this day are in an illegal state! @@ -698,55 +467,9 @@ Your bookings and time assignments for this day are in an illegal state!Ungültig - + Open Offen - - UpdateBookingReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - UpdateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - diff --git a/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts b/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts index 2e4ce17..27f9a57 100644 --- a/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts +++ b/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts @@ -54,187 +54,6 @@ - - CreateBookingReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - CreateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - DeleteBookingReply - - - Request error occured: %0 - - - - - DeleteTimeAssignmentReply - - - Request error occured: %0 - - - - - GetBookingsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetPresenceStatusReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetProjectsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain elements! - - - - - elements is not an array! - - - - - GetReportReply - - - - Request error occured: %0 - - - - - GetTimeAssignmentsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetUserInfoReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain evoAppsUser! - - - - - evoAppsUser is not an object! - - - LanguageSelectionDialog @@ -264,42 +83,6 @@ - - LoginPageReply - - - Request error occured: %0 - - - - - Could not find necessary keywords in login page! - - - - - LoginReply - - - Request error occured: %0 - - - - - Response did not contain a Location header. - - - - - Authentication failure. Please check username and password. - - - - - An unknown authentication failure occured. Redirected to: %0 - - - MainWindow @@ -544,7 +327,7 @@ Booking ID: %1 - + %0: %1 @@ -555,17 +338,17 @@ Booking ID: %1 - - + + %0h - - - - + + + + HH:mm @@ -575,74 +358,60 @@ Booking ID: %1 - - - - Expected %0 but received %1 in time assignment. -Time assignment ID: %2 - - - - - - - - - - - - + + + HH:mm:ss - - + + There is another booking after an unfinished time assignment. Booking ID: %0 Time assignment ID: %1 - - - + + + There is another time assignment after an unfinished time assignment. Time assignment ID: %0 Time assignment ID: %1 - + The last time assignment is finished without end booking Time assignment ID: %0 - + Expected end booking, instead got type %0 Booking ID: %1 - + Missing time assignment! Missing: %0 - + Time assignment time longer than booking time! Time assignment: %0 Booking: %1 - + Assigned time - + Strip rendering aborted due error. Your bookings and time assignments for this day are in an illegal state! @@ -698,55 +467,9 @@ Your bookings and time assignments for this day are in an illegal state! - + Open - - UpdateBookingReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - UpdateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - diff --git a/zeiterfassungguilib/zeiterfassungguilib.pro b/zeiterfassungguilib/zeiterfassungguilib.pro index 27e6778..0f252db 100644 --- a/zeiterfassungguilib/zeiterfassungguilib.pro +++ b/zeiterfassungguilib/zeiterfassungguilib.pro @@ -7,64 +7,32 @@ CONFIG += c++14 DESTDIR = $${OUT_PWD}/../lib +LIBS += -L$$OUT_PWD/../lib -lzeiterfassungcorelib + +INCLUDEPATH += $$PWD/../zeiterfassungcorelib +DEPENDPATH += $$PWD/../zeiterfassungcorelib + DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT DEFINES += ZEITERFASSUNGGUILIB_LIBRARY SOURCES += mainwindow.cpp \ stripfactory.cpp \ stripswidget.cpp \ - timeutils.cpp \ - zeiterfassungapi.cpp \ zeiterfassungplugin.cpp \ - zeiterfassungsettings.cpp \ dialogs/aboutmedialog.cpp \ dialogs/authenticationdialog.cpp \ dialogs/languageselectiondialog.cpp \ - dialogs/settingsdialog.cpp \ - replies/createbookingreply.cpp \ - replies/createtimeassignmentreply.cpp \ - replies/deletebookingreply.cpp \ - replies/deletetimeassignmentreply.cpp \ - replies/getbookingsreply.cpp \ - replies/getpresencestatusreply.cpp \ - replies/getprojectsreply.cpp \ - replies/gettimeassignmentsreply.cpp \ - replies/loginpagereply.cpp \ - replies/loginreply.cpp \ - replies/updatebookingreply.cpp \ - replies/updatetimeassignmentreply.cpp \ - replies/zeiterfassungreply.cpp \ - replies/getuserinforeply.cpp \ - replies/getreportreply.cpp + dialogs/settingsdialog.cpp -HEADERS += cpp14polyfills.h \ - mainwindow.h \ +HEADERS += mainwindow.h \ stripfactory.h \ stripswidget.h \ - timeutils.h \ - zeiterfassungapi.h \ zeiterfassungguilib_global.h \ zeiterfassungplugin.h \ - zeiterfassungsettings.h \ dialogs/aboutmedialog.h \ dialogs/authenticationdialog.h \ dialogs/languageselectiondialog.h \ - dialogs/settingsdialog.h \ - replies/createbookingreply.h \ - replies/createtimeassignmentreply.h \ - replies/deletebookingreply.h \ - replies/deletetimeassignmentreply.h \ - replies/getbookingsreply.h \ - replies/getpresencestatusreply.h \ - replies/getprojectsreply.h \ - replies/gettimeassignmentsreply.h \ - replies/loginpagereply.h \ - replies/loginreply.h \ - replies/updatebookingreply.h \ - replies/updatetimeassignmentreply.h \ - replies/zeiterfassungreply.h \ - replies/getuserinforeply.h \ - replies/getreportreply.h + dialogs/settingsdialog.h FORMS += mainwindow.ui \ dialogs/settingsdialog.ui \ diff --git a/zeiterfassungguilib/zeiterfassungguilib_global.h b/zeiterfassungguilib/zeiterfassungguilib_global.h index 985c61f..3da52d5 100644 --- a/zeiterfassungguilib/zeiterfassungguilib_global.h +++ b/zeiterfassungguilib/zeiterfassungguilib_global.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #if defined(ZEITERFASSUNGGUILIB_LIBRARY) # define ZEITERFASSUNGGUILIBSHARED_EXPORT Q_DECL_EXPORT